diff --git a/changelog.d/chat-shell-parity-first-batch.added.md b/changelog.d/chat-shell-parity-first-batch.added.md new file mode 100644 index 000000000..8124c7fde --- /dev/null +++ b/changelog.d/chat-shell-parity-first-batch.added.md @@ -0,0 +1 @@ +Wide sidebar shows a 72px FlyBot icon rail beside the session list. The Grove theme, denser rows, rounded session header and taller pill composer land in `parity-shell.js`. Product name and mark stay FlyBot. Existing Search, New, Inbox, Kanban and Projects entries remain. Built `core/client.js` from this source (`npm run build` / `build-client.mjs --check`). Fresh profiles resolve to the Grove theme; saved DeepSeek/Mono/Paper/Moonlight ids are kept. Shell metrics follow the 1920×1072 visual-reference measurements (72/360/56/86, selected `#235039`, title 14/500, preview 12/400, long-title ellipsis, list scroll, disabled opacity). diff --git a/changelog.d/owner-scoped-history-search.added.md b/changelog.d/owner-scoped-history-search.added.md new file mode 100644 index 000000000..35012f9bb --- /dev/null +++ b/changelog.d/owner-scoped-history-search.added.md @@ -0,0 +1 @@ +Search human transcript text across the signed-in owner’s local Bot chat segments, with Chinese literal matching, bounded pagination and read-only hit context. Earlier hits no longer open the current chat as if located. Recheck ownership and visibility before/after reads and before delivery; refuse stale or expired hits. Group, remote and Agent history remain loaded-outline-only. Cold observation still materializes a full Session before limits; browser acceptance is pending. diff --git a/changelog.d/share-stopped-bot-errors.fixed.md b/changelog.d/share-stopped-bot-errors.fixed.md new file mode 100644 index 000000000..0ed157a2c --- /dev/null +++ b/changelog.d/share-stopped-bot-errors.fixed.md @@ -0,0 +1 @@ +Sharing a Bot with a friend, joining an invite, entering a face-to-face room, approving a waiting card, and accepting a friend request now say so when Bot Social refuses because a Bot is stopped or was removed (`bot_frozen` / `bot_revoked`), including after a grant or consent that arrives later, instead of a generic "try again" or the raw server code. A stopped Bot can be resumed and then shared, approved or joined with the same link; a removed one needs a new invite. The waiting card stays pending when the approve is refused. diff --git a/changelog.d/teamily-group-and-session-filter.added.md b/changelog.d/teamily-group-and-session-filter.added.md new file mode 100644 index 000000000..d70c48733 --- /dev/null +++ b/changelog.d/teamily-group-and-session-filter.added.md @@ -0,0 +1 @@ +The New group form now matches the Teamily create-group layout where FlyBot already can: an optional name, member search, a selected pane with an empty state, and Create disabled until a local admin and one more member are picked. The sidebar session list can filter to all, group chats, direct chats, and unread using marks the rows already had. It does not add a Team plan, paid member modes, a convert-workspace wizard, or a filter the list cannot actually apply. diff --git a/changelog.d/teamily-integrated-quality-review.fixed.md b/changelog.d/teamily-integrated-quality-review.fixed.md new file mode 100644 index 000000000..e5acc43ed --- /dev/null +++ b/changelog.d/teamily-integrated-quality-review.fixed.md @@ -0,0 +1 @@ +Integrated parity review: clarify manual-unread clearing and estimated night hours; guard IME/read-only shortcuts including NewChat; preserve full inline text behind document cards and respect No folding; handle fenced code, menu clipboard/download failures and dismissal; stage host preference validation; reduce host-theme observer conflicts; improve keyboard/narrow layouts. Static HTML references are explicitly marked hand-authored mockups, not real UI acceptance. That historical review retained one dev-bench preflight failure; the later local bench-preflight symlink CLI fix resolved it without skipping tests or raising thresholds. 2026-11-16 (Asia/Shanghai): close historical-search click loop with a real read-only segment context viewer, not current-chat navigation. Opaque owner/instance/snapshot-bound hit tickets, permission rechecks before/after reads and after lease release, stale/revoked/deleted handling, cancellable hooks, bounded concurrency/queries/segments/scanned text/encoded JSON output. Cold observation still materializes a whole Session before byte/event checks; no hard native I/O or peak-memory guarantee. Focused 84/84 and build/check/lint passed; final full regression recorded in core/dev/history-hit-review/progress.md. No real history, browser, screenshots, deployment, network changes, commits or pushes. diff --git a/changelog.d/teamily-memory-directory.added.md b/changelog.d/teamily-memory-directory.added.md new file mode 100644 index 000000000..cf9a88bb6 --- /dev/null +++ b/changelog.d/teamily-memory-directory.added.md @@ -0,0 +1 @@ +The memory panel now has a real directory and search over entries the host already loaded: Overview, All entries, and topics grouped by Bot or team memory. The directory can be hidden. Changing the setting does not invent a knowledge graph, a profile, a todo list, or a new page that saves itself immediately. diff --git a/changelog.d/teamily-message-folding.added.md b/changelog.d/teamily-message-folding.added.md new file mode 100644 index 000000000..12b0caa13 --- /dev/null +++ b/changelog.d/teamily-message-folding.added.md @@ -0,0 +1 @@ +Long messages in a chat bubble now fold to a preview (compact / standard / no folding), with Show more / Show less. Under the standard setting, a long multi-section document can collapse into a card opened beside the conversation. The General setting writes through set-prefs and actually changes the bubbles. diff --git a/changelog.d/teamily-message-menu.added.md b/changelog.d/teamily-message-menu.added.md new file mode 100644 index 000000000..0dbda4243 --- /dev/null +++ b/changelog.d/teamily-message-menu.added.md @@ -0,0 +1 @@ +Message hover, overflow, and right-click menus now share the actions FlyBot can actually run: add a reaction, reply (quote into the composer), copy, and download. User bubbles use the same menu. A locked window hides Reply. Unimplemented items such as Artifacts, translation, forwarding, multi-select, templates, recall, re-edit, message pin, and report are not drawn. Session Pin/Unpin is already a host flag and is also offered in the conversation overflow when that write is allowed. diff --git a/changelog.d/teamily-search-and-unread.added.md b/changelog.d/teamily-search-and-unread.added.md new file mode 100644 index 000000000..bf3eecccd --- /dev/null +++ b/changelog.d/teamily-search-and-unread.added.md @@ -0,0 +1 @@ +The chat search palette now opens with an empty state instead of a prefilled bot list, keeps a close control, and only offers type filters the host can actually apply: All, Chats, Messages, and Commands. Message search still uses loaded turn outlines, and the copy says so instead of claiming every chat or all content. Session row menus and the header overflow can mark a chat unread or clear that local mark; the unread filter follows the change. Mark as Read does not pretend to acknowledge a completion or pending-interaction flag, and there is no @ filter. diff --git a/changelog.d/teamily-settings-parity.added.md b/changelog.d/teamily-settings-parity.added.md new file mode 100644 index 000000000..517db5db7 --- /dev/null +++ b/changelog.d/teamily-settings-parity.added.md @@ -0,0 +1 @@ +General settings now include appearance (light / dark / automatic / match system, with sunset-to-sunrise or a custom night window), a language entry that follows the DeepSeek Harness locale, and a real Enter vs Shift+Enter send shortcut. A Channels page lists only integrations FlyBot already has (for example Feishu). The composer + menu groups the existing Attach, Reference, and Scheduled task actions, and the session header overflow exposes conversation settings and Copy invite link when sharing is available. Product name and mark stay FlyBot. Paid plans, credits, unimplemented creation types, and unconnected messaging channels are not added. diff --git a/core/client.js b/core/client.js index 34a7d1da8..5f190fb94 100644 --- a/core/client.js +++ b/core/client.js @@ -233,6 +233,9 @@ var ZH = { "Could not create the invite. Use Bot settings → Sharing → Copy invite link for this Bot.": "无法创建邀请。请在 Bot 设置 → Sharing 里使用 Copy invite link for this Bot。", "Add friend": "添加好友", "Friend requests": "好友请求", + "A friend": "一位好友", + "{name} requests a share": "{name} 请求分享", + "{name} requests {capability}": "{name} 请求 {capability}", "Accept or decline incoming requests.": "接受或拒绝收到的请求。", "Accept invite": "接受邀请", "Paste a friend’s invite link or code.": "粘贴朋友的邀请链接或邀请码。", @@ -698,12 +701,59 @@ var ZH = { "Group chats": "群聊", Secrets: "密钥", Appearance: "外观", + Grove: "林间", Theme: "主题", "Colors for the whole team, on every device.": "整个团队的配色,所有设备同步。", Accent: "强调色", "Unread marks, badges, and the brand mark.": "未读标记、徽标和品牌标志。", "Theme accent": "主题强调色", "Custom accent": "自定义强调色", + "Light theme": "浅色", + "Dark theme": "深色", + Automatic: "自动", + "Match system": "跟随系统", + "How this window looks: light, dark, automatic, or match the system.": "此窗口的外观:浅色、深色、自动,或跟随系统。", + "Automatic switch": "自动切换", + "Sunset to sunrise": "日落到日出", + "Custom hours": "自定义时段", + "Dark from": "深色开始", + "Dark until": "深色结束", + "Switches about a minute after the chosen time, and not in the middle of a turn.": "到点后约再等一分钟,且不会打断正在进行的回复。", + Language: "语言", + "Interface language": "界面语言", + "Follows the DeepSeek Harness language.": "跟随 DeepSeek Harness 的界面语言。", + English: "English", + "Simplified Chinese": "简体中文", + Shortcuts: "快捷键", + "Send shortcut": "发送快捷键", + "Enter to send": "Enter 发送", + "Shift+Enter to send": "Shift+Enter 发送", + "Enter inserts a new line.": "Enter 换行。", + "Shift+Enter inserts a new line.": "Shift+Enter 换行。", + "Message folding": "消息折叠", + "Choose how much of a long message to show before it folds.": "选择长消息在对话里折叠前展示多少内容。", + Compact: "紧凑", + "A very short preview, for scanning a conversation.": "只展示很短的预览。适合以扫读为主的场景。", + Standard: "标准", + "A moderate preview. Recommended.": "展示适中的预览。推荐。", + "No folding": "不折叠", + "Show every message in full. Long messages push the conversation off the screen.": "完整展示每条消息。长消息会把对话推离屏幕。", + "Collapse long documents into cards": "长文档收成卡片", + "Messages with several sections appear as a card you can open beside the conversation.": "含多个章节的消息显示为卡片,可在对话旁边打开阅读,不再铺满屏幕。", + "Open beside the conversation": "在对话旁打开", + "Opened beside the conversation.": "已在对话旁打开。", + "Close document": "关闭文档", + "{count} sections": "{count} 个章节", + Document: "文档", + Channels: "渠道", + "No channels yet.": "还没有渠道。", + "Only integrations FlyBot already has appear here.": "这里只列出 FlyBot 已经接入的渠道。", + "Conversation settings": "会话设置", + Attach: "附件", + "Reference a chat is available in a Bot or group chat.": "在 Bot 或群聊里才能引用另一段对话。", + "A read-only window cannot create a scheduled task.": "只读窗口不能创建定时任务。", + "Invite link copied": "邀请链接已复制", + "Could not copy the invite link": "无法复制邀请链接", On: "开", None: "无", "Bots · {count}": "Bot · {count}", @@ -870,7 +920,22 @@ var ZH = { Messages: "消息", Commands: "命令", "Search Bots, chats and messages": "搜索 Bot、对话和消息", + "Search Bots, chats, and loaded messages": "搜索 Bot、对话和已加载的消息", "Clear search": "清除搜索", + "Search filters": "搜索筛选", + Chats: "对话", + "Search chats and messages": "搜索对话和消息", + "Type a Bot name, a group name, or words from a loaded message": "输入 Bot 名、群名,或已加载消息里的词", + "Try a Bot name, a group name, or words from a loaded message": "试试 Bot 名、群名,或已加载消息里的词", + "Type at least two characters to search messages already loaded": "至少输入两个字符,搜索已加载的消息", + "Clear unread mark": "清除手动未读标记", + "Estimated night hours (time-zone based)": "估算夜间时段(按时区,非实际日落时间)", + "Could not copy message": "未能复制消息,请重试或手动选择文字复制", + "Could not download message": "未能下载消息,请重试或复制正文", + "Clipboard unavailable": "剪贴板不可用,请手动选择文字复制", + "Show message text": "显示消息正文", + "Hide message text": "收起消息正文", + "Mark as Read": "标为已读", Results: "结果", "No results": "没有结果", "Try a Bot name or words from a message": "试试 Bot 名字或消息里的词", @@ -1075,6 +1140,16 @@ var ZH = { "Manage {name}'s memory": "管理 {name} 的记忆", "{name}'s memory": "{name} 的记忆", "Memory summary": "记忆摘要", + Overview: "总览", + "Memory directory": "记忆目录", + "Search memory": "搜索记忆", + "Hide directory": "收起目录", + "Show directory": "显示目录", + "Main memory": "主记忆", + "1 topic": "1 个主题", + "{count} topics": "{count} 个主题", + 'No entries match "{query}"': "没有与“{query}”相符的记忆", + "Try a different word, or clear the search to see every entry.": "换个词试试,或清空搜索查看全部记忆。", "All entries": "全部记忆", "Memory options": "记忆选项", "Close memory": "关闭记忆", @@ -1312,6 +1387,20 @@ var ZH = { "Who to chat with…": "想和谁聊…", "Add at least one more Bot": "再至少添加一个 Bot", Members: "成员", + "Add a name, then pick Bots to chat with.": "添加名称,然后选择要一起聊天的 Bot。", + "Group name (optional)": "输入群组名称(可选)", + "Search members": "搜索成员", + "Selected {count}": "已选 {count}", + "Selected members": "已选成员", + "No members selected": "还没有选择成员", + "No more Bots to add": "没有更多可添加的 Bot", + // Session list filters (kinds the sidebar already has) + "Session filter": "会话筛选", + "Direct chats": "单聊", + Unread: "未读", + "No group chats": "没有群聊", + "No direct chats": "没有单聊", + "No unread chats": "没有未读会话", // Connectors and scheduled tasks "Choose Bots": "选择 Bot", "Off for every Bot. Choose which Bots may use it.": "所有 Bot 都未开启。选择哪些 Bot 可以使用。", @@ -1383,6 +1472,7 @@ var ZH = { "Sum up what changed since yesterday and what needs me today.": "总结一下昨天以来的变化,以及今天需要我处理的事。", When: "什么时候", "Date and time": "日期和时间", + "Time zone": "时区", Days: "星期", Time: "时间", Every: "每", @@ -1609,6 +1699,10 @@ var HOST_ZH = { "Only a Main Bot can be replaced": "只能替换主 Bot", "A Main Bot cannot be deleted; remove its Main Bot role first": "主 Bot 不能删除,请先取消它的主 Bot 身份", "Unknown theme": "未知主题", + "Appearance must be light, dark, auto or system": "外观必须是浅色、深色、自动或跟随系统", + "Send shortcut must be Enter or Shift+Enter": "发送快捷键必须是 Enter 或 Shift+Enter", + "Message folding must be compact, standard or none": "消息折叠必须是紧凑、标准或不折叠", + "Document cards must be on or off": "长文档卡片必须开或关", "Accent must be a #rrggbb color": "强调色必须是 #rrggbb 格式", "Type the key first": "请先输入密钥", "Choose every Bot or a list of Bots": "请选择所有 Bot 或指定的 Bot", @@ -1626,6 +1720,41 @@ var HOST_ZH = { "No FlyBot core update is available": "没有可用的 FlyBot 核心更新", "saved by a newer FlyBot; update FlyBot": "由更新的 FlyBot 保存;请更新 FlyBot" }; +Object.assign(ZH, { + "Local Bot chat history": "本机 Bot 对话历史", + "Earlier part; opens current chat": "较早分段;打开当前对话", + "History; opens current chat": "历史记录;打开当前对话", + "Search chats and local Bot history": "搜索对话和本机 Bot 历史", + "History: your local Bots in this instance. Other chats: loaded messages only.": "历史范围:本实例中你拥有的本机 Bot。其他对话仅搜索已加载消息。", + "History unavailable; searching loaded messages only.": "历史检索不可用,仅搜索已加载消息。", + "History query is limited to 256 characters.": "历史搜索词最多 256 个字符。", + "Searching history…": "正在搜索历史…", + "History query failed; showing loaded messages only.": "历史查询失败,以下仅为已加载消息。", + "Some history could not be read; results are incomplete.": "部分历史无法读取,结果不完整。", + "History search reached a safety limit; narrow your query.": "历史检索已达到安全上限,请缩小搜索范围。", + "Search more history": "继续搜索历史", + "More history remains to be searched": "还有历史尚未检索", + "Enter text to search local Bot history; other chats use loaded messages.": "输入文字搜索本机 Bot 历史;其他对话只查已加载消息。" +}); +Object.assign(ZH, { "No matches in the searched portion": "已检索部分没有匹配项" }); +Object.assign(ZH, { + "Read-only history match": "只读历史命中", + "Back to search": "返回搜索", + "This is segment history, not the current chat. No Bot is activated.": "这里是分段历史,不是当前聊天;不会激活 Bot。", + "Loading authorized history…": "正在读取有权查看的历史…", + "History changed, expired, or is no longer accessible. Search again.": "历史已变化、结果已过期或无权访问,请重新搜索。", + "Segment {part} of {count}": "分段 {part} / {count}", + "History session": "历史会话", + "Matched message": "命中消息", + "Nearby message": "相邻消息", + "Sequence": "序号", + "Turn": "轮次", + "Text truncated by the byte limit; this is not complete history.": "正文已按字节上限截断,不是完整历史。", + "Reload history context": "重新读取历史上下文", + "Earlier part; view read-only history": "较早分段;查看只读历史", + "View read-only history": "查看只读历史" +}); +Object.assign(ZH, { "Shows the match and up to two nearby visible messages on each side.": "仅显示命中消息,以及前后各最多两条有权查看的相邻消息。" }); Object.assign(ZH, HOST_ZH); var fill = (text2, params) => params ? text2.replace(/\{(\w+)\}/g, (match, name) => name in params ? String(params[name]) : match) : text2; var service = null; @@ -1659,6 +1788,16 @@ function language() { const active = service?.getLocale?.().active; return typeof active === "string" ? active : "en"; } +function canSetLocale() { + return typeof service?.setLocale === "function"; +} +function setInterfaceLocale(tag) { + if (typeof service?.setLocale !== "function") return void 0; + return service.setLocale(tag); +} +function languageLabel() { + return language().startsWith("zh") ? "Simplified Chinese" : "English"; +} var dateLocale = () => language().startsWith("zh") ? "zh-CN" : "en-US"; var DICTIONARY = { zh: ZH }; @@ -2413,7 +2552,7 @@ ${REST_NOTE}`); // src/client/api.js var ROUTE = "api/bot"; -var REFUSALS = /* @__PURE__ */ new Set(["bot/refused", "bot/invalid", "bot/read-only", "bot/not-found", "bot/browser-off"]); +var REFUSALS = /* @__PURE__ */ new Set(["bot/history-unavailable", "bot/search-unavailable", "bot/refused", "bot/invalid", "bot/read-only", "bot/not-found", "bot/browser-off"]); var call = async (endpoint, payload, signal) => { let response; try { @@ -2877,8 +3016,8 @@ function bodyOf(def, paint, flat = false) { return ""; } } -var eyeMarkup = ([cx, cy, w, h50, tilt]) => ``; -var happyEyeMarkup = ([cx, cy, w, h50, tilt]) => ``; +var eyeMarkup = ([cx, cy, w, h53, tilt]) => ``; +var happyEyeMarkup = ([cx, cy, w, h53, tilt]) => ``; var maskBox = (size) => `maskUnits="userSpaceOnUse" x="${-size}" y="${-size}" width="${size * 3}" height="${size * 3}"`; var holes = (def, eyes) => `${eyes}`; var MASK_ID = "%MASK%"; @@ -3264,29 +3403,29 @@ function inviteCountdown(expiresAt, offsetMs = 0) { const total = Math.max(1, Math.ceil(left / 1e3)); return `${Math.floor(total / 60)}:${String(total % 60).padStart(2, "0")} left to join`; } -function RoomInvitePreview({ h: h50, preview, kind = "face-link-preview", busy = false, joinLabel = "Join", clearLabel = "Clear", showClear = true, onJoin, onClear, now } = {}) { - if (!preview || typeof h50 !== "function") return null; +function RoomInvitePreview({ h: h53, preview, kind = "face-link-preview", busy = false, joinLabel = "Join", clearLabel = "Clear", showClear = true, onJoin, onClear, now } = {}) { + if (!preview || typeof h53 !== "function") return null; const at = `${kind}`; const child = (name) => `${at}-${name}`; const countdown = now === void 0 ? inviteCountdown(preview.expiresAt, preview.clockOffsetMs) : inviteCountdownAt(preview.expiresAt, preview.clockOffsetMs, now); - return h50( + return h53( "div", { className: "fs-preview", "data-flybot": at, role: "status" }, - h50("div", { className: "fs-preview-name", "data-flybot": child("name") }, preview.name || "Face-to-face room"), - preview.lead ? h50("div", { className: "fs-preview-meta", "data-flybot": child("lead") }, `Lead: ${preview.lead}`) : null, - preview.people ? h50("div", { className: "fs-preview-meta", "data-flybot": child("members") }, preview.people) : null, - preview.expiresAt ? h50("div", { className: "fs-preview-meta", "data-flybot": child("expiry") }, countdown) : null, - onJoin || onClear ? h50( + h53("div", { className: "fs-preview-name", "data-flybot": child("name") }, preview.name || "Face-to-face room"), + preview.lead ? h53("div", { className: "fs-preview-meta", "data-flybot": child("lead") }, `Lead: ${preview.lead}`) : null, + preview.people ? h53("div", { className: "fs-preview-meta", "data-flybot": child("members") }, preview.people) : null, + preview.expiresAt ? h53("div", { className: "fs-preview-meta", "data-flybot": child("expiry") }, countdown) : null, + onJoin || onClear ? h53( "div", { className: "fs-preview-foot", "data-flybot": child("foot") }, - showClear && onClear ? h50("button", { + showClear && onClear ? h53("button", { type: "button", className: "fs-btn fs-btn-sm", "data-flybot": child("clear"), disabled: !!busy, onClick: onClear }, clearLabel) : null, - onJoin ? h50("button", { + onJoin ? h53("button", { type: "button", className: "fs-btn fs-btn-sm fs-btn-primary", "data-flybot": child("join"), @@ -3668,12 +3807,12 @@ function liveSprings(apply2) { const dt = Math.min(0.5, Math.max(1e-3, (now - last) / 1e3)); last = now; const steps = Math.ceil(dt * 240); - const h50 = dt / steps; + const h53 = dt / steps; let moving = false; for (const value of values.values()) { for (let index = 0; index < steps; index += 1) { - value.v += (-value.k * (value.x - value.to) - value.c * value.v) * h50; - value.x += value.v * h50; + value.v += (-value.k * (value.x - value.to) - value.c * value.v) * h53; + value.x += value.v * h53; } if (Math.abs(value.x - value.to) < 0.05 && Math.abs(value.v) < 1) { value.x = value.to; @@ -3880,6 +4019,69 @@ function useSchedules(actions) { } var schedulesReadFailure = (failure) => typeof failure === "string" && failure !== "" ? t("The scheduled tasks could not be read: {reason}", { reason: failure }) : null; var localZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone; +function timeZoneOptions(current) { + const supported = typeof Intl.supportedValuesOf === "function" ? Intl.supportedValuesOf("timeZone") : []; + const zone = String(current ?? "").trim(); + const list = supported.length ? ["UTC", ...supported] : ["UTC", "Asia/Shanghai"]; + if (zone) list.unshift(zone); + return [...new Set(list.filter(Boolean))]; +} +function zoneParts(ms, timeZone) { + const parts = new Intl.DateTimeFormat("en-US", { + timeZone: timeZone || "UTC", + hourCycle: "h23", + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit", + second: "2-digit" + }).formatToParts(new Date(ms)); + const value = (type) => Number(parts.find((part) => part.type === type)?.value); + return Date.UTC(value("year"), value("month") - 1, value("day"), value("hour"), value("minute"), value("second")); +} +function wallClockInput(ms, timeZone) { + const at = Number(ms); + if (!Number.isFinite(at)) return ""; + const zone = String(timeZone ?? "").trim() || localZone(); + const parts = new Intl.DateTimeFormat("en-US", { + timeZone: zone, + hourCycle: "h23", + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit" + }).formatToParts(new Date(at)); + const value = (type) => parts.find((part) => part.type === type)?.value; + if (!value("year")) return ""; + return `${value("year")}-${value("month")}-${value("day")}T${value("hour")}:${value("minute")}`; +} +function instantFromWallClock(wall, timeZone) { + const match = String(wall ?? "").match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?$/); + if (!match) throw new Error("Pick a date and time"); + const asUtc = Date.UTC( + Number(match[1]), + Number(match[2]) - 1, + Number(match[3]), + Number(match[4]), + Number(match[5]), + Number(match[6] ?? 0) + ); + const zone = String(timeZone ?? "").trim() || "UTC"; + let instant2 = asUtc; + for (let step = 0; step < 3; step += 1) { + const shown = zoneParts(instant2, zone); + const delta = shown - asUtc; + if (delta === 0) break; + instant2 -= delta; + } + if (zoneParts(instant2, zone) === asUtc) return new Date(instant2).toISOString(); + for (const probe of [instant2 - 36e5, instant2 + 36e5, instant2 - 72e5, instant2 + 72e5]) { + if (zoneParts(probe, zone) === asUtc) return new Date(probe).toISOString(); + } + throw new Error("Pick a date and time"); +} var clock2 = (time) => String(time ?? "").slice(0, 5); var when = (ms, options) => new Intl.DateTimeFormat(dateLocale(), options).format(ms); function dayAndTime(ms) { @@ -4054,10 +4256,6 @@ function inAnHour() { } var KINDS = [["at", "Once"], ["daily", "Every day"], ["weekly", "Every week"], ["every", "Repeat"]]; var UNITS = [["seconds", 1, "second", "seconds"], ["minutes", 60, "minute", "minutes"], ["hours", 3600, "hour", "hours"], ["days", 86400, "day", "days"]]; -function localInput(ms) { - const date = new Date(ms); - return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(date.getMinutes())}`; -} function formStart(task) { const seconds = task?.kind === "every" ? Number(task.everySeconds) : 3600; const [unit, size] = seconds % 86400 === 0 ? ["days", 86400] : seconds % 3600 === 0 ? ["hours", 3600] : seconds % 60 === 0 ? ["minutes", 60] : ["seconds", 1]; @@ -4066,7 +4264,7 @@ function formStart(task) { title: task?.title ?? "", prompt: task?.prompt ?? "", kind: once ? "at" : task?.kind ?? "daily", - at: once && !Number.isNaN(Date.parse(task.scheduledAt)) ? localInput(Date.parse(task.scheduledAt)) : inAnHour(), + at: once && !Number.isNaN(Date.parse(task.scheduledAt)) ? wallClockInput(Date.parse(task.scheduledAt), task?.timeZone || localZone()) : inAnHour(), time: task?.time ? clock2(task.time) : "09:00", weekdays: task?.kind === "weekly" && Array.isArray(task.weekdays) ? task.weekdays : [1, 2, 3, 4, 5], count: Math.max(1, Math.round(seconds / size)), @@ -4074,6 +4272,13 @@ function formStart(task) { timeZone: task?.timeZone || localZone() }; } +function whenFromForm({ kind, at, time, weekdays, timeZone, count, unit } = {}) { + const zone = String(timeZone ?? "").trim() || localZone(); + if (kind === "cron") return { kind: "keep" }; + if (kind === "at") return { kind, at: instantFromWallClock(at, zone), timeZone: zone }; + if (kind === "every") return { kind, seconds: Math.round(Number(count) * UNITS.find(([id]) => id === unit)[1]) }; + return { kind, time, timeZone: zone, ...kind === "weekly" ? { weekdays } : {} }; +} function TaskForm({ roster, actions, start, task, onDone, onCancel }) { const first = formStart(task); const [target, setTarget] = (0, import_react4.useState)(task ? task.botId ?? task.roomId : start ?? ""); @@ -4085,14 +4290,10 @@ function TaskForm({ roster, actions, start, task, onDone, onCancel }) { const [weekdays, setWeekdays] = (0, import_react4.useState)(first.weekdays); const [count, setCount] = (0, import_react4.useState)(first.count); const [unit, setUnit] = (0, import_react4.useState)(first.unit); + const [timeZone, setTimeZone] = (0, import_react4.useState)(first.timeZone); const [busy, setBusy] = (0, import_react4.useState)(false); const [error, setError] = (0, import_react4.useState)(""); - const timing = () => { - if (kind === "cron") return { kind: "keep" }; - if (kind === "at") return { kind, at: new Date(at).toISOString(), timeZone: first.timeZone }; - if (kind === "every") return { kind, seconds: Math.round(Number(count) * UNITS.find(([id]) => id === unit)[1]) }; - return { kind, time, timeZone: first.timeZone, ...kind === "weekly" ? { weekdays } : {} }; - }; + const timing = () => whenFromForm({ kind, at, time, weekdays, timeZone, count, unit }); const submit = (event) => { event.preventDefault(); if (busy || target === "") return; @@ -4171,6 +4372,20 @@ function TaskForm({ roster, actions, start, task, onDone, onCancel }) { ) : null ) ), + // Visible, and submitted, only when the engine uses a zone (#3110). A repeat-every interval + // has none; a cron rule is kept as stored unless the kind changes. + kind === "at" || kind === "daily" || kind === "weekly" ? (0, import_react4.createElement)( + "label", + { className: "bt-set-row bt-bs-row" }, + (0, import_react4.createElement)("span", { className: "bt-set-copy" }, (0, import_react4.createElement)("span", { className: "bt-bs-label" }, t("Time zone"))), + (0, import_react4.createElement)("select", { + className: "bt-select bt-task-timezone", + "data-flybot": "task-timezone", + value: timeZone, + "aria-label": t("Time zone"), + onChange: (event) => setTimeZone(event.target.value) + }, timeZoneOptions(timeZone).map((zone) => (0, import_react4.createElement)("option", { key: zone, value: zone }, zone))) + ) : null, error ? (0, import_react4.createElement)("div", { className: "bt-set-row" }, (0, import_react4.createElement)("span", { className: "bt-danger bt-set-hint", role: "alert" }, error)) : null, (0, import_react4.createElement)( "div", @@ -4908,6 +5123,13 @@ var THEMES = { label: "Moonlight", light: { bg: "#f7f9fc", sidebar: "#eef2f8", bubble: "#e5ebf5", card: "#ffffff", text: "#121826", user: "#1e3a8a", userText: "#ffffff", accent: "#1e86ff" }, dark: { bg: "#0b1020", sidebar: "#10172a", bubble: "#1a2340", card: "#141c33", text: "#e8edf7", user: "#3b6fd8", userText: "#ffffff", accent: "#4f9dff" } + }, + grove: { + label: "Grove", + light: { bg: "#f4f7f5", sidebar: "#e8eee9", bubble: "#dfe8e2", card: "#ffffff", text: "#171c19", user: "#235039", userText: "#f4f7f5", accent: "#1f7a54" }, + dark: { bg: "#171c19", sidebar: "#141916", bubble: "#2a332d", card: "#272e2b", text: "#e8eee9", user: "#235039", userText: "#f4f7f5", accent: "#3d9a6e" }, + // #235039 is the measured selected fill from the visual reference Instant-mode sample. + css: "html body{--bt-selected:color-mix(in srgb,var(--bt-accent) 18%,var(--bt-sidebar))}html body[data-ds-dark-theme]{--bt-selected:#235039}" } }; var rgba = (hex, alpha) => `rgba(${[1, 3, 5].map((index) => parseInt(hex.slice(index, index + 2), 16)).join(",")},${alpha})`; @@ -4990,6 +5212,230 @@ function registerTheme(id, theme) { }; } var allThemes = () => ({ ...THEMES, ...customThemes }); +var DEFAULT_THEME = "grove"; +function resolveThemeId(prefs, themes = allThemes()) { + const id = prefs?.theme; + return themes[id] ? id : DEFAULT_THEME; +} +function themePrefsRecord(prefs = {}) { + return { + theme: prefs.theme, + accent: prefs.accent, + motion: prefs.motion, + appearance: prefs.appearance, + sendKey: prefs.sendKey, + folding: prefs.folding + }; +} + +// src/client/appearance.js +var APPEARANCE_MODES = ["light", "dark", "auto", "system"]; +var AUTO_KINDS = ["sun", "custom"]; +var SEND_KEYS = ["enter", "shift-enter"]; +var DEFAULT_APPEARANCE = { mode: "system", auto: "sun", from: "19:00", to: "07:00" }; +var DEFAULT_SEND_KEY = "enter"; +var DEFAULT_LATITUDE = 40; +var TIME = /^([01]\d|2[0-3]):[0-5]\d$/; +var TZ_LATITUDE = { + "Asia/Shanghai": 31.23, + "Asia/Chongqing": 29.56, + "Asia/Hong_Kong": 22.32, + "Asia/Taipei": 25.03, + "Asia/Tokyo": 35.68, + "Asia/Seoul": 37.57, + "Asia/Singapore": 1.35, + "Asia/Kolkata": 28.61, + "Europe/London": 51.51, + "Europe/Paris": 48.86, + "Europe/Berlin": 52.52, + "America/New_York": 40.71, + "America/Chicago": 41.88, + "America/Denver": 39.74, + "America/Los_Angeles": 34.05, + "America/Sao_Paulo": -23.55, + "Australia/Sydney": -33.87, + UTC: 0 +}; +function timezoneOf(date = /* @__PURE__ */ new Date(), timeZone) { + if (typeof timeZone === "string" && timeZone) return timeZone; + try { + return Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC"; + } catch { + return "UTC"; + } +} +function latitudeForZone(timeZone) { + return TZ_LATITUDE[timeZone] ?? DEFAULT_LATITUDE; +} +function parseClock(value) { + if (typeof value !== "string" || !TIME.test(value)) return null; + const [hours, minutes] = value.split(":").map(Number); + return hours * 60 + minutes; +} +function formatClock(minutes) { + const wrapped = (Math.round(minutes) % 1440 + 1440) % 1440; + const hours = Math.floor(wrapped / 60); + const mins = wrapped % 60; + return `${String(hours).padStart(2, "0")}:${String(mins).padStart(2, "0")}`; +} +function localMinutes(date, timeZone) { + const zone = timezoneOf(date, timeZone); + const parts = new Intl.DateTimeFormat("en-US", { + timeZone: zone, + hour: "2-digit", + minute: "2-digit", + hourCycle: "h23" + }).formatToParts(date); + const hour = Number(parts.find((part) => part.type === "hour")?.value ?? 0); + const minute = Number(parts.find((part) => part.type === "minute")?.value ?? 0); + return hour * 60 + minute; +} +function dayOfYear(date, timeZone) { + const zone = timezoneOf(date, timeZone); + const parts = new Intl.DateTimeFormat("en-US", { + timeZone: zone, + year: "numeric", + month: "numeric", + day: "numeric" + }).formatToParts(date); + const year = Number(parts.find((part) => part.type === "year")?.value); + const month = Number(parts.find((part) => part.type === "month")?.value); + const day = Number(parts.find((part) => part.type === "day")?.value); + const utc = Date.UTC(year, month - 1, day); + const start = Date.UTC(year, 0, 0); + return Math.round((utc - start) / 864e5); +} +function sunMinutes(date, { latitude, timeZone } = {}) { + const zone = timezoneOf(date, timeZone); + const latDeg = Number.isFinite(latitude) ? latitude : latitudeForZone(zone); + const decl = -23.44 * Math.cos(2 * Math.PI / 365 * (dayOfYear(date, zone) + 10)) * (Math.PI / 180); + const lat = latDeg * (Math.PI / 180); + const cosHa = -Math.tan(lat) * Math.tan(decl); + if (cosHa >= 1) return { sunrise: 12 * 60, sunset: 12 * 60, alwaysDark: true }; + if (cosHa <= -1) return { sunrise: 0, sunset: 24 * 60, alwaysDark: false, alwaysLight: true }; + const minutesFromNoon = Math.acos(cosHa) * 180 / Math.PI / 15 * 60; + const noon = 12 * 60; + return { sunrise: noon - minutesFromNoon, sunset: noon + minutesFromNoon }; +} +function afterSunset(date, options) { + const sun = sunMinutes(date, options); + if (sun.alwaysDark) return true; + if (sun.alwaysLight) return false; + const now = localMinutes(date, options?.timeZone); + return now >= sun.sunset || now < sun.sunrise; +} +function inNightWindow(date, from, to, timeZone) { + const start = parseClock(from); + const end = parseClock(to); + if (start === null || end === null || start === end) return false; + const now = localMinutes(date, timeZone); + return start < end ? now >= start && now < end : now >= start || now < end; +} +function normalizeAppearance(value) { + const mode = APPEARANCE_MODES.includes(value?.mode) ? value.mode : DEFAULT_APPEARANCE.mode; + const auto = AUTO_KINDS.includes(value?.auto) ? value.auto : DEFAULT_APPEARANCE.auto; + const from = parseClock(value?.from) !== null ? value.from : DEFAULT_APPEARANCE.from; + const to = parseClock(value?.to) !== null ? value.to : DEFAULT_APPEARANCE.to; + return { mode, auto, from, to }; +} +function appearanceOf(prefs) { + return normalizeAppearance(prefs?.appearance); +} +function normalizeSendKey(value) { + return SEND_KEYS.includes(value) ? value : DEFAULT_SEND_KEY; +} +function sendKeyOf(prefs) { + return normalizeSendKey(prefs?.sendKey); +} +function systemDark(media = globalThis.matchMedia) { + try { + return typeof media === "function" ? Boolean(media.call(globalThis, "(prefers-color-scheme: dark)")?.matches) : false; + } catch { + return false; + } +} +function isDarkAppearance(prefs, now = /* @__PURE__ */ new Date(), darkSystem = systemDark(), options = {}) { + const appearance = appearanceOf(prefs); + if (appearance.mode === "light") return false; + if (appearance.mode === "dark") return true; + if (appearance.mode === "system") return Boolean(darkSystem); + const zone = options.timeZone; + if (appearance.auto === "custom") return inNightWindow(now, appearance.from, appearance.to, zone); + return afterSunset(now, { timeZone: zone, latitude: options.latitude }); +} +function applyAppearanceAttribute(dark, root) { + const doc = root?.ownerDocument ?? root ?? (typeof document === "undefined" ? null : document); + if (!doc?.documentElement) return dark ? "dark" : "light"; + const body = doc.body ?? doc.documentElement; + if (dark) body.setAttribute("data-ds-dark-theme", ""); + else body.removeAttribute("data-ds-dark-theme"); + return dark ? "dark" : "light"; +} +function appearanceRecord(appearance, { clear = false } = {}) { + if (clear || appearance == null) return null; + const next = normalizeAppearance(appearance); + if (next.mode === DEFAULT_APPEARANCE.mode && next.auto === DEFAULT_APPEARANCE.auto && next.from === DEFAULT_APPEARANCE.from && next.to === DEFAULT_APPEARANCE.to) return null; + return next; +} +function shouldSendOnKey(event, sendKey) { + if (!event || event.key !== "Enter" || event.metaKey || event.ctrlKey || event.altKey || event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229 || event.which === 229) return false; + return normalizeSendKey(sendKey) === "shift-enter" ? event.shiftKey === true : event.shiftKey !== true; +} +function shouldBreakOnKey(event, sendKey) { + if (!event || event.key !== "Enter" || event.metaKey || event.ctrlKey || event.altKey || event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229 || event.which === 229) return false; + return normalizeSendKey(sendKey) === "shift-enter" ? event.shiftKey !== true : event.shiftKey === true; +} +function handleComposerSendKey(event, sendKey, { send, insertNewline } = {}) { + const key = normalizeSendKey(sendKey); + if (key === DEFAULT_SEND_KEY) return false; + if (shouldSendOnKey(event, key)) { + event.preventDefault(); + event.stopPropagation(); + send?.(); + return "send"; + } + if (shouldBreakOnKey(event, key)) { + event.preventDefault(); + event.stopPropagation(); + insertNewline?.(event); + return "break"; + } + return false; +} +function composerCardOf(node) { + return node instanceof Element ? node.closest("[data-composer-card]") : null; +} +function composerFieldOf(event) { + const target = event?.target; + if (!(target instanceof Element)) return null; + return target.closest('[data-composer-input], textarea, [contenteditable="true"]'); +} +function findSendButton(card) { + if (!card) return null; + const named = card.querySelector("button[type=submit], button[data-send], [data-composer-send]"); + if (named) return named; + return [...card.querySelectorAll("button")].find((button) => { + const label = `${button.getAttribute("aria-label") ?? ""} ${button.getAttribute("title") ?? ""} ${button.textContent ?? ""}`; + return /send|发送/i.test(label) && !/dictate|mic|voice|add|plus|录音|听写|添加/i.test(label); + }) ?? null; +} +function insertComposerNewline(field) { + if (!field) return; + if (typeof field.value === "string" && typeof field.selectionStart === "number") { + const start = field.selectionStart; + const end = field.selectionEnd ?? start; + const value = field.value; + field.value = `${value.slice(0, start)} +${value.slice(end)}`; + field.selectionStart = field.selectionEnd = start + 1; + field.dispatchEvent(new Event("input", { bubbles: true })); + return; + } + if (field.isContentEditable || field.getAttribute?.("contenteditable") === "true") { + const doc = field.ownerDocument ?? document; + if (typeof doc.execCommand === "function") doc.execCommand("insertText", false, "\n"); + } +} // src/shared/look-image.js var LOOK_IMAGE_MAX = 65536; @@ -5044,6 +5490,9 @@ function mentionCss(bots) { // src/client/styles.js var SHELL_CSS = ` +.bt-palette.bt-history-view{max-height:85vh;display:flex;flex-direction:column;width:min(760px,calc(100vw - 24px))}.bt-history-view h2{font-size:16px;margin:0;flex:1}.bt-history-disclaimer{padding:8px 16px;margin:0;color:var(--bt-ink-2)}.bt-history-content{overflow:auto;min-height:80px;padding:8px 16px;overflow-wrap:anywhere}.bt-history-entry{border-top:1px solid var(--bt-line);padding:8px 0}.bt-history-entry[data-hit]{border-left:3px solid var(--bt-accent);padding-left:10px}.bt-history-entry h3{font-size:12px;color:var(--bt-ink-2);font-weight:500}.bt-history-entry pre{white-space:pre-wrap;overflow-wrap:anywhere;font:inherit;margin:8px 0}.bt-history-foot{display:flex;flex-wrap:wrap;gap:8px;padding:12px 16px;border-top:1px solid var(--bt-line)} + +.bt-palette-history{padding:8px 16px;border-bottom:1px solid var(--bt-line);font-size:12px;color:var(--bt-ink-2);overflow-wrap:anywhere}.bt-palette-scope{margin:0 0 4px}.bt-palette-history button{margin:4px 0;display:block} body{--bt-ink:#141414;--bt-ink-2:rgba(20,20,20,.6);--bt-ink-3:rgba(20,20,20,.36);--bt-bubble:#eeeeee;--bt-sidebar:#f7f7f7;--bt-main:#fcfcfc;--bt-line:rgba(20,20,20,.08);--bt-line-2:rgba(20,20,20,.15);--bt-line-weak:rgba(20,20,20,.1);--bt-hover:rgba(119,119,119,.09);--bt-active:rgba(119,119,119,.17);--bt-card:#ffffff;--bt-accent:#4d6bfe;--bt-green:#00c972;--bt-star:#ff9800;--bt-user:#070707;--bt-user-ink:#fcfcfc;--bt-tag-bg:rgba(20,20,20,.06);--bt-tag-ink:rgba(20,20,20,.56)} body[data-ds-dark-theme]{--bt-ink:#f2f2f2;--bt-ink-2:rgba(242,242,242,.6);--bt-ink-3:rgba(242,242,242,.36);--bt-bubble:#262626;--bt-sidebar:#1b1b1b;--bt-main:#141414;--bt-line:rgba(255,255,255,.08);--bt-line-2:rgba(255,255,255,.15);--bt-line-weak:rgba(255,255,255,.1);--bt-hover:rgba(160,160,160,.12);--bt-active:rgba(160,160,160,.2);--bt-card:#1f1f1f;--bt-user:#f2f2f2;--bt-user-ink:#141414;--bt-tag-bg:rgba(255,255,255,.09);--bt-tag-ink:rgba(242,242,242,.62)} ${Object.entries(INKS).map(([name, [light]]) => `body{--bt-ink-${name}:${light}}`).join("")} @@ -5200,6 +5649,11 @@ body[data-bt-motion=quiet] .bt-mark[data-poke]{cursor:default} @media (prefers-reduced-motion:reduce){} .bt-head{position:relative;display:flex;justify-content:center;align-items:center;height:40px;flex:none;pointer-events:none} +.bt-head-actions{position:absolute;right:8px;top:50%;transform:translateY(-50%);display:flex;align-items:center;gap:4px;pointer-events:auto;z-index:2} +.bt-head-more{display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px;padding:0;border:0;border-radius:50%;background:var(--bt-main);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2);cursor:pointer;box-shadow:0 1px 2px rgba(0,0,0,.04)} +.bt-head-more:hover{background:var(--bt-hover);color:var(--bt-ink)} +.bt-head-more svg{width:16px;height:16px} +.bt-head-menu{position:fixed;min-width:220px;z-index:40} .bt-pill{pointer-events:auto;display:inline-flex;align-items:center;gap:8px;height:40px;padding:7.5px 13.5px 7.5px 7.5px;border-radius:999px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 2px 8px -1px rgba(0,0,0,.06),0 1px 2px rgba(0,0,0,.04);color:var(--bt-ink);font-family:inherit;font-size:14px;line-height:20px;cursor:pointer;max-width:70%;box-sizing:border-box;transition:background-color .12s ease,transform ${SPRING_TAP.duration}ms ${SPRING_TAP.easing}} .bt-pill:hover{background:color-mix(in srgb,var(--bt-main),#777 9%)} .bt-pill:active{transform:scale(.965)} @@ -5234,6 +5688,25 @@ body[data-bt-motion=quiet] .bt-mark[data-poke]{cursor:default} .bt-bubble [class*="_markdown"]{color:inherit!important;font-size:inherit!important;line-height:inherit!important} .bt-bubble p{margin:0} .bt-bubble p + p{margin-top:6px} +.bt-fold{display:flex;flex-direction:column;gap:6px;min-width:0} +.bt-fold-toggle{align-self:flex-start;margin:2px 0 0;border:0;background:none;padding:0;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:16px;font-weight:600;cursor:pointer} +.bt-fold-toggle:hover{color:var(--bt-ink);text-decoration:underline;text-underline-offset:2px} +.bt-fold[data-folded] .bt-bubble,[data-folded].bt-fold{position:relative} +.bt-doc-card{display:flex;align-items:center;gap:12px;width:min(100%,440px);box-sizing:border-box;margin:0;padding:12px 14px;border:.5px solid var(--bt-line-2);border-radius:14px;background:var(--bt-card);color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer} +.bt-doc-card:hover{background:var(--bt-hover)} +.bt-doc-card-icon{flex:none;display:inline-flex;align-items:center;justify-content:center;width:36px;height:36px;border-radius:9px;background:var(--bt-tag-bg);color:var(--bt-ink-2)} +.bt-doc-card-copy{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px} +.bt-doc-card-title{font-size:14px;line-height:20px;font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-doc-card-meta{font-size:12px;line-height:16px;color:var(--bt-ink-3)} +.bt-doc-card-go{flex:none;font-size:12px;line-height:16px;color:var(--bt-ink-2);white-space:nowrap} +.bt-umsg .bt-doc-card{width:min(100%,320px)} +.bt-doc-pane{display:flex;flex-direction:column;min-height:0;height:100%;background:var(--bt-main);color:var(--bt-ink)} +.bt-doc-pane-head{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;flex:none;padding:16px 16px 12px;border-bottom:.5px solid var(--bt-line)} +.bt-doc-pane-copy{min-width:0} +.bt-doc-pane-title{margin:0;font-size:16px;line-height:22px;font-weight:600;overflow:hidden;text-overflow:ellipsis} +.bt-doc-pane-hint{margin:4px 0 0;font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow-wrap:anywhere} +.bt-doc-pane-body{flex:1;min-height:0;overflow:auto;padding:16px;font-size:var(--dsh-content-font-size,14px);line-height:calc(var(--dsh-content-font-size,14px) + 8px);overflow-wrap:anywhere} +.bt-doc-pane-body [class*="_markdown"]{color:inherit} .bt-bubble ul,.bt-bubble ol{margin:4px 0;padding-left:20px} .bt-bubble a[href^="${MENTION_ORIGIN}"]{text-decoration:none;font-weight:400;cursor:pointer;white-space:nowrap} .bt-bubble a[href^="${MENTION_ORIGIN}"]::before{content:"";display:inline-block;width:16px;height:16px;margin-right:3px;vertical-align:-3px;background:currentColor;-webkit-mask:${DEFAULT_MASK} center/contain no-repeat;mask:${DEFAULT_MASK} center/contain no-repeat} @@ -5322,6 +5795,7 @@ button.bt-q-opt:active{background:var(--bt-active)} .bt-newchat{flex:1;display:flex;flex-direction:column;min-width:0;position:relative;animation:bt-veil-in .18s ease-out} .bt-pane[data-menu]{background:transparent}.bt-pane[data-menu] .bt-newchat{flex:none;align-self:flex-start;width:min(280px,calc(100% - 16px));max-height:calc(100% - 16px);margin:8px;overflow:auto;background:var(--bt-card);border:1px solid var(--bt-line-2);border-radius:12px;box-shadow:0 10px 30px rgba(0,0,0,.14),0 2px 6px rgba(0,0,0,.06)}.bt-newchat[data-menu] .bt-drop{position:relative;top:0;left:0;width:auto;max-height:none;margin:0;box-shadow:none;border:0;max-width:none} +.bt-nc-name{margin:8px 16px 0} .bt-to{display:flex;align-items:center;flex-wrap:wrap;gap:6px;min-height:48px;padding:6px 12px;border-bottom:1px solid var(--bt-line);font-size:14px;box-sizing:border-box} .bt-to-label{color:var(--bt-ink-2)} .bt-to input{flex:1;min-width:120px;border:0;outline:none;background:none;color:var(--bt-ink);font-size:14px;height:26px} @@ -5719,6 +6193,10 @@ button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-side .bt-menu[data-leaving]{pointer-events:none;animation:bt-pop-out .12s cubic-bezier(.4,0,1,1) forwards} .bt-menu-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .bt-menu-hint{flex:none;color:var(--bt-ink-3);font-size:12px;font-variant-numeric:tabular-nums} +.bt-document-message{min-width:0;max-width:100%} +.bt-message-note{white-space:normal;overflow-wrap:anywhere;padding:6px 8px;max-width:220px} +.bt-menu-reacts{display:flex;gap:2px;padding:2px 4px} +.bt-menu-reacts button{width:32px;min-width:32px;height:32px;padding:0;justify-content:center;font-size:18px;line-height:1} .bt-palette-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:140;isolation:isolate;pointer-events:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} .bt-backdrop{position:absolute;inset:0;background:rgba(0,0,0,.46);animation:bt-fade .22s ease-out} .bt-palette{position:absolute;top:50%;left:50%;width:min(560px,92vw);transform:translate(-50%,-50%);display:flex;flex-direction:column;border-radius:12px;background:var(--bt-main);border:1px solid var(--bt-line-2);box-shadow:0 24px 48px -12px rgba(0,0,0,.25);overflow:hidden;color:var(--bt-ink);animation:bt-palette-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} @@ -5733,6 +6211,9 @@ button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-side .bt-palette-clear{width:18px;height:18px;border:0;padding:0;border-radius:6px;background:none;color:var(--bt-ink-3);display:inline-flex;align-items:center;justify-content:center;cursor:pointer} .bt-palette-clear:hover{color:var(--bt-ink)} .bt-palette-clear svg{width:12px;height:12px} +.bt-palette-filters{display:flex;flex-wrap:wrap;gap:0;padding:0 10px;border-bottom:.5px solid var(--bt-line-2);flex:none} +.bt-palette-filter{height:36px;padding:0 12px;border:0;border-bottom:2px solid transparent;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;cursor:pointer} +.bt-palette-filter[aria-selected=true]{color:var(--bt-ink);border-bottom-color:var(--bt-accent);font-weight:600} .bt-palette-list{position:relative;height:402px;overflow-y:auto;padding:8px;display:flex;flex-direction:column;gap:2px;box-sizing:border-box} .bt-palette-list>.bt-thumb,.bt-drop-list>.bt-thumb{left:0;right:0;border-radius:8px;background:var(--bt-active)} .bt-palette-list>.bt-thumb{left:8px;right:8px} @@ -5809,6 +6290,20 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} .bt-addlist{display:flex;flex-direction:column;margin-top:4px;padding:4px;border:1px solid var(--bt-line);border-radius:10px;background:var(--bt-card);animation:bt-rise .16s ease-out} .bt-seg{position:relative;display:flex;gap:2px;padding:2px;border-radius:10px;background:var(--bt-hover)} .bt-motion-seg{width:216px} +.bt-appearance-seg{width:min(100%,360px)} +.bt-appearance-seg button{font-size:12px;padding:6px 8px} +.bt-time-field{display:inline-flex;align-items:center;gap:8px;font-size:12px;color:var(--bt-ink-2)} +.bt-time-field .bt-input{width:auto} +.bt-fold-modes{display:flex;flex-direction:column;width:100%} +.bt-fold-lead{margin:0;padding:10px 16px 4px;font-size:12px;line-height:16px;color:var(--bt-ink-2)} +.bt-fold-mode{display:flex;align-items:flex-start;gap:12px;width:100%;margin:0;padding:12px 16px;border:0;border-top:.5px solid var(--bt-line);background:none;color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer;box-sizing:border-box} +.bt-fold-mode:hover{background:var(--bt-hover)} +.bt-fold-radio{flex:none;width:16px;height:16px;margin-top:2px;border:1.5px solid var(--bt-ink-3);border-radius:50%;box-sizing:border-box;background:transparent;position:relative} +.bt-fold-mode[aria-checked=true] .bt-fold-radio{border-color:var(--bt-accent)} +.bt-fold-mode[aria-checked=true] .bt-fold-radio::after{content:"";position:absolute;inset:3px;border-radius:50%;background:var(--bt-accent)} +.bt-fold-mode-copy{display:flex;flex-direction:column;gap:2px;min-width:0} +.bt-fold-mode-label{font-size:14px;line-height:20px;font-weight:600} +.bt-set-card .bt-fold-modes + .bt-set-row,.bt-set-card > .bt-switch{border-top:.5px solid var(--bt-line)} .bt-seg button{position:relative;z-index:1;flex:1;height:30px;border:0;border-radius:8px;background:none;font:inherit;font-size:13px;color:var(--bt-ink-2);cursor:pointer;transition:background-color .15s ease,color .15s ease,box-shadow .15s ease,${spring(SPRING_TAP, "scale")}} .bt-seg button[aria-pressed=true]{background:var(--bt-card);color:var(--bt-ink);box-shadow:0 1px 3px rgba(0,0,0,.08)} .bt-seg button:disabled{opacity:.4;cursor:default} @@ -5826,7 +6321,7 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} .bt-mem-row-go{display:inline-flex;align-items:center;gap:2px;color:var(--bt-ink-3);font-size:12px} .bt-mem-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:121;isolation:isolate;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} .bt-mem-scrim{animation:bt-fade .2s ease-out} -.bt-mem{position:relative;width:min(680px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} +.bt-mem{position:relative;width:min(880px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} .bt-mem-head{position:relative;display:flex;align-items:center;gap:8px;height:60px;flex:none;padding:0 14px 0 24px;border-bottom:.5px solid var(--bt-line);box-sizing:border-box} .bt-mem-head .bt-icon-btn{width:32px;height:32px;flex:none} .bt-mem-head [aria-haspopup] svg{width:18px;height:18px;stroke-width:2.6} @@ -5836,7 +6331,23 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} .bt-mem-head-gap{flex:1} .bt-mem-menu{position:absolute;top:52px;right:50px;min-width:220px;--bt-origin:top right} .bt-mem-menu button:disabled{opacity:.4;cursor:default;background:none} +.bt-mem-shell{flex:1;min-height:0;display:flex} +.bt-mem-main{flex:1;min-width:0;display:flex;flex-direction:column} +.bt-mem-nav{flex:none;width:228px;display:flex;flex-direction:column;gap:10px;padding:12px 10px 16px;border-right:.5px solid var(--bt-line);background:var(--bt-sidebar);min-height:0} +.bt-mem-search{display:flex;align-items:center;gap:8px;margin:0 4px;padding:0 8px;height:32px;border-radius:8px;background:var(--bt-main);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2)} +.bt-mem-search svg{flex:none;width:14px;height:14px} +.bt-mem-search-input{flex:1;min-width:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;outline:none} +.bt-mem-nav-list{display:flex;flex-direction:column;gap:2px;min-height:0;overflow:auto;padding:0 2px} +.bt-mem-nav-group{display:flex;flex-direction:column;gap:2px;margin-top:10px} +.bt-mem-nav-heading{padding:4px 8px 2px;font-size:11px;line-height:14px;font-weight:600;color:var(--bt-ink-3);text-transform:uppercase;letter-spacing:.04em} +.bt-mem-nav-item{display:flex;align-items:center;gap:8px;width:100%;margin:0;padding:6px 8px;border:0;border-radius:8px;background:none;color:var(--bt-ink);font:inherit;font-size:13px;line-height:18px;text-align:left;cursor:pointer} +.bt-mem-nav-item:hover{background:var(--bt-hover)} +.bt-mem-nav-item[aria-current=page]{background:var(--bt-selected,var(--bt-active));font-weight:600} +.bt-mem-nav-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-mem-nav-count{flex:none;font-size:11px;line-height:14px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums} +.bt-mem[data-nav=hidden] .bt-mem-shell{display:flex} .bt-mem-body{flex:1;overflow-y:auto;padding:22px 28px 24px;scrollbar-width:thin;display:flex;flex-direction:column;gap:12px} +@media (max-width:640px){.bt-mem-nav{width:180px}} .bt-mem-summary{transition:opacity .3s ease} .bt-mem-summary[data-stale]{opacity:.55} .bt-mem-summary h3{margin:20px 0 6px;font-size:17px;line-height:26px;font-weight:600} @@ -6080,7 +6591,11 @@ body[data-bt-friend-chat] [data-composer-stats]{display:none!important} .bt-plus:active{scale:.9} .bt-plus svg{width:14px;height:14px;transition:${spring(SPRING_POP, "rotate")}} .bt-plus[aria-expanded=true] svg{rotate:45deg} -.bt-plus-menu{min-width:180px} +.bt-plus-menu{min-width:220px} +.bt-plus-group{display:flex;flex-direction:column} +.bt-plus-group + .bt-plus-group{border-top:.5px solid var(--bt-line);margin-top:4px;padding-top:4px} +.bt-plus-menu .bt-menu-hint,.bt-head-menu .bt-menu-hint{display:block;padding:2px 12px 8px 36px;font-size:11px;line-height:15px;color:var(--bt-ink-3);white-space:normal;max-width:240px} +.bt-plus-menu button:disabled{opacity:.55;cursor:default} [data-composer-card] [class*="_tools"]{gap:0!important} [data-composer-card] [class*="_modes"]:empty{display:none!important} [data-composer-card] [class*="_activity"]:not(:has([data-slot] > *)){display:none!important} @@ -6239,15 +6754,281 @@ function installCompiledStyles(text2, tag) { }; } -// src/client/questions.js +// src/client/parity-shell.js +var ICON_RAIL_WIDTH = 72; +var CHAT_LIST_WIDTH = 360; +var SHELL_LEFT_WIDTH = ICON_RAIL_WIDTH + CHAT_LIST_WIDTH; +var COMPOSER_HEIGHT = 86; +var HEADER_HEIGHT = 56; +var PARITY_SHELL_CSS = ` +.bt-side.bt-side-split{display:flex;flex-direction:row;align-items:stretch;min-height:100%;background:var(--bt-sidebar);min-width:0} +.bt-icon-rail{flex:none;width:72px;display:flex;flex-direction:column;align-items:center;gap:6px;padding:16px 8px 12px;box-sizing:border-box;border-right:1px solid var(--bt-line);background:color-mix(in srgb,var(--bt-sidebar) 92%,#000 8%)} +.bt-brand-rail{display:flex;align-items:center;justify-content:center;width:40px;height:40px;flex:none} +.bt-brand-rail .bt-mark,.bt-brand-rail .bt-mark svg{width:28px;height:28px} +.bt-rail-btn{width:40px;height:40px;border:0;border-radius:12px;padding:0;background:transparent;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;transition:background-color .12s ease,color .12s ease,opacity .12s ease} +.bt-rail-btn svg{width:20px;height:20px} +.bt-rail-btn:hover{background:var(--bt-hover);color:var(--bt-ink)} +.bt-rail-btn[aria-current=page],.bt-icon-rail .bt-row[aria-current=page]{background:var(--bt-selected,color-mix(in srgb,var(--bt-accent) 28%,transparent));color:var(--bt-ink)} +.bt-rail-btn:disabled{opacity:.4;cursor:not-allowed} +.bt-rail-btn:focus-visible,.bt-brand-rail:focus-visible,.bt-icon-rail .bt-row:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px} +.bt-chat-col{flex:1 1 auto;min-width:0;display:flex;flex-direction:column;background:var(--bt-sidebar)} +.bt-side.bt-side-split .bt-side-top{display:flex;align-items:center;padding:10px 12px 8px;gap:8px} +.bt-side.bt-side-split .bt-brand{align-items:center} +.bt-side.bt-side-split .bt-row{min-height:48px;padding:8px 10px;border-radius:12px;align-items:center} +.bt-side.bt-side-split .bt-row:hover{background:var(--bt-hover)} +.bt-side.bt-side-split .bt-row[aria-current=page]{background:var(--bt-selected,color-mix(in srgb,var(--bt-accent) 22%,transparent))} +.bt-side.bt-side-split .bt-row-name{font-size:14px;line-height:20px;font-weight:500;color:var(--bt-ink)} +.bt-side.bt-side-split .bt-row[aria-current=page] .bt-row-name{font-weight:600} +.bt-side.bt-side-split .bt-row-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0} +.bt-side.bt-side-split .bt-row-preview{font-size:12px;line-height:16px;font-weight:400;color:var(--bt-ink-2);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-side.bt-side-split .bt-list{flex:1 1 auto;min-height:0;overflow-x:hidden;overflow-y:auto;scrollbar-width:thin;padding:4px 8px 12px} +.bt-side.bt-side-split .bt-hint{margin:24px 12px;padding:0;text-align:center;color:var(--bt-ink-3);font-size:13px;line-height:18px} +.bt-plus-menu{border-radius:16px;border:1px solid var(--bt-line-2);background:var(--bt-card);padding:8px} + +@media (min-width:1025px){ +[class*="_sidebar"]:has(.bt-side-split),[class*="Sidebar"]:has(.bt-side-split){width:432px;min-width:432px;max-width:432px;flex:none} +.bt-chat-col{width:360px;max-width:360px} +} + +@media (min-width:641px){ +[class*="_header"]:has(.bt-head){min-height:56px;margin:8px 12px 0;padding:0 12px;border-radius:16px;background:var(--bt-card);border:1px solid var(--bt-line);box-sizing:border-box;display:flex;align-items:center} +[data-composer-card]{min-height:86px!important;border-radius:20px!important;padding:10px 14px!important;background:var(--bt-bubble)!important;border:1px solid color-mix(in srgb,var(--bt-ink) 22%,transparent)!important;box-shadow:none!important;align-items:center!important} +[data-composer-card]:has(> [data-slot="conversation.input.attachments"] *),[data-composer-card]:has([data-composer-input] br + *),[data-composer-card]:has([data-composer-input] > :nth-child(2)){border-radius:16px!important;align-items:flex-end!important} +[class*="_root"]:has(> [data-composer-card]){padding:8px 16px 12px!important} +[data-composer-card] [class*="_tools"]{order:1;flex:none;align-self:center;margin:0;gap:6px!important} +[data-composer-card]>[data-input-scroll]{order:2;flex:1 1 0;min-width:0;min-height:44px;padding:6px 12px!important;margin:0!important} +[data-composer-card] [class*="_trailing"]{order:3;flex:none;align-self:center;margin:0;gap:8px} +[data-composer-card] [data-composer-input]{min-height:44px;padding:8px 0!important;font-size:14px;line-height:20px} +[data-composer-card] [data-composer-placeholder]::after{font-size:14px;line-height:20px;color:var(--bt-ink-3)} +[data-composer-card] .bt-plus,.bt-mic,.bt-voice,[data-composer-card] button[class*="_primary"]{width:32px!important;height:32px!important} +[data-composer-card] .bt-plus svg,.bt-mic svg,.bt-voice svg,[data-composer-card] button[class*="_primary"] svg{width:18px;height:18px} +[data-composer-card] .bt-plus:disabled,.bt-mic:disabled,.bt-voice:disabled,[data-composer-card] button:disabled{opacity:.4;cursor:not-allowed} +[data-composer-card] .bt-plus:focus-visible,.bt-mic:focus-visible,.bt-voice:focus-visible,[data-composer-card] button:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px} +} +`; + +// src/shared/message-actions.js +var MESSAGE_REACTIONS = ["👍", "❤️", "😂", "😮", "😢", "🙏"]; +function hasMessageText(text2) { + return String(text2 ?? "").trim() !== ""; +} +function isLockedRoster(roster) { + return typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; +} +function userMessageReactKey(sessionId, node) { + if (sessionId == null || sessionId === "") return void 0; + const location2 = node?.location; + const rawTurn = location2 && (location2.kind === "turn" || location2.kind === "step" || location2.turn != null) ? location2.turn : node?.data?.turn; + const turn = typeof rawTurn === "object" ? rawTurn?.turn : rawTurn; + if (!Number.isInteger(turn) || turn < 0) return void 0; + return `${sessionId}:${turn}:user`; +} +function messageActionIds({ + text: text2, + sessionId, + canReact = false, + canReply = false, + locked = false +} = {}) { + const ids = []; + if (canReact) ids.push("react"); + if (canReply && sessionId && !locked && hasMessageText(text2)) ids.push("reply"); + if (hasMessageText(text2)) { + ids.push("copy"); + ids.push("download"); + } + return ids; +} +function hasMessageActions(flags) { + return messageActionIds(flags).length > 0; +} + +// src/client/message-tools.js var import_react7 = require("react"); +var import_react_dom = require("react-dom"); +function useDismiss(open, close, refs) { + (0, import_react7.useEffect)(() => { + if (!open) return void 0; + const onDown = (event) => { + if (refs.some((ref) => ref.current?.contains(event.target))) return; + close(); + }; + const onKey = (event) => { + if (event.key === "Escape") { + event.stopPropagation(); + close(); + } + }; + window.addEventListener("mousedown", onDown); + window.addEventListener("keydown", onKey, true); + return () => { + window.removeEventListener("mousedown", onDown); + window.removeEventListener("keydown", onKey, true); + }; + }, [open, close]); +} +function downloadMessage(text2, name) { + const url = URL.createObjectURL(new Blob([text2], { type: "text/markdown" })); + const link = Object.assign(document.createElement("a"), { href: url, download: `${name}-message.md` }); + link.click(); + setTimeout(() => URL.revokeObjectURL(url), 1e3); +} +function MessageTools({ + text: text2, + name, + sessionId, + react, + actions, + roster, + contextAt, + className = "bt-tools" +}) { + const [panel, setPanel] = (0, import_react7.useState)(null); + const [place, setPlace] = (0, import_react7.useState)(null); + const [copied, setCopied] = (0, import_react7.useState)(false); + const tools = (0, import_react7.useRef)(null); + const pop = (0, import_react7.useRef)(null); + const locked = isLockedRoster(roster); + const ids = messageActionIds({ + text: text2, + sessionId, + canReact: typeof react === "function", + canReply: typeof actions?.quote === "function", + locked + }); + const [dismissed, setDismissed] = (0, import_react7.useState)(null); + const [note, setNote] = (0, import_react7.useState)(""); + const close = () => { + setDismissed(contextAt?.token ?? dismissed); + setPanel(null); + }; + const cursorPlace = (at) => { + if (!at) return null; + const width = typeof window === "undefined" ? 1400 : window.innerWidth; + const height = typeof window === "undefined" ? 800 : window.innerHeight; + const below = at.y + 220 < height; + return { + left: Math.max(8, Math.min(at.x, width - 228)), + ...below ? { top: at.y } : { bottom: height - at.y + 4, "--bt-origin": "bottom left" } + }; + }; + const openFromContext = Boolean(contextAt?.token && contextAt.token !== dismissed && ids.length > 0); + const shown = openFromContext ? "more" : panel; + const menuPlace = openFromContext ? cursorPlace(contextAt) : place; + const openAt = (kind, event, { cursor = false } = {}) => { + if (!cursor && panel === kind) { + close(); + return; + } + setDismissed(contextAt?.token ?? dismissed); + const width = typeof window === "undefined" ? 1400 : window.innerWidth; + const height = typeof window === "undefined" ? 800 : window.innerHeight; + const rect = event?.currentTarget?.getBoundingClientRect?.(); + const below = cursor ? event.clientY + 220 < height : rect && rect.bottom + 220 < height; + const left = cursor ? Math.min(event.clientX, width - 228) : Math.min(rect.left, width - 228); + setPlace(kind === "react" && !cursor ? { left: rect.left + rect.width / 2, top: rect.top - 6, "--bt-origin": "bottom center" } : { left: Math.max(8, left), ...below ? { top: cursor ? event.clientY : rect.bottom + 4 } : { bottom: height - (cursor ? event.clientY : rect.top) + 4, "--bt-origin": "bottom left" } }); + setPanel(kind); + }; + useDismiss(shown !== null, close, [tools, pop]); + (0, import_react7.useEffect)(() => { + if (shown) pop.current?.querySelector?.("button")?.focus?.(); + }, [shown, contextAt?.token]); + const copy2 = async () => { + try { + if (typeof navigator.clipboard?.writeText !== "function") { + setNote(t("Clipboard unavailable")); + return; + } + await navigator.clipboard.writeText(text2); + setCopied(true); + setNote(t("Copied")); + setTimeout(() => setCopied(false), 1e3); + } catch { + setNote(t("Could not copy message")); + } + }; + const download2 = () => { + try { + downloadMessage(text2, name); + close(); + } catch { + setNote(t("Could not download message")); + } + }; + const reply = () => actions.quote(sessionId, text2); + const item = (label, Icon, run, keepOpen = false) => (0, import_react7.createElement)("button", { key: label, type: "button", role: "menuitem", onClick: () => { + if (!keepOpen) close(); + run(); + } }, (0, import_react7.createElement)(Icon), label); + const menuItems = []; + if (ids.includes("reply")) menuItems.push(item(t("Reply"), ReplyIcon, reply)); + if (ids.includes("copy")) menuItems.push(item(copied ? t("Copied") : t("Copy"), copied ? CheckIcon : CopyIcon, copy2, true)); + if (ids.includes("download")) menuItems.push(item(t("Download"), DownloadIcon, download2, true)); + if (ids.length === 0) return null; + return (0, import_react7.createElement)( + "div", + { ref: tools, className, "data-open": shown !== null || void 0 }, + ids.includes("react") ? (0, import_react7.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Add reaction"), title: t("Add reaction"), "aria-expanded": shown === "react", onClick: (event) => openAt("react", event) }, (0, import_react7.createElement)(SmileIcon)) : null, + ids.includes("reply") ? (0, import_react7.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Reply"), title: t("Reply"), onClick: reply }, (0, import_react7.createElement)(ReplyIcon)) : null, + menuItems.length > 0 || ids.includes("react") ? (0, import_react7.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("More message actions"), title: t("More"), "aria-haspopup": "menu", "aria-expanded": shown === "more", onClick: (event) => openAt("more", event) }, copied ? (0, import_react7.createElement)(CheckIcon) : (0, import_react7.createElement)(DotsIcon)) : null, + shown === "react" ? (0, import_react_dom.createPortal)((0, import_react7.createElement)( + "div", + { ref: pop, className: "bt-react-strip", role: "menu", "aria-label": t("Reactions"), style: menuPlace }, + MESSAGE_REACTIONS.map((emoji) => (0, import_react7.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => { + close(); + react(emoji); + } }, emoji)) + ), document.body) : null, + shown === "more" ? (0, import_react_dom.createPortal)((0, import_react7.createElement)( + "div", + { + ref: pop, + className: "bt-menu", + role: "menu", + "aria-label": t("Message actions"), + style: menuPlace, + onKeyDown: (event) => { + if (!["ArrowDown", "ArrowUp", "Home", "End"].includes(event.key)) return; + const buttons = [...pop.current?.querySelectorAll?.("button:not(:disabled)") ?? []]; + if (!buttons.length) return; + event.preventDefault(); + const at = buttons.indexOf(document.activeElement); + const next = event.key === "Home" ? 0 : event.key === "End" ? buttons.length - 1 : (at + (event.key === "ArrowDown" ? 1 : -1) + buttons.length) % buttons.length; + buttons[next].focus(); + } + }, + ids.includes("react") ? (0, import_react7.createElement)( + "div", + { key: "reacts", className: "bt-menu-reacts", role: "group", "aria-label": t("Reactions") }, + MESSAGE_REACTIONS.map((emoji) => (0, import_react7.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => { + close(); + react(emoji); + } }, emoji)) + ) : null, + ids.includes("react") && menuItems.length > 0 ? (0, import_react7.createElement)("div", { key: "sep", className: "bt-menu-sep", role: "separator" }) : null, + ...menuItems, + note ? (0, import_react7.createElement)("div", { role: "status", "aria-live": "polite", className: "bt-menu-hint bt-message-note" }, note) : null + ), document.body) : null + ); +} +var contextToken = 0; +function onMessageContextMenu(event, setContextAt, { live = false } = {}) { + if (live) return; + if (event.target?.closest?.('a[href], input, textarea, [role="menu"]')) return; + event.preventDefault(); + event.stopPropagation(); + setContextAt({ x: event.clientX, y: event.clientY, token: ++contextToken }); +} + +// src/client/questions.js +var import_react8 = require("react"); var keyLetter = (index) => String.fromCharCode(65 + index); var optionsOf = (question) => (question?.options ?? []).map((option) => typeof option === "string" ? { label: option } : option); var isTypingTarget = (node) => node instanceof HTMLInputElement || node instanceof HTMLTextAreaElement || node instanceof HTMLSelectElement || node instanceof HTMLElement && node.isContentEditable; function useOptionKeys(count, onPick, ownRef) { - const pick2 = (0, import_react7.useRef)(onPick); + const pick2 = (0, import_react8.useRef)(onPick); pick2.current = onPick; - (0, import_react7.useEffect)(() => { + (0, import_react8.useEffect)(() => { if (count === 0) return void 0; const onKey = (event) => { if (event.defaultPrevented || event.metaKey || event.ctrlKey || event.altKey || event.shiftKey || event.key.length !== 1) return; @@ -6267,10 +7048,10 @@ function useOptionKeys(count, onPick, ownRef) { }, [count, ownRef]); } function QuestionView({ question, onAnswer, onDismiss, ownAnswer = false, raised = false, locked = false }) { - const [own, setOwn] = (0, import_react7.useState)(""); - const [picked, setPicked] = (0, import_react7.useState)([]); - const ownRef = (0, import_react7.useRef)(null); - const titleId = (0, import_react7.useId)(); + const [own, setOwn] = (0, import_react8.useState)(""); + const [picked, setPicked] = (0, import_react8.useState)([]); + const ownRef = (0, import_react8.useRef)(null); + const titleId = (0, import_react8.useId)(); const options = optionsOf(question); const multi = question.multiSelect === true; const custom = own.trim(); @@ -6288,7 +7069,7 @@ function QuestionView({ question, onAnswer, onDismiss, ownAnswer = false, raised }; useOptionKeys(locked ? 0 : options.length, (index) => choose(options[index].label), ownRef); const ownLetter = options.length > 0 ? keyLetter(options.length) : void 0; - const field = ownAnswer && !locked ? (0, import_react7.createElement)("textarea", { + const field = ownAnswer && !locked ? (0, import_react8.createElement)("textarea", { ref: ownRef, rows: 1, value: own, @@ -6308,16 +7089,16 @@ function QuestionView({ question, onAnswer, onDismiss, ownAnswer = false, raised const rows = options.map((option, optionIndex) => { const selected = multi && picked.includes(option.label); const body = [ - (0, import_react7.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)), - (0, import_react7.createElement)( + (0, import_react8.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)), + (0, import_react8.createElement)( "span", { className: "bt-q-body" }, - (0, import_react7.createElement)("span", { className: "bt-q-label" }, option.label), - option.description ? (0, import_react7.createElement)("span", { className: "bt-q-desc" }, option.description) : null + (0, import_react8.createElement)("span", { className: "bt-q-label" }, option.label), + option.description ? (0, import_react8.createElement)("span", { className: "bt-q-desc" }, option.description) : null ), - selected && !raised ? (0, import_react7.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react7.createElement)(CheckIcon)) : null + selected && !raised ? (0, import_react8.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react8.createElement)(CheckIcon)) : null ]; - return locked ? (0, import_react7.createElement)("div", { key: option.label, className: "bt-q-opt" }, ...body) : (0, import_react7.createElement)("button", { + return locked ? (0, import_react8.createElement)("div", { key: option.label, className: "bt-q-opt" }, ...body) : (0, import_react8.createElement)("button", { key: option.label, type: "button", className: "bt-q-opt", @@ -6327,25 +7108,25 @@ function QuestionView({ question, onAnswer, onDismiss, ownAnswer = false, raised }, ...body); }); if (raised && field) { - rows.push((0, import_react7.createElement)( + rows.push((0, import_react8.createElement)( "label", { key: "own", className: "bt-q-opt bt-q-ownrow", "data-filled": custom !== "" ? "" : void 0 }, - ownLetter ? (0, import_react7.createElement)("span", { className: "bt-key", "aria-hidden": true }, ownLetter) : null, - (0, import_react7.createElement)("span", { className: "bt-q-body" }, field) + ownLetter ? (0, import_react8.createElement)("span", { className: "bt-key", "aria-hidden": true }, ownLetter) : null, + (0, import_react8.createElement)("span", { className: "bt-q-body" }, field) )); } let foot = null; if (!locked && raised && multi) { - foot = (0, import_react7.createElement)( + foot = (0, import_react8.createElement)( "div", { className: "bt-q-foot" }, - (0, import_react7.createElement)("button", { type: "button", className: "bt-q-btn", onClick: onDismiss }, t("Skip")), - (0, import_react7.createElement)("button", { type: "submit", className: "bt-q-submit", disabled: !canSubmit }, t("Submit")) + (0, import_react8.createElement)("button", { type: "button", className: "bt-q-btn", onClick: onDismiss }, t("Skip")), + (0, import_react8.createElement)("button", { type: "submit", className: "bt-q-submit", disabled: !canSubmit }, t("Submit")) ); } else if (!locked && (raised || multi) && canSubmit) { - foot = (0, import_react7.createElement)("div", { className: "bt-q-foot" }, (0, import_react7.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit"))); + foot = (0, import_react8.createElement)("div", { className: "bt-q-foot" }, (0, import_react8.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit"))); } - return (0, import_react7.createElement)( + return (0, import_react8.createElement)( locked ? "div" : "form", { className: raised ? "bt-q bt-q-raised" : "bt-q", @@ -6355,24 +7136,24 @@ function QuestionView({ question, onAnswer, onDismiss, ownAnswer = false, raised submit(); } } }, - (0, import_react7.createElement)( + (0, import_react8.createElement)( "div", { className: "bt-q-head" }, - (0, import_react7.createElement)( + (0, import_react8.createElement)( "div", { className: "bt-q-text" }, - (0, import_react7.createElement)("p", { className: "bt-q-title", id: titleId }, question.header ? `${question.header} · ` : "", question.question), - question.detail ? (0, import_react7.createElement)("div", { className: "bt-q-detail" }, question.detail) : null, - raised && multi ? (0, import_react7.createElement)("div", { className: "bt-q-detail" }, t("Choose all that apply")) : null + (0, import_react8.createElement)("p", { className: "bt-q-title", id: titleId }, question.header ? `${question.header} · ` : "", question.question), + question.detail ? (0, import_react8.createElement)("div", { className: "bt-q-detail" }, question.detail) : null, + raised && multi ? (0, import_react8.createElement)("div", { className: "bt-q-detail" }, t("Choose all that apply")) : null ), - locked ? null : (0, import_react7.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Dismiss question"), title: t("Dismiss"), onClick: onDismiss }, (0, import_react7.createElement)(CloseIcon)) + locked ? null : (0, import_react8.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Dismiss question"), title: t("Dismiss"), onClick: onDismiss }, (0, import_react8.createElement)(CloseIcon)) ), - rows.length > 0 ? (0, import_react7.createElement)("div", { className: "bt-q-list", role: "group" }, rows) : null, - field && !raised ? (0, import_react7.createElement)( + rows.length > 0 ? (0, import_react8.createElement)("div", { className: "bt-q-list", role: "group" }, rows) : null, + field && !raised ? (0, import_react8.createElement)( "div", { className: "bt-q-custom" }, - (0, import_react7.createElement)("label", { className: "bt-q-field" }, field), - !multi && canSubmit ? (0, import_react7.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit")) : null + (0, import_react8.createElement)("label", { className: "bt-q-field" }, field), + !multi && canSubmit ? (0, import_react8.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit")) : null ) : null, foot ); @@ -6382,29 +7163,29 @@ function SettledQuestion({ question, answer }) { const prompt = question?.question ?? ""; const chosen = [...answer.selected ?? [], ...answer.custom ? [answer.custom] : []]; if (chosen.length === 0) { - return (0, import_react7.createElement)( + return (0, import_react8.createElement)( "div", { className: "bt-q bt-q-settled bt-q-dismissed", role: "group", "aria-label": prompt }, - (0, import_react7.createElement)( + (0, import_react8.createElement)( "div", { className: "bt-q-head" }, - (0, import_react7.createElement)("div", { className: "bt-q-text" }, (0, import_react7.createElement)("p", { className: "bt-q-title" }, prompt)), - (0, import_react7.createElement)("span", { className: "bt-q-badge" }, t("Dismissed")) + (0, import_react8.createElement)("div", { className: "bt-q-text" }, (0, import_react8.createElement)("p", { className: "bt-q-title" }, prompt)), + (0, import_react8.createElement)("span", { className: "bt-q-badge" }, t("Dismissed")) ) ); } - return (0, import_react7.createElement)( + return (0, import_react8.createElement)( "div", { className: "bt-q bt-q-settled", role: "group", "aria-label": prompt }, - prompt ? (0, import_react7.createElement)("div", { className: "bt-q-head" }, (0, import_react7.createElement)("div", { className: "bt-q-text" }, (0, import_react7.createElement)("p", { className: "bt-q-title" }, prompt))) : null, - (0, import_react7.createElement)("div", { className: "bt-q-list", role: "group", "aria-label": t("Your answer") }, chosen.map((label, index) => { + prompt ? (0, import_react8.createElement)("div", { className: "bt-q-head" }, (0, import_react8.createElement)("div", { className: "bt-q-text" }, (0, import_react8.createElement)("p", { className: "bt-q-title" }, prompt))) : null, + (0, import_react8.createElement)("div", { className: "bt-q-list", role: "group", "aria-label": t("Your answer") }, chosen.map((label, index) => { const optionIndex = options.findIndex((option) => option.label === label); - return (0, import_react7.createElement)( + return (0, import_react8.createElement)( "div", { key: `${label}-${index}`, className: "bt-q-opt" }, - optionIndex >= 0 ? (0, import_react7.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)) : null, - (0, import_react7.createElement)("span", { className: "bt-q-body" }, (0, import_react7.createElement)("span", { className: "bt-q-label" }, label)), - (0, import_react7.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react7.createElement)(CheckIcon)) + optionIndex >= 0 ? (0, import_react8.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)) : null, + (0, import_react8.createElement)("span", { className: "bt-q-body" }, (0, import_react8.createElement)("span", { className: "bt-q-label" }, label)), + (0, import_react8.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react8.createElement)(CheckIcon)) ); })) ); @@ -6412,8 +7193,8 @@ function SettledQuestion({ question, answer }) { function QuestionCard({ matched }) { const pending = matched; const questions = pending.questions ?? []; - const [index, setIndex] = (0, import_react7.useState)(0); - const [answers, setAnswers] = (0, import_react7.useState)([]); + const [index, setIndex] = (0, import_react8.useState)(0); + const [answers, setAnswers] = (0, import_react8.useState)([]); const question = questions[index]; if (question === void 0) return null; const onAnswer = (answer) => { @@ -6425,10 +7206,10 @@ function QuestionCard({ matched }) { } pending.answer({ answers: next }); }; - return (0, import_react7.createElement)(QuestionView, { key: index, question, onAnswer, onDismiss: () => pending.dismiss(), ownAnswer: true, raised: true }); + return (0, import_react8.createElement)(QuestionView, { key: index, question, onAnswer, onDismiss: () => pending.dismiss(), ownAnswer: true, raised: true }); } function PendingQuestion({ sessionId, question, actions, roster, inline }) { - const [answered, setAnswered] = (0, import_react7.useState)(null); + const [answered, setAnswered] = (0, import_react8.useState)(null); if (answered === question.id) return null; const locked = lockedWindow(roster); const onAnswer = (answer) => { @@ -6439,11 +7220,11 @@ function PendingQuestion({ sessionId, question, actions, roster, inline }) { setAnswered(question.id); void actions.dismissQuestion(sessionId); }; - return (0, import_react7.createElement)( + return (0, import_react8.createElement)( "div", { className: inline ? "bt-q-inline" : "bt-q-dock" }, - ...locked ? [(0, import_react7.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly))] : [], - (0, import_react7.createElement)(QuestionView, { key: question.id, question, onAnswer, onDismiss, ownAnswer: question.allowCustom === true, raised: !inline, locked }) + ...locked ? [(0, import_react8.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly))] : [], + (0, import_react8.createElement)(QuestionView, { key: question.id, question, onAnswer, onDismiss, ownAnswer: question.allowCustom === true, raised: !inline, locked }) ); } function QuestionDock({ sessionId, useRoster, useCards, useSession, actions }) { @@ -6452,16 +7233,16 @@ function QuestionDock({ sessionId, useRoster, useCards, useSession, actions }) { const drawn = useCards?.((state) => state[sessionId]?.[question?.callId] > 0) === true; const loading = useSession?.(historyLoading) === true; if (question === void 0 || question.callId && (drawn || loading)) return null; - return (0, import_react7.createElement)(PendingQuestion, { sessionId, question, actions, roster, inline: false }); + return (0, import_react8.createElement)(PendingQuestion, { sessionId, question, actions, roster, inline: false }); } function AnsweredCell({ node }) { const data = node.data ?? {}; const questions = Array.isArray(data.questions) ? data.questions : []; if (questions.length === 0) { - return data.text ? (0, import_react7.createElement)("div", { className: "bt-urow" }, (0, import_react7.createElement)("div", { className: "bt-ububble" }, data.text)) : null; + return data.text ? (0, import_react8.createElement)("div", { className: "bt-urow" }, (0, import_react8.createElement)("div", { className: "bt-ububble" }, data.text)) : null; } const answers = Array.isArray(data.answers) ? data.answers : []; - return (0, import_react7.createElement)("div", { className: "bt-q-inline" }, questions.map((question) => (0, import_react7.createElement)(SettledQuestion, { + return (0, import_react8.createElement)("div", { className: "bt-q-inline" }, questions.map((question) => (0, import_react8.createElement)(SettledQuestion, { key: question.id, question, answer: answers.find((answer) => answer.id === question.id) ?? { selected: [] } @@ -6469,26 +7250,26 @@ function AnsweredCell({ node }) { } // src/client/secret-card.js -var import_react8 = require("react"); +var import_react9 = require("react"); var MIN_VALUE = 4; var NONE = {}; -var KeyIcon = () => (0, import_react8.createElement)( +var KeyIcon = () => (0, import_react9.createElement)( "svg", { width: 15, height: 15, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, - (0, import_react8.createElement)("path", { d: "M7 9.5a3.5 3.5 0 1 1 0 .01z" }), - (0, import_react8.createElement)("path", { d: "M10.4 10.6L17 10.6M14.5 10.6v2.4M16.6 10.6v1.8" }) + (0, import_react9.createElement)("path", { d: "M7 9.5a3.5 3.5 0 1 1 0 .01z" }), + (0, import_react9.createElement)("path", { d: "M10.4 10.6L17 10.6M14.5 10.6v2.4M16.6 10.6v1.8" }) ); -var LockIcon = () => (0, import_react8.createElement)( +var LockIcon = () => (0, import_react9.createElement)( "svg", { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, - (0, import_react8.createElement)("path", { d: "M6.5 9V7a3.5 3.5 0 0 1 7 0v2" }), - (0, import_react8.createElement)("rect", { x: 4.5, y: 9, width: 11, height: 8, rx: 2 }) + (0, import_react9.createElement)("path", { d: "M6.5 9V7a3.5 3.5 0 0 1 7 0v2" }), + (0, import_react9.createElement)("rect", { x: 4.5, y: 9, width: 11, height: 8, rx: 2 }) ); -var WarnIcon = () => (0, import_react8.createElement)( +var WarnIcon = () => (0, import_react9.createElement)( "svg", { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, - (0, import_react8.createElement)("path", { d: "M10 3.5l7 12.5H3z" }), - (0, import_react8.createElement)("path", { d: "M10 8.5v3.5M10 14.2h.01" }) + (0, import_react9.createElement)("path", { d: "M10 3.5l7 12.5H3z" }), + (0, import_react9.createElement)("path", { d: "M10 8.5v3.5M10 14.2h.01" }) ); var MASK_BY_CSS = typeof CSS !== "undefined" && typeof CSS.supports === "function" && CSS.supports("-webkit-text-security", "disc"); var insecure = () => typeof location !== "undefined" && location.protocol === "http:" && !/^(localhost|127(?:\.\d{1,3}){3}|\[::1\])$/.test(location.hostname); @@ -6499,7 +7280,7 @@ var scopeLabel = (scope, roster) => { }; var when2 = (time) => Number.isFinite(time) ? new Date(time).toLocaleString(dateLocale(), { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" }) : ""; function MaskedInput({ value, onChange, onEnter, label, autoFocus = false }) { - return (0, import_react8.createElement)("input", { + return (0, import_react9.createElement)("input", { className: "bt-secret-input", type: MASK_BY_CSS ? "text" : "password", "data-masked": MASK_BY_CSS ? "" : void 0, @@ -6525,11 +7306,11 @@ function MaskedInput({ value, onChange, onEnter, label, autoFocus = false }) { } function ScopeSwitch({ value, onChange, bot }) { const options = [["all", t("All my Bots")], ["bot", t("Only {name}", { name: bot.name })]]; - return (0, import_react8.createElement)( + return (0, import_react9.createElement)( "div", { className: "bt-secret-scope", role: "radiogroup", "aria-label": t("Who may use it") }, - (0, import_react8.createElement)("span", { className: "bt-secret-glide", "data-at": value === "all" ? 0 : 1, "aria-hidden": true }), - options.map(([id, text2]) => (0, import_react8.createElement)("button", { + (0, import_react9.createElement)("span", { className: "bt-secret-glide", "data-at": value === "all" ? 0 : 1, "aria-hidden": true }), + options.map(([id, text2]) => (0, import_react9.createElement)("button", { key: id, type: "button", role: "radio", @@ -6540,26 +7321,26 @@ function ScopeSwitch({ value, onChange, bot }) { ); } function SecretHead({ bot, title, detail, name, onClose }) { - return (0, import_react8.createElement)( + return (0, import_react9.createElement)( "div", { className: "bt-q-head bt-secret-head" }, - (0, import_react8.createElement)("span", { className: "bt-secret-who" }, (0, import_react8.createElement)(BotMark, { bot, size: 28 }), (0, import_react8.createElement)("span", { className: "bt-secret-lock" }, (0, import_react8.createElement)(LockIcon))), - (0, import_react8.createElement)( + (0, import_react9.createElement)("span", { className: "bt-secret-who" }, (0, import_react9.createElement)(BotMark, { bot, size: 28 }), (0, import_react9.createElement)("span", { className: "bt-secret-lock" }, (0, import_react9.createElement)(LockIcon))), + (0, import_react9.createElement)( "div", { className: "bt-q-text" }, - (0, import_react8.createElement)("p", { className: "bt-q-title" }, title), - (0, import_react8.createElement)("div", { className: "bt-q-detail" }, (0, import_react8.createElement)("code", { className: "bt-secret-name" }, name), detail ? ` · ${detail}` : "") + (0, import_react9.createElement)("p", { className: "bt-q-title" }, title), + (0, import_react9.createElement)("div", { className: "bt-q-detail" }, (0, import_react9.createElement)("code", { className: "bt-secret-name" }, name), detail ? ` · ${detail}` : "") ), - onClose ? (0, import_react8.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Cancel the request"), title: t("Cancel"), onClick: onClose }, (0, import_react8.createElement)(CloseIcon)) : null + onClose ? (0, import_react9.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Cancel the request"), title: t("Cancel"), onClick: onClose }, (0, import_react9.createElement)(CloseIcon)) : null ); } function SecretCard({ bot, request, roster, actions }) { - const [value, setValue] = (0, import_react8.useState)(""); - const [scope, setScope] = (0, import_react8.useState)("all"); - const [replacing, setReplacing] = (0, import_react8.useState)(false); - const [busy, setBusy] = (0, import_react8.useState)(false); - const [error, setError] = (0, import_react8.useState)(""); - const noteId = (0, import_react8.useId)(); + const [value, setValue] = (0, import_react9.useState)(""); + const [scope, setScope] = (0, import_react9.useState)("all"); + const [replacing, setReplacing] = (0, import_react9.useState)(false); + const [busy, setBusy] = (0, import_react9.useState)(false); + const [error, setError] = (0, import_react9.useState)(""); + const noteId = (0, import_react9.useId)(); const secret = (roster.secrets ?? []).find((entry) => entry.name === request.name); const run = (promise) => { setBusy(true); @@ -6575,73 +7356,73 @@ function SecretCard({ bot, request, roster, actions }) { if (!busy) void run(actions.secretAllow(request.id)); }; const filling = request.kind === "fill" || replacing; - const warn = insecure() ? (0, import_react8.createElement)("div", { className: "bt-secret-warn", role: "note" }, (0, import_react8.createElement)(WarnIcon), t("This page is not on HTTPS: the key crosses the network unencrypted.")) : null; - return (0, import_react8.createElement)( + const warn = insecure() ? (0, import_react9.createElement)("div", { className: "bt-secret-warn", role: "note" }, (0, import_react9.createElement)(WarnIcon), t("This page is not on HTTPS: the key crosses the network unencrypted.")) : null; + return (0, import_react9.createElement)( "div", { className: "bt-q bt-secret", role: "group", "aria-describedby": noteId, "data-kind": request.kind }, - (0, import_react8.createElement)(SecretHead, { + (0, import_react9.createElement)(SecretHead, { bot, title: request.kind === "allow" ? t("Let {bot} use {name}?", { bot: bot.name, name: request.name }) : t("{name} needs a key", { name: bot.name }), detail: request.purpose, name: request.name, onClose: busy ? void 0 : cancel }), - request.kind === "allow" ? (0, import_react8.createElement)("div", { className: "bt-secret-saved" }, (0, import_react8.createElement)(KeyIcon), t("Saved for {scope}", { scope: scopeLabel(secret?.scope, roster) })) : null, - filling ? (0, import_react8.createElement)( + request.kind === "allow" ? (0, import_react9.createElement)("div", { className: "bt-secret-saved" }, (0, import_react9.createElement)(KeyIcon), t("Saved for {scope}", { scope: scopeLabel(secret?.scope, roster) })) : null, + filling ? (0, import_react9.createElement)( "div", { className: "bt-secret-body" }, - (0, import_react8.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react8.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value of {name}", { name: request.name }), autoFocus: replacing })), - request.kind === "fill" ? (0, import_react8.createElement)(ScopeSwitch, { value: scope, onChange: setScope, bot }) : null + (0, import_react9.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react9.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value of {name}", { name: request.name }), autoFocus: replacing })), + request.kind === "fill" ? (0, import_react9.createElement)(ScopeSwitch, { value: scope, onChange: setScope, bot }) : null ) : null, - (0, import_react8.createElement)( + (0, import_react9.createElement)( "div", { className: "bt-secret-note", id: noteId }, t("{bot} never sees the value. It reaches {bot}'s shell as ", { bot: bot.name }), - (0, import_react8.createElement)("code", null, `$DSH_SECRET_${request.name}`), + (0, import_react9.createElement)("code", null, `$DSH_SECRET_${request.name}`), ".", filling && value !== "" && !long ? t(" At least {count} characters.", { count: MIN_VALUE }) : "" ), warn, - error ? (0, import_react8.createElement)("div", { className: "bt-secret-error", role: "alert" }, error) : null, - (0, import_react8.createElement)( + error ? (0, import_react9.createElement)("div", { className: "bt-secret-error", role: "alert" }, error) : null, + (0, import_react9.createElement)( "div", { className: "bt-q-foot" }, - request.kind === "allow" && !replacing ? (0, import_react8.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => setReplacing(true) }, t("Replace value")) : null, - (0, import_react8.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: cancel }, t("Cancel")), - filling ? (0, import_react8.createElement)("button", { type: "button", className: "bt-q-submit", disabled: !long || busy, onClick: save }, busy ? t("Saving…") : t("Save")) : (0, import_react8.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: allow }, busy ? t("Allowing…") : t("Allow")) + request.kind === "allow" && !replacing ? (0, import_react9.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => setReplacing(true) }, t("Replace value")) : null, + (0, import_react9.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: cancel }, t("Cancel")), + filling ? (0, import_react9.createElement)("button", { type: "button", className: "bt-q-submit", disabled: !long || busy, onClick: save }, busy ? t("Saving…") : t("Save")) : (0, import_react9.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: allow }, busy ? t("Allowing…") : t("Allow")) ) ); } function SettledSecret({ bot, request, roster }) { const canceled = request.status === "canceled"; const text2 = canceled ? t("{bot} asked for {name}", { bot: bot.name, name: request.name }) : request.status === "allowed" ? t("Allowed {bot} to use {name}", { bot: bot.name, name: request.name }) : t("Saved {name}", { name: request.name }); - return (0, import_react8.createElement)( + return (0, import_react9.createElement)( "div", { className: "bt-q bt-q-settled bt-secret bt-secret-done", role: "group", "aria-label": text2, "data-status": request.status }, - (0, import_react8.createElement)( + (0, import_react9.createElement)( "div", { className: "bt-q-head" }, - (0, import_react8.createElement)("span", { className: "bt-secret-who" }, (0, import_react8.createElement)(BotMark, { bot, size: 22 })), - (0, import_react8.createElement)("div", { className: "bt-q-text" }, (0, import_react8.createElement)( + (0, import_react9.createElement)("span", { className: "bt-secret-who" }, (0, import_react9.createElement)(BotMark, { bot, size: 22 })), + (0, import_react9.createElement)("div", { className: "bt-q-text" }, (0, import_react9.createElement)( "p", { className: "bt-q-title" }, text2, - canceled ? null : (0, import_react8.createElement)("span", { className: "bt-secret-scope-tag" }, ` · ${scopeLabel(request.scope, roster)}`) + canceled ? null : (0, import_react9.createElement)("span", { className: "bt-secret-scope-tag" }, ` · ${scopeLabel(request.scope, roster)}`) )), - canceled ? (0, import_react8.createElement)("span", { className: "bt-q-badge" }, t("Canceled")) : (0, import_react8.createElement)("span", { className: "bt-q-check bt-secret-check", title: t("Done") }, (0, import_react8.createElement)(CheckIcon)) + canceled ? (0, import_react9.createElement)("span", { className: "bt-q-badge" }, t("Canceled")) : (0, import_react9.createElement)("span", { className: "bt-q-check bt-secret-check", title: t("Done") }, (0, import_react9.createElement)(CheckIcon)) ) ); } function RequestView({ bot, request, roster, actions }) { - return request.status === "pending" ? (0, import_react8.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }) : (0, import_react8.createElement)(SettledSecret, { bot, request, roster }); + return request.status === "pending" ? (0, import_react9.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }) : (0, import_react9.createElement)(SettledSecret, { bot, request, roster }); } function SecretToolCell({ sessionId, callId, name, done, content, roster, actions }) { const bot = roster.byId[sessionId]; if (!bot) return null; const request = (roster.secretRequests?.[bot.id] ?? []).find((entry) => entry.callId === callId && (entry.sessionId ?? sessionId) === sessionId); - if (request) return (0, import_react8.createElement)("div", { className: "bt-q-inline" }, (0, import_react8.createElement)(RequestView, { bot, request, roster, actions })); + if (request) return (0, import_react9.createElement)("div", { className: "bt-q-inline" }, (0, import_react9.createElement)(RequestView, { bot, request, roster, actions })); if (done && /already saved/.test(contentText(content))) { - return (0, import_react8.createElement)("div", { className: "bt-event" }, (0, import_react8.createElement)("span", { className: "bt-secret-event" }, (0, import_react8.createElement)(KeyIcon), t("{bot} is using {name}", { bot: bot.name, name: name ?? t("a saved key") }))); + return (0, import_react9.createElement)("div", { className: "bt-event" }, (0, import_react9.createElement)("span", { className: "bt-secret-event" }, (0, import_react9.createElement)(KeyIcon), t("{bot} is using {name}", { bot: bot.name, name: name ?? t("a saved key") }))); } return null; } @@ -6654,46 +7435,46 @@ function SecretDock({ sessionId, useRoster, useCards, useSession, actions }) { const drawn = (entry) => entry.callId && entry.sessionId === sessionId && (loading || shown[entry.callId] > 0); const waiting = (roster.secretRequests?.[bot.id] ?? []).filter((entry) => entry.status === "pending" && !drawn(entry)); if (waiting.length === 0) return null; - return (0, import_react8.createElement)("div", { className: "bt-q-dock bt-secret-dock" }, waiting.map((request) => (0, import_react8.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }))); + return (0, import_react9.createElement)("div", { className: "bt-q-dock bt-secret-dock" }, waiting.map((request) => (0, import_react9.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }))); } var scopeMode = (scope) => scope === "all" ? "all" : scope.length === 0 ? "none" : "some"; function ScopeEditor({ secret, roster, onSave }) { - const [mode, setMode] = (0, import_react8.useState)(scopeMode(secret.scope)); - const [picked, setPicked] = (0, import_react8.useState)(secret.scope === "all" ? [] : secret.scope); + const [mode, setMode] = (0, import_react9.useState)(scopeMode(secret.scope)); + const [picked, setPicked] = (0, import_react9.useState)(secret.scope === "all" ? [] : secret.scope); const toggle = (id) => setPicked((list) => list.includes(id) ? list.filter((item) => item !== id) : [...list, id]); const next = mode === "all" ? "all" : mode === "none" ? [] : picked; const same2 = next === "all" ? secret.scope === "all" : secret.scope !== "all" && [...next].sort().join() === [...secret.scope].sort().join(); - return (0, import_react8.createElement)( + return (0, import_react9.createElement)( "div", { className: "bt-secret-edit-block" }, - (0, import_react8.createElement)("div", { className: "bt-secret-edit-label" }, t("Who may use it")), - (0, import_react8.createElement)( + (0, import_react9.createElement)("div", { className: "bt-secret-edit-label" }, t("Who may use it")), + (0, import_react9.createElement)( "div", { className: "bt-secret-radios", role: "radiogroup", "aria-label": t("Who may use {name}", { name: secret.name }) }, - [["all", t("All my Bots")], ["some", t("Chosen Bots")], ["none", t("No Bot")]].map(([id, text2]) => (0, import_react8.createElement)( + [["all", t("All my Bots")], ["some", t("Chosen Bots")], ["none", t("No Bot")]].map(([id, text2]) => (0, import_react9.createElement)( "label", { key: id, className: "bt-secret-radio" }, - (0, import_react8.createElement)("input", { type: "radio", name: `scope-${secret.name}`, checked: mode === id, onChange: () => setMode(id) }), + (0, import_react9.createElement)("input", { type: "radio", name: `scope-${secret.name}`, checked: mode === id, onChange: () => setMode(id) }), text2 )) ), - mode === "some" ? (0, import_react8.createElement)("div", { className: "bt-secret-bots" }, roster.bots.map((bot) => (0, import_react8.createElement)("button", { + mode === "some" ? (0, import_react9.createElement)("div", { className: "bt-secret-bots" }, roster.bots.map((bot) => (0, import_react9.createElement)("button", { key: bot.id, type: "button", className: "bt-secret-bot", "aria-pressed": picked.includes(bot.id), onClick: () => toggle(bot.id) - }, (0, import_react8.createElement)(BotAvatar, { bot, size: 20, badge: false, live: false }), bot.name, picked.includes(bot.id) ? (0, import_react8.createElement)(CheckIcon) : null))) : null, - (0, import_react8.createElement)( + }, (0, import_react9.createElement)(BotAvatar, { bot, size: 20, badge: false, live: false }), bot.name, picked.includes(bot.id) ? (0, import_react9.createElement)(CheckIcon) : null))) : null, + (0, import_react9.createElement)( "div", { className: "bt-secret-row-actions" }, - (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: same2, onClick: () => onSave(next) }, t("Save access")) + (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: same2, onClick: () => onSave(next) }, t("Save access")) ) ); } function ValueEditor({ secret, onSave }) { - const [value, setValue] = (0, import_react8.useState)(""); - const [replaced, setReplaced] = (0, import_react8.useState)(false); + const [value, setValue] = (0, import_react9.useState)(""); + const [replaced, setReplaced] = (0, import_react9.useState)(false); const long = value.trim().length >= MIN_VALUE; const save = () => { if (!long) return; @@ -6708,66 +7489,66 @@ function ValueEditor({ secret, onSave }) { setValue(next); setReplaced(false); }; - return (0, import_react8.createElement)( + return (0, import_react9.createElement)( "div", { className: "bt-secret-edit-block" }, - (0, import_react8.createElement)("div", { className: "bt-secret-edit-label" }, t("Replace the value")), - (0, import_react8.createElement)( + (0, import_react9.createElement)("div", { className: "bt-secret-edit-label" }, t("Replace the value")), + (0, import_react9.createElement)( "div", { className: "bt-secret-inline" }, - (0, import_react8.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react8.createElement)(MaskedInput, { value, onChange: edit, onEnter: save, label: t("New value of {name}", { name: secret.name }) })), - (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !long, onClick: save }, t("Replace")) + (0, import_react9.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react9.createElement)(MaskedInput, { value, onChange: edit, onEnter: save, label: t("New value of {name}", { name: secret.name }) })), + (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !long, onClick: save }, t("Replace")) ), - value !== "" && !long ? (0, import_react8.createElement)("div", { className: "bt-set-hint" }, t("At least {count} characters.", { count: MIN_VALUE })) : replaced ? (0, import_react8.createElement)("div", { className: "bt-set-hint bt-secret-ok", role: "status" }, (0, import_react8.createElement)(CheckIcon), t("Replaced. Bots get the new value from their next command.")) : null + value !== "" && !long ? (0, import_react9.createElement)("div", { className: "bt-set-hint" }, t("At least {count} characters.", { count: MIN_VALUE })) : replaced ? (0, import_react9.createElement)("div", { className: "bt-set-hint bt-secret-ok", role: "status" }, (0, import_react9.createElement)(CheckIcon), t("Replaced. Bots get the new value from their next command.")) : null ); } function SecretRow({ secret, roster, actions, run, open, onToggle }) { - const [confirm, setConfirm] = (0, import_react8.useState)(false); - (0, import_react8.useEffect)(() => { + const [confirm, setConfirm] = (0, import_react9.useState)(false); + (0, import_react9.useEffect)(() => { if (!open) setConfirm(false); }, [open]); const asker = secret.requestedBy ? roster.byId[secret.requestedBy]?.name ?? t("a deleted Bot") : t("you"); const allowed = secret.scope === "all" ? [] : secret.scope.map((id) => roster.byId[id]).filter(Boolean); const meta = [t("Asked by {name}", { name: asker }), t("added {time}", { time: when2(secret.createdAt) }), secret.lastUsedAt ? t("last used {time}", { time: when2(secret.lastUsedAt) }) : t("not used yet")].join(" · "); - return (0, import_react8.createElement)( + return (0, import_react9.createElement)( "div", { className: "bt-secret-item", "data-open": open ? "" : void 0 }, - (0, import_react8.createElement)( + (0, import_react9.createElement)( "button", { type: "button", className: "bt-set-row bt-secret-summary", "aria-expanded": open, onClick: onToggle }, - (0, import_react8.createElement)( + (0, import_react9.createElement)( "span", { className: "bt-set-copy" }, - (0, import_react8.createElement)("span", { className: "bt-secret-title" }, (0, import_react8.createElement)(KeyIcon), (0, import_react8.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react8.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), - (0, import_react8.createElement)("span", { className: "bt-set-hint" }, meta) + (0, import_react9.createElement)("span", { className: "bt-secret-title" }, (0, import_react9.createElement)(KeyIcon), (0, import_react9.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react9.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), + (0, import_react9.createElement)("span", { className: "bt-set-hint" }, meta) ), - (0, import_react8.createElement)( + (0, import_react9.createElement)( "span", { className: "bt-set-control" }, - secret.scope === "all" ? (0, import_react8.createElement)("span", { className: "bt-tag" }, t("All my Bots")) : allowed.length === 0 ? (0, import_react8.createElement)("span", { className: "bt-tag" }, t("No Bot")) : (0, import_react8.createElement)("span", { className: "bt-secret-faces", title: allowed.map((bot) => bot.name).join(", ") }, allowed.slice(0, 5).map((bot) => (0, import_react8.createElement)(BotAvatar, { key: bot.id, bot, size: 20, badge: false, live: false }))) + secret.scope === "all" ? (0, import_react9.createElement)("span", { className: "bt-tag" }, t("All my Bots")) : allowed.length === 0 ? (0, import_react9.createElement)("span", { className: "bt-tag" }, t("No Bot")) : (0, import_react9.createElement)("span", { className: "bt-secret-faces", title: allowed.map((bot) => bot.name).join(", ") }, allowed.slice(0, 5).map((bot) => (0, import_react9.createElement)(BotAvatar, { key: bot.id, bot, size: 20, badge: false, live: false }))) ) ), - open ? (0, import_react8.createElement)( + open ? (0, import_react9.createElement)( "div", { className: "bt-secret-edit" }, - (0, import_react8.createElement)(ScopeEditor, { key: JSON.stringify(secret.scope), secret, roster, onSave: (scope) => run(actions.secretUpdate(secret.name, scope)) }), - (0, import_react8.createElement)(ValueEditor, { secret, onSave: (value) => run(actions.secretSet({ name: secret.name, value })) }), - (0, import_react8.createElement)( + (0, import_react9.createElement)(ScopeEditor, { key: JSON.stringify(secret.scope), secret, roster, onSave: (scope) => run(actions.secretUpdate(secret.name, scope)) }), + (0, import_react9.createElement)(ValueEditor, { secret, onSave: (value) => run(actions.secretSet({ name: secret.name, value })) }), + (0, import_react9.createElement)( "div", { className: "bt-secret-row-actions" }, confirm ? [ - (0, import_react8.createElement)("span", { key: "q", className: "bt-set-hint" }, t("Delete {name}? Bots lose it at once.", { name: secret.name })), - (0, import_react8.createElement)("button", { key: "no", type: "button", className: "bt-soft bt-soft-sm", onClick: () => setConfirm(false) }, t("Keep")), - (0, import_react8.createElement)("button", { key: "yes", type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => run(actions.secretDelete(secret.name)) }, t("Delete")) - ] : (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => setConfirm(true) }, (0, import_react8.createElement)(TrashIcon), t("Delete")) + (0, import_react9.createElement)("span", { key: "q", className: "bt-set-hint" }, t("Delete {name}? Bots lose it at once.", { name: secret.name })), + (0, import_react9.createElement)("button", { key: "no", type: "button", className: "bt-soft bt-soft-sm", onClick: () => setConfirm(false) }, t("Keep")), + (0, import_react9.createElement)("button", { key: "yes", type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => run(actions.secretDelete(secret.name)) }, t("Delete")) + ] : (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => setConfirm(true) }, (0, import_react9.createElement)(TrashIcon), t("Delete")) ) ) : null ); } function AddSecret({ actions, run, onDone }) { - const [name, setName] = (0, import_react8.useState)(""); - const [purpose, setPurpose] = (0, import_react8.useState)(""); - const [value, setValue] = (0, import_react8.useState)(""); + const [name, setName] = (0, import_react9.useState)(""); + const [purpose, setPurpose] = (0, import_react9.useState)(""); + const [value, setValue] = (0, import_react9.useState)(""); const ready = /^[A-Za-z][\w-]{0,63}$/.test(name.trim()) && value.trim().length >= MIN_VALUE; const save = () => { if (!ready) return; @@ -6778,70 +7559,70 @@ function AddSecret({ actions, run, onDone }) { } }); }; - return (0, import_react8.createElement)( + return (0, import_react9.createElement)( "div", { className: "bt-set-row bt-set-paste bt-secret-add" }, - (0, import_react8.createElement)("input", { className: "bt-input", "aria-label": t("Key name"), placeholder: t("NAME, e.g. GITHUB_TOKEN"), value: name, spellCheck: false, autoComplete: "off", autoFocus: true, onChange: (event) => setName(event.target.value.toUpperCase()) }), - (0, import_react8.createElement)("input", { className: "bt-input", "aria-label": t("What it is for"), placeholder: t("What it is for"), value: purpose, autoComplete: "off", onChange: (event) => setPurpose(event.target.value) }), - (0, import_react8.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react8.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value") })), - (0, import_react8.createElement)( + (0, import_react9.createElement)("input", { className: "bt-input", "aria-label": t("Key name"), placeholder: t("NAME, e.g. GITHUB_TOKEN"), value: name, spellCheck: false, autoComplete: "off", autoFocus: true, onChange: (event) => setName(event.target.value.toUpperCase()) }), + (0, import_react9.createElement)("input", { className: "bt-input", "aria-label": t("What it is for"), placeholder: t("What it is for"), value: purpose, autoComplete: "off", onChange: (event) => setPurpose(event.target.value) }), + (0, import_react9.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react9.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value") })), + (0, import_react9.createElement)( "div", { className: "bt-secret-row-actions" }, - (0, import_react8.createElement)("span", { className: "bt-set-hint" }, t("New keys are for all your Bots; change who may use it afterwards.")), - (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDone }, t("Cancel")), - (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !ready, onClick: save }, t("Save key")) + (0, import_react9.createElement)("span", { className: "bt-set-hint" }, t("New keys are for all your Bots; change who may use it afterwards.")), + (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDone }, t("Cancel")), + (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !ready, onClick: save }, t("Save key")) ) ); } function SecretsPage({ roster, actions, run, Section }) { - const [open, setOpen] = (0, import_react8.useState)(null); - const [adding, setAdding] = (0, import_react8.useState)(false); + const [open, setOpen] = (0, import_react9.useState)(null); + const [adding, setAdding] = (0, import_react9.useState)(false); const secrets = roster.secrets ?? []; if (lockedWindow(roster)) { return [ - (0, import_react8.createElement)( + (0, import_react9.createElement)( "p", { key: "about", className: "bt-secret-about" }, t("Keys your Bots asked for. Bots never see the values: they use them as "), - (0, import_react8.createElement)("code", null, "$DSH_SECRET_NAME"), + (0, import_react9.createElement)("code", null, "$DSH_SECRET_NAME"), t(" in their shell, and every value is replaced by "), - (0, import_react8.createElement)("code", null, "[secret:NAME]"), + (0, import_react9.createElement)("code", null, "[secret:NAME]"), t(" before anything goes to a model.") ), - (0, import_react8.createElement)( + (0, import_react9.createElement)( Section, { key: "list", title: t("Secrets · {count}", { count: secrets.length }) }, - secrets.length === 0 ? (0, import_react8.createElement)("div", { className: "bt-set-row" }, (0, import_react8.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : secrets.map((secret) => (0, import_react8.createElement)( + secrets.length === 0 ? (0, import_react9.createElement)("div", { className: "bt-set-row" }, (0, import_react9.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : secrets.map((secret) => (0, import_react9.createElement)( "div", { key: secret.name, className: "bt-set-row" }, - (0, import_react8.createElement)( + (0, import_react9.createElement)( "span", { className: "bt-set-copy" }, - (0, import_react8.createElement)("span", { className: "bt-secret-title" }, (0, import_react8.createElement)(KeyIcon), (0, import_react8.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react8.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), - (0, import_react8.createElement)("span", { className: "bt-set-hint" }, scopeLabel(secret.scope, roster)) + (0, import_react9.createElement)("span", { className: "bt-secret-title" }, (0, import_react9.createElement)(KeyIcon), (0, import_react9.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react9.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), + (0, import_react9.createElement)("span", { className: "bt-set-hint" }, scopeLabel(secret.scope, roster)) ) )) ) ]; } return [ - (0, import_react8.createElement)( + (0, import_react9.createElement)( "p", { key: "about", className: "bt-secret-about" }, t("Keys your Bots asked for. Bots never see the values: they use them as "), - (0, import_react8.createElement)("code", null, "$DSH_SECRET_NAME"), + (0, import_react9.createElement)("code", null, "$DSH_SECRET_NAME"), t(" in their shell, and every value is replaced by "), - (0, import_react8.createElement)("code", null, "[secret:NAME]"), + (0, import_react9.createElement)("code", null, "[secret:NAME]"), t(" before anything goes to a model.") ), - (0, import_react8.createElement)( + (0, import_react9.createElement)( Section, { key: "list", title: t("Secrets · {count}", { count: secrets.length }) }, - secrets.length === 0 && !adding ? (0, import_react8.createElement)("div", { className: "bt-set-row" }, (0, import_react8.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : null, - secrets.map((secret) => (0, import_react8.createElement)(SecretRow, { key: secret.name, secret, roster, actions, run, open: open === secret.name, onToggle: () => setOpen(open === secret.name ? null : secret.name) })), - adding ? (0, import_react8.createElement)(AddSecret, { actions, run, onDone: () => setAdding(false) }) : null + secrets.length === 0 && !adding ? (0, import_react9.createElement)("div", { className: "bt-set-row" }, (0, import_react9.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : null, + secrets.map((secret) => (0, import_react9.createElement)(SecretRow, { key: secret.name, secret, roster, actions, run, open: open === secret.name, onToggle: () => setOpen(open === secret.name ? null : secret.name) })), + adding ? (0, import_react9.createElement)(AddSecret, { actions, run, onDone: () => setAdding(false) }) : null ), - adding ? null : (0, import_react8.createElement)("div", { key: "add", className: "bt-actions" }, (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setAdding(true) }, t("Add a key"))) + adding ? null : (0, import_react9.createElement)("div", { key: "add", className: "bt-actions" }, (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setAdding(true) }, t("Add a key"))) ]; } var SECRET_CSS = ` @@ -6968,10 +7749,10 @@ function facePersonLabel(person) { } // src/client/held-reply.js -var import_react9 = require("react"); +var import_react10 = require("react"); var call3 = (endpoint, payload) => call(`flybot/${endpoint}`, payload); var Boundary; -var boundary = () => Boundary ??= class HeldReplyBoundary extends import_react9.Component { +var boundary = () => Boundary ??= class HeldReplyBoundary extends import_react10.Component { constructor(props) { super(props); this.state = { failed: false }; @@ -6988,18 +7769,18 @@ var boundary = () => Boundary ??= class HeldReplyBoundary extends import_react9. }; function useInlineEntry(policy) { const slots = registry(); - const [, setVersion] = (0, import_react9.useState)(0); - (0, import_react9.useEffect)(() => slots.subscribe(() => setVersion(slots.version())), [slots]); + const [, setVersion] = (0, import_react10.useState)(0); + (0, import_react10.useEffect)(() => slots.subscribe(() => setVersion(slots.version())), [slots]); return slots.entries("flybot.approvals").find((entry) => entry.inline === true && entry.policy === policy); } function HeldReplyActions({ held, actions, roster }) { const locked = lockedWindow(roster); - const readOnlyLine2 = () => (0, import_react9.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)); + const readOnlyLine2 = () => (0, import_react10.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)); const custom = useInlineEntry(held?.by); - const [busy, setBusy] = (0, import_react9.useState)(false); - const [error, setError] = (0, import_react9.useState)(""); + const [busy, setBusy] = (0, import_react10.useState)(false); + const [error, setError] = (0, import_react10.useState)(""); const waiting = isApprovalWaiting(held?.status); - (0, import_react9.useEffect)(() => { + (0, import_react10.useEffect)(() => { if (!waiting) return void 0; claimApprovals(`held-reply:${held.id}`, [held.id]); return () => claimApprovals(`held-reply:${held.id}`, []); @@ -7018,37 +7799,37 @@ function HeldReplyActions({ held, actions, roster }) { }; if (!waiting) { const failed = held.status === "failed"; - return (0, import_react9.createElement)( + return (0, import_react10.createElement)( "div", { className: "bt-held-note", "data-state": held.status, title: failed && held.error ? held.error : void 0 }, - (0, import_react9.createElement)("span", null, held.status === "approved" ? t("Sent to {to}", { to: held.toName }) : held.status === "auto" ? t("Auto-sent to {to}", { to: held.toName }) : failed ? t("Not sent: delivery failed") : t("Not sent")), + (0, import_react10.createElement)("span", null, held.status === "approved" ? t("Sent to {to}", { to: held.toName }) : held.status === "auto" ? t("Auto-sent to {to}", { to: held.toName }) : failed ? t("Not sent: delivery failed") : t("Not sent")), // #968: the terminal answer comes from one predicate, not from `status === 'failed'` here and a // different field elsewhere. A failure that can never succeed draws no button on any surface. - failed && canRetry(held) ? locked ? readOnlyLine2() : (0, import_react9.createElement)("button", { type: "button", className: "bt-held-retry", disabled: busy, onClick: () => decide("retry") }, t("Retry")) : null, - error ? (0, import_react9.createElement)("span", { className: "bt-flybot-approval-error", role: "alert" }, error) : null + failed && canRetry(held) ? locked ? readOnlyLine2() : (0, import_react10.createElement)("button", { type: "button", className: "bt-held-retry", disabled: busy, onClick: () => decide("retry") }, t("Retry")) : null, + error ? (0, import_react10.createElement)("span", { className: "bt-flybot-approval-error", role: "alert" }, error) : null ); } const at = typeof held.createdAt === "number" ? held.createdAt : Date.parse(held.createdAt); const age = Number.isFinite(at) && at > 0 ? ` · ${relativeShort(at)}` : null; const reason = reasonLine(held.reason); - const plain = (0, import_react9.createElement)( + const plain = (0, import_react10.createElement)( "div", { className: "bt-held-card", role: "region", "aria-label": t("Waiting for your approval") }, - (0, import_react9.createElement)("div", { className: "bt-held-head" }, t("Waiting for your approval"), age), - (0, import_react9.createElement)("div", { className: "bt-flybot-approval-origin" }, t("{from} → {to}", { from: held.from ?? t("A Bot"), to: held.toName })), - reason ? (0, import_react9.createElement)("div", { className: "bt-flybot-approval-reason", title: reason.title }, reason.text) : null, - locked ? readOnlyLine2() : (0, import_react9.createElement)( + (0, import_react10.createElement)("div", { className: "bt-held-head" }, t("Waiting for your approval"), age), + (0, import_react10.createElement)("div", { className: "bt-flybot-approval-origin" }, t("{from} → {to}", { from: held.from ?? t("A Bot"), to: held.toName })), + reason ? (0, import_react10.createElement)("div", { className: "bt-flybot-approval-reason", title: reason.title }, reason.text) : null, + locked ? readOnlyLine2() : (0, import_react10.createElement)( "div", { className: "bt-flybot-approval-actions" }, - (0, import_react9.createElement)("button", { type: "button", disabled: busy, onClick: () => decide("reject") }, t("Reject")), - (0, import_react9.createElement)("button", { type: "button", className: "bt-flybot-approve", disabled: busy, onClick: () => decide("approve") }, t("Approve")) + (0, import_react10.createElement)("button", { type: "button", disabled: busy, onClick: () => decide("reject") }, t("Reject")), + (0, import_react10.createElement)("button", { type: "button", className: "bt-flybot-approve", disabled: busy, onClick: () => decide("approve") }, t("Approve")) ), - error ? (0, import_react9.createElement)("div", { className: "bt-flybot-approval-error", role: "alert" }, error) : null + error ? (0, import_react10.createElement)("div", { className: "bt-flybot-approval-error", role: "alert" }, error) : null ); - return (0, import_react9.createElement)( + return (0, import_react10.createElement)( "div", { className: "bt-held-actions", "data-flybot": "held-reply-actions" }, - custom ? (0, import_react9.createElement)(boundary(), { id: custom.id, fallback: plain }, (0, import_react9.createElement)(custom.component, { held, decide, call: call3, actions, readOnly: locked === true })) : plain + custom ? (0, import_react10.createElement)(boundary(), { id: custom.id, fallback: plain }, (0, import_react10.createElement)(custom.component, { held, decide, call: call3, actions, readOnly: locked === true })) : plain ); } @@ -7062,79 +7843,331 @@ var texts = (step) => step.blocks.filter((block) => block.kind === "text" && blo var thinkingLive = (step) => step.status === "running" && texts(step).length === 0 && step.blocks.some((block) => block.kind === "reasoning"); var stepReasoning = (step) => step.blocks.filter((block) => block.kind === "reasoning").map((block) => block.text).join("\n").trim(); -// src/client/cells.js -var import_react10 = require("react"); -var import_react_dom = require("react-dom"); -var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives"); -var mdLabels = () => ({ code: { copyLabel: t("Copy"), copiedLabel: t("Copied") }, footnotes: t("Footnotes") }); -function bubbleLinkClick({ actions, subject }) { - return (event) => { - if (!event || event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return false; - const anchor = event.target?.closest?.("a[href]"); - if (!anchor) return false; - const href = anchor.getAttribute?.("href"); - if (typeof href !== "string" || href.startsWith(MENTION_ORIGIN) || !/^https?:/i.test(href)) return false; - event.preventDefault(); - event.stopPropagation(); - const tabId = typeof actions?.browserNewTab === "function" ? actions.browserNewTab(subject) : null; - if (tabId !== void 0 && tabId !== null && typeof actions.browserNavigate === "function") { - void actions.browserNavigate(tabId, href); - return true; +// src/shared/message-fold-prefs.js +var MODES = /* @__PURE__ */ new Set(["compact", "standard", "none"]); +var DEFAULT_FOLDING = { mode: "standard", documentCards: true }; +function readFolding(body, current) { + if (body === null) return void 0; + if (typeof body !== "object" || Array.isArray(body)) return false; + const mode = body.mode === void 0 ? current?.mode ?? DEFAULT_FOLDING.mode : body.mode; + if (!MODES.has(mode)) return false; + const documentCards = body.documentCards === void 0 ? current?.documentCards ?? DEFAULT_FOLDING.documentCards : body.documentCards; + if (typeof documentCards !== "boolean") return false; + return { mode, documentCards }; +} + +// src/shared/message-fold.js +var FOLD_MODES = ["compact", "standard", "none"]; +var FOLD_THRESHOLDS = { + compact: { lines: 4, chars: 240 }, + standard: { lines: 12, chars: 800 } +}; +var DOCUMENT_MIN_HEADINGS = 2; +var DOCUMENT_MIN_BREAKS = 3; +var MODE_SET = new Set(FOLD_MODES); +function foldingOf(prefs) { + const raw = prefs?.folding; + if (!raw || typeof raw !== "object" || Array.isArray(raw)) return { ...DEFAULT_FOLDING }; + const mode = MODE_SET.has(raw.mode) ? raw.mode : DEFAULT_FOLDING.mode; + const documentCards = typeof raw.documentCards === "boolean" ? raw.documentCards : DEFAULT_FOLDING.documentCards; + return { mode, documentCards }; +} +function clipWord(line2, max) { + if (line2.length <= max) return line2; + const slice = line2.slice(0, max); + let breakAt = -1; + for (const mark of [" ", " ", ",", "。", "、", ";", ":", ",", ".", ";", ":", "!", "?", "!", "?"]) { + breakAt = Math.max(breakAt, slice.lastIndexOf(mark)); + } + if (breakAt >= Math.min(8, Math.floor(max * 0.4))) return slice.slice(0, breakAt); + return slice; +} +function closeFences(preview) { + let fence = null; + let offset = 0; + for (const line2 of preview.split("\n")) { + const match = line2.match(/^ {0,3}(`{3,}|~{3,})(.*)$/); + if (match) { + const mark = match[1]; + if (!fence) fence = { char: mark[0], length: mark.length, offset }; + else if (mark[0] === fence.char && mark.length >= fence.length && match[2].trim() === "") fence = null; } - if (typeof window !== "undefined" && typeof window.open === "function") window.open(href, "_blank", "noopener,noreferrer"); - return true; - }; + offset += line2.length + 1; + } + if (!fence) return preview; + if (preview.slice(0, fence.offset).trim()) return preview.slice(0, fence.offset).trimEnd(); + return `${preview} +${fence.char.repeat(fence.length)}`; +} +function proseLines(text2) { + let fence = null; + return String(text2 ?? "").split("\n").filter((line2) => { + const match = line2.match(/^ {0,3}(`{3,}|~{3,})(.*)$/); + if (match) { + if (!fence) fence = match[1]; + else if (match[1][0] === fence[0] && match[1].length >= fence.length && !match[2].trim()) fence = null; + return false; + } + return !fence; + }); } -function Bubbles({ texts: texts2, roster, selfId, actions, streaming, sessionId, msgKey, msgKeys, useUi, lead, mentions }) { - const openLink = bubbleLinkClick({ actions, subject: selfId ?? sessionId }); - const onClick = (event) => { - if (openLink(event)) return; - const target = mentionTarget(event); - if (target === null) return; - event.preventDefault(); - event.stopPropagation(); - actions.openSession(target); - }; - const reactions = useUi ? useUi((state) => msgKey || msgKeys ? msgKeys ? state.reactions ?? null : state.reactions?.[msgKey] ?? null : null) : null; - const reactKey = (index) => msgKeys ? msgKeys[index] : msgKey; - const reactIndex = (index) => msgKeys ? 0 : index; - const shown = (texts2 ?? []).filter((text2) => String(text2 ?? "").trim() !== ""); - if (shown.length === 0) return null; - return (0, import_react10.createElement)( - "div", - { className: "bt-astack", "data-lead": lead ? "" : void 0, onClickCapture: onClick }, - shown.map((text2, index) => { - const key = reactKey(index); - const picked = key ? (msgKeys ? reactions?.[key] : reactions)?.[reactIndex(index)] ?? [] : []; - const last = index === shown.length - 1; - const live = streaming && last; - return (0, import_react10.createElement)( - "div", - { key: index, className: "bt-msg" }, - (0, import_react10.createElement)( - "div", - { className: "bt-msg-line" }, - lead && last ? lead : null, - (0, import_react10.createElement)( - "div", - { className: "bt-bubble" }, - (0, import_react10.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: linkMentions(text2, roster.bots, selfId), streaming: live, labels: mdLabels(), variant: "compact", fileMentions: mentions }) - ), - live ? null : (0, import_react10.createElement)(MessageTools, { text: text2, name: roster.byId[selfId]?.name ?? t("Bot"), sessionId, react: key ? (emoji) => actions.toggleReaction(key, reactIndex(index), emoji) : void 0, actions }) - ), - picked.length ? (0, import_react10.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react10.createElement)("button", { - key: emoji, - type: "button", - className: "bt-react", - "aria-label": t("Remove reaction {emoji}", { emoji }), - onClick: () => actions.toggleReaction(key, reactIndex(index), emoji) +function exceedsThreshold(text2, cap) { + if (!cap) return false; + const raw = String(text2 ?? ""); + if (raw.length > cap.chars) return true; + return raw.split("\n").length > cap.lines; +} +function previewOf2(text2, mode) { + const cap = FOLD_THRESHOLDS[mode]; + const raw = String(text2 ?? ""); + if (!cap) return raw; + const lines = raw.split("\n"); + const out = []; + let chars = 0; + for (let i = 0; i < lines.length && out.length < cap.lines; i++) { + const line2 = lines[i]; + const extra = (out.length === 0 ? 0 : 1) + line2.length; + if (out.length === 0 && line2.length > cap.chars) { + out.push(clipWord(line2, cap.chars)); + break; + } + if (out.length > 0 && chars + extra > cap.chars) { + const budget = cap.chars - chars - 1; + if (budget > 0) out.push(clipWord(line2, budget)); + break; + } + out.push(line2); + chars += extra; + } + return closeFences(out.join("\n")); +} +function shouldFold(text2, mode) { + const cap = FOLD_THRESHOLDS[mode]; + if (!cap) return false; + const raw = String(text2 ?? ""); + if (!exceedsThreshold(raw, cap)) return false; + return previewOf2(raw, mode) !== raw; +} +function documentHeadings(text2) { + const heads = []; + for (const line2 of proseLines(text2)) { + const match = line2.match(/^(#{1,6})\s+(.+?)\s*$/); + if (match) heads.push({ level: match[1].length, title: match[2] }); + } + return heads; +} +function isLongDocument(text2) { + if (!exceedsThreshold(text2, FOLD_THRESHOLDS.standard)) return false; + if (documentHeadings(text2).length >= DOCUMENT_MIN_HEADINGS) return true; + const sections = proseLines(text2).join("\n").split(/^\s*---\s*$/m).filter((part) => part.trim() !== ""); + return sections.length >= DOCUMENT_MIN_BREAKS; +} +function documentTitle(text2) { + const first = documentHeadings(text2)[0]?.title; + if (first) return first; + const line2 = String(text2 ?? "").split("\n").find((item) => item.trim() !== "") ?? ""; + const plain = line2.replace(/^#{1,6}\s+/, "").trim(); + return plain.length > 80 ? `${plain.slice(0, 80).trim()}…` : plain; +} +function showsDocumentCard(text2, folding, { streaming = false } = {}) { + if (streaming || folding?.mode === "none") return false; + return Boolean(folding?.documentCards) && isLongDocument(text2); +} + +// src/client/message-fold.js +var import_react11 = require("react"); +var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives"); +function FoldedContent({ text: text2, folding, streaming = false, actions, sessionId, children }) { + const [open, setOpen] = (0, import_react11.useState)(false); + const mode = folding?.mode ?? DEFAULT_FOLDING.mode; + const cards = folding?.documentCards === true || folding?.documentCards !== false && DEFAULT_FOLDING.documentCards; + (0, import_react11.useEffect)(() => { + setOpen(false); + }, [mode, cards, text2]); + const render = typeof children === "function" ? children : Array.isArray(children) && children.length === 1 && typeof children[0] === "function" ? children[0] : null; + const raw = String(text2 ?? ""); + if (streaming) return render ? render(raw) : null; + if (mode !== "none" && showsDocumentCard(raw, { ...folding, documentCards: cards })) { + const title = documentTitle(raw) || t("Document"); + const count = Math.max(documentHeadings(raw).length, 1); + return (0, import_react11.createElement)( + "div", + { className: "bt-document-message" }, + (0, import_react11.createElement)(DocumentCard, { title, count, onOpen: () => actions?.openDocument?.({ title, text: raw, sessionId }) }), + (0, import_react11.createElement)("button", { + type: "button", + className: "bt-fold-toggle", + "aria-expanded": open, + onClick: () => setOpen((value) => !value) + }, t(open ? "Hide message text" : "Show message text")), + open ? render ? render(raw) : (0, import_react11.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: raw, labels: mdLabels(), variant: "compact" }) : null + ); + } + if (!shouldFold(raw, mode)) return render ? render(raw) : null; + const shown = open ? raw : previewOf2(raw, mode); + return (0, import_react11.createElement)( + "div", + { className: "bt-fold", "data-folded": open ? void 0 : "" }, + render ? render(shown) : null, + (0, import_react11.createElement)("button", { + type: "button", + className: "bt-fold-toggle", + "aria-expanded": open, + onClick: (event) => { + event.preventDefault(); + event.stopPropagation(); + setOpen((value) => !value); + } + }, t(open ? "Show less" : "Show more")) + ); +} +function DocumentCard({ title, count, onOpen }) { + const sections = t("{count} sections", { count }); + return (0, import_react11.createElement)( + "button", + { + type: "button", + className: "bt-doc-card", + onClick: (event) => { + event.preventDefault(); + event.stopPropagation(); + onOpen?.(); + }, + "aria-label": `${title}. ${sections}. ${t("Open beside the conversation")}` + }, + (0, import_react11.createElement)("span", { className: "bt-doc-card-icon", "aria-hidden": true }, (0, import_react11.createElement)(DocIcon)), + (0, import_react11.createElement)( + "span", + { className: "bt-doc-card-copy" }, + (0, import_react11.createElement)("span", { className: "bt-doc-card-title" }, title), + (0, import_react11.createElement)("span", { className: "bt-doc-card-meta" }, sections) + ), + (0, import_react11.createElement)("span", { className: "bt-doc-card-go" }, t("Open beside the conversation")) + ); +} +function DocIcon() { + return (0, import_react11.createElement)( + "svg", + { width: 22, height: 22, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, + (0, import_react11.createElement)("path", { d: "M7 3.5h7l5 5V20a1.5 1.5 0 0 1-1.5 1.5h-10.5A1.5 1.5 0 0 1 5.5 20V5A1.5 1.5 0 0 1 7 3.5z" }), + (0, import_react11.createElement)("path", { d: "M14 3.5V9h5.5" }), + (0, import_react11.createElement)("path", { d: "M8.5 13h7M8.5 16.5h5" }) + ); +} +var mdLabels = () => ({ code: { copyLabel: t("Copy"), copiedLabel: t("Copied") }, footnotes: t("Footnotes") }); +function DocumentPane({ document: document2, onClose }) { + const title = document2?.title || t("Document"); + const text2 = String(document2?.text ?? ""); + return (0, import_react11.createElement)( + "div", + { className: "bt-doc-pane", "aria-label": title }, + (0, import_react11.createElement)( + "div", + { className: "bt-doc-pane-head" }, + (0, import_react11.createElement)( + "div", + { className: "bt-doc-pane-copy" }, + (0, import_react11.createElement)("h2", { className: "bt-doc-pane-title" }, title), + (0, import_react11.createElement)("p", { className: "bt-doc-pane-hint" }, t("Opened beside the conversation.")) + ), + (0, import_react11.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close document"), onClick: onClose }, (0, import_react11.createElement)(CloseIcon)) + ), + (0, import_react11.createElement)( + "div", + { className: "bt-doc-pane-body" }, + (0, import_react11.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: text2, labels: mdLabels(), variant: "compact" }) + ) + ); +} + +// src/client/cells.js +var import_react12 = require("react"); +var import_dsh_client_ui_primitives2 = require("@deepseek-ai/dsh-client-ui-primitives"); +var mdLabels2 = () => ({ code: { copyLabel: t("Copy"), copiedLabel: t("Copied") }, footnotes: t("Footnotes") }); +function bubbleLinkClick({ actions, subject }) { + return (event) => { + if (!event || event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return false; + const anchor = event.target?.closest?.("a[href]"); + if (!anchor) return false; + const href = anchor.getAttribute?.("href"); + if (typeof href !== "string" || href.startsWith(MENTION_ORIGIN) || !/^https?:/i.test(href)) return false; + event.preventDefault(); + event.stopPropagation(); + const tabId = typeof actions?.browserNewTab === "function" ? actions.browserNewTab(subject) : null; + if (tabId !== void 0 && tabId !== null && typeof actions.browserNavigate === "function") { + void actions.browserNavigate(tabId, href); + return true; + } + if (typeof window !== "undefined" && typeof window.open === "function") window.open(href, "_blank", "noopener,noreferrer"); + return true; + }; +} +function bubbleBody({ text: text2, roster, selfId, live, mentions, actions, sessionId }) { + const folding = foldingOf(roster?.prefs); + const render = (shown) => (0, import_react12.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: linkMentions(shown, roster.bots, selfId), streaming: live, labels: mdLabels2(), variant: "compact", fileMentions: mentions }); + if (!live && showsDocumentCard(text2, folding)) { + return (0, import_react12.createElement)(FoldedContent, { text: text2, folding, actions, sessionId }); + } + return (0, import_react12.createElement)( + "div", + { className: "bt-bubble" }, + (0, import_react12.createElement)(FoldedContent, { text: text2, folding, streaming: live, actions, sessionId }, render) + ); +} +function Bubbles({ texts: texts2, roster, selfId, actions, streaming, sessionId, msgKey, msgKeys, useUi, lead, mentions }) { + const openLink = bubbleLinkClick({ actions, subject: selfId ?? sessionId }); + const onClick = (event) => { + if (openLink(event)) return; + const target = mentionTarget(event); + if (target === null) return; + event.preventDefault(); + event.stopPropagation(); + actions.openSession(target); + }; + const reactions = useUi ? useUi((state) => msgKey || msgKeys ? msgKeys ? state.reactions ?? null : state.reactions?.[msgKey] ?? null : null) : null; + const reactKey = (index) => msgKeys ? msgKeys[index] : msgKey; + const reactIndex = (index) => msgKeys ? 0 : index; + const [contextAt, setContextAt] = (0, import_react12.useState)(null); + const shown = (texts2 ?? []).filter((text2) => String(text2 ?? "").trim() !== ""); + if (shown.length === 0) return null; + return (0, import_react12.createElement)( + "div", + { className: "bt-astack", "data-lead": lead ? "" : void 0, onClickCapture: onClick }, + shown.map((text2, index) => { + const key = reactKey(index); + const picked = key ? (msgKeys ? reactions?.[key] : reactions)?.[reactIndex(index)] ?? [] : []; + const last = index === shown.length - 1; + const live = streaming && last; + return (0, import_react12.createElement)( + "div", + { key: index, className: "bt-msg", onContextMenu: (event) => onMessageContextMenu(event, (at) => setContextAt({ ...at, index }), { live }) }, + (0, import_react12.createElement)( + "div", + { className: "bt-msg-line" }, + lead && last ? lead : null, + bubbleBody({ text: text2, roster, selfId, live, mentions, actions, sessionId }), + live ? null : (0, import_react12.createElement)(MessageTools, { + text: text2, + name: roster.byId[selfId]?.name ?? t("Bot"), + sessionId, + react: key ? (emoji) => actions.toggleReaction(key, reactIndex(index), emoji) : void 0, + actions, + roster, + contextAt: contextAt?.index === index ? contextAt : null + }) + ), + picked.length ? (0, import_react12.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react12.createElement)("button", { + key: emoji, + type: "button", + className: "bt-react", + "aria-label": t("Remove reaction {emoji}", { emoji }), + onClick: () => actions.toggleReaction(key, reactIndex(index), emoji) }, emoji))) : null ); }) ); } var WAITING_OTHERS_NOTICE = "Waiting for the owner's approval"; -var REACTIONS = ["👍", "❤️", "😂", "😮", "😢", "🙏"]; function leaveNoticeCoveredByClose(room2, text2) { if (room2?.origin !== "face-to-face" || room2.face?.status !== "closed") return false; const match = String(text2 ?? "").trim().match(/^(.+) left(?: the room)?$/); @@ -7147,83 +8180,6 @@ function leaveNoticeCoveredByClose(room2, text2) { } return false; } -function useDismiss(open, close, refs) { - (0, import_react10.useEffect)(() => { - if (!open) return void 0; - const onDown = (event) => { - if (refs.some((ref) => ref.current?.contains(event.target))) return; - close(); - }; - const onKey = (event) => { - if (event.key === "Escape") { - event.stopPropagation(); - close(); - } - }; - window.addEventListener("mousedown", onDown); - window.addEventListener("keydown", onKey, true); - return () => { - window.removeEventListener("mousedown", onDown); - window.removeEventListener("keydown", onKey, true); - }; - }, [open]); -} -function MessageTools({ text: text2, name, sessionId, react, actions }) { - const [panel, setPanel] = (0, import_react10.useState)(null); - const [place, setPlace] = (0, import_react10.useState)(null); - const [copied, setCopied] = (0, import_react10.useState)(false); - const tools = (0, import_react10.useRef)(null); - const pop = (0, import_react10.useRef)(null); - const close = () => setPanel(null); - useDismiss(panel !== null, close, [tools, pop]); - const open = (kind, event) => { - if (panel === kind) { - close(); - return; - } - const rect = event.currentTarget.getBoundingClientRect(); - const below = rect.bottom + 220 < window.innerHeight; - setPlace(kind === "react" ? { left: rect.left + rect.width / 2, top: rect.top - 6, "--bt-origin": "bottom center" } : { left: Math.min(rect.left, window.innerWidth - 208), ...below ? { top: rect.bottom + 4 } : { bottom: window.innerHeight - rect.top + 4, "--bt-origin": "bottom left" } }); - setPanel(kind); - }; - const copy2 = () => { - void navigator.clipboard?.writeText(text2).then(() => { - setCopied(true); - setTimeout(() => setCopied(false), 1e3); - }); - }; - const download2 = () => { - const url = URL.createObjectURL(new Blob([text2], { type: "text/markdown" })); - const link = Object.assign(document.createElement("a"), { href: url, download: `${name}-message.md` }); - link.click(); - setTimeout(() => URL.revokeObjectURL(url), 1e3); - }; - const item = (label, Icon, run) => (0, import_react10.createElement)("button", { key: label, type: "button", role: "menuitem", onClick: () => { - close(); - run(); - } }, (0, import_react10.createElement)(Icon), label); - return (0, import_react10.createElement)( - "div", - { ref: tools, className: "bt-tools", "data-open": panel !== null || void 0 }, - react ? (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Add reaction"), title: t("Add reaction"), "aria-expanded": panel === "react", onClick: (event) => open("react", event) }, (0, import_react10.createElement)(SmileIcon)) : null, - sessionId ? (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Reply"), title: t("Reply"), onClick: () => actions.quote(sessionId, text2) }, (0, import_react10.createElement)(ReplyIcon)) : null, - (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("More message actions"), title: t("More"), "aria-haspopup": "menu", "aria-expanded": panel === "more", onClick: (event) => open("more", event) }, copied ? (0, import_react10.createElement)(CheckIcon) : (0, import_react10.createElement)(DotsIcon)), - panel === "react" ? (0, import_react_dom.createPortal)((0, import_react10.createElement)( - "div", - { ref: pop, className: "bt-react-strip", role: "menu", "aria-label": t("Reactions"), style: place }, - REACTIONS.map((emoji) => (0, import_react10.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => { - close(); - react(emoji); - } }, emoji)) - ), document.body) : null, - panel === "more" ? (0, import_react_dom.createPortal)((0, import_react10.createElement)( - "div", - { ref: pop, className: "bt-menu", role: "menu", "aria-label": t("Message actions"), style: place }, - item(t("Copy"), CopyIcon, copy2), - item(t("Download"), DownloadIcon, download2) - ), document.body) : null - ); -} var PEEK_MAX = 160; var CUT = "…"; var MARKUP = [/^\s{0,3}(?:`{3,}|~{3,})/, /^\s{0,3}([-*_])(?:\s*\1){2,}\s*$/]; @@ -7247,17 +8203,17 @@ var peekLine = (text2) => { function ThinkingRow({ text: text2 }) { if (typeof text2 !== "string" || text2.trim() === "") return null; const peek = peekLine(text2); - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "details", { className: "bt-think" }, - (0, import_react10.createElement)( + (0, import_react12.createElement)( "summary", null, - (0, import_react10.createElement)("span", { className: "bt-think-caret", "aria-hidden": true }, "›"), + (0, import_react12.createElement)("span", { className: "bt-think-caret", "aria-hidden": true }, "›"), t("Thought it through"), - peek ? (0, import_react10.createElement)("span", { className: "bt-think-peek" }, peek) : null + peek ? (0, import_react12.createElement)("span", { className: "bt-think-peek" }, peek) : null ), - (0, import_react10.createElement)("div", { className: "bt-think-text" }, text2) + (0, import_react12.createElement)("div", { className: "bt-think-text" }, text2) ); } function useFileMentions({ node, openFile, fileMentions, useTurnData }) { @@ -7265,7 +8221,7 @@ function useFileMentions({ node, openFile, fileMentions, useTurnData }) { const location2 = node.location; const turn = location2?.kind === "turn" || location2?.kind === "step" ? location2.turn : void 0; const seq = node.data.finalNode?.seq; - return (0, import_react10.useMemo)(() => { + return (0, import_react12.useMemo)(() => { if (typeof fileMentions !== "function" || turn?.status !== "closed" || seq === void 0) return void 0; return tail?.closing?.finalNode.seq === seq ? fileMentions({ turn, seq, openFile }) : void 0; }, [fileMentions, openFile, seq, tail, turn]); @@ -7279,7 +8235,7 @@ function useClosingText(node, useTurnData) { function friendLead(bot, texts2) { if (bot?.remote === void 0 || texts2.length === 0) return void 0; if (texts2.every((text2) => /^Not sent:/.test(text2.trim()))) return void 0; - return (0, import_react10.createElement)("span", { className: "bt-lead", title: bot.name, "data-flybot": "friend-lead" }, (0, import_react10.createElement)(BotMark, { bot, size: 22 })); + return (0, import_react12.createElement)("span", { className: "bt-lead", title: bot.name, "data-flybot": "friend-lead" }, (0, import_react12.createElement)(BotMark, { bot, size: 22 })); } function AssistantCell({ node, groupPart, sessionId, openFile, fileMentions, useTurnData, useRoster, useUi, useTurnSteps, useTurnContext, actions }) { const roster = useRoster((value) => value); @@ -7299,14 +8255,14 @@ function AssistantCell({ node, groupPart, sessionId, openFile, fileMentions, use const relays = relayPart(data, groupPart) ? relaysBefore(contexts, steps, data) : []; if (texts2.length === 0 && !reasoning && relays.length === 0) return null; const selfId = roster.byId[sessionId]?.id ?? sessionId; - const bubbles = texts2.length ? person ? (0, import_react10.createElement)(PersonMessage, { name: person, texts: texts2, roster, selfId, actions, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi }) : (0, import_react10.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, streaming: running, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi, mentions, lead: friendLead(roster.byId[sessionId], texts2) }) : null; - return (0, import_react10.createElement)( - import_react10.Fragment, + const bubbles = texts2.length ? person ? (0, import_react12.createElement)(PersonMessage, { name: person, texts: texts2, roster, selfId, actions, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi }) : (0, import_react12.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, streaming: running, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi, mentions, lead: friendLead(roster.byId[sessionId], texts2) }) : null; + return (0, import_react12.createElement)( + import_react12.Fragment, null, relays.map((relay) => { const source = relay.source; const sender = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; - return (0, import_react10.createElement)(EventLine, { + return (0, import_react12.createElement)(EventLine, { key: relay.seq, prefix: source.role === "stopped" ? t("Stopped by") : source.role === "reply" ? t("Reply from") : t("Message from"), bots: [sender], @@ -7316,57 +8272,57 @@ function AssistantCell({ node, groupPart, sessionId, openFile, fileMentions, use whole: true }); }), - reasoning ? (0, import_react10.createElement)(ThinkingRow, { text: reasoning }) : null, - held && bubbles ? (0, import_react10.createElement)(HeldReply, { held, roster, sessionId, actions, closing }, bubbles) : bubbles + reasoning ? (0, import_react12.createElement)(ThinkingRow, { text: reasoning }) : null, + held && bubbles ? (0, import_react12.createElement)(HeldReply, { held, roster, sessionId, actions, closing }, bubbles) : bubbles ); } function HeldReply({ held, roster, sessionId, actions, closing, children }) { const bot = roster.byId[sessionId]; const chat = (roster.bots ?? []).find((item) => item.remote?.handle === held.to); const toName = cleanPeerName(held.toOwner) || (chat ? friendBotOwner(chat) : ownerNameOf({ handle: held.to })) || held.to || t("a friend"); - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-held-reply", "data-state": held.status, "data-held": isApprovalWaiting(held.status) ? "" : void 0 }, children, - closing ? (0, import_react10.createElement)(HeldReplyActions, { held: { ...held, toName, from: bot?.name }, actions, roster }) : null + closing ? (0, import_react12.createElement)(HeldReplyActions, { held: { ...held, toName, from: bot?.name }, actions, roster }) : null ); } function PersonMessage({ name, texts: texts2, roster, selfId, actions, sessionId, msgKey, useUi }) { if (!(texts2 ?? []).some((text2) => String(text2 ?? "").trim() !== "")) return null; - const lead = (0, import_react10.createElement)("span", { className: "bt-lead", title: name }, (0, import_react10.createElement)(PersonMark, { name })); - return (0, import_react10.createElement)( + const lead = (0, import_react12.createElement)("span", { className: "bt-lead", title: name }, (0, import_react12.createElement)(PersonMark, { name })); + return (0, import_react12.createElement)( "div", { className: "bt-group-msg bt-person-msg", "data-person": name }, - (0, import_react10.createElement)("span", { className: "bt-group-name" }, name), - (0, import_react10.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, sessionId, msgKey, useUi, lead }) + (0, import_react12.createElement)("span", { className: "bt-group-name" }, name), + (0, import_react12.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, sessionId, msgKey, useUi, lead }) ); } function EventLine({ prefix, bots, joiner = t("and"), onOpen, whole = false }) { if (whole && bots.length === 1) { - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-event" }, - (0, import_react10.createElement)( + (0, import_react12.createElement)( "button", { type: "button", className: "bt-event-whole", title: bots[0].name, onClick: () => onOpen?.(bots[0]) }, - (0, import_react10.createElement)("span", null, prefix), - (0, import_react10.createElement)(BotMark, { bot: bots[0], size: 16 }), - (0, import_react10.createElement)("span", { className: "bt-event-name" }, bots[0].name) + (0, import_react12.createElement)("span", null, prefix), + (0, import_react12.createElement)(BotMark, { bot: bots[0], size: 16 }), + (0, import_react12.createElement)("span", { className: "bt-event-name" }, bots[0].name) ) ); } const parts = []; - parts.push((0, import_react10.createElement)("span", { key: "p" }, prefix)); + parts.push((0, import_react12.createElement)("span", { key: "p" }, prefix)); bots.forEach((bot, index) => { - if (index > 0) parts.push((0, import_react10.createElement)("span", { key: `j${index}` }, joiner)); - parts.push((0, import_react10.createElement)( + if (index > 0) parts.push((0, import_react12.createElement)("span", { key: `j${index}` }, joiner)); + parts.push((0, import_react12.createElement)( "button", { key: bot.id ?? index, type: "button", onClick: () => onOpen?.(bot) }, - (0, import_react10.createElement)(BotMark, { bot, size: 16 }), + (0, import_react12.createElement)(BotMark, { bot, size: 16 }), bot.name )); }); - return (0, import_react10.createElement)("div", { className: "bt-event" }, parts); + return (0, import_react12.createElement)("div", { className: "bt-event" }, parts); } var heldForm = (text2) => String(text2 ?? "").replace(/\s+/g, " ").trim().replace(/^(to (the )?face[ -]?room|to the room)\s*:\s*/i, "").trim(); var sameName = (a, b) => String(a ?? "").replace(/\s+/g, " ").trim().toLowerCase() === String(b ?? "").replace(/\s+/g, " ").trim().toLowerCase(); @@ -7396,30 +8352,30 @@ function GroupMessage({ bot, text: text2, room: room2, roster, actions, msgKey, if (String(text2 ?? "").trim() === "") return null; const held = heldLineState(room2, { seq, botId: bot.id, text: text2 }); if (held === "rejected") { - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-event bt-not-sent", "data-flybot": "held-not-sent", role: "status" }, - (0, import_react10.createElement)(BotMark, { bot, size: 16 }), - (0, import_react10.createElement)("span", null, t("{name} · Not sent", { name: bot.name })) + (0, import_react12.createElement)(BotMark, { bot, size: 16 }), + (0, import_react12.createElement)("span", null, t("{name} · Not sent", { name: bot.name })) ); } if (held === "held" || isHeldLine(room2, text2, bot)) return null; - const lead = (0, import_react10.createElement)( + const lead = (0, import_react12.createElement)( "button", { type: "button", className: "bt-lead", "aria-label": t("Open {name}'s chat", { name: bot.name }), onClick: () => actions.openSession(bot.id) }, - (0, import_react10.createElement)(BotMark, { bot, size: 22 }) + (0, import_react12.createElement)(BotMark, { bot, size: 22 }) ); - const name = (0, import_react10.createElement)( + const name = (0, import_react12.createElement)( "span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, faceBotLabel(room2, roster, bot) ?? bot.name, - room2?.admin === bot.id ? (0, import_react10.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null + room2?.admin === bot.id ? (0, import_react12.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null ); - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-group-msg" }, name, - (0, import_react10.createElement)(Bubbles, { texts: [text2], roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead }) + (0, import_react12.createElement)(Bubbles, { texts: [text2], roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead }) ); } function remoteSpeaker(source, roster, sessionId) { @@ -7463,53 +8419,53 @@ function RemoteMessage({ source, text: text2, roster, actions, sessionId, msgKey if (String(words ?? "").trim() === "" && files.length === 0) return null; const person = typeof source.remote.typedBy === "string" ? source.remote.typedBy : ""; if (person) { - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-group-msg bt-person-msg bt-remote-msg", "data-person": person, "data-remote": handle }, // One short header: the person, and the Bot that carried the line only when it is known (#275). - (0, import_react10.createElement)( + (0, import_react12.createElement)( "span", { className: "bt-group-name", title: handle }, person, - carrier ? (0, import_react10.createElement)("span", { className: "bt-remote-handle" }, t("via {name}", { name: carrier })) : null + carrier ? (0, import_react12.createElement)("span", { className: "bt-remote-handle" }, t("via {name}", { name: carrier })) : null ), - String(words ?? "").trim() === "" ? null : (0, import_react10.createElement)(Bubbles, { texts: [words], roster, selfId: bot.id, actions, sessionId, msgKey, useUi, lead: (0, import_react10.createElement)("span", { className: "bt-lead", title: person }, (0, import_react10.createElement)(PersonMark, { name: person })) }), - files.length ? (0, import_react10.createElement)(RemoteFiles, { files, plugin: member?.plugin ?? "social", botId: roster.byId[sessionId]?.id ?? sessionId }) : null + String(words ?? "").trim() === "" ? null : (0, import_react12.createElement)(Bubbles, { texts: [words], roster, selfId: bot.id, actions, sessionId, msgKey, useUi, lead: (0, import_react12.createElement)("span", { className: "bt-lead", title: person }, (0, import_react12.createElement)(PersonMark, { name: person })) }), + files.length ? (0, import_react12.createElement)(RemoteFiles, { files, plugin: member?.plugin ?? "social", botId: roster.byId[sessionId]?.id ?? sessionId }) : null ); } - const mark = (0, import_react10.createElement)(BotMark, { bot, size: 22 }); - const lead = chatId ? (0, import_react10.createElement)("button", { type: "button", className: "bt-lead", title: handle, "aria-label": t("Open {name}'s chat", { name }), onClick: () => actions.openSession(chatId) }, mark) : (0, import_react10.createElement)("span", { className: "bt-lead", title: handle }, mark); - return (0, import_react10.createElement)( + const mark = (0, import_react12.createElement)(BotMark, { bot, size: 22 }); + const lead = chatId ? (0, import_react12.createElement)("button", { type: "button", className: "bt-lead", title: handle, "aria-label": t("Open {name}'s chat", { name }), onClick: () => actions.openSession(chatId) }, mark) : (0, import_react12.createElement)("span", { className: "bt-lead", title: handle }, mark); + return (0, import_react12.createElement)( "div", { className: "bt-group-msg bt-remote-msg", "data-remote": handle }, // A face room's header is the one name alone; the handle is on hover only (#457). - face ? (0, import_react10.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) }, title: handle }, name) : (0, import_react10.createElement)( + face ? (0, import_react12.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) }, title: handle }, name) : (0, import_react12.createElement)( "span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, name, - (0, import_react10.createElement)("span", { className: "bt-remote-handle", title: source.remote.home ?? handle, "aria-label": t("Friend's Bot") }, (0, import_react10.createElement)(GlobeMark), handle) + (0, import_react12.createElement)("span", { className: "bt-remote-handle", title: source.remote.home ?? handle, "aria-label": t("Friend's Bot") }, (0, import_react12.createElement)(GlobeMark), handle) ), - String(words ?? "").trim() === "" ? null : (0, import_react10.createElement)(Bubbles, { texts: [words], roster, selfId: bot.id, actions, sessionId, msgKey, useUi, lead }), - files.length ? (0, import_react10.createElement)(RemoteFiles, { files, plugin: member?.plugin ?? "social", botId: roster.byId[sessionId]?.id ?? sessionId }) : null + String(words ?? "").trim() === "" ? null : (0, import_react12.createElement)(Bubbles, { texts: [words], roster, selfId: bot.id, actions, sessionId, msgKey, useUi, lead }), + files.length ? (0, import_react12.createElement)(RemoteFiles, { files, plugin: member?.plugin ?? "social", botId: roster.byId[sessionId]?.id ?? sessionId }) : null ); } function FirstContact({ source, roster, sessionId }) { const person = typeof source.remote.typedBy === "string" ? source.remote.typedBy : ""; const who = person || remoteSpeaker(source, roster).name; const bot = roster.byId[sessionId]?.name ?? t("your Bot"); - return (0, import_react10.createElement)("div", { className: "bt-event", "data-first-contact": source.remote.handle }, (0, import_react10.createElement)("span", null, t("{name} is talking to {bot} through Bot Social", { name: who, bot }))); + return (0, import_react12.createElement)("div", { className: "bt-event", "data-first-contact": source.remote.handle }, (0, import_react12.createElement)("span", null, t("{name} is talking to {bot} through Bot Social", { name: who, bot }))); } function GlobeMark() { - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "svg", { width: 10, height: 10, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", "aria-hidden": true }, - (0, import_react10.createElement)("circle", { cx: 12, cy: 12, r: 9 }), - (0, import_react10.createElement)("path", { d: "M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18" }) + (0, import_react12.createElement)("circle", { cx: 12, cy: 12, r: 9 }), + (0, import_react12.createElement)("path", { d: "M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18" }) ); } function RemoteFiles({ files, plugin, botId }) { - const [busy, setBusy] = (0, import_react10.useState)(""); - const [error, setError] = (0, import_react10.useState)(""); + const [busy, setBusy] = (0, import_react12.useState)(""); + const [error, setError] = (0, import_react12.useState)(""); const download2 = async (file) => { setBusy(file.id); setError(""); @@ -7527,23 +8483,23 @@ function RemoteFiles({ files, plugin, botId }) { setBusy(""); } }; - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-file-chips" }, - files.map((file) => (0, import_react10.createElement)( + files.map((file) => (0, import_react12.createElement)( "button", { key: file.id, type: "button", className: "bt-file-chip", disabled: busy === file.id, title: `Download ${file.name} (untrusted file from a remote Bot)`, onClick: () => download2(file) }, `📎 ${file.name} · ${fileSize(file.size)}` )), - error ? (0, import_react10.createElement)("span", { className: "bt-file-error", role: "alert" }, error) : null + error ? (0, import_react12.createElement)("span", { className: "bt-file-error", role: "alert" }, error) : null ); } function GroupEvent({ prefix, room: room2, name, roster, actions }) { - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-event" }, - (0, import_react10.createElement)("span", null, prefix), - room2 ? (0, import_react10.createElement)("button", { type: "button", onClick: () => actions.openSession(room2.id) }, (0, import_react10.createElement)(RoomAvatar, { room: room2, roster, size: 16 }), room2.name) : name ? (0, import_react10.createElement)("span", null, name) : null + (0, import_react12.createElement)("span", null, prefix), + room2 ? (0, import_react12.createElement)("button", { type: "button", onClick: () => actions.openSession(room2.id) }, (0, import_react12.createElement)(RoomAvatar, { room: room2, roster, size: 16 }), room2.name) : name ? (0, import_react12.createElement)("span", null, name) : null ); } function MemoryEvent({ sessionId, scope, result, roster, actions, findBot }) { @@ -7554,14 +8510,14 @@ function MemoryEvent({ sessionId, scope, result, roster, actions, findBot }) { const target = other && other.id !== self?.id ? other : self; if (!target) return null; const label = team ? t("Team memory updated") : target === self ? t("Memory updated") : t("Updated {name}'s memory", { name: target.name }); - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-event" }, - (0, import_react10.createElement)("button", { type: "button", title: result, onClick: () => actions.openMemory(target.id) }, (0, import_react10.createElement)(MemoryIcon), label) + (0, import_react12.createElement)("button", { type: "button", title: result, onClick: () => actions.openMemory(target.id) }, (0, import_react12.createElement)(MemoryIcon), label) ); } function PartLine({ time }) { - return (0, import_react10.createElement)("div", { className: "bt-part-line", role: "separator" }, Number.isFinite(time) ? (0, import_react10.createElement)("span", null, dayLabel(time)) : null); + return (0, import_react12.createElement)("div", { className: "bt-part-line", role: "separator" }, Number.isFinite(time) ? (0, import_react12.createElement)("span", null, dayLabel(time)) : null); } var scrollParent = (node) => { for (let at = node.parentElement; at; at = at.parentElement) { @@ -7570,11 +8526,11 @@ var scrollParent = (node) => { return null; }; function EarlierParts({ sessionId, roster, actions, useUi }) { - const [view, setView] = (0, import_react10.useState)({ items: [], cursor: void 0, loading: true, failed: false, startedAt: null }); - const top = (0, import_react10.useRef)(null); - const busy = (0, import_react10.useRef)(false); - const alive = (0, import_react10.useRef)(true); - const restore = (0, import_react10.useRef)(null); + const [view, setView] = (0, import_react12.useState)({ items: [], cursor: void 0, loading: true, failed: false, startedAt: null }); + const top = (0, import_react12.useRef)(null); + const busy = (0, import_react12.useRef)(false); + const alive = (0, import_react12.useRef)(true); + const restore = (0, import_react12.useRef)(null); const load = (cursor) => { if (busy.current) return; busy.current = true; @@ -7590,19 +8546,19 @@ function EarlierParts({ sessionId, roster, actions, useUi }) { if (alive.current) setView((current) => ({ ...current, loading: false, failed: true })); }); }; - (0, import_react10.useEffect)(() => { + (0, import_react12.useEffect)(() => { alive.current = true; load(void 0); return () => { alive.current = false; }; }, [sessionId]); - (0, import_react10.useLayoutEffect)(() => { + (0, import_react12.useLayoutEffect)(() => { const pending = restore.current; restore.current = null; if (pending) pending.scroller.scrollTop = pending.scroller.scrollHeight - pending.fromEnd; }, [view.items]); - (0, import_react10.useEffect)(() => { + (0, import_react12.useEffect)(() => { const node = top.current; if (!node || view.loading || view.failed || !view.cursor || typeof IntersectionObserver !== "function") return void 0; const observer = new IntersectionObserver((entries2) => { @@ -7626,35 +8582,35 @@ function EarlierParts({ sessionId, roster, actions, useUi }) { } rows.push(item); } - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-earlier", role: "feed", "aria-label": t("Earlier messages"), "aria-busy": view.loading }, - (0, import_react10.createElement)( + (0, import_react12.createElement)( "div", { ref: top, className: "bt-earlier-top" }, - view.loading ? (0, import_react10.createElement)(Shimmer, null, t("Loading earlier messages…")) : view.failed ? (0, import_react10.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Couldn’t load earlier messages · Retry")) : view.cursor ? (0, import_react10.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Load earlier")) : null + 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 ), rows.map((row, index) => { const key = rows.length - index; switch (row.kind) { case "divider": - return (0, import_react10.createElement)(PartLine, { key, time: row.time }); + return (0, import_react12.createElement)(PartLine, { key, time: row.time }); case "user": - return (0, import_react10.createElement)("div", { key, className: "bt-urow", onClickCapture: bubbleLinkClick({ actions, subject: selfId ?? sessionId }) }, (0, import_react10.createElement)( + return (0, import_react12.createElement)("div", { key, className: "bt-urow", onClickCapture: bubbleLinkClick({ actions, subject: selfId ?? sessionId }) }, (0, import_react12.createElement)( "div", { className: "bt-ububble" }, - row.text ? (0, import_react10.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: row.text, labels: mdLabels(), variant: "compact" }) : null, - row.images ? (0, import_react10.createElement)("span", { className: "bt-uimages" }, row.images === 1 ? t("1 image") : t("{count} images", { count: row.images })) : null + row.text ? (0, import_react12.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: row.text, labels: mdLabels2(), variant: "compact" }) : null, + row.images ? (0, import_react12.createElement)("span", { className: "bt-uimages" }, row.images === 1 ? t("1 image") : t("{count} images", { count: row.images })) : null )); case "answer": - return (0, import_react10.createElement)(AnsweredCell, { key, node: { data: row } }); + return (0, import_react12.createElement)(AnsweredCell, { key, node: { data: row } }); case "bot": - return (0, import_react10.createElement)(Bubbles, { key, texts: row.texts, msgKeys: row.msgKeys, roster, selfId, actions, sessionId, useUi }); + return (0, import_react12.createElement)(Bubbles, { key, texts: row.texts, msgKeys: row.msgKeys, roster, selfId, actions, sessionId, useUi }); case "event": { - if (row.role === "report") return (0, import_react10.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_react12.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_react10.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => { + return (0, import_react12.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => { if (selfId && other.id) actions.openExchange(selfId, other.id); }, whole: true }); } @@ -7662,7 +8618,7 @@ function EarlierParts({ sessionId, roster, actions, useUi }) { return null; } }), - (0, import_react10.createElement)(PartLine, { time: view.startedAt }) + (0, import_react12.createElement)(PartLine, { time: view.startedAt }) ); } function TriggerCell({ node, sessionId, useRoster, useSessions, useTurnClock, useUi, actions }) { @@ -7673,7 +8629,7 @@ function TriggerCell({ node, sessionId, useRoster, useSessions, useTurnClock, us const deferred = source.kind === "bot" && source.deferred === true; const relayed = isRelayContext(data); const turn = node.location?.turn?.turn ?? data.turn; - (0, import_react10.useLayoutEffect)(() => { + (0, import_react12.useLayoutEffect)(() => { if (relayed) actions.noteTurnPeer(sessionId, turn, source.senderSessionId); }, [relayed, sessionId, turn, source.senderSessionId]); const order = useSessions((list) => { @@ -7692,31 +8648,31 @@ function TriggerCell({ node, sessionId, useRoster, useSessions, useTurnClock, us return first?.turn === turn && unseenSince(visit, first.start) ? clockLabel(first.start) : ""; }); const body = triggerBody(); - return unreadOpening ? (0, import_react10.createElement)(import_react10.Fragment, null, (0, import_react10.createElement)("div", { className: "bt-open-new" }, (0, import_react10.createElement)(NewDivider), (0, import_react10.createElement)("div", { className: "bt-time-sep", role: "separator" }, unreadOpening)), body) : body; + 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; function triggerBody() { if (source.form === "remote-chat") return null; if (source.shown === true) return null; if (source.remote?.handle) { - const message = (0, import_react10.createElement)(RemoteMessage, { source, text: remoteMessageText(stripHeader(contentText(data.content))), roster, actions, sessionId, msgKey: `${sessionId}:${data.turn}:remote`, useUi }); - return source.remote.firstContact === true ? (0, import_react10.createElement)(import_react10.Fragment, null, (0, import_react10.createElement)(FirstContact, { source, roster, sessionId }), message) : message; + const message = (0, import_react12.createElement)(RemoteMessage, { source, text: remoteMessageText(stripHeader(contentText(data.content))), roster, actions, sessionId, msgKey: `${sessionId}:${data.turn}:remote`, useUi }); + return source.remote.firstContact === true ? (0, import_react12.createElement)(import_react12.Fragment, null, (0, import_react12.createElement)(FirstContact, { source, roster, sessionId }), message) : message; } if (source.kind === "bot") { - if (source.handoff === true) return roster.roomsById[sessionId] ? null : (0, import_react10.createElement)(EarlierParts, { sessionId, roster, actions, useUi }); + if (source.handoff === true) return roster.roomsById[sessionId] ? null : (0, import_react12.createElement)(EarlierParts, { sessionId, roster, actions, useUi }); if (source.role === "room" || source.role === "kickoff") return null; - if (source.role === "mention") return (0, import_react10.createElement)("div", { className: "bt-event" }, (0, import_react10.createElement)("span", null, contentText(data.content))); + if (source.role === "mention") return (0, import_react12.createElement)("div", { className: "bt-event" }, (0, import_react12.createElement)("span", null, contentText(data.content))); if (source.role === "secret" || deferred) return null; if (source.role === "post") { if (source.failed !== void 0 || source.resumed === true || source.stopped === true) return null; if (source.notice === true || source.senderSessionId === "face-notice") return null; const room2 = roster.roomsById[sessionId]; const poster = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; - return (0, import_react10.createElement)(GroupMessage, { bot: poster, text: stripHeader(contentText(data.content)), room: room2, roster, actions, msgKey: `${sessionId}:${data.turn}:post`, useUi }); + return (0, import_react12.createElement)(GroupMessage, { bot: poster, text: stripHeader(contentText(data.content)), room: room2, roster, actions, msgKey: `${sessionId}:${data.turn}:post`, useUi }); } if (source.role === "report") { - return (0, import_react10.createElement)(GroupEvent, { prefix: t("Replies from"), room: roster.roomsById[source.roomId], name: t("a group chat"), roster, actions }); + return (0, import_react12.createElement)(GroupEvent, { prefix: t("Replies from"), room: roster.roomsById[source.roomId], name: t("a group chat"), roster, actions }); } - if (source.role === "resume" || source.resumed === true) return (0, import_react10.createElement)("div", { className: "bt-event" }, t("Picked up its work after a restart")); - if (source.role === "retry" || source.retried === true) return (0, import_react10.createElement)("div", { className: "bt-event" }, t("Asked to make the tool call it wrote as text")); + if (source.role === "resume" || source.resumed === true) return (0, import_react12.createElement)("div", { className: "bt-event" }, t("Picked up its work after a restart")); + if (source.role === "retry" || source.retried === true) return (0, import_react12.createElement)("div", { className: "bt-event" }, t("Asked to make the tool call it wrote as text")); const run = relayed ? commRunOf( order.split(",").filter(Boolean).map(Number), Object.fromEntries(peers.split(",").filter(Boolean).map((pair) => [Number(pair.slice(0, pair.indexOf(":"))), pair.slice(pair.indexOf(":") + 1)])), @@ -7730,7 +8686,7 @@ function TriggerCell({ node, sessionId, useRoster, useSessions, useTurnClock, us for (const peer of (run?.peerIds ?? []).map((id) => roster.byId[id]).filter(Boolean)) { if (!bots.some((bot) => bot.id === peer.id)) bots.push(peer); } - return (0, import_react10.createElement)(EventLine, { + return (0, import_react12.createElement)(EventLine, { prefix: source.role === "stopped" ? t("Stopped by") : count > 1 ? t("{count} messages with", { count }) : t("Message from"), bots, onOpen: (bot) => actions.openExchange(selfId, bot.id), @@ -7739,24 +8695,24 @@ function TriggerCell({ node, sessionId, useRoster, useSessions, useTurnClock, us } if (source.kind === "schedule") { const prompts = reminderPrompts(contentText(data.content)); - return (0, import_react10.createElement)("div", { className: "bt-event" }, prompts.length > 0 ? t("Scheduled task: {text}", { text: cutText(prompts.join(" · "), 80) }) : t("Routine started")); + return (0, import_react12.createElement)("div", { className: "bt-event" }, prompts.length > 0 ? t("Scheduled task: {text}", { text: cutText(prompts.join(" · "), 80) }) : t("Routine started")); } if (source.kind === "user-question-reply") return null; - return (0, import_react10.createElement)("div", { className: "bt-event" }, cutText(contentText(data.content), 80) || t("Update")); + return (0, import_react12.createElement)("div", { className: "bt-event" }, cutText(contentText(data.content), 80) || t("Update")); } } function NewDivider() { - return (0, import_react10.createElement)("div", { className: "bt-new-sep", role: "separator", "aria-label": t("New messages") }, (0, import_react10.createElement)("span", null, t("New"))); + return (0, import_react12.createElement)("div", { className: "bt-new-sep", role: "separator", "aria-label": t("New messages") }, (0, import_react12.createElement)("span", null, t("New"))); } function TurnProcessCell({ node, sessionId, turnProcess, useRoster, useUi, useTurnClock, actions }) { const open = turnProcess === void 0 || !turnProcess.foldable || turnProcess.open; - (0, import_react10.useEffect)(() => { + (0, import_react12.useEffect)(() => { if (!open) turnProcess.setOpen(true); }, [open, turnProcess]); const turn = node?.location?.turn?.turn ?? node?.data?.turn; const start = node?.location?.turn?.start?.time; const hidden = useRoster((roster) => isHiddenTurn(roster, sessionId, turn)); - (0, import_react10.useEffect)(() => { + (0, import_react12.useEffect)(() => { actions.noteTurnTime(sessionId, turn, "first", start); }, [sessionId, turn, start]); const visit = useUi((state) => state.visits?.[sessionId]); @@ -7764,7 +8720,7 @@ function TurnProcessCell({ node, sessionId, turnProcess, useRoster, useUi, useTu const own = state[sessionId]?.[turn]; return !hidden && typeof visit?.seen === "number" && own?.first !== void 0 && own.first <= visit.seen && own.end !== void 0 && own.end > visit.seen && own.end <= visit.entered; }); - return fresh ? (0, import_react10.createElement)(NewDivider) : null; + return fresh ? (0, import_react12.createElement)(NewDivider) : null; } function Nothing() { return null; @@ -7823,7 +8779,7 @@ function ContextCell({ node, useRoster }) { else if (block?.type === "tool-addition" && block.toolName) parts.push(`Tool added: ${block.toolName}`); } if (parts.length === 0) return null; - return (0, import_react10.createElement)("div", { className: "bt-event" }, parts.join(" · ")); + return (0, import_react12.createElement)("div", { className: "bt-event" }, parts.join(" · ")); } var SEPARATOR_GAP_MS = 30 * 60 * 1e3; function clockLabel(time, now = Date.now()) { @@ -7867,7 +8823,7 @@ var leftSeen = (seen, tail, now = Date.now()) => Math.max(typeof seen === "numbe function TurnTailCell({ turn: location2, sessionId, useTurnClock, useUi, actions }) { const turn = location2.turn; const time = location2.end.time; - (0, import_react10.useEffect)(() => { + (0, import_react12.useEffect)(() => { actions.noteTurnTime(sessionId, turn, "end", time); }, [sessionId, turn, time]); const label = useTurnClock((state) => { @@ -7881,15 +8837,15 @@ function TurnTailCell({ turn: location2, sessionId, useTurnClock, useUi, actions return start !== void 0 && start > visit.seen && start <= visit.entered; }); if (!label && !fresh) return null; - return (0, import_react10.createElement)( - import_react10.Fragment, + return (0, import_react12.createElement)( + import_react12.Fragment, null, - label ? (0, import_react10.createElement)("div", { className: "bt-time-sep", role: "separator" }, label) : null, - fresh ? (0, import_react10.createElement)(NewDivider) : null + label ? (0, import_react12.createElement)("div", { className: "bt-time-sep", role: "separator" }, label) : null, + fresh ? (0, import_react12.createElement)(NewDivider) : null ); } function Shimmer({ children }) { - return (0, import_react10.createElement)("span", { className: "bt-shimmer" }, children); + return (0, import_react12.createElement)("span", { className: "bt-shimmer" }, children); } var PHRASES = { thinking: ["Thinking about it", "Weighing the options", "Working out a plan", "Sorting out the details"], @@ -7958,15 +8914,15 @@ function workText(tool, step) { } function useLiveNote(actions, sessionId, id, entry) { const key = entry ? JSON.stringify(entry) : ""; - (0, import_react10.useEffect)(() => { + (0, import_react12.useEffect)(() => { if (!key) return void 0; actions.noteLive(sessionId, id, JSON.parse(key)); return () => actions.noteLive(sessionId, id, null); }, [sessionId, id, key]); } function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi }) { - const [live, setLive] = (0, import_react10.useState)({ replies: [] }); - (0, import_react10.useEffect)(() => { + const [live, setLive] = (0, import_react12.useState)({ replies: [] }); + (0, import_react12.useEffect)(() => { if (done) return void 0; let stop = false; let timer; @@ -7998,7 +8954,7 @@ function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi } if (replies.length === 0) return null; const room2 = roster.roomsById[sessionId]; - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { className: "bt-group-replies" }, replies.map((reply, index) => { @@ -8008,66 +8964,66 @@ function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi if (reply.kind === "user") { const who = reply.name && reply.name !== "User" ? reply.name : reply.authorId; if (reply.other) { - return (0, import_react10.createElement)(PersonMessage, { key: `user-${index}`, name: who, texts: [remoteMessageText(reply.text)], roster, selfId: sessionId, actions, sessionId, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi }); + return (0, import_react12.createElement)(PersonMessage, { key: `user-${index}`, name: who, texts: [remoteMessageText(reply.text)], roster, selfId: sessionId, actions, sessionId, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi }); } - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { key: `user-${index}`, className: "bt-urow", "data-author": reply.authorId, "data-author-name": who, onClickCapture: bubbleLinkClick({ actions, subject: sessionId }) }, - who ? (0, import_react10.createElement)("span", { className: "bt-uauthor" }, who) : null, - (0, import_react10.createElement)( + who ? (0, import_react12.createElement)("span", { className: "bt-uauthor" }, who) : null, + (0, import_react12.createElement)( "div", { className: "bt-ububble" }, - (0, import_react10.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: remoteMessageText(reply.text), labels: mdLabels(), variant: "compact" }) + (0, import_react12.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: remoteMessageText(reply.text), labels: mdLabels2(), variant: "compact" }) ), - room2?.origin === "face-to-face" ? (0, import_react10.createElement)("span", { className: "bt-lead", title: who || void 0 }, (0, import_react10.createElement)(PersonMark, { name: who || void 0 })) : null + room2?.origin === "face-to-face" ? (0, import_react12.createElement)("span", { className: "bt-lead", title: who || void 0 }, (0, import_react12.createElement)(PersonMark, { name: who || void 0 })) : null ); } if (reply.kind === "failed") { - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { key: `${reply.botId}-${index}`, className: "bt-event bt-event-error", role: "status" }, t("{name} could not answer: {reason}", { name: bot.name, reason: failureLabel(reply.code, reply.text) }) ); } if (reply.kind === "lookup") { - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { key: `${reply.botId}-${index}`, className: "bt-event" }, reply.text ? t("{name} looked up its own chat for “{text}”", { name: bot.name, text: reply.text }) : t("{name} looked up its own chat", { name: bot.name }) ); } if (reply.kind === "missed") { - return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name })); + return (0, import_react12.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name })); } if (reply.kind === "resumed") { - return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name })); + return (0, import_react12.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name })); } if (reply.kind === "cut") { - return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name })); + return (0, import_react12.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name })); } if (reply.kind === "approval" || reply.kind === "working") { - return (0, import_react10.createElement)( + return (0, import_react12.createElement)( "div", { key: `${reply.botId}-${index}`, className: "bt-event" }, - (0, import_react10.createElement)( + (0, import_react12.createElement)( "button", { type: "button", className: "bt-event-whole", onClick: () => actions.showDetails(sessionId) }, - (0, import_react10.createElement)(BotMark, { bot, size: 16 }), - (0, import_react10.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name })) + (0, import_react12.createElement)(BotMark, { bot, size: 16 }), + (0, import_react12.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name })) ) ); } if (reply.kind === "stopped") { - return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("You stopped {name}'s work", { name: bot.name })); + return (0, import_react12.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("You stopped {name}'s work", { name: bot.name })); } if (reply.kind === "notice" && room2?.origin === "face-to-face" && String(reply.text ?? "").trim() === WAITING_OTHERS_NOTICE) return null; if ((reply.kind === "notice" || reply.kind === "left") && leaveNoticeCoveredByClose(room2, reply.text)) return null; if (reply.kind === "notice" || reply.kind === "joined" || reply.kind === "left" || reply.kind === "started") { - return (0, import_react10.createElement)("div", { key: `notice-${index}`, className: "bt-event", "data-flybot": "face-notice" }, remoteMessageText(reply.text)); + return (0, import_react12.createElement)("div", { key: `notice-${index}`, className: "bt-event", "data-flybot": "face-notice" }, remoteMessageText(reply.text)); } const remote = reply.remote || reply.handle && !roster.byId[reply.botId]; if (remote) { - return (0, import_react10.createElement)(RemoteMessage, { + return (0, import_react12.createElement)(RemoteMessage, { key: `${reply.botId || reply.handle}-${index}`, source: { remote: { handle: reply.handle || reply.botId }, senderName: reply.name || reply.who, senderSessionId: reply.botId }, text: remoteMessageText(reply.text), @@ -8078,7 +9034,7 @@ function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi useUi }); } - return (0, import_react10.createElement)(GroupMessage, { key: `${reply.botId}-${index}`, bot, text: reply.text, room: room2, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi, seq: reply.seq }); + return (0, import_react12.createElement)(GroupMessage, { key: `${reply.botId}-${index}`, bot, text: reply.text, room: room2, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi, seq: reply.seq }); }) ); } @@ -8099,7 +9055,7 @@ function callTree(root) { } function useShownCards(actions, sessionId, callIds) { const key = JSON.stringify(callIds); - (0, import_react10.useLayoutEffect)(() => { + (0, import_react12.useLayoutEffect)(() => { const ids = JSON.parse(key); if (ids.length === 0 || !actions.noteCards) return void 0; actions.noteCards(sessionId, ids, 1); @@ -8114,25 +9070,25 @@ function renderCall(call4, { sessionId, roster, actions, useUi, findBot }) { switch (tool) { case "message_bot": { const target = findBot(arg("to")) ?? { name: arg("to") ?? "…", color: "gray" }; - if (done && call4.isError) return (0, import_react10.createElement)("div", { className: "bt-event" }, t("Couldn't message {name}", { name: target.name })); - return (0, import_react10.createElement)(EventLine, { prefix: t("Messaged"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); + if (done && call4.isError) return (0, import_react12.createElement)("div", { className: "bt-event" }, t("Couldn't message {name}", { name: target.name })); + return (0, import_react12.createElement)(EventLine, { prefix: t("Messaged"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); } case "stop_bot": { const target = findBot(arg("bot")) ?? { name: arg("bot") ?? "…", color: "gray" }; - if (done && call4.isError) return (0, import_react10.createElement)("div", { className: "bt-event" }, t("Couldn't stop {name}", { name: target.name })); - return (0, import_react10.createElement)(EventLine, { prefix: t("Stopped"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); + if (done && call4.isError) return (0, import_react12.createElement)("div", { className: "bt-event" }, t("Couldn't stop {name}", { name: target.name })); + return (0, import_react12.createElement)(EventLine, { prefix: t("Stopped"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); } case "create_bot": { const created = findBot(arg("name")); if (!done || created === void 0) return null; - return (0, import_react10.createElement)(EventLine, { prefix: t("Created"), bots: [created], onOpen: (bot) => actions.openSession(bot.id) }); + return (0, import_react12.createElement)(EventLine, { prefix: t("Created"), bots: [created], onOpen: (bot) => actions.openSession(bot.id) }); } case "update_bot": { const target = findBot(arg("name")) ?? findBot(arg("bot")) ?? (arg("bot") ? void 0 : self); - return done && target ? (0, import_react10.createElement)(EventLine, { prefix: t("Updated"), bots: [target], onOpen: (bot) => actions.openSession(bot.id) }) : null; + return done && target ? (0, import_react12.createElement)(EventLine, { prefix: t("Updated"), bots: [target], onOpen: (bot) => actions.openSession(bot.id) }) : null; } case "group_relay": - return (0, import_react10.createElement)(GroupReplies, { sessionId, callId: call4.callId, done, content: call4.content, roster, actions, useUi }); + return (0, import_react12.createElement)(GroupReplies, { sessionId, callId: call4.callId, done, content: call4.content, roster, actions, useUi }); case "create_group": case "update_group": case "delete_group": @@ -8146,18 +9102,18 @@ function renderCall(call4, { sessionId, roster, actions, useUi, findBot }) { if (!done) return null; const result = contentText(call4.content); const named = /^(Created group|Updated|Nothing changed in|Deleted|Posted in) "([^"]+)"/.exec(result); - if (call4.isError || !named) return (0, import_react10.createElement)("div", { className: "bt-event", title: result }, t(verbs[1])); + if (call4.isError || !named) return (0, import_react12.createElement)("div", { className: "bt-event", title: result }, t(verbs[1])); const name = named[2]; const room2 = roster.rooms.find((entry) => entry.name === name); - return (0, import_react10.createElement)(GroupEvent, { prefix: t(verbs[0]), room: tool === "delete_group" ? void 0 : room2, name, roster, actions }); + return (0, import_react12.createElement)(GroupEvent, { prefix: t(verbs[0]), room: tool === "delete_group" ? void 0 : room2, name, roster, actions }); } case "ask_user": { const question = roster.questions?.[sessionId]; - if (!question || question.callId !== call4.callId) return (0, import_react10.createElement)("span", { className: "bt-q-gone", hidden: true }); - return (0, import_react10.createElement)(PendingQuestion, { sessionId, question, actions, roster, inline: true }); + if (!question || question.callId !== call4.callId) return (0, import_react12.createElement)("span", { className: "bt-q-gone", hidden: true }); + return (0, import_react12.createElement)(PendingQuestion, { sessionId, question, actions, roster, inline: true }); } case "request_secret": - return (0, import_react10.createElement)(SecretToolCell, { sessionId, callId: call4.callId, name: arg("name"), done, content: call4.content, roster, actions }); + return (0, import_react12.createElement)(SecretToolCell, { sessionId, callId: call4.callId, name: arg("name"), done, content: call4.content, roster, actions }); case "ask_user_question": { if (!done) return null; let parsed = null; @@ -8169,16 +9125,16 @@ function renderCall(call4, { sessionId, roster, actions, useUi, findBot }) { const answer = parsed?.answers?.[0]; const question = argValue("questions")?.[0]; if (!answer) return null; - return (0, import_react10.createElement)("div", { className: "bt-q-inline" }, (0, import_react10.createElement)(SettledQuestion, { question, answer })); + return (0, import_react12.createElement)("div", { className: "bt-q-inline" }, (0, import_react12.createElement)(SettledQuestion, { question, answer })); } case "read_group_chat": { if (!done) return null; const room2 = roster.rooms.find((entry) => entry.name === arg("group")); - return room2 ? (0, import_react10.createElement)(GroupEvent, { prefix: t("Read"), room: room2, roster, actions }) : null; + return room2 ? (0, import_react12.createElement)(GroupEvent, { prefix: t("Read"), room: room2, roster, actions }) : null; } case "remember": case "forget": - return done && !call4.isError ? (0, import_react10.createElement)(MemoryEvent, { sessionId, scope: arg("scope"), result: contentText(call4.content), roster, actions, findBot }) : null; + return done && !call4.isError ? (0, import_react12.createElement)(MemoryEvent, { sessionId, scope: arg("scope"), result: contentText(call4.content), roster, actions, findBot }) : null; default: return null; } @@ -8197,7 +9153,7 @@ function ToolCell({ node, sessionId, useRoster, useUi, actions }) { useShownCards(actions, sessionId, drawn.filter((call4) => CARDS.has(toolName(call4)) && call4.callId).map((call4) => call4.callId)); if (drawn.length === 0) return null; const env = { sessionId, roster, actions, useUi, findBot }; - return (0, import_react10.createElement)(import_react10.Fragment, null, drawn.map((call4, index) => (0, import_react10.createElement)(import_react10.Fragment, { key: call4.callId ?? index }, renderCall(call4, env)))); + return (0, import_react12.createElement)(import_react12.Fragment, null, drawn.map((call4, index) => (0, import_react12.createElement)(import_react12.Fragment, { key: call4.callId ?? index }, renderCall(call4, env)))); } // src/client/awaiting.js @@ -8227,7 +9183,7 @@ function findRunningHostIn(root) { } // src/client/activity-row.js -var import_react11 = require("react"); +var import_react13 = require("react"); var import_react_dom2 = require("react-dom"); var PHRASE_HOLD_MS = 800; var drawPhrase = (pool) => t(pool[Math.min(pool.length - 1, Math.floor(Math.random() * pool.length))]); @@ -8240,9 +9196,9 @@ function elapsedLabel(ms) { var REMOTE_GRACE_MS = 1500; function useAwaitingReply(roster, sessionId) { const at = roster?.remoteAwaiting?.[sessionId]; - const [, tick] = (0, import_react11.useState)(0); + const [, tick] = (0, import_react13.useState)(0); const shown = awaitingReply(roster, sessionId); - (0, import_react11.useEffect)(() => { + (0, import_react13.useEffect)(() => { if (!shown) return void 0; const timer = setTimeout(() => tick((n) => n + 1), Math.max(0, at + AWAIT_REPLY_MS - Date.now()) + 50); return () => clearTimeout(timer); @@ -8264,10 +9220,10 @@ var lastTurnOnScreen = (kind) => { return top; }; function useReplyAfterSend(remote, sending) { - const sendTurn = (0, import_react11.useRef)(-1); - const wasSending = (0, import_react11.useRef)(false); - const [replied, setReplied] = (0, import_react11.useState)(false); - (0, import_react11.useEffect)(() => { + const sendTurn = (0, import_react13.useRef)(-1); + const wasSending = (0, import_react13.useRef)(false); + const [replied, setReplied] = (0, import_react13.useState)(false); + (0, import_react13.useEffect)(() => { if (!remote) return void 0; if (sending) { wasSending.current = true; @@ -8298,8 +9254,8 @@ function useReplyAfterSend(remote, sending) { return replied; } function useRunningHost(active, where = RUNNING_HOST) { - const [host, setHost] = (0, import_react11.useState)(null); - (0, import_react11.useEffect)(() => { + const [host, setHost] = (0, import_react13.useState)(null); + (0, import_react13.useEffect)(() => { if (!active) { setHost(null); return void 0; @@ -8323,9 +9279,9 @@ function useRunningHost(active, where = RUNNING_HOST) { return host; } function useRowEntrances(replacing) { - const check = (0, import_react11.useRef)(replacing); + const check = (0, import_react13.useRef)(replacing); check.current = replacing; - (0, import_react11.useEffect)(() => { + (0, import_react13.useEffect)(() => { const seen = /* @__PURE__ */ new WeakSet(); const started = Date.now(); let column = null; @@ -8376,31 +9332,31 @@ function ActivityIndicator({ sessionId, useRoster, useSessionStatus, useLive, us const pendingInput = useSession((snapshot) => Math.max(0, ...(snapshot?.pendingSubmissions ?? []).filter((sub) => sub.placement !== "queued").map((sub) => sub.time))); const bot = roster.byId[sessionId]; const room2 = roster.roomsById[sessionId]; - const entries2 = (0, import_react11.useMemo)(() => Object.values(JSON.parse(liveKey)), [liveKey]); + const entries2 = (0, import_react13.useMemo)(() => Object.values(JSON.parse(liveKey)), [liveKey]); const streaming = entries2.some((entry) => entry.text); const tools = entries2.filter((entry) => !entry.text).sort((a, b) => a.at - b.at); const relaying = tools.some((entry) => entry.relay); const awaiting = useAwaitingReply(roster, sessionId); - const sendRun = (0, import_react11.useRef)(false); + const sendRun = (0, import_react13.useRef)(false); if (!running) sendRun.current = false; else if (pendingInput > 0) sendRun.current = true; const replied = useReplyAfterSend(bot?.remote !== void 0, running && sendRun.current); const visible = bot?.remote !== void 0 ? !streaming && (running ? sendRun.current : awaiting && !replied) : running && !streaming && !relaying && (bot !== void 0 || room2 !== void 0); - const lastRun = (0, import_react11.useRef)({ running, send: false }); + const lastRun = (0, import_react13.useRef)({ running, send: false }); const bridging = bot?.remote !== void 0 && !streaming && lastRun.current.running && lastRun.current.send && !running; lastRun.current = { running, send: sendRun.current }; const steady = bridging; const tool = tools.at(-1); - const inputRef = (0, import_react11.useRef)(0); + const inputRef = (0, import_react13.useRef)(0); const inputAt = Math.max(inputRef.current, pendingInput); inputRef.current = inputAt; const phrase = visible ? remoteApprovalPhrase(bot?.remote !== void 0, { tool, inputAt }) : null; const want = !visible ? null : phrase ? { ...phrase, label: t(phrase.label) } : inputAt > (tool?.at ?? 0) ? { key: `input:${inputAt}`, pool: PHRASES.thinking, state: "thinking" } : tool ? { key: tool.label ? `tool:${tool.label}` : "working", label: tool.label, pool: PHRASES.working, state: tool.state ?? "working" } : { key: "thinking", pool: PHRASES.thinking, state: "thinking" }; - const [shown, setShown] = (0, import_react11.useState)(null); + const [shown, setShown] = (0, import_react13.useState)(null); const wantKey = want?.key ?? null; - const markState = (0, import_react11.useRef)("thinking"); + const markState = (0, import_react13.useRef)("thinking"); if (want) markState.current = want.state; - (0, import_react11.useEffect)(() => { + (0, import_react13.useEffect)(() => { if (wantKey === null || shown?.key === wantKey) return void 0; const make = () => setShown({ key: wantKey, text: want.label ?? drawPhrase(want.pool), at: Date.now() }); const wait = shown ? shown.at + PHRASE_HOLD_MS - Date.now() : 0; @@ -8411,12 +9367,12 @@ function ActivityIndicator({ sessionId, useRoster, useSessionStatus, useLive, us const timer = setTimeout(make, wait); return () => clearTimeout(timer); }, [wantKey, shown]); - const [phase, setPhase] = (0, import_react11.useState)(null); - const endedAt2 = (0, import_react11.useRef)(0); - const shift = (0, import_react11.useRef)(null); - const leaving = (0, import_react11.useRef)(false); + const [phase, setPhase] = (0, import_react13.useState)(null); + const endedAt2 = (0, import_react13.useRef)(0); + const shift = (0, import_react13.useRef)(null); + const leaving = (0, import_react13.useRef)(false); leaving.current = phase !== null && !visible; - (0, import_react11.useEffect)(() => { + (0, import_react13.useEffect)(() => { if (visible) { setPhase("in"); return void 0; @@ -8433,7 +9389,7 @@ function ActivityIndicator({ sessionId, useRoster, useSessionStatus, useLive, us else leave(); return () => clearTimeout(timer); }, [visible]); - (0, import_react11.useLayoutEffect)(() => { + (0, import_react13.useLayoutEffect)(() => { if (phase !== null) return; endedAt2.current = Date.now(); setShown(null); @@ -8444,42 +9400,87 @@ function ActivityIndicator({ sessionId, useRoster, useSessionStatus, useLive, us const delta = before - scroller.scrollTop; if (delta > 0) scroller.querySelector("[data-chat-flow]")?.animate([{ transform: `translateY(${-delta}px)` }, { transform: "none" }], { duration: 140, easing: "cubic-bezier(.23,1,.32,1)" }); }, [phase]); - (0, import_react11.useEffect)(() => { + (0, import_react13.useEffect)(() => { if (!running) actions.clearLive(sessionId); }, [running, sessionId]); useRowEntrances(() => leaving.current || Date.now() - endedAt2.current < 300); - const [now, setNow] = (0, import_react11.useState)(Date.now); - (0, import_react11.useEffect)(() => { + const [now, setNow] = (0, import_react13.useState)(Date.now); + (0, import_react13.useEffect)(() => { if (phase !== "in") return void 0; const timer = setInterval(() => setNow(Date.now()), 1e4); return () => clearInterval(timer); }, [phase]); const remote = bot?.remote !== void 0; const host = useRunningHost(running || remote && phase !== null, running || !remote ? RUNNING_HOST : TAIL_HOST); - const drawn = (0, import_react11.useRef)(false); + const drawn = (0, import_react13.useRef)(false); const carry = drawn.current; - (0, import_react11.useEffect)(() => { + (0, import_react13.useEffect)(() => { drawn.current = Boolean(host && phase !== null && shown); }, [host, phase, shown]); if (!host || phase === null || !shown) return null; const elapsed = now - shown.at >= 6e4 ? elapsedLabel(now - shown.at) : null; - return (0, import_react_dom2.createPortal)((0, import_react11.createElement)( + return (0, import_react_dom2.createPortal)((0, import_react13.createElement)( "div", { className: "bt-typing", "data-exiting": phase === "out" ? "" : void 0, "data-carry": carry && phase !== "out" ? "" : void 0, "data-remote": remote ? "" : void 0, "data-flybot": shown.key === "remote-approval" ? "remote-approval" : void 0, "aria-hidden": true }, - bot ? (0, import_react11.createElement)(BotMark, { bot, size: 28, state: markState.current, live: true, pokeable: true }) : (0, import_react11.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), - (0, import_react11.createElement)( + bot ? (0, import_react13.createElement)(BotMark, { bot, size: 28, state: markState.current, live: true, pokeable: true }) : (0, import_react13.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), + (0, import_react13.createElement)( "span", { className: "bt-typing-text" }, - (0, import_react11.createElement)( + (0, import_react13.createElement)( "span", { key: `${shown.key}:${shown.at}`, className: "bt-typing-label" }, - (0, import_react11.createElement)(Shimmer, null, `${shown.text}…`), - elapsed ? (0, import_react11.createElement)("span", { className: "bt-typing-time" }, `· ${elapsed}`) : null + (0, import_react13.createElement)(Shimmer, null, `${shown.text}…`), + elapsed ? (0, import_react13.createElement)("span", { className: "bt-typing-time" }, `· ${elapsed}`) : null ) ) ), host); } +// src/shared/session-list-filter.js +var SESSION_FILTERS = ["all", "group", "direct", "unread"]; +function sessionStatusOf(map, id) { + if (id == null || map == null) return void 0; + if (typeof map.get === "function") return map.get(id); + return map[id]; +} +function sessionIsUnread(entry, statusMap, markedUnread) { + const item = entry?.item; + if (!item) return false; + if (markedUnread?.[item.id]) return true; + if (entry.kind === "agent") { + return (item.sessions ?? []).some((id) => sessionStatusOf(statusMap, id)?.completionUnread === true); + } + if (entry.kind === "room") { + return sessionStatusOf(statusMap, item.id)?.completionUnread === true; + } + const part = item.sessionId ?? item.id; + const status = sessionStatusOf(statusMap, part); + return status?.completionUnread === true || status?.pendingInteraction !== void 0; +} +function matchesSessionFilter(entry, filter, unread = false) { + if (filter === "group") return entry?.kind === "room"; + if (filter === "direct") return entry?.kind === "bot" || entry?.kind === "agent"; + if (filter === "unread") return unread === true; + return true; +} + +// src/shared/session-unread.js +function shouldClearManualUnread({ active, wasActive, marked }) { + return Boolean(marked) && active === true && wasActive !== true; +} +function unreadEntryId(roster, sessionId) { + if (sessionId == null || sessionId === "") return sessionId; + if (roster?.byId?.[sessionId] || roster?.roomsById?.[sessionId]) return sessionId; + const bot = (roster?.bots ?? []).find((item) => (item.sessionId ?? item.id) === sessionId); + if (bot) return bot.id; + const agent = (roster?.agents ?? []).find((item) => item.id === sessionId || (item.sessions ?? []).includes(sessionId)); + if (agent) return agent.id; + return sessionId; +} +function isManuallyUnread(unread, id) { + return Boolean(id) && unread?.[id] === true; +} + // src/client/dsh-offer.js var APP_OFFER = /* @__PURE__ */ new Set(["available", "downloading", "verifying", "installing", "ready"]); var bare = (value) => String(value ?? "").trim().replace(/^v/i, "").split("+")[0]; @@ -8491,15 +9492,15 @@ function showsDshRow(dsh, app) { } // src/client/overlay-hooks.js -var import_react12 = require("react"); +var import_react14 = require("react"); var escapeLayers = []; var onEscapeKey = (event) => { if (event.key === "Escape") escapeLayers.at(-1)?.current(); }; function useEscape(onClose) { - const ref = (0, import_react12.useRef)(onClose); + const ref = (0, import_react14.useRef)(onClose); ref.current = onClose; - (0, import_react12.useEffect)(() => { + (0, import_react14.useEffect)(() => { if (escapeLayers.length === 0) window.addEventListener("keydown", onEscapeKey); escapeLayers.push(ref); return () => { @@ -8509,7 +9510,7 @@ function useEscape(onClose) { }, []); } function useDialogFocus(ref) { - (0, import_react12.useEffect)(() => { + (0, import_react14.useEffect)(() => { const before = document.activeElement; ref.current?.focus?.({ preventScroll: true }); return () => { @@ -8521,8 +9522,8 @@ function useDialogFocus(ref) { }, []); } function usePaneLeft() { - const [paneLeft, setPaneLeft] = (0, import_react12.useState)(280); - (0, import_react12.useLayoutEffect)(() => { + const [paneLeft, setPaneLeft] = (0, import_react14.useState)(280); + (0, import_react14.useLayoutEffect)(() => { const column = document.querySelector('[class*="_footArea"]')?.parentElement; if (column) setPaneLeft(Math.round(column.getBoundingClientRect().right)); }, []); @@ -8530,7 +9531,7 @@ function usePaneLeft() { } // src/client/member-status.js -var import_react13 = require("react"); +var import_react15 = require("react"); var NO_WORK = { bots: {}, rooms: {}, approvals: [] }; var ROWS_MAX = 4; var stepIn = (work, botId, roomId, tool) => { @@ -8578,39 +9579,39 @@ function summaryText(busy) { return { waiting, doing }; } function Face({ entry, size }) { - return (0, import_react13.createElement)( + return (0, import_react15.createElement)( "span", { className: "bt-mw-face", "data-ask": entry.state === "ask" || void 0 }, - (0, import_react13.createElement)(BotMark, { bot: entry.bot, size, state: entry.state === "ask" ? "alert" : toolState(entry.doing?.tool ?? "") }) + (0, import_react15.createElement)(BotMark, { bot: entry.bot, size, state: entry.state === "ask" ? "alert" : toolState(entry.doing?.tool ?? "") }) ); } var elapsedSince = (now, at) => typeof at === "number" && now - at >= 6e4 ? elapsedLabel(now - at) : ""; function WorkRow({ bot, tool, step, label, at, now, onOpen }) { const text2 = `${label} · ${workText(tool, step)}`; const elapsed = elapsedSince(now, at); - return (0, import_react13.createElement)( + return (0, import_react15.createElement)( "button", { type: "button", className: "bt-mw-row", "aria-label": [text2, elapsed].filter(Boolean).join(" · "), onClick: onOpen }, - (0, import_react13.createElement)(BotMark, { bot, size: 22, state: toolState(tool ?? ""), live: true }), - (0, import_react13.createElement)("span", { className: "bt-mw-row-text" }, (0, import_react13.createElement)(Shimmer, null, text2)), - elapsed ? (0, import_react13.createElement)("span", { className: "bt-mw-row-time" }, `· ${elapsed}`) : null + (0, import_react15.createElement)(BotMark, { bot, size: 22, state: toolState(tool ?? ""), live: true }), + (0, import_react15.createElement)("span", { className: "bt-mw-row-text" }, (0, import_react15.createElement)(Shimmer, null, text2)), + elapsed ? (0, import_react15.createElement)("span", { className: "bt-mw-row-time" }, `· ${elapsed}`) : null ); } function SummaryLine({ busy, now, onOpen }) { const { waiting, doing } = summaryText(busy); const elapsed = doing ? elapsedSince(now, busy.find((entry) => entry.state === "work")?.doing.since) : ""; - return (0, import_react13.createElement)( + return (0, import_react15.createElement)( "button", { type: "button", className: "bt-mw-row bt-mw-line", "aria-label": [waiting, doing, elapsed].filter(Boolean).join(" · "), onClick: onOpen }, - (0, import_react13.createElement)("span", { className: "bt-mw-stack", "aria-hidden": true }, busy.slice(0, 4).map((entry) => (0, import_react13.createElement)(Face, { key: entry.id, entry, size: 16 }))), - (0, import_react13.createElement)( + (0, import_react15.createElement)("span", { className: "bt-mw-stack", "aria-hidden": true }, busy.slice(0, 4).map((entry) => (0, import_react15.createElement)(Face, { key: entry.id, entry, size: 16 }))), + (0, import_react15.createElement)( "span", { className: "bt-mw-row-text" }, - waiting ? (0, import_react13.createElement)("span", { className: "bt-mw-ask" }, waiting) : null, + waiting ? (0, import_react15.createElement)("span", { className: "bt-mw-ask" }, waiting) : null, waiting && doing ? " · " : null, - doing ? (0, import_react13.createElement)(Shimmer, null, doing) : null + doing ? (0, import_react15.createElement)(Shimmer, null, doing) : null ), - elapsed ? (0, import_react13.createElement)("span", { className: "bt-mw-row-time" }, `· ${elapsed}`) : null + elapsed ? (0, import_react15.createElement)("span", { className: "bt-mw-row-time" }, `· ${elapsed}`) : null ); } function MemberDock({ sessionId, useRoster, useWork, actions }) { @@ -8623,25 +9624,25 @@ function MemberDock({ sessionId, useRoster, useWork, actions }) { const groups = bot !== void 0 && !ownChat ? botGroupWork(bot.id, work, roster) : []; const shown = busy.length > 0 || groups.length > 0; const now = useNow(shown); - const ref = (0, import_react13.useRef)(null); + const ref = (0, import_react15.useRef)(null); useFlowColumn(ref, shown, sessionId); if (!shown) return null; if (room2) { const { rows: rows2, rest } = splitBusy(busy); const open = () => actions.showDetails(sessionId); - return (0, import_react13.createElement)( + return (0, import_react15.createElement)( "div", { ref, className: "bt-mw-dock-stack" }, - rows2.map((entry) => (0, import_react13.createElement)(WorkRow, { key: entry.id, bot: entry.bot, tool: entry.doing.tool, step: entry.doing.step, label: entry.bot.name, at: entry.doing.since, now, onOpen: open })), - rest.length > 0 ? (0, import_react13.createElement)(SummaryLine, { busy: rest, now, onOpen: open }) : null + rows2.map((entry) => (0, import_react15.createElement)(WorkRow, { key: entry.id, bot: entry.bot, tool: entry.doing.tool, step: entry.doing.step, label: entry.bot.name, at: entry.doing.since, now, onOpen: open })), + rest.length > 0 ? (0, import_react15.createElement)(SummaryLine, { busy: rest, now, onOpen: open }) : null ); } const rows = groups.slice(0, ROWS_MAX); const more = groups.length - rows.length; - return (0, import_react13.createElement)( + return (0, import_react15.createElement)( "div", { ref, className: "bt-mw-dock-stack" }, - rows.map((item) => (0, import_react13.createElement)(WorkRow, { + rows.map((item) => (0, import_react15.createElement)(WorkRow, { key: item.room.id, bot, tool: item.tool, @@ -8651,15 +9652,15 @@ function MemberDock({ sessionId, useRoster, useWork, actions }) { now, onOpen: () => actions.openSession(item.room.id) })), - more > 0 ? (0, import_react13.createElement)( + more > 0 ? (0, import_react15.createElement)( "div", { className: "bt-mw-row bt-mw-line bt-mw-static" }, - (0, import_react13.createElement)("span", { className: "bt-mw-row-text" }, moreRooms(more)) + (0, import_react15.createElement)("span", { className: "bt-mw-row-text" }, moreRooms(more)) ) : null ); } function useFlowColumn(ref, active, key) { - (0, import_react13.useLayoutEffect)(() => { + (0, import_react15.useLayoutEffect)(() => { const node = ref.current; const flow = document.querySelector("[data-chat-flow]"); if (!active || !node || !flow) return void 0; @@ -8676,8 +9677,8 @@ function useFlowColumn(ref, active, key) { }, [active, key]); } function useNow(active) { - const [now, setNow] = (0, import_react13.useState)(Date.now); - (0, import_react13.useEffect)(() => { + const [now, setNow] = (0, import_react15.useState)(Date.now); + (0, import_react15.useEffect)(() => { if (!active) return void 0; const timer = setInterval(() => setNow(Date.now()), 3e4); return () => clearInterval(timer); @@ -8690,39 +9691,39 @@ var alwaysChoices = (approval, bot) => bot?.remote ? [] : [ ...approval.roomId ? [["always-room", "Always allow for this group"]] : [] ]; function ApprovalCard({ approval, bot, actions }) { - const [busy, setBusy] = (0, import_react13.useState)(false); + const [busy, setBusy] = (0, import_react15.useState)(false); const answer = (choice) => { setBusy(true); void Promise.resolve(actions.answerApproval(approval.id, choice)).catch((error) => actions.reportError(error, "approval")).finally(() => setBusy(false)); }; - return (0, import_react13.createElement)( + return (0, import_react15.createElement)( "div", { className: "bt-mw-card", role: "group", "aria-label": t("{name} is waiting for your approval", { name: bot.name }) }, - (0, import_react13.createElement)("div", { className: "bt-mw-tool" }, approval.tool), - approval.detail?.text ? (0, import_react13.createElement)("div", { className: "bt-mw-text" }, approval.detail.text) : null, - approval.reason ? (0, import_react13.createElement)("div", { className: "bt-mw-reason" }, approval.reason) : null, - approval.detail?.code ? (0, import_react13.createElement)("code", { className: "bt-mw-code", title: approval.detail.code }, approval.detail.code) : null, - approval.answerable ? (0, import_react13.createElement)( + (0, import_react15.createElement)("div", { className: "bt-mw-tool" }, approval.tool), + approval.detail?.text ? (0, import_react15.createElement)("div", { className: "bt-mw-text" }, approval.detail.text) : null, + approval.reason ? (0, import_react15.createElement)("div", { className: "bt-mw-reason" }, approval.reason) : null, + approval.detail?.code ? (0, import_react15.createElement)("code", { className: "bt-mw-code", title: approval.detail.code }, approval.detail.code) : null, + approval.answerable ? (0, import_react15.createElement)( "div", { className: "bt-mw-actions" }, - (0, import_react13.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => answer("reject") }, t("Reject")), - (0, import_react13.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: () => answer("allow") }, t("Allow once")), - ...alwaysChoices(approval, bot).map(([choice, label]) => (0, import_react13.createElement)("button", { key: choice, type: "button", className: "bt-q-btn", "data-choice": choice, disabled: busy, onClick: () => answer(choice) }, t(label))) - ) : (0, import_react13.createElement)( + (0, import_react15.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => answer("reject") }, t("Reject")), + (0, import_react15.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: () => answer("allow") }, t("Allow once")), + ...alwaysChoices(approval, bot).map(([choice, label]) => (0, import_react15.createElement)("button", { key: choice, type: "button", className: "bt-q-btn", "data-choice": choice, disabled: busy, onClick: () => answer(choice) }, t(label))) + ) : (0, import_react15.createElement)( "div", { className: "bt-mw-actions" }, - (0, import_react13.createElement)("button", { type: "button", className: "bt-q-btn", onClick: () => actions.openSession(bot.id) }, t("Open {name}'s chat", { name: bot.name })) + (0, import_react15.createElement)("button", { type: "button", className: "bt-q-btn", onClick: () => actions.openSession(bot.id) }, t("Open {name}'s chat", { name: bot.name })) ) ); } function MemberWork({ entry, bot, room: room2, actions, now }) { - const [stopping, setStopping] = (0, import_react13.useState)(false); + const [stopping, setStopping] = (0, import_react15.useState)(false); if (entry.state === "ask") { - return (0, import_react13.createElement)( + return (0, import_react15.createElement)( "div", { className: "bt-mw-member" }, - (0, import_react13.createElement)("div", { className: "bt-mw-state bt-mw-ask" }, `${t("Waiting for your approval")}${since(now, entry.approvals[0].at)}`), - entry.approvals.map((approval) => (0, import_react13.createElement)(ApprovalCard, { key: approval.id, approval, bot, actions })) + (0, import_react15.createElement)("div", { className: "bt-mw-state bt-mw-ask" }, `${t("Waiting for your approval")}${since(now, entry.approvals[0].at)}`), + entry.approvals.map((approval) => (0, import_react15.createElement)(ApprovalCard, { key: approval.id, approval, bot, actions })) ); } if (entry.state !== "work") return null; @@ -8730,14 +9731,14 @@ function MemberWork({ entry, bot, room: room2, actions, now }) { setStopping(true); void Promise.resolve(actions.stopMemberWork(room2.id, bot.id)).catch((error) => actions.reportError(error, "stop")).finally(() => setStopping(false)); }; - return (0, import_react13.createElement)( + return (0, import_react15.createElement)( "div", { className: "bt-mw-member" }, - (0, import_react13.createElement)( + (0, import_react15.createElement)( "div", { className: "bt-mw-state bt-mw-work" }, - (0, import_react13.createElement)("span", null, (0, import_react13.createElement)(Shimmer, null, workText(entry.doing.tool, entry.doing.step)), since(now, entry.doing.since)), - entry.here && entry.doing.handed !== true ? (0, import_react13.createElement)("button", { type: "button", className: "bt-mw-stop", disabled: stopping, onClick: stop }, t("Stop")) : null + (0, import_react15.createElement)("span", null, (0, import_react15.createElement)(Shimmer, null, workText(entry.doing.tool, entry.doing.step)), since(now, entry.doing.since)), + entry.here && entry.doing.handed !== true ? (0, import_react15.createElement)("button", { type: "button", className: "bt-mw-stop", disabled: stopping, onClick: stop }, t("Stop")) : null ) ); } @@ -8841,13 +9842,13 @@ function progressOf(task) { // src/client/read-only.js var readOnlySaid = (roster) => typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; -function readOnlyLine(h50, roster, actions, { key, className, style, reload = true } = {}) { +function readOnlyLine(h53, roster, actions, { key, className, style, reload = true } = {}) { if (!readOnlySaid(roster)) return null; - return h50( + return h53( "div", { key, className: ["bt-readonly-line", className].filter(Boolean).join(" "), style }, - h50("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)), - reload ? h50("button", { + h53("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)), + reload ? h53("button", { type: "button", className: "bt-read-only-reload", onClick: () => { @@ -8862,14 +9863,14 @@ function reloadReceipt(before, after) { } // src/client/inbox.js -var import_react14 = require("react"); +var import_react16 = require("react"); var KEEP_MS = 7 * 864e5; var POLL_MS3 = 3e4; var DONE_MAX = 20; var FEEDBACK_MS = 5e3; -var line = (d) => (0, import_react14.createElement)("path", { d }); +var line = (d) => (0, import_react16.createElement)("path", { d }); var icon = (...paths) => function StatusIcon() { - return (0, import_react14.createElement)("svg", { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, paths.map(line)); + return (0, import_react16.createElement)("svg", { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, paths.map(line)); }; var RING = "M10 3.25a6.75 6.75 0 1 1 0 13.5 6.75 6.75 0 0 1 0-13.5z"; var InboxIcon = icon("M3.5 11.5l1.9-6.1A1.5 1.5 0 0 1 6.83 4.35h6.34a1.5 1.5 0 0 1 1.43 1.05l1.9 6.1", "M3.5 11.5v3.25a1.5 1.5 0 0 0 1.5 1.5h10a1.5 1.5 0 0 0 1.5-1.5V11.5", "M3.5 11.5h3.75l1 1.75h3.5l1-1.75h3.75"); @@ -8904,8 +9905,8 @@ function publishTasks(list) { for (const listener of taskListeners) listener(sharedTasks); } function useTasks(actions) { - const [tasks, setTasks] = (0, import_react14.useState)(sharedTasks); - (0, import_react14.useEffect)(() => { + const [tasks, setTasks] = (0, import_react16.useState)(sharedTasks); + (0, import_react16.useEffect)(() => { taskListeners.add(setTasks); let stopped = false; let timer; @@ -8933,8 +9934,8 @@ function publishWorkflows(settled) { for (const listener of workflowListeners) listener(sharedWorkflows); } function useWorkflows(actions) { - const [workflows, setWorkflows] = (0, import_react14.useState)(sharedWorkflows); - (0, import_react14.useEffect)(() => { + const [workflows, setWorkflows] = (0, import_react16.useState)(sharedWorkflows); + (0, import_react16.useEffect)(() => { workflowListeners.add(setWorkflows); if (workflowPoll === null && typeof actions?.workflowState === "function") { const load = () => Promise.resolve(actions.workflowState()).then(publishWorkflows, () => { @@ -9238,7 +10239,7 @@ var resultSlot = (id) => { return slot; }; function ResultActions({ card, busy, onAnswer }) { - const [, redraw] = (0, import_react14.useState)(0); + const [, redraw] = (0, import_react16.useState)(0); if (!(card.kind === "task" && card.status === "result")) return null; const slot = resultSlot(card.id); const send = () => { @@ -9246,10 +10247,10 @@ function ResultActions({ card, busy, onAnswer }) { if (busy || note === "") return; onAnswer(card, { note }); }; - return (0, import_react14.createElement)( + return (0, import_react16.createElement)( "span", { className: "bt-inbox-result" }, - slot.open ? (0, import_react14.createElement)("input", { + slot.open ? (0, import_react16.createElement)("input", { type: "text", className: "bt-inbox-answer-text", value: slot.text, @@ -9266,15 +10267,15 @@ function ResultActions({ card, busy, onAnswer }) { send(); } }) : null, - slot.open ? (0, import_react14.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: send }, t("Send it back")) : (0, import_react14.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { + slot.open ? (0, import_react16.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: send }, t("Send it back")) : (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { slot.open = true; redraw((count) => count + 1); } }, t("Send back")), - (0, import_react14.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "accept") }, t("Accept")) + (0, import_react16.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "accept") }, t("Accept")) ); } function AnswerFields({ card, busy, onAnswer }) { - const [, redraw] = (0, import_react14.useState)(0); + const [, redraw] = (0, import_react16.useState)(0); const question = card.kind === "question"; const taskInput = card.kind === "task" && card.status === "input" && typeof card.task?.inputRequest?.id === "string"; if (!question && !taskInput) return null; @@ -9302,10 +10303,10 @@ function AnswerFields({ card, busy, onAnswer }) { slot.picked = slot.picked.includes(label) ? slot.picked.filter((item) => item !== label) : [...slot.picked, label]; redraw((count) => count + 1); }; - return (0, import_react14.createElement)( + return (0, import_react16.createElement)( "span", { className: "bt-inbox-answer" }, - ...options.map((option, index) => (0, import_react14.createElement)("button", { + ...options.map((option, index) => (0, import_react16.createElement)("button", { key: `${option.label}-${index}`, type: "button", className: "bt-soft bt-soft-sm", @@ -9313,7 +10314,7 @@ function AnswerFields({ card, busy, onAnswer }) { "aria-pressed": multi ? slot.picked.includes(option.label) : void 0, onClick: () => choose(option.label) }, option.label)), - (0, import_react14.createElement)("input", { + (0, import_react16.createElement)("input", { type: "text", className: "bt-inbox-answer-text", value: slot.text, @@ -9330,7 +10331,7 @@ function AnswerFields({ card, busy, onAnswer }) { send(); } }), - (0, import_react14.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: send }, t("Submit")) + (0, import_react16.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: send }, t("Submit")) ); } function InboxRow({ wide, useRoster, useWork, useUi, actions }) { @@ -9341,7 +10342,7 @@ function InboxRow({ wide, useRoster, useWork, useUi, actions }) { const workflows = useWorkflows(actions); const count = needsCount(roster, work, tasks, void 0, workflows); const label = count > 0 ? t("Inbox, {count} need you", { count }) : t("Inbox"); - return (0, import_react14.createElement)( + return (0, import_react16.createElement)( "button", { type: "button", @@ -9352,14 +10353,14 @@ function InboxRow({ wide, useRoster, useWork, useUi, actions }) { "aria-expanded": open, onClick: () => actions.openInbox() }, - (0, import_react14.createElement)("span", { className: "bt-inbox-mark" }, (0, import_react14.createElement)(InboxIcon)), - wide ? (0, import_react14.createElement)("span", { className: "bt-inbox-label" }, t("Inbox")) : null, - count > 0 ? (0, import_react14.createElement)("span", { className: "bt-inbox-count", "aria-hidden": true }, count > 99 ? "99+" : String(count)) : null + (0, import_react16.createElement)("span", { className: "bt-inbox-mark" }, (0, import_react16.createElement)(InboxIcon)), + wide ? (0, import_react16.createElement)("span", { className: "bt-inbox-label" }, t("Inbox")) : null, + count > 0 ? (0, import_react16.createElement)("span", { className: "bt-inbox-count", "aria-hidden": true }, count > 99 ? "99+" : String(count)) : null ); } function Status({ status }) { const { label, tone, Icon } = STATUSES[status]; - return (0, import_react14.createElement)("span", { className: "bt-inbox-status", "data-tone": tone }, (0, import_react14.createElement)(Icon), (0, import_react14.createElement)("span", null, t(label))); + return (0, import_react16.createElement)("span", { className: "bt-inbox-status", "data-tone": tone }, (0, import_react16.createElement)(Icon), (0, import_react16.createElement)("span", null, t(label))); } function whenText(card, now) { if (card.status === "running" || card.status === "task") { @@ -9378,25 +10379,25 @@ function InboxCard({ card, roster, now, busy, error, onAnswer, onOpen }) { const target = card.kind === "task" ? card.task?.target?.href : void 0; const writeBack = card.kind === "task" && card.task?.writeBack?.state === "failed" ? card.task.writeBack : void 0; const unconfirmed = card.kind === "task" && card.task?.writeBack?.state === "unconfirmed" ? card.task.writeBack : void 0; - return (0, import_react14.createElement)( + return (0, import_react16.createElement)( "div", { className: "bt-inbox-card", role: "group", "aria-label": `${t(STATUSES[card.status].label)}: ${card.title}`, "data-status": card.status, "data-run": card.kind === "workflow" ? card.run?.id : void 0 }, - (0, import_react14.createElement)("span", { className: "bt-inbox-ava" }, card.bot ? (0, import_react14.createElement)(BotAvatar, { bot: card.bot, size: 28, badge: false, live: false }) : card.room ? (0, import_react14.createElement)(RoomAvatar, { room: card.room, roster, size: 28 }) : null), - (0, import_react14.createElement)( + (0, import_react16.createElement)("span", { className: "bt-inbox-ava" }, card.bot ? (0, import_react16.createElement)(BotAvatar, { bot: card.bot, size: 28, badge: false, live: false }) : card.room ? (0, import_react16.createElement)(RoomAvatar, { room: card.room, roster, size: 28 }) : null), + (0, import_react16.createElement)( "span", { className: "bt-inbox-copy" }, - (0, import_react14.createElement)( + (0, import_react16.createElement)( "span", { className: "bt-inbox-top" }, - (0, import_react14.createElement)(Status, { status: card.status }), - (0, import_react14.createElement)("span", { className: "bt-inbox-meta", title: meta }, meta) + (0, import_react16.createElement)(Status, { status: card.status }), + (0, import_react16.createElement)("span", { className: "bt-inbox-meta", title: meta }, meta) ), - (0, import_react14.createElement)("span", { className: "bt-inbox-title", title: card.title }, card.title), - card.calls > 0 ? (0, import_react14.createElement)("span", { className: "bt-inbox-calls" }, t("{count} tool calls", { count: card.calls })) : null, - card.reason ? (0, import_react14.createElement)("span", { className: "bt-inbox-reason", title: card.reason }, failureSentence(card.reason, t)) : null, - card.activity ? (0, import_react14.createElement)("span", { className: "bt-inbox-activity", title: card.activity }, t("Latest: {text}", { text: card.activity })) : null, - card.hint ? (0, import_react14.createElement)("span", { className: "bt-inbox-hint" }, card.hint) : null, - evidence.length > 0 ? (0, import_react14.createElement)("span", { className: "bt-inbox-evidence" }, ...evidence.map((href, index) => (0, import_react14.createElement)("a", { + (0, import_react16.createElement)("span", { className: "bt-inbox-title", title: card.title }, card.title), + card.calls > 0 ? (0, import_react16.createElement)("span", { className: "bt-inbox-calls" }, t("{count} tool calls", { count: card.calls })) : null, + card.reason ? (0, import_react16.createElement)("span", { className: "bt-inbox-reason", title: card.reason }, failureSentence(card.reason, t)) : null, + card.activity ? (0, import_react16.createElement)("span", { className: "bt-inbox-activity", title: card.activity }, t("Latest: {text}", { text: card.activity })) : null, + card.hint ? (0, import_react16.createElement)("span", { className: "bt-inbox-hint" }, card.hint) : null, + evidence.length > 0 ? (0, import_react16.createElement)("span", { className: "bt-inbox-evidence" }, ...evidence.map((href, index) => (0, import_react16.createElement)("a", { key: `${href}-${index}`, href, target: "_blank", @@ -9404,32 +10405,32 @@ function InboxCard({ card, roster, now, busy, error, onAnswer, onOpen }) { className: "bt-inbox-evidence-link", title: href }, href))) : null, - sentBack ? (0, import_react14.createElement)("span", { className: "bt-inbox-reason", title: sentBack }, t("Sent back: {note}", { note: sentBack })) : null, - target ? (0, import_react14.createElement)("span", { className: "bt-inbox-evidence" }, (0, import_react14.createElement)("a", { + sentBack ? (0, import_react16.createElement)("span", { className: "bt-inbox-reason", title: sentBack }, t("Sent back: {note}", { note: sentBack })) : null, + target ? (0, import_react16.createElement)("span", { className: "bt-inbox-evidence" }, (0, import_react16.createElement)("a", { href: target, target: "_blank", rel: "noreferrer noopener", className: "bt-inbox-evidence-link bt-inbox-target", title: target }, t("Comment goes to {target}", { target: target.replace(/^https:\/\/github\.com\//, "") }))) : null, - writeBack ? (0, import_react14.createElement)("span", { className: "bt-inbox-writeback", role: "alert", title: writeBack.error }, t("Could not comment on {target}: {error}", { target: writeBack.target, error: writeBack.error })) : null, - unconfirmed ? (0, import_react14.createElement)("span", { className: "bt-inbox-writeback", title: unconfirmed.target }, t("Could not confirm the comment on {target} went out", { target: unconfirmed.target })) : null, - ...locked ? [] : [(0, import_react14.createElement)(AnswerFields, { card, busy, onAnswer }), (0, import_react14.createElement)(ResultActions, { card, busy, onAnswer })], - error ? (0, import_react14.createElement)("span", { className: "bt-inbox-error", role: "alert" }, error) : null + writeBack ? (0, import_react16.createElement)("span", { className: "bt-inbox-writeback", role: "alert", title: writeBack.error }, t("Could not comment on {target}: {error}", { target: writeBack.target, error: writeBack.error })) : null, + unconfirmed ? (0, import_react16.createElement)("span", { className: "bt-inbox-writeback", title: unconfirmed.target }, t("Could not confirm the comment on {target} went out", { target: unconfirmed.target })) : null, + ...locked ? [] : [(0, import_react16.createElement)(AnswerFields, { card, busy, onAnswer }), (0, import_react16.createElement)(ResultActions, { card, busy, onAnswer })], + error ? (0, import_react16.createElement)("span", { className: "bt-inbox-error", role: "alert" }, error) : null ), - (0, import_react14.createElement)( + (0, import_react16.createElement)( "span", { className: "bt-inbox-actions" }, - answerable ? (0, import_react14.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "reject") }, t("Reject")) : null, - answerable ? (0, import_react14.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "allow") }, t("Allow once")) : null, - ...(answerable ? alwaysChoices(card.approval, card.bot) : []).map(([choice, label]) => (0, import_react14.createElement)("button", { key: choice, type: "button", className: "bt-soft bt-soft-sm", "data-choice": choice, disabled: busy, onClick: () => onAnswer(card, choice) }, t(label))), - (0, import_react14.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "aria-label": who ? t("Open {name}", { name: card.room?.name ?? who }) : t("Open"), onClick: () => onOpen(card) }, t("Open")) + answerable ? (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "reject") }, t("Reject")) : null, + answerable ? (0, import_react16.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "allow") }, t("Allow once")) : null, + ...(answerable ? alwaysChoices(card.approval, card.bot) : []).map(([choice, label]) => (0, import_react16.createElement)("button", { key: choice, type: "button", className: "bt-soft bt-soft-sm", "data-choice": choice, disabled: busy, onClick: () => onAnswer(card, choice) }, t(label))), + (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "aria-label": who ? t("Open {name}", { name: card.room?.name ?? who }) : t("Open"), onClick: () => onOpen(card) }, t("Open")) ) ); } function useNow2(ms) { - const [now, setNow] = (0, import_react14.useState)(Date.now); - (0, import_react14.useEffect)(() => { + const [now, setNow] = (0, import_react16.useState)(Date.now); + (0, import_react16.useEffect)(() => { const timer = setInterval(() => setNow(Date.now()), ms); return () => clearInterval(timer); }, [ms]); @@ -9454,14 +10455,14 @@ function InboxDialog({ roster, useWork, useSessions, actions, leaving = false }) const tasks = useTasks(actions); const workflows = useWorkflows(actions); const now = useNow2(3e4); - const [answered, setAnswered] = (0, import_react14.useState)({}); - const [busy, setBusy] = (0, import_react14.useState)(""); - const [errors, setErrors] = (0, import_react14.useState)({}); - const [feedback, setFeedback] = (0, import_react14.useState)(""); - const [allDone, setAllDone] = (0, import_react14.useState)(false); - const close = (0, import_react14.useCallback)(() => actions.closeInbox(), []); + const [answered, setAnswered] = (0, import_react16.useState)({}); + const [busy, setBusy] = (0, import_react16.useState)(""); + const [errors, setErrors] = (0, import_react16.useState)({}); + const [feedback, setFeedback] = (0, import_react16.useState)(""); + const [allDone, setAllDone] = (0, import_react16.useState)(false); + const close = (0, import_react16.useCallback)(() => actions.closeInbox(), []); useEscape(close); - (0, import_react14.useEffect)(() => { + (0, import_react16.useEffect)(() => { if (!feedback) return void 0; const timer = setTimeout(() => setFeedback(""), FEEDBACK_MS); return () => clearTimeout(timer); @@ -9484,41 +10485,41 @@ function InboxDialog({ roster, useWork, useSessions, actions, leaving = false }) }, (failure) => setErrors((value) => ({ ...value, [card.id]: hostText(failure?.message ?? String(failure)) }))).finally(() => setBusy("")); }; const open = (card) => openCard(actions, card); - return (0, import_react14.createElement)( + return (0, import_react16.createElement)( "div", { className: "bt-mem-layer bt-inbox-layer", "data-leaving": leaving || void 0 }, - (0, import_react14.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), - (0, import_react14.createElement)( + (0, import_react16.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), + (0, import_react16.createElement)( "div", { className: "bt-mem bt-inbox", role: "dialog", "aria-modal": true, "aria-labelledby": "bt-inbox-heading" }, - (0, import_react14.createElement)( + (0, import_react16.createElement)( "div", { className: "bt-mem-head" }, - (0, import_react14.createElement)("h2", { id: "bt-inbox-heading" }, t("Inbox")), - (0, import_react14.createElement)("span", { className: "bt-mem-status" }, t("Your Bots")), - (0, import_react14.createElement)("span", { className: "bt-mem-head-gap" }), - (0, import_react14.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close inbox"), autoFocus: true, onClick: close }, (0, import_react14.createElement)(CloseIcon)) + (0, import_react16.createElement)("h2", { id: "bt-inbox-heading" }, t("Inbox")), + (0, import_react16.createElement)("span", { className: "bt-mem-status" }, t("Your Bots")), + (0, import_react16.createElement)("span", { className: "bt-mem-head-gap" }), + (0, import_react16.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close inbox"), autoFocus: true, onClick: close }, (0, import_react16.createElement)(CloseIcon)) ), - (0, import_react14.createElement)( + (0, import_react16.createElement)( "div", { className: "bt-mem-body bt-inbox-body" }, - ...locked ? [readOnlyLine(import_react14.createElement, roster, actions, { key: "readonly" })] : [], - (0, import_react14.createElement)("div", { className: "bt-inbox-feedback", role: "status", "aria-live": "polite" }, feedback), + ...locked ? [readOnlyLine(import_react16.createElement, roster, actions, { key: "readonly" })] : [], + (0, import_react16.createElement)("div", { className: "bt-inbox-feedback", role: "status", "aria-live": "polite" }, feedback), GROUPS.map((group) => { const settled = group.id === "done" ? model.doneAll ?? groups.done : null; const canOpen = group.id === "done" && settled.length > DONE_MAX; const rows = canOpen && allDone ? settled : groups[group.id]; const hidden = group.id === "done" ? Math.max(0, (model.doneTotal ?? rows.length) - rows.length) : 0; - return (0, import_react14.createElement)( + return (0, import_react16.createElement)( "section", { key: group.id, className: "bt-inbox-group", "aria-labelledby": `bt-inbox-${group.id}` }, - (0, import_react14.createElement)( + (0, import_react16.createElement)( "h3", { id: `bt-inbox-${group.id}`, className: "bt-inbox-head" }, - (0, import_react14.createElement)("span", null, t(group.title)), - rows.length > 0 ? (0, import_react14.createElement)("span", { className: "bt-inbox-head-count" }, String(rows.length)) : null + (0, import_react16.createElement)("span", null, t(group.title)), + rows.length > 0 ? (0, import_react16.createElement)("span", { className: "bt-inbox-head-count" }, String(rows.length)) : null ), - rows.length === 0 ? (0, import_react14.createElement)("p", { className: "bt-inbox-empty" }, t(group.empty)) : (0, import_react14.createElement)("div", { className: "bt-inbox-list" }, rows.map((card) => (0, import_react14.createElement)(InboxCard, { + rows.length === 0 ? (0, import_react16.createElement)("p", { className: "bt-inbox-empty" }, t(group.empty)) : (0, import_react16.createElement)("div", { className: "bt-inbox-list" }, rows.map((card) => (0, import_react16.createElement)(InboxCard, { key: card.id, card, roster, @@ -9528,8 +10529,8 @@ function InboxDialog({ roster, useWork, useSessions, actions, leaving = false }) onAnswer: answer, onOpen: open }))), - hidden > 0 ? (0, import_react14.createElement)("div", { key: "more", className: "bt-inbox-more" }, t("{count} more not shown", { count: hidden })) : null, - canOpen ? (0, import_react14.createElement)("button", { + hidden > 0 ? (0, import_react16.createElement)("div", { key: "more", className: "bt-inbox-more" }, t("{count} more not shown", { count: hidden })) : null, + canOpen ? (0, import_react16.createElement)("button", { key: "all", type: "button", className: "bt-inbox-show-all", @@ -9613,7 +10614,7 @@ function taskCard(task) { } // src/client/board-card.js -var import_react15 = require("react"); +var import_react17 = require("react"); var TASK_SKIN = { card: "bt-board-card", top: "bt-board-card-top", @@ -9643,7 +10644,7 @@ function BoardCard({ onDragEnd = null }) { const labels = Array.isArray(card?.labels) ? card.labels : []; - return (0, import_react15.createElement)( + return (0, import_react17.createElement)( "article", { ...attrs, @@ -9658,17 +10659,17 @@ function BoardCard({ } : void 0, onDragEnd: draggable ? () => onDragEnd?.() : void 0 }, - (0, import_react15.createElement)( + (0, import_react17.createElement)( "span", { className: skin.top }, - (0, import_react15.createElement)("span", { className: skin.id }, idText), + (0, import_react17.createElement)("span", { className: skin.id }, idText), topExtra, - badge ? (0, import_react15.createElement)("span", { className: skin.badge, "data-badge": card?.badge ?? void 0 }, badge) : null + badge ? (0, import_react17.createElement)("span", { className: skin.badge, "data-badge": card?.badge ?? void 0 }, badge) : null ), - (0, import_react15.createElement)("span", { className: skin.title }, card?.title || emptyTitle), - labels.length ? (0, import_react15.createElement)("span", { className: skin.labels }, labels.map((name) => (0, import_react15.createElement)("span", { key: name, className: skin.label, "data-label": name }, name))) : null, - card?.owner ? (0, import_react15.createElement)("span", { className: skin.owner, "data-kind": card.ownerKind ?? "human" }, card.owner) : null, - note ? (0, import_react15.createElement)("span", { className: skin.note }, note) : null, + (0, import_react17.createElement)("span", { className: skin.title }, card?.title || emptyTitle), + labels.length ? (0, import_react17.createElement)("span", { className: skin.labels }, labels.map((name) => (0, import_react17.createElement)("span", { key: name, className: skin.label, "data-label": name }, name))) : null, + card?.owner ? (0, import_react17.createElement)("span", { className: skin.owner, "data-kind": card.ownerKind ?? "human" }, card.owner) : null, + note ? (0, import_react17.createElement)("span", { className: skin.note }, note) : null, meta, footer, actions @@ -9676,15 +10677,15 @@ function BoardCard({ } // src/client/kanban.js -var import_react16 = require("react"); +var import_react18 = require("react"); var POLL_MS4 = 15e3; function BoardIcon() { - return (0, import_react16.createElement)( + return (0, import_react18.createElement)( "svg", { width: 18, height: 18, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinejoin: "round", "aria-hidden": true }, - (0, import_react16.createElement)("rect", { x: 2.5, y: 3, width: 4, height: 14, rx: 1 }), - (0, import_react16.createElement)("rect", { x: 8, y: 3, width: 4, height: 9, rx: 1 }), - (0, import_react16.createElement)("rect", { x: 13.5, y: 3, width: 4, height: 12, rx: 1 }) + (0, import_react18.createElement)("rect", { x: 2.5, y: 3, width: 4, height: 14, rx: 1 }), + (0, import_react18.createElement)("rect", { x: 8, y: 3, width: 4, height: 9, rx: 1 }), + (0, import_react18.createElement)("rect", { x: 13.5, y: 3, width: 4, height: 12, rx: 1 }) ); } function shortId(id) { @@ -9825,11 +10826,11 @@ function lanesOf(tasks, roster) { var upsert = (list, task) => list.some((item) => item.id === task.id) ? list.map((item) => item.id === task.id ? task : item) : [...list, task]; var without = (list, id) => list.filter((item) => item.id !== id); function useBoardTasks(actions, scope) { - const [own, setOwn] = (0, import_react16.useState)([]); - const [groupTasks, setGroupTasks] = (0, import_react16.useState)([]); - const [archive, setArchive] = (0, import_react16.useState)([]); + const [own, setOwn] = (0, import_react18.useState)([]); + const [groupTasks, setGroupTasks] = (0, import_react18.useState)([]); + const [archive, setArchive] = (0, import_react18.useState)([]); const key = scope?.kind === "group" ? `group:${scope.roomId}` : `bot:${scope.botId ?? ""}`; - (0, import_react16.useEffect)(() => { + (0, import_react18.useEffect)(() => { let stopped = false; const load = () => { const query = scope?.kind === "group" ? { roomId: scope.roomId } : {}; @@ -9863,7 +10864,7 @@ function useBoardTasks(actions, scope) { return { own, groupTasks, tasks, archive: done, replace }; } function RailButton({ row, selected, meta, onSelect }) { - return (0, import_react16.createElement)( + return (0, import_react18.createElement)( "button", { type: "button", @@ -9875,8 +10876,8 @@ function RailButton({ row, selected, meta, onSelect }) { style: row.depth ? { paddingLeft: `${10 + row.depth * 14}px` } : void 0, onClick: () => onSelect(row.kind === "group" ? { kind: "group", roomId: row.id } : { kind: "bot", botId: row.id }) }, - (0, import_react16.createElement)("span", { className: "bt-board-rail-name" }, row.name), - meta ? (0, import_react16.createElement)("span", { className: "bt-board-rail-meta" }, meta) : null + (0, import_react18.createElement)("span", { className: "bt-board-rail-name" }, row.name), + meta ? (0, import_react18.createElement)("span", { className: "bt-board-rail-meta" }, meta) : null ); } function BoardCard2({ task, roster, movable, onMove, onDrag, partOf: partOf2 }) { @@ -9887,7 +10888,7 @@ function BoardCard2({ task, roster, movable, onMove, onDrag, partOf: partOf2 }) const question = task.waitingFor === "input" ? task.inputRequest?.question : ""; const overall = task.kind === "group"; const finished = column === "done" ? finishedAt(task) : void 0; - return (0, import_react16.createElement)(BoardCard, { + return (0, import_react18.createElement)(BoardCard, { card: taskCard(task), skin: TASK_SKIN, attrs: { @@ -9899,34 +10900,34 @@ function BoardCard2({ task, roster, movable, onMove, onDrag, partOf: partOf2 }) idText: shortId(task.id), emptyTitle: t("Untitled task"), topExtra: [ - (0, import_react16.createElement)("span", { key: "priority", className: "bt-board-priority", "data-priority": priority }, priorityLabel(priority)), - (0, import_react16.createElement)("span", { key: "status", className: "bt-board-status" }, statusLabel(task.status)) + (0, import_react18.createElement)("span", { key: "priority", className: "bt-board-priority", "data-priority": priority }, priorityLabel(priority)), + (0, import_react18.createElement)("span", { key: "status", className: "bt-board-status" }, statusLabel(task.status)) ], note: task.note ?? "", meta: [ - overall ? (0, import_react16.createElement)("span", { key: "kind", className: "bt-board-kind" }, t("Group task")) : null, - partOf2 ? (0, import_react16.createElement)("span", { key: "part", className: "bt-board-part" }, t("Part of {title}", { title: partOf2 })) : null, - question ? (0, import_react16.createElement)("span", { key: "wait", className: "bt-board-wait" }, question) : null + overall ? (0, import_react18.createElement)("span", { key: "kind", className: "bt-board-kind" }, t("Group task")) : null, + partOf2 ? (0, import_react18.createElement)("span", { key: "part", className: "bt-board-part" }, t("Part of {title}", { title: partOf2 })) : null, + question ? (0, import_react18.createElement)("span", { key: "wait", className: "bt-board-wait" }, question) : null ], - footer: (0, import_react16.createElement)( + footer: (0, import_react18.createElement)( "span", { className: "bt-board-foot" }, - who ? (0, import_react16.createElement)("span", { className: "bt-board-who" }, who) : null, - Number.isFinite(finished) && finished > 0 ? (0, import_react16.createElement)("span", { key: "finished", className: "bt-board-when" }, relativeShort(finished)) : null, - (0, import_react16.createElement)( + who ? (0, import_react18.createElement)("span", { className: "bt-board-who" }, who) : null, + Number.isFinite(finished) && finished > 0 ? (0, import_react18.createElement)("span", { key: "finished", className: "bt-board-when" }, relativeShort(finished)) : null, + (0, import_react18.createElement)( "span", { className: "bt-board-progress" }, - (0, import_react16.createElement)( + (0, import_react18.createElement)( "span", { className: "bt-board-progress-bar", role: "progressbar", "aria-valuemin": 0, "aria-valuemax": 100, "aria-valuenow": progress, "aria-label": t("Progress") }, - (0, import_react16.createElement)("span", { style: { width: `${progress}%` } }) + (0, import_react18.createElement)("span", { style: { width: `${progress}%` } }) ), - (0, import_react16.createElement)("span", { className: "bt-board-percent" }, t("{percent}%", { percent: progress })) + (0, import_react18.createElement)("span", { className: "bt-board-percent" }, t("{percent}%", { percent: progress })) ) ), actions: [ - movable && column === "not-started" ? (0, import_react16.createElement)("button", { key: "start", type: "button", className: "bt-soft bt-soft-sm", onClick: () => onMove?.(task.id, "in-progress") }, t("Start")) : null, - movable && column === "in-progress" && task.status !== "blocked" ? (0, import_react16.createElement)("button", { key: "complete", type: "button", className: "bt-soft bt-soft-sm", onClick: () => onMove?.(task.id, "done") }, t("Complete")) : null + movable && column === "not-started" ? (0, import_react18.createElement)("button", { key: "start", type: "button", className: "bt-soft bt-soft-sm", onClick: () => onMove?.(task.id, "in-progress") }, t("Start")) : null, + movable && column === "in-progress" && task.status !== "blocked" ? (0, import_react18.createElement)("button", { key: "complete", type: "button", className: "bt-soft bt-soft-sm", onClick: () => onMove?.(task.id, "done") }, t("Complete")) : null ], draggable: movable, dragValue: task.id, @@ -9941,7 +10942,7 @@ function BoardColumn({ column, tasks, roster, lanes, dragging, onMove, onDrag, a const tree = lanes ? columnTree(tasks) : null; const linked = tree ? tree.loose.filter((task) => task.parentId || task.parentTitle) : []; const plain = tree ? tree.loose.filter((task) => !task.parentId && !task.parentTitle) : tasks; - return (0, import_react16.createElement)( + return (0, import_react18.createElement)( "section", { className: "bt-board-column", @@ -9959,33 +10960,33 @@ function BoardColumn({ column, tasks, roster, lanes, dragging, onMove, onDrag, a onDrag?.(null); } }, - (0, import_react16.createElement)( + (0, import_react18.createElement)( "h3", { className: "bt-board-column-head" }, - (0, import_react16.createElement)("span", null, columnTitle(column)), + (0, import_react18.createElement)("span", null, columnTitle(column)), // #2045: the Done column is one archive page. `tasks.length` is what was drawn, not what the // owner has, so a full page says `20 newest` instead of claiming the page is the total. - (0, import_react16.createElement)("span", { className: "bt-board-count" }, column === "done" && archiveFull ? t("{count} newest", { count: tasks.length }) : String(tasks.length)) + (0, import_react18.createElement)("span", { className: "bt-board-count" }, column === "done" && archiveFull ? t("{count} newest", { count: tasks.length }) : String(tasks.length)) ), - dragging ? (0, import_react16.createElement)("div", { className: "bt-board-drop" }, dropLabel(column)) : null, - tasks.length === 0 && !dragging ? (0, import_react16.createElement)("p", { className: "bt-board-empty" }, t("Nothing in this column.")) : null, - tree ? tree.nests.map((nest) => (0, import_react16.createElement)( + dragging ? (0, import_react18.createElement)("div", { className: "bt-board-drop" }, dropLabel(column)) : null, + tasks.length === 0 && !dragging ? (0, import_react18.createElement)("p", { className: "bt-board-empty" }, t("Nothing in this column.")) : null, + tree ? tree.nests.map((nest) => (0, import_react18.createElement)( "div", { key: nest.task.id, className: "bt-board-nest" }, - (0, import_react16.createElement)(BoardCard2, cardProps(nest.task, roster, onMove, onDrag, void 0, locked)), - nest.children.map((child) => (0, import_react16.createElement)( + (0, import_react18.createElement)(BoardCard2, cardProps(nest.task, roster, onMove, onDrag, void 0, locked)), + nest.children.map((child) => (0, import_react18.createElement)( "div", { key: child.id, className: "bt-board-subtask", "data-parent": nest.task.id }, - (0, import_react16.createElement)(BoardCard2, cardProps(child, roster, onMove, onDrag, void 0, locked)) + (0, import_react18.createElement)(BoardCard2, cardProps(child, roster, onMove, onDrag, void 0, locked)) )) )) : null, - linked.map((task) => (0, import_react16.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, task.parentTitle || "", locked) })), - lanes ? lanesOf(plain, roster).map((lane) => (0, import_react16.createElement)( + linked.map((task) => (0, import_react18.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, task.parentTitle || "", locked) })), + lanes ? lanesOf(plain, roster).map((lane) => (0, import_react18.createElement)( "div", { key: lane.id, className: "bt-board-lane" }, - (0, import_react16.createElement)("span", { className: "bt-board-lane-name" }, lane.name), - lane.tasks.map((task) => (0, import_react16.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, void 0, locked) })) - )) : plain.map((task) => (0, import_react16.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, void 0, locked) })) + (0, import_react18.createElement)("span", { className: "bt-board-lane-name" }, lane.name), + lane.tasks.map((task) => (0, import_react18.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, void 0, locked) })) + )) : plain.map((task) => (0, import_react18.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, void 0, locked) })) ); } function BoardView({ roster, actions, tasks, rail, scope, counts: counts2, dragging, error, draft, onDraft, onSelect, onMove, onDrag, onCreate, archiveFull, locked }) { @@ -9993,18 +10994,18 @@ function BoardView({ roster, actions, tasks, rail, scope, counts: counts2, dragg const lanes = scope?.kind === "group"; const selectedBot = scope?.kind === "bot" ? scope.botId : ""; const selectedRoom = scope?.kind === "group" ? scope.roomId : ""; - return (0, import_react16.createElement)( + return (0, import_react18.createElement)( "div", { className: "bt-board-body" }, - (0, import_react16.createElement)( + (0, import_react18.createElement)( "aside", { className: "bt-board-rail", "aria-label": t("Task board") }, - (0, import_react16.createElement)("h3", { className: "bt-board-rail-head" }, t("Your Bots")), - rail.bots.length === 0 ? (0, import_react16.createElement)("p", { className: "bt-board-empty" }, t("No tasks yet.")) : rail.bots.map((row) => { + (0, import_react18.createElement)("h3", { className: "bt-board-rail-head" }, t("Your Bots")), + rail.bots.length === 0 ? (0, import_react18.createElement)("p", { className: "bt-board-empty" }, t("No tasks yet.")) : rail.bots.map((row) => { const count = counts2?.[row.id] ?? { done: 0, total: 0 }; const capped = archiveFull && (scope?.kind === "group" ? count.done > 0 : count.done >= ARCHIVE_SHOWN); const meta = count.total === 0 ? "" : capped ? t("{count}+ done", { count: count.done }) : t("{done}/{total}", { done: count.done, total: count.total }); - return (0, import_react16.createElement)(RailButton, { + return (0, import_react18.createElement)(RailButton, { key: row.id, row, selected: row.id === selectedBot, @@ -10012,31 +11013,31 @@ function BoardView({ roster, actions, tasks, rail, scope, counts: counts2, dragg meta }); }), - rail.groups.length > 0 ? (0, import_react16.createElement)("h3", { className: "bt-board-rail-head" }, t("Groups you admin")) : null, - rail.groups.map((row) => (0, import_react16.createElement)(RailButton, { key: row.id, row, selected: row.id === selectedRoom, onSelect })) + rail.groups.length > 0 ? (0, import_react18.createElement)("h3", { className: "bt-board-rail-head" }, t("Groups you admin")) : null, + rail.groups.map((row) => (0, import_react18.createElement)(RailButton, { key: row.id, row, selected: row.id === selectedRoom, onSelect })) ), - (0, import_react16.createElement)( + (0, import_react18.createElement)( "div", { className: "bt-board-main" }, - error ? (0, import_react16.createElement)("p", { className: "bt-board-error", role: "alert" }, error) : null, - lanes ? (0, import_react16.createElement)("p", { className: "bt-board-hint" }, t("Assign, claim, and progress live on this board: one overall task, a subtask per part, an assignee, a column, and progress. @ only wakes someone.")) : null, - scope?.kind === "bot" && onCreate && !locked ? (0, import_react16.createElement)( + error ? (0, import_react18.createElement)("p", { className: "bt-board-error", role: "alert" }, error) : null, + lanes ? (0, import_react18.createElement)("p", { className: "bt-board-hint" }, t("Assign, claim, and progress live on this board: one overall task, a subtask per part, an assignee, a column, and progress. @ only wakes someone.")) : null, + scope?.kind === "bot" && onCreate && !locked ? (0, import_react18.createElement)( "form", { className: "bt-board-add", onSubmit: (event) => { event.preventDefault(); onCreate(draft); } }, - (0, import_react16.createElement)("input", { "aria-label": t("Task title"), placeholder: t("New task"), value: draft ?? "", onChange: (event) => onDraft?.(event.target.value) }), - (0, import_react16.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, t("Add task")) + (0, import_react18.createElement)("input", { "aria-label": t("Task title"), placeholder: t("New task"), value: draft ?? "", onChange: (event) => onDraft?.(event.target.value) }), + (0, import_react18.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, t("Add task")) ) : null, // #2273: the board is a 1080px overlay and covers the sidebar banner and the Settings hint, // so the lock's own sentence is drawn here too, from the host, not in a second wording — // with the shared Reload beside it, since the sidebar's entry is covered by this overlay. - locked ? readOnlyLine(import_react16.createElement, roster, actions, { key: "readonly", className: "bt-board-hint" }) : null, - (0, import_react16.createElement)( + locked ? readOnlyLine(import_react18.createElement, roster, actions, { key: "readonly", className: "bt-board-hint" }) : null, + (0, import_react18.createElement)( "div", { className: "bt-board-columns" }, - ["not-started", "in-progress", "done"].map((column) => (0, import_react16.createElement)(BoardColumn, { + ["not-started", "in-progress", "done"].map((column) => (0, import_react18.createElement)(BoardColumn, { key: column, column, tasks: columns[column], @@ -10055,7 +11056,7 @@ function BoardView({ roster, actions, tasks, rail, scope, counts: counts2, dragg function KanbanRow({ wide, useUi, actions }) { const open = useUi ? useUi((value) => Boolean(value.board)) : false; const label = t("Tasks"); - return (0, import_react16.createElement)( + return (0, import_react18.createElement)( "button", { type: "button", @@ -10066,8 +11067,8 @@ function KanbanRow({ wide, useUi, actions }) { "aria-expanded": open, onClick: () => actions.openBoard() }, - (0, import_react16.createElement)("span", { className: "bt-board-mark" }, (0, import_react16.createElement)(BoardIcon)), - wide ? (0, import_react16.createElement)("span", { className: "bt-board-label" }, label) : null + (0, import_react18.createElement)("span", { className: "bt-board-mark" }, (0, import_react18.createElement)(BoardIcon)), + wide ? (0, import_react18.createElement)("span", { className: "bt-board-label" }, label) : null ); } function scopeName(roster, scope) { @@ -10078,15 +11079,15 @@ function scopeName(roster, scope) { function KanbanDialog({ roster, actions, leaving = false }) { const locked = typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; const rail = boardRail(roster); - const [scope, setScope] = (0, import_react16.useState)(() => rail.bots[0] ? { kind: "bot", botId: rail.bots[0].id } : rail.groups[0] ? { kind: "group", roomId: rail.groups[0].id } : null); - const [dragging, setDragging] = (0, import_react16.useState)(null); - const [error, setError] = (0, import_react16.useState)(""); - const [draft, setDraft] = (0, import_react16.useState)(""); + const [scope, setScope] = (0, import_react18.useState)(() => rail.bots[0] ? { kind: "bot", botId: rail.bots[0].id } : rail.groups[0] ? { kind: "group", roomId: rail.groups[0].id } : null); + const [dragging, setDragging] = (0, import_react18.useState)(null); + const [error, setError] = (0, import_react18.useState)(""); + const [draft, setDraft] = (0, import_react18.useState)(""); const { own, groupTasks, tasks, archive, replace } = useBoardTasks(actions, scope); const boardTasks = boardTasksFor(tasks, archive); - const close = (0, import_react16.useCallback)(() => actions.closeBoard(), []); + const close = (0, import_react18.useCallback)(() => actions.closeBoard(), []); useEscape(close); - (0, import_react16.useEffect)(() => { + (0, import_react18.useEffect)(() => { if (typeof window === "undefined") return; if (!window.location.hash.startsWith("#task=")) return; const [kind, id] = window.location.hash.slice("#task=".length).split(":"); @@ -10128,24 +11129,24 @@ function KanbanDialog({ roster, actions, leaving = false }) { } }; const name = scopeName(roster, scope); - return (0, import_react16.createElement)( + return (0, import_react18.createElement)( "div", { className: "bt-mem-layer bt-board-layer", "data-leaving": leaving || void 0 }, - (0, import_react16.createElement)("div", { className: "bt-scrim", onClick: close }), - (0, import_react16.createElement)( + (0, import_react18.createElement)("div", { className: "bt-scrim", onClick: close }), + (0, import_react18.createElement)( "div", { className: "bt-mem bt-board", role: "dialog", "aria-modal": true, "aria-labelledby": "bt-board-heading" }, - (0, import_react16.createElement)( + (0, import_react18.createElement)( "div", { className: "bt-mem-head" }, - (0, import_react16.createElement)("h2", { id: "bt-board-heading" }, t("Board")), - (0, import_react16.createElement)("span", { className: "bt-mem-status" }, name), + (0, import_react18.createElement)("h2", { id: "bt-board-heading" }, t("Board")), + (0, import_react18.createElement)("span", { className: "bt-mem-status" }, name), // #1854: the left sidebar's Projects row is the one entry to a Project board; this header // used to draw a second door (#1701), so the sidebar row was the only way in for the rest. - (0, import_react16.createElement)("span", { className: "bt-mem-head-gap" }), - (0, import_react16.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close board"), autoFocus: true, onClick: close }, (0, import_react16.createElement)(CloseIcon)) + (0, import_react18.createElement)("span", { className: "bt-mem-head-gap" }), + (0, import_react18.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close board"), autoFocus: true, onClick: close }, (0, import_react18.createElement)(CloseIcon)) ), - (0, import_react16.createElement)(BoardView, { + (0, import_react18.createElement)(BoardView, { roster, actions, tasks: boardTasks, @@ -10232,11 +11233,11 @@ var KANBAN_CSS = ` `; // src/client/project-presence.js -var import_react17 = require("react"); +var import_react19 = require("react"); function useProjectPresent() { const slots = registry(); - const [present, setPresent] = (0, import_react17.useState)(() => projectPresent()); - (0, import_react17.useEffect)(() => { + const [present, setPresent] = (0, import_react19.useState)(() => projectPresent()); + (0, import_react19.useEffect)(() => { setPresent(projectPresent()); return slots.subscribe(() => setPresent(projectPresent())); }, [slots]); @@ -10251,7 +11252,7 @@ function roleText(role) { } // src/client/projects-nav.js -var import_react18 = require("react"); +var import_react20 = require("react"); var import_react_dom3 = require("react-dom"); var PROJECTS_NAV_CSS = ` .bt-projects-row { display: flex; align-items: center; gap: 8px; } @@ -10294,7 +11295,7 @@ function roleNote(answer) { return t("Role unchanged: {reason}", { reason }); } function ProjectList({ projects, error, note, onOpen, onRole }) { - const rows = projects === null ? (0, import_react18.createElement)("div", { className: "bt-projects-note" }, t("Reading Projects…")) : error !== "" ? (0, import_react18.createElement)("div", { className: "bt-projects-note" }, error) : projects.length === 0 ? (0, import_react18.createElement)("div", { className: "bt-projects-empty" }, t("No Projects yet")) : projects.map((project) => (0, import_react18.createElement)( + const rows = projects === null ? (0, import_react20.createElement)("div", { className: "bt-projects-note" }, t("Reading Projects…")) : error !== "" ? (0, import_react20.createElement)("div", { className: "bt-projects-note" }, error) : projects.length === 0 ? (0, import_react20.createElement)("div", { className: "bt-projects-empty" }, t("No Projects yet")) : projects.map((project) => (0, import_react20.createElement)( "button", { key: String(project.id), @@ -10309,34 +11310,34 @@ function ProjectList({ projects, error, note, onOpen, onRole }) { onRole?.(project, event); } }, - (0, import_react18.createElement)("span", { className: "bt-project-entry-name" }, projectName(project)), - roleText(project.role) === "" ? null : (0, import_react18.createElement)("span", { className: "bt-project-entry-role" }, roleText(project.role)) + (0, import_react20.createElement)("span", { className: "bt-project-entry-name" }, projectName(project)), + roleText(project.role) === "" ? null : (0, import_react20.createElement)("span", { className: "bt-project-entry-role" }, roleText(project.role)) )); - return (0, import_react18.createElement)( + return (0, import_react20.createElement)( "div", { className: "bt-projects-list", role: "group", "aria-label": t("Projects") }, rows, - note === "" || note === void 0 ? null : (0, import_react18.createElement)("div", { className: "bt-projects-note", role: "status" }, note) + note === "" || note === void 0 ? null : (0, import_react20.createElement)("div", { className: "bt-projects-note", role: "status" }, note) ); } function Chevron() { - return (0, import_react18.createElement)( + return (0, import_react20.createElement)( "svg", { width: 12, height: 12, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, - (0, import_react18.createElement)("path", { d: "M7.5 4.5L13 10l-5.5 5.5" }) + (0, import_react20.createElement)("path", { d: "M7.5 4.5L13 10l-5.5 5.5" }) ); } function ProjectsMark() { - return (0, import_react18.createElement)( + return (0, import_react20.createElement)( "svg", { width: 18, height: 18, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinejoin: "round", "aria-hidden": true }, - (0, import_react18.createElement)("path", { d: "M2.5 5.5h6l1.5 2h7.5v8a1 1 0 0 1-1 1h-13a1 1 0 0 1-1-1z" }), - (0, import_react18.createElement)("path", { d: "M2.5 5.5v-1a1 1 0 0 1 1-1h4l1.5 2" }) + (0, import_react20.createElement)("path", { d: "M2.5 5.5h6l1.5 2h7.5v8a1 1 0 0 1-1 1h-13a1 1 0 0 1-1-1z" }), + (0, import_react20.createElement)("path", { d: "M2.5 5.5v-1a1 1 0 0 1 1-1h4l1.5 2" }) ); } function ProjectRoleMenu({ project, x, y, onPick, onClose }) { - const ref = (0, import_react18.useRef)(null); - (0, import_react18.useEffect)(() => { + const ref = (0, import_react20.useRef)(null); + (0, import_react20.useEffect)(() => { const onDown = (event) => { if (!ref.current?.contains(event.target)) onClose(); }; @@ -10351,7 +11352,7 @@ function ProjectRoleMenu({ project, x, y, onPick, onClose }) { }; }, [onClose]); const items = projectMenuItems(project); - return (0, import_react_dom3.createPortal)((0, import_react18.createElement)( + return (0, import_react_dom3.createPortal)((0, import_react20.createElement)( "div", { ref, @@ -10361,8 +11362,8 @@ function ProjectRoleMenu({ project, x, y, onPick, onClose }) { style: { left: `${x}px`, top: `${y}px` }, "data-project-id": String(project?.id ?? "") }, - (0, import_react18.createElement)("div", { className: "bt-projects-note" }, projectName(project)), - items.length === 0 ? (0, import_react18.createElement)("div", { className: "bt-projects-note" }, t("No role to switch here.")) : items.map((item) => (0, import_react18.createElement)("button", { + (0, import_react20.createElement)("div", { className: "bt-projects-note" }, projectName(project)), + items.length === 0 ? (0, import_react20.createElement)("div", { className: "bt-projects-note" }, t("No role to switch here.")) : items.map((item) => (0, import_react20.createElement)("button", { key: item.role, type: "button", role: "menuitemradio", @@ -10379,19 +11380,19 @@ function ProjectRoleMenu({ project, x, y, onPick, onClose }) { function ProjectsNav({ wide = true, request, onOpen } = {}) { const read = request ?? call; const present = useProjectPresent(); - const open = (0, import_react18.useCallback)((id) => { + const open = (0, import_react20.useCallback)((id) => { if (onOpen) { onOpen(id); return; } if (typeof window !== "undefined") window.location.hash = projectHash(id); }, [onOpen]); - const [expanded, setExpanded] = (0, import_react18.useState)(false); - const [projects, setProjects] = (0, import_react18.useState)(null); - const [error, setError] = (0, import_react18.useState)(""); - const [note, setNote] = (0, import_react18.useState)(""); - const [menu, setMenu] = (0, import_react18.useState)(null); - const load = (0, import_react18.useCallback)(async () => { + const [expanded, setExpanded] = (0, import_react20.useState)(false); + const [projects, setProjects] = (0, import_react20.useState)(null); + const [error, setError] = (0, import_react20.useState)(""); + const [note, setNote] = (0, import_react20.useState)(""); + const [menu, setMenu] = (0, import_react20.useState)(null); + const load = (0, import_react20.useCallback)(async () => { try { const listing = await read("projects"); const list = Array.isArray(listing?.projects) ? listing.projects : []; @@ -10402,7 +11403,7 @@ function ProjectsNav({ wide = true, request, onOpen } = {}) { setError(failure?.message ?? String(failure)); } }, [read]); - (0, import_react18.useEffect)(() => { + (0, import_react20.useEffect)(() => { if (!expanded) return; void load(); }, [expanded, load]); @@ -10416,10 +11417,10 @@ function ProjectsNav({ wide = true, request, onOpen } = {}) { }; const listed = expanded && wide; if (!present) return null; - return (0, import_react18.createElement)( + return (0, import_react20.createElement)( "div", { className: "bt-projects" }, - (0, import_react18.createElement)( + (0, import_react20.createElement)( "button", { type: "button", @@ -10429,12 +11430,12 @@ function ProjectsNav({ wide = true, request, onOpen } = {}) { title: wide ? void 0 : t("Projects"), onClick: toggle }, - (0, import_react18.createElement)("span", { className: "bt-projects-mark" }, (0, import_react18.createElement)(ProjectsMark)), - wide ? (0, import_react18.createElement)("span", { className: "bt-projects-label" }, t("Projects")) : null, - wide ? (0, import_react18.createElement)("span", { className: "bt-projects-chevron", "aria-hidden": true }, (0, import_react18.createElement)(Chevron)) : null + (0, import_react20.createElement)("span", { className: "bt-projects-mark" }, (0, import_react20.createElement)(ProjectsMark)), + wide ? (0, import_react20.createElement)("span", { className: "bt-projects-label" }, t("Projects")) : null, + wide ? (0, import_react20.createElement)("span", { className: "bt-projects-chevron", "aria-hidden": true }, (0, import_react20.createElement)(Chevron)) : null ), - listed ? (0, import_react18.createElement)(ProjectList, { projects, error, note, onOpen: open, onRole: (project, event) => setMenu({ project, x: event.clientX, y: event.clientY }) }) : null, - menu === null ? null : (0, import_react18.createElement)(ProjectRoleMenu, { + listed ? (0, import_react20.createElement)(ProjectList, { projects, error, note, onOpen: open, onRole: (project, event) => setMenu({ project, x: event.clientX, y: event.clientY }) }) : null, + menu === null ? null : (0, import_react20.createElement)(ProjectRoleMenu, { project: menu.project, x: menu.x, y: menu.y, @@ -10455,22 +11456,25 @@ function ProjectsNav({ wide = true, request, onOpen } = {}) { } // src/client/sidebar.js -var import_react19 = require("react"); +var import_react21 = require("react"); var import_react_dom4 = require("react-dom"); -var import_dsh_client_ui_primitives2 = require("@deepseek-ai/dsh-client-ui-primitives"); +var import_dsh_client_ui_primitives3 = require("@deepseek-ai/dsh-client-ui-primitives"); function useMarkedUnread(id, active, marked, actions) { - (0, import_react19.useEffect)(() => { - if (active && marked) actions.clearUnread(id); - }, [active, marked]); + const wasActive = (0, import_react21.useRef)(false); + (0, import_react21.useEffect)(() => { + const opened = shouldClearManualUnread({ active, wasActive: wasActive.current, marked }); + wasActive.current = active; + if (opened) actions.clearUnread(id); + }, [active, marked, id]); } -var PinMark = () => (0, import_react19.createElement)("span", { className: "bt-pin", "aria-hidden": true }, (0, import_react19.createElement)(PinMarkIcon)); +var PinMark = () => (0, import_react21.createElement)("span", { className: "bt-pin", "aria-hidden": true }, (0, import_react21.createElement)(PinMarkIcon)); var useApproval = (useWork, match) => useWork ? useWork((work) => (work.approvals ?? []).some(match)) : false; var useGroupWork = (useWork, pick2) => useWork ? useWork((work) => pick2(work.rooms ?? {}).join(",")) : ""; var workKeys = (text2) => text2 === "" ? [] : text2.split(",").map((key) => { const [id, tool] = key.split("|"); return { id, tool: tool || void 0 }; }); -var workLine = (lead, tool, more) => (0, import_react19.createElement)(Shimmer, null, `${lead} · ${workPhrase(tool)}…${more > 0 ? ` +${more}` : ""}`); +var workLine = (lead, tool, more) => (0, import_react21.createElement)(Shimmer, null, `${lead} · ${workPhrase(tool)}…${more > 0 ? ` +${more}` : ""}`); function BotRow({ bot, roster, actions, useSessions, useSessionStatus, useSessionRetainInfo, useActivity, useWork, wide, marked, asRow = false }) { const id = bot.id; const part = currentPart(bot); @@ -10501,7 +11505,7 @@ function BotRow({ bot, roster, actions, useSessions, useSessionStatus, useSessio const secondLine = awayLine || preview || (remote ? bot.remote?.gone ? t("no longer shared") : t("Friend's Bot") : ""); const label = [shown, main ? t("Main Bot") : "", pinned ? t("Pinned") : "", running || away ? t("Working") : "", waiting ? t("Waiting for your approval") : alert ? t("Waiting for your answer") : "", unread ? t("Unread activity") : ""].filter(Boolean).join(", "); if (tile && wide) { - return (0, import_react19.createElement)("div", { className: "bt-tile-wrap" }, (0, import_react19.createElement)( + return (0, import_react21.createElement)("div", { className: "bt-tile-wrap" }, (0, import_react21.createElement)( "button", { type: "button", @@ -10513,15 +11517,15 @@ function BotRow({ bot, roster, actions, useSessions, useSessionStatus, useSessio onClick: () => actions.openSession(id), onContextMenu }, - (0, import_react19.createElement)(BotAvatar, { bot, size: 60, state, main: true }), - (0, import_react19.createElement)("span", { className: "bt-tile-name" }, shown), + (0, import_react21.createElement)(BotAvatar, { bot, size: 60, state, main: true }), + (0, import_react21.createElement)("span", { className: "bt-tile-name" }, shown), // The Main Bot's tile gets the same unread dot as a row (#420); a wait shows on its avatar. - unread && !waiting && !active ? (0, import_react19.createElement)("span", { className: "bt-unread bt-tile-unread", "aria-hidden": true }) : null, - bot.role ? (0, import_react19.createElement)("span", { className: "bt-chip" }, bot.role) : null + unread && !waiting && !active ? (0, import_react21.createElement)("span", { className: "bt-unread bt-tile-unread", "aria-hidden": true }) : null, + bot.role ? (0, import_react21.createElement)("span", { className: "bt-chip" }, bot.role) : null )); } - const unreadMark = wide && waiting && !active ? (0, import_react19.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react19.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null; - const row = (0, import_react19.createElement)( + const unreadMark = wide && waiting && !active ? (0, import_react21.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react21.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null; + const row = (0, import_react21.createElement)( "button", { type: "button", @@ -10534,24 +11538,24 @@ function BotRow({ bot, roster, actions, useSessions, useSessionStatus, useSessio onClick: () => actions.openSession(id), onContextMenu }, - (0, import_react19.createElement)(BotAvatar, { bot, size: 36, state, main }), - pinned && !wide ? (0, import_react19.createElement)(PinMark) : null, - wide ? (0, import_react19.createElement)( + (0, import_react21.createElement)(BotAvatar, { bot, size: 36, state, main }), + pinned && !wide ? (0, import_react21.createElement)(PinMark) : null, + wide ? (0, import_react21.createElement)( "span", { className: "bt-row-body" }, - (0, import_react19.createElement)( + (0, import_react21.createElement)( "span", { className: "bt-row-name" }, - (0, import_react19.createElement)("span", { className: "bt-row-title" }, shown), - bot.remote ? (0, import_react19.createElement)(RemoteMark, { remote: bot.remote }) : null, - pinned ? (0, import_react19.createElement)(PinMark) : null + (0, import_react21.createElement)("span", { className: "bt-row-title" }, shown), + bot.remote ? (0, import_react21.createElement)(RemoteMark, { remote: bot.remote }) : null, + pinned ? (0, import_react21.createElement)(PinMark) : null ), - secondLine ? (0, import_react19.createElement)("span", { className: "bt-row-preview" }, secondLine) : null + secondLine ? (0, import_react21.createElement)("span", { className: "bt-row-preview" }, secondLine) : null ) : null, unreadMark ); const settingsLabel = bot.remote ? t("Bot settings") : t("Edit Bot"); - const settings = wide ? (0, import_react19.createElement)("button", { + const settings = wide ? (0, import_react21.createElement)("button", { type: "button", className: "bt-row-settings", "aria-label": settingsLabel, @@ -10562,8 +11566,8 @@ function BotRow({ bot, roster, actions, useSessions, useSessionStatus, useSessio keepSidebarStill(event.currentTarget); actions.openSettings("bots", id); } - }, (0, import_react19.createElement)(GearIcon)) : null; - if (settings) return (0, import_react19.createElement)("div", { className: "bt-row-wrap", "data-bot-id": id }, row, settings); + }, (0, import_react21.createElement)(GearIcon)) : null; + if (settings) return (0, import_react21.createElement)("div", { className: "bt-row-wrap", "data-bot-id": id }, row, settings); return row; } function keepSidebarStill(node) { @@ -10576,14 +11580,14 @@ function keepSidebarStill(node) { if (typeof requestAnimationFrame === "function") requestAnimationFrame(() => requestAnimationFrame(reset)); } function RemoteMark({ remote }) { - return (0, import_react19.createElement)( + return (0, import_react21.createElement)( "span", { className: "bt-row-remote", title: remote.gone ? `${remote.handle} · ${t("no longer shared")}` : remote.handle, "aria-label": t("Friend's Bot") }, - (0, import_react19.createElement)( + (0, import_react21.createElement)( "svg", { width: 11, height: 11, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", "aria-hidden": true }, - (0, import_react19.createElement)("circle", { cx: 12, cy: 12, r: 9 }), - (0, import_react19.createElement)("path", { d: "M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18" }) + (0, import_react21.createElement)("circle", { cx: 12, cy: 12, r: 9 }), + (0, import_react21.createElement)("path", { d: "M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18" }) ) ); } @@ -10595,15 +11599,15 @@ function isPastFaceRoom(room2) { return status === "candidate" && expires && Number.isFinite(Date.parse(expires)) && Date.parse(expires) <= Date.now(); } function FaceMark() { - return (0, import_react19.createElement)( + return (0, import_react21.createElement)( "span", { className: "bt-row-remote bt-row-face", title: t("Face-to-face"), "aria-label": t("Face-to-face") }, - (0, import_react19.createElement)( + (0, import_react21.createElement)( "svg", { width: 11, height: 11, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", "aria-hidden": true }, - (0, import_react19.createElement)("circle", { cx: 9, cy: 8, r: 3 }), - (0, import_react19.createElement)("circle", { cx: 16, cy: 9, r: 2.5 }), - (0, import_react19.createElement)("path", { d: "M4 18a5 5 0 0 1 10 0M14 18a4 4 0 0 1 6 0" }) + (0, import_react21.createElement)("circle", { cx: 9, cy: 8, r: 3 }), + (0, import_react21.createElement)("circle", { cx: 16, cy: 9, r: 2.5 }), + (0, import_react21.createElement)("path", { d: "M4 18a5 5 0 0 1 10 0M14 18a4 4 0 0 1 6 0" }) ) ); } @@ -10628,7 +11632,7 @@ function RoomRow({ room: room2, roster, actions, useSessions, useSessionStatus, const alert = question || waiting; const face = room2.origin === "face-to-face"; const label = [hover, face ? t("Face-to-face") : "", pinned ? t("Pinned") : "", members.length > 0 ? t("Working") : "", waiting ? t("Waiting for your approval") : alert ? t("Waiting for your answer") : ""].filter(Boolean).join(", "); - return (0, import_react19.createElement)( + return (0, import_react21.createElement)( "button", { type: "button", @@ -10645,20 +11649,20 @@ function RoomRow({ room: room2, roster, actions, useSessions, useSessionStatus, actions.openMenu({ kind: "room", id, x: event.clientX, y: event.clientY }); } }, - (0, import_react19.createElement)(RoomAvatar, { room: room2, roster, size: 36 }), - pinned && !wide ? (0, import_react19.createElement)(PinMark) : null, - wide ? (0, import_react19.createElement)( + (0, import_react21.createElement)(RoomAvatar, { room: room2, roster, size: 36 }), + pinned && !wide ? (0, import_react21.createElement)(PinMark) : null, + wide ? (0, import_react21.createElement)( "span", { className: "bt-row-body" }, - (0, import_react19.createElement)("span", { className: "bt-row-name" }, (0, import_react19.createElement)("span", { className: face ? "bt-row-title bt-row-title-face" : "bt-row-title" }, face ? faceRowTitle(title) : title), face ? (0, import_react19.createElement)(FaceMark) : room2.sharedFrom ? (0, import_react19.createElement)("span", { className: "bt-tag", title: from }, t("Shared")) : null, pinned ? (0, import_react19.createElement)(PinMark) : null), - workingLine ? (0, import_react19.createElement)("span", { className: "bt-row-preview" }, workingLine) : preview ? (0, import_react19.createElement)("span", { className: "bt-row-preview" }, preview) : null + (0, import_react21.createElement)("span", { className: "bt-row-name" }, (0, import_react21.createElement)("span", { className: face ? "bt-row-title bt-row-title-face" : "bt-row-title" }, face ? faceRowTitle(title) : title), face ? (0, import_react21.createElement)(FaceMark) : room2.sharedFrom ? (0, import_react21.createElement)("span", { className: "bt-tag", title: from }, t("Shared")) : null, pinned ? (0, import_react21.createElement)(PinMark) : null), + workingLine ? (0, import_react21.createElement)("span", { className: "bt-row-preview" }, workingLine) : preview ? (0, import_react21.createElement)("span", { className: "bt-row-preview" }, preview) : null ) : null, - wide && alert && !active ? (0, import_react19.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react19.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null + wide && alert && !active ? (0, import_react21.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react21.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null ); } function AgentSessionRow({ session, agent, actions, renaming, index }) { - const input = (0, import_react19.useRef)(null); - (0, import_react19.useLayoutEffect)(() => { + const input = (0, import_react21.useRef)(null); + (0, import_react21.useLayoutEffect)(() => { if (!renaming) return; input.current?.focus(); input.current?.select(); @@ -10679,10 +11683,10 @@ function AgentSessionRow({ session, agent, actions, renaming, index }) { } })(); }; - return (0, import_react19.createElement)( + return (0, import_react21.createElement)( "div", { className: "bt-agent-sub-row bt-agent-edit", style: { "--i": index } }, - (0, import_react19.createElement)("input", { + (0, import_react21.createElement)("input", { ref: input, defaultValue: session.title, "aria-label": t("Rename"), @@ -10695,7 +11699,7 @@ function AgentSessionRow({ session, agent, actions, renaming, index }) { }) ); } - return (0, import_react19.createElement)( + return (0, import_react21.createElement)( "button", { type: "button", @@ -10709,8 +11713,8 @@ function AgentSessionRow({ session, agent, actions, renaming, index }) { actions.openMenu({ kind: "agent-session", id: session.id, agentId: agent.id, x: event.clientX, y: event.clientY }); } }, - (0, import_react19.createElement)("span", { className: "bt-agent-sub-title" }, session.title), - (0, import_react19.createElement)("span", { className: "bt-agent-sub-time" }, session.at > 0 ? relativeShort(session.at) : "") + (0, import_react21.createElement)("span", { className: "bt-agent-sub-title" }, session.title), + (0, import_react21.createElement)("span", { className: "bt-agent-sub-time" }, session.at > 0 ? relativeShort(session.at) : "") ); } function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, marked }) { @@ -10745,10 +11749,10 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, const preview = sessions[0]?.title ?? t("New session"); const label = ["DSH Agent", running ? t("Working") : "", unread ? t("Unread activity") : ""].filter(Boolean).join(", "); const open = active && wide; - return (0, import_react19.createElement)( + return (0, import_react21.createElement)( "div", { className: "bt-agent" }, - (0, import_react19.createElement)( + (0, import_react21.createElement)( "button", { type: "button", @@ -10763,30 +11767,30 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, actions.openMenu({ kind: "agent", id: agent.id, x: event.clientX, y: event.clientY }); } }, - (0, import_react19.createElement)("span", { className: `bt-agent-ava${running ? " bt-run" : ""}` }, (0, import_react19.createElement)(import_dsh_client_ui_primitives2.FishLogo, { size: 22 })), - wide ? (0, import_react19.createElement)( + (0, import_react21.createElement)("span", { className: `bt-agent-ava${running ? " bt-run" : ""}` }, (0, import_react21.createElement)(import_dsh_client_ui_primitives3.FishLogo, { size: 22 })), + wide ? (0, import_react21.createElement)( "span", { className: "bt-row-body" }, - (0, import_react19.createElement)("span", { className: "bt-row-name" }, "DSH Agent"), - preview ? (0, import_react19.createElement)("span", { className: "bt-row-preview" }, preview) : null + (0, import_react21.createElement)("span", { className: "bt-row-name" }, "DSH Agent"), + preview ? (0, import_react21.createElement)("span", { className: "bt-row-preview" }, preview) : null ) : null, - wide && unread && !active ? (0, import_react19.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null + wide && unread && !active ? (0, import_react21.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null ), - (0, import_react19.createElement)( + (0, import_react21.createElement)( "div", { className: "bt-agent-sub", "data-open": open || void 0 }, - (0, import_react19.createElement)( + (0, import_react21.createElement)( "div", { className: "bt-agent-sub-in" }, - (0, import_react19.createElement)( + (0, import_react21.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")); } }, - (0, import_react19.createElement)(PlusIcon), - (0, import_react19.createElement)("span", { className: "bt-agent-sub-title" }, t("New session")) + (0, import_react21.createElement)(PlusIcon), + (0, import_react21.createElement)("span", { className: "bt-agent-sub-title" }, t("New session")) ), - sessions.map((session, index) => (0, import_react19.createElement)(AgentSessionRow, { + sessions.map((session, index) => (0, import_react21.createElement)(AgentSessionRow, { key: session.id, session, agent, @@ -10800,8 +11804,8 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, } var GLIDE = springEasing(1e3, 63); function useListGlide(listRef, layout, key) { - const tops = (0, import_react19.useRef)({ layout, map: /* @__PURE__ */ new Map() }); - (0, import_react19.useLayoutEffect)(() => { + const tops = (0, import_react21.useRef)({ layout, map: /* @__PURE__ */ new Map() }); + (0, import_react21.useLayoutEffect)(() => { const list = listRef.current; if (!list) return; const next = /* @__PURE__ */ new Map(); @@ -10818,7 +11822,7 @@ function useListGlide(listRef, layout, key) { tops.current = { layout, map: next }; }, [layout, key]); } -var NodeActions = class extends import_react19.Component { +var NodeActions = class extends import_react21.Component { constructor(props) { super(props); this.state = { failed: false }; @@ -10830,32 +11834,59 @@ var NodeActions = class extends import_react19.Component { console.error("flybot: nodeActions failed", error); } render() { - return this.state.failed ? null : (0, import_react19.createElement)(this.props.component, { bot: this.props.bot }); + return this.state.failed ? null : (0, import_react21.createElement)(this.props.component, { bot: this.props.bot }); } }; function TreeNode({ node, rowProps, markedUnread, collapsed, toggle, actions }) { const { bot, depth, children } = node; const closed = collapsed[bot.id] === true; - return (0, import_react19.createElement)( - import_react19.Fragment, + return (0, import_react21.createElement)( + import_react21.Fragment, null, - (0, import_react19.createElement)( + (0, import_react21.createElement)( "div", { className: "bt-tree-item", "data-depth": depth, style: { paddingLeft: `${depth * 16}px` } }, - children.length ? (0, import_react19.createElement)( + children.length ? (0, import_react21.createElement)( "button", { type: "button", className: "bt-tree-toggle", "aria-expanded": !closed, "aria-label": `${closed ? t("Expand") : t("Collapse")} ${bot.name}`, onClick: () => toggle(bot.id) }, - (0, import_react19.createElement)("span", { className: "bt-tree-chev", "aria-hidden": true }, "▾") - ) : (0, import_react19.createElement)("span", { className: "bt-tree-toggle bt-tree-leaf", "aria-hidden": true }), - (0, import_react19.createElement)(BotRow, { ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }), - typeof actions === "function" ? (0, import_react19.createElement)(NodeActions, { component: actions, bot }) : null + (0, import_react21.createElement)("span", { className: "bt-tree-chev", "aria-hidden": true }, "▾") + ) : (0, import_react21.createElement)("span", { className: "bt-tree-toggle bt-tree-leaf", "aria-hidden": true }), + (0, import_react21.createElement)(BotRow, { ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }), + typeof actions === "function" ? (0, import_react21.createElement)(NodeActions, { component: actions, bot }) : null ), - closed ? null : children.map((child) => (0, import_react19.createElement)(TreeNode, { key: child.bot.id, node: child, rowProps, markedUnread, collapsed, toggle, actions })) + closed ? null : children.map((child) => (0, import_react21.createElement)(TreeNode, { key: child.bot.id, node: child, rowProps, markedUnread, collapsed, toggle, actions })) + ); +} +function SessionFilter({ value, onChange }) { + const items = [ + ["all", t("All")], + ["group", t("Group chats")], + ["direct", t("Direct chats")], + ["unread", t("Unread")] + ]; + return (0, import_react21.createElement)( + "div", + { className: "bt-session-filter", role: "radiogroup", "aria-label": t("Session filter") }, + items.map(([id, label]) => (0, import_react21.createElement)("button", { + key: id, + type: "button", + role: "radio", + className: "bt-session-filter-btn", + "data-filter": id, + "aria-checked": value === id, + onClick: () => onChange(id) + }, label)) ); } +function sessionFilterEmpty(filter) { + if (filter === "group") return t("No group chats"); + if (filter === "direct") return t("No direct chats"); + if (filter === "unread") return t("No unread chats"); + return null; +} function TeamSidebar(props) { const { wide, useRoster, useUi, useSessions, actions } = props; - const listRef = (0, import_react19.useRef)(null); + const listRef = (0, import_react21.useRef)(null); const roster = useRoster((value) => value); const markedUnread = useUi((value) => value.unread); props.useRegistry((value) => value); @@ -10864,7 +11895,7 @@ function TeamSidebar(props) { for (const id of list.ids) stamps[id] = list.byId[id]?.updatedAt ?? 0; return JSON.stringify(stamps); }); - const order = (0, import_react19.useMemo)(() => { + const order = (0, import_react21.useMemo)(() => { const stamps = JSON.parse(updated); const entries2 = [ // Own Bots, friends' Bots, groups and face rooms share one list. A remote chat @@ -10879,7 +11910,7 @@ function TeamSidebar(props) { }, [roster, updated]); const main = roster.byId[roster.mainBotId]; const readOnlySaid2 = typeof roster.readOnly === "string" && roster.readOnly.trim() !== ""; - const readOnlyReload = (0, import_react19.createElement)("button", { + const readOnlyReload = (0, import_react21.createElement)("button", { type: "button", className: "bt-read-only-reload", onClick: () => { @@ -10887,12 +11918,27 @@ function TeamSidebar(props) { } }, t("Reload")); const structure = useSidebarStructure(); - const [collapsed, setCollapsed] = (0, import_react19.useState)({}); + const [collapsed, setCollapsed] = (0, import_react21.useState)({}); + const [sessionFilter, setSessionFilter] = (0, import_react21.useState)("all"); const toggle = (id) => setCollapsed((value) => ({ ...value, [id]: !value[id] })); const inTree = (entry) => entry.kind === "bot" && !entry.item.remote; const listed = (entry) => inTree(entry) && structure?.include?.(entry.item.id) !== false; - const tree = structure && wide && main ? botTree([main, ...order.filter(listed).map((entry) => entry.item)], main.id, (id) => structure.parentOf(id)) : null; - useListGlide(listRef, wide, order.map((entry) => entry.item.id).join(",")); + const statusMap = props.useSessionStatus ? props.useSessionStatus((value) => value) : void 0; + const unreadIds = (0, import_react21.useMemo)(() => { + const ids = /* @__PURE__ */ new Set(); + const consider = (entry) => { + if (entry?.item && sessionIsUnread(entry, statusMap, markedUnread)) ids.add(entry.item.id); + }; + if (main) consider({ kind: "bot", item: main }); + for (const entry of order) consider(entry); + return ids; + }, [order, main, statusMap, markedUnread]); + const showTree = Boolean(structure && wide && main && (sessionFilter === "all" || sessionFilter === "direct")); + const tree = showTree ? botTree([main, ...order.filter(listed).map((entry) => entry.item)], main.id, (id) => structure.parentOf(id)) : null; + const visibleOrder = order.filter((entry) => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false) && matchesSessionFilter(entry, sessionFilter, unreadIds.has(entry.item.id))); + const showMain = !tree && main && matchesSessionFilter({ kind: "bot", item: main }, sessionFilter, unreadIds.has(main.id)); + const filterEmpty = roster.ready && !showMain && !tree && visibleOrder.length === 0 ? sessionFilterEmpty(sessionFilter) : null; + useListGlide(listRef, wide, [showMain && main ? main.id : null, ...visibleOrder.map((entry) => entry.item.id)].filter(Boolean).join(",")); useLandOnMainBot(roster, useSessions, actions); const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide }; const typeToSearch = (event) => { @@ -10901,46 +11947,59 @@ function TeamSidebar(props) { event.preventDefault(); actions.openPalette(event.key); }; - return (0, import_react19.createElement)( + const sideTop = wide ? (0, import_react21.createElement)( "div", - { className: wide ? "bt-side" : "bt-side bt-rail", onKeyDown: typeToSearch }, - wide ? (0, import_react19.createElement)( - "div", - { className: "bt-side-top" }, - (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)( - import_react19.Fragment, - null, - (0, import_react19.createElement)(UpdateButton, { useUpdate: props.useUpdate, 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)) - ), - wide && readOnlySaid2 ? (0, import_react19.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null, + { className: "bt-side-top" }, + (0, import_react21.createElement)("span", { className: "bt-brand" }, (0, import_react21.createElement)(BrandMark, { size: 22 }), (0, import_react21.createElement)(BrandName)), + (0, import_react21.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }), + (0, import_react21.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react21.createElement)(SearchIcon)), + (0, import_react21.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react21.createElement)(PlusIcon)) + ) : (0, import_react21.createElement)( + import_react21.Fragment, + null, + (0, import_react21.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }), + (0, import_react21.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react21.createElement)(PlusIcon)) + ); + const sideBody = [ + wide && readOnlySaid2 ? (0, import_react21.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null, wide && readOnlySaid2 ? readOnlyReload : null, - !wide && readOnlySaid2 ? (0, import_react19.createElement)("div", { className: "bt-hint bt-read-only", role: "status", title: hostText(roster.readOnly), "aria-label": hostText(roster.readOnly) }, hostText(roster.readOnly)) : null, + !wide && readOnlySaid2 ? (0, import_react21.createElement)("div", { className: "bt-hint bt-read-only", role: "status", title: hostText(roster.readOnly), "aria-label": hostText(roster.readOnly) }, hostText(roster.readOnly)) : null, !wide && readOnlySaid2 ? readOnlyReload : null, - (0, import_react19.createElement)(InboxRow, { wide, useRoster, useWork: props.useWork, useUi, actions }), - (0, import_react19.createElement)(KanbanRow, { wide, useUi, actions }), - (0, import_react19.createElement)(ProjectsNav, { wide }), - (0, import_react19.createElement)( + (0, import_react21.createElement)(InboxRow, { wide, useRoster, useWork: props.useWork, useUi, actions }), + (0, import_react21.createElement)(KanbanRow, { wide, useUi, actions }), + (0, import_react21.createElement)(ProjectsNav, { wide }), + wide ? (0, import_react21.createElement)(SessionFilter, { value: sessionFilter, onChange: setSessionFilter }) : null, + (0, import_react21.createElement)( "div", { ref: listRef, className: "bt-list", role: "region", "aria-label": t("Bot list") }, - tree ? (0, import_react19.createElement)("div", { className: "bt-tree", role: "group", "aria-label": t("Bot tree") }, tree.map((node) => (0, import_react19.createElement)(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions }))) : 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…")), - order.filter((entry) => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false)).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 })), - wide ? (0, import_react19.createElement)(FlyBotSections, { roster, actions, renderBot: (bot) => (0, import_react19.createElement)(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null + tree ? (0, import_react21.createElement)("div", { className: "bt-tree", role: "group", "aria-label": t("Bot tree") }, tree.map((node) => (0, import_react21.createElement)(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions }))) : showMain ? (0, import_react21.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react21.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")), + visibleOrder.map((entry) => entry.kind === "bot" ? (0, import_react21.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react21.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react21.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true })), + filterEmpty ? (0, import_react21.createElement)("div", { className: "bt-hint bt-session-filter-empty" }, filterEmpty) : null, + wide && sessionFilter === "all" ? (0, import_react21.createElement)(FlyBotSections, { roster, actions, renderBot: (bot) => (0, import_react21.createElement)(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null ) + ]; + const iconRail = wide ? (0, import_react21.createElement)( + "nav", + { className: "bt-icon-rail", "aria-label": t("FlyBot") }, + (0, import_react21.createElement)("span", { className: "bt-brand-rail", title: t("FlyBot") }, (0, import_react21.createElement)(BrandMark, { size: 28 })), + (0, import_react21.createElement)("button", { type: "button", className: "bt-rail-btn", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react21.createElement)(SearchIcon)), + (0, import_react21.createElement)("button", { type: "button", className: "bt-rail-btn", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react21.createElement)(PlusIcon)) + ) : null; + return (0, import_react21.createElement)( + "div", + { className: wide ? "bt-side bt-side-split" : "bt-side bt-rail", onKeyDown: typeToSearch }, + iconRail, + wide ? (0, import_react21.createElement)("div", { className: "bt-chat-col" }, sideTop, ...sideBody) : (0, import_react21.createElement)(import_react21.Fragment, null, sideTop, ...sideBody) ); } function UpdateButton({ useUpdate, actions }) { const update = useUpdate((value) => value); - const [open, setOpen] = (0, import_react19.useState)(false); - const [box, setBox] = (0, import_react19.useState)(null); - const [error, setError] = (0, import_react19.useState)(""); - const [dshError, setDshError] = (0, import_react19.useState)(""); - const button = (0, import_react19.useRef)(null); - (0, import_react19.useEffect)(() => { + const [open, setOpen] = (0, import_react21.useState)(false); + const [box, setBox] = (0, import_react21.useState)(null); + const [error, setError] = (0, import_react21.useState)(""); + const [dshError, setDshError] = (0, import_react21.useState)(""); + const button = (0, import_react21.useRef)(null); + (0, import_react21.useEffect)(() => { if (!open) return void 0; const onDown = (event) => { if (event.target instanceof Element && (event.target.closest(".bt-update-pop") || button.current?.contains(event.target))) return; @@ -10983,10 +12042,10 @@ function UpdateButton({ useUpdate, actions }) { const message = error || (phase === "failed" ? update.error : ""); const dshMessage = dshError || (dshPhase === "failed" ? dsh?.error : ""); const dshText = dshPhase === "installed" ? t("Restart DSH to start using DSH {version}.", { version: dsh.installed ?? dsh.verified }) : dsh?.available === false && dsh?.blockedBy ? t("Update FlyBot core {version} first.", { version: dsh.blockedBy }) : t("You have {version}.", { version: dsh?.current }); - return (0, import_react19.createElement)( - import_react19.Fragment, + return (0, import_react21.createElement)( + import_react21.Fragment, null, - (0, import_react19.createElement)("button", { + (0, import_react21.createElement)("button", { ref: button, type: "button", className: "bt-round bt-update", @@ -10996,21 +12055,21 @@ function UpdateButton({ useUpdate, actions }) { "aria-haspopup": "dialog", "aria-expanded": open, onClick: toggle - }, (0, import_react19.createElement)(CloudDownloadIcon, { done: phase === "installed" }), phase === "failed" || dshPhase === "failed" ? (0, import_react19.createElement)("span", { className: "bt-update-dot", "aria-hidden": true }) : null), - open && box ? (0, import_react_dom4.createPortal)((0, import_react19.createElement)( + }, (0, import_react21.createElement)(CloudDownloadIcon, { done: phase === "installed" }), phase === "failed" || dshPhase === "failed" ? (0, import_react21.createElement)("span", { className: "bt-update-dot", "aria-hidden": true }) : null), + open && box ? (0, import_react_dom4.createPortal)((0, import_react21.createElement)( "div", { className: "bt-update-pop", role: "dialog", "aria-label": update?.available || phase !== "idle" ? t("FlyBot core update") : t("DSH update"), style: box }, - update?.available || phase !== "idle" ? (0, import_react19.createElement)( - import_react19.Fragment, + update?.available || phase !== "idle" ? (0, import_react21.createElement)( + import_react21.Fragment, null, - (0, import_react19.createElement)("div", { className: "bt-update-title" }, phase === "installed" ? t("Update installed") : t("FlyBot core {version}", { version: update.latest })), - (0, import_react19.createElement)("div", { className: "bt-update-text" }, phase === "installed" ? t("Restart DSH to start using FlyBot core {version}.", { version: update.installed ?? update.latest }) : t("You have {version}.", { version: update.current })), - message ? (0, import_react19.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: message })) : null, - (0, import_react19.createElement)( + (0, import_react21.createElement)("div", { className: "bt-update-title" }, phase === "installed" ? t("Update installed") : t("FlyBot core {version}", { version: update.latest })), + (0, import_react21.createElement)("div", { className: "bt-update-text" }, phase === "installed" ? t("Restart DSH to start using FlyBot core {version}.", { version: update.installed ?? update.latest }) : t("You have {version}.", { version: update.current })), + message ? (0, import_react21.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: message })) : null, + (0, import_react21.createElement)( "div", { className: "bt-update-actions" }, - update.notesUrl ? (0, import_react19.createElement)("a", { className: "bt-update-notes", href: update.notesUrl, target: "_blank", rel: "noopener noreferrer" }, t("What's new")) : null, - phase === "installed" ? null : (0, import_react19.createElement)("button", { + update.notesUrl ? (0, import_react21.createElement)("a", { className: "bt-update-notes", href: update.notesUrl, target: "_blank", rel: "noopener noreferrer" }, t("What's new")) : null, + phase === "installed" ? null : (0, import_react21.createElement)("button", { type: "button", className: "bt-update-go", disabled: phase === "installing", @@ -11018,17 +12077,17 @@ function UpdateButton({ useUpdate, actions }) { }, phase === "installing" ? t("Updating…") : phase === "failed" ? t("Try again") : t("Update")) ) ) : null, - dshRow ? (0, import_react19.createElement)( + dshRow ? (0, import_react21.createElement)( "div", { className: "bt-update-dsh" }, - (0, import_react19.createElement)("div", { className: "bt-update-title" }, t("DSH {version}", { version: dsh.verified })), - (0, import_react19.createElement)("div", { className: "bt-update-text" }, dshText), - dshMessage ? (0, import_react19.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: dshMessage })) : null, - (0, import_react19.createElement)( + (0, import_react21.createElement)("div", { className: "bt-update-title" }, t("DSH {version}", { version: dsh.verified })), + (0, import_react21.createElement)("div", { className: "bt-update-text" }, dshText), + dshMessage ? (0, import_react21.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: dshMessage })) : null, + (0, import_react21.createElement)( "div", { className: "bt-update-actions" }, - dsh.kind === "app" ? dsh.available ? (0, import_react19.createElement)("button", { type: "button", className: "bt-update-go", onClick: () => void actions.openAppUpdates(dsh.verified).catch(() => { - }) }, t("Open updates")) : null : !dsh.available && dshPhase === "idle" ? null : dshPhase === "installed" ? null : (0, import_react19.createElement)("button", { + dsh.kind === "app" ? dsh.available ? (0, import_react21.createElement)("button", { type: "button", className: "bt-update-go", onClick: () => void actions.openAppUpdates(dsh.verified).catch(() => { + }) }, t("Open updates")) : null : !dsh.available && dshPhase === "idle" ? null : dshPhase === "installed" ? null : (0, import_react21.createElement)("button", { type: "button", className: "bt-update-go", disabled: dshPhase === "installing", @@ -11041,23 +12100,23 @@ function UpdateButton({ useUpdate, actions }) { } function ConnectApps({ wide, actions }) { if (!wide) return null; - return (0, import_react19.createElement)( + return (0, import_react21.createElement)( "span", { className: "bt-connect-wrap" }, - (0, import_react19.createElement)( + (0, import_react21.createElement)( "button", { type: "button", className: "bt-connect bt-connect-foot", onClick: () => actions.openConnectors() }, - (0, import_react19.createElement)(PlugIcon), + (0, import_react21.createElement)(PlugIcon), t("Connect apps") ) ); } function YouAvatar() { - return (0, import_react19.createElement)( + return (0, import_react21.createElement)( "span", { className: "bt-you-wrap" }, - (0, import_react19.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react19.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })), - (0, import_react19.createElement)("span", { style: { position: "absolute", width: 1, height: 1, overflow: "hidden", clip: "rect(0 0 0 0)" } }, t("Settings")) + (0, import_react21.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react21.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })), + (0, import_react21.createElement)("span", { style: { position: "absolute", width: 1, height: 1, overflow: "hidden", clip: "rect(0 0 0 0)" } }, t("Settings")) ); } var openShellSettings = null; @@ -11089,7 +12148,7 @@ function openHarnessOnboarding(id) { var MODELS_STEP_ID = "flybot-models"; var MODELS_STEP_ORDER = 1e3; function ModelsSettingsStep({ explicit, complete, openSection }) { - (0, import_react19.useLayoutEffect)(() => { + (0, import_react21.useLayoutEffect)(() => { if (explicit) openSection("models"); complete(); }, []); @@ -11127,32 +12186,32 @@ function pressSettingsShortcut() { })); } function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboarding, actions }) { - const [open, setOpen] = (0, import_react19.useState)(false); - (0, import_react19.useLayoutEffect)(() => { + const [open, setOpen] = (0, import_react21.useState)(false); + (0, import_react21.useLayoutEffect)(() => { if (!seat) return void 0; actions.seatAccount(true); return () => actions.seatAccount(false); }, [seat]); - const [box, setBox] = (0, import_react19.useState)(null); - const button = (0, import_react19.useRef)(null); - (0, import_react19.useEffect)(() => { + const [box, setBox] = (0, import_react21.useState)(null); + const button = (0, import_react21.useRef)(null); + (0, import_react21.useEffect)(() => { if (settingsOpen) setOpen(false); }, [settingsOpen]); - (0, import_react19.useEffect)(() => { + (0, import_react21.useEffect)(() => { if (!openSettings) return void 0; openShellSettings = openSettings; return () => { if (openShellSettings === openSettings) openShellSettings = null; }; }, [openSettings]); - (0, import_react19.useEffect)(() => { + (0, import_react21.useEffect)(() => { if (!openOnboarding) return void 0; openShellOnboarding = openOnboarding; return () => { if (openShellOnboarding === openOnboarding) openShellOnboarding = null; }; }, [openOnboarding]); - (0, import_react19.useEffect)(() => { + (0, import_react21.useEffect)(() => { if (!open) return void 0; const onDown = (event) => { if (event.target instanceof Element && (event.target.closest(".bt-account-menu") || button.current?.contains(event.target))) return; @@ -11181,6 +12240,7 @@ function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboardi [ [t("Usage"), GaugeIcon, () => actions.openSettings("usage")], [t("Connect apps"), ConnectorIcon, () => actions.openConnectors()], + [t("Channels"), ConnectorIcon, () => actions.openSettings("channels")], [t("Plugins"), PlugIcon, () => actions.selectPanel("plugins")], [t("Scheduled tasks"), ClockIcon, () => actions.openSettings("schedules")], [t("Settings"), GearIcon, () => actions.openSettings("general")] @@ -11189,23 +12249,23 @@ function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboardi [t("Switch to classic Agent mode"), SwitchIcon, () => actions.setSurface("agent")] ] ]; - return (0, import_react19.createElement)( - import_react19.Fragment, + return (0, import_react21.createElement)( + import_react21.Fragment, null, - (0, import_react19.createElement)( + (0, import_react21.createElement)( "button", { ref: button, type: "button", className: "bt-account", "aria-label": t("Account"), "aria-haspopup": "menu", "aria-expanded": open, onClick: toggle }, - (0, import_react19.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react19.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })) + (0, import_react21.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react21.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })) ), - open && box ? (0, import_react_dom4.createPortal)((0, import_react19.createElement)( + open && box ? (0, import_react_dom4.createPortal)((0, import_react21.createElement)( "div", { className: "bt-menu bt-menu-up bt-account-menu", role: "menu", "aria-label": t("Account"), style: box }, - (0, import_react19.createElement)(FlyBotAccountHeader, { actions }), - groups.map((group, index) => (0, import_react19.createElement)( - import_react19.Fragment, + (0, import_react21.createElement)(FlyBotAccountHeader, { actions }), + groups.map((group, index) => (0, import_react21.createElement)( + import_react21.Fragment, { key: index }, - index > 0 ? (0, import_react19.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, - group.map(([label, Icon, run, hint]) => (0, import_react19.createElement)("button", { + index > 0 ? (0, import_react21.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, + group.map(([label, Icon, run, hint]) => (0, import_react21.createElement)("button", { key: label, type: "button", role: "menuitem", @@ -11213,7 +12273,7 @@ function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboardi setOpen(false); void Promise.resolve(run()).catch((error) => actions.reportError(error, "menu")); } - }, (0, import_react19.createElement)(Icon), (0, import_react19.createElement)("span", { className: "bt-menu-label" }, label), hint ? (0, import_react19.createElement)("span", { className: "bt-menu-hint" }, hint) : null)) + }, (0, import_react21.createElement)(Icon), (0, import_react21.createElement)("span", { className: "bt-menu-label" }, label), hint ? (0, import_react21.createElement)("span", { className: "bt-menu-hint" }, hint) : null)) )) ), document.body) : null ); @@ -11223,8 +12283,8 @@ function useLandOnMainBot(roster, useSessions, actions) { const row = Object.values(list.byId).find((session) => (session?.retainedBy?.mainView ?? 0) > 0); return row ? `${row.id}|${row.blank ? 1 : 0}` : ""; }); - const lastBot = (0, import_react19.useRef)(null); - (0, import_react19.useEffect)(() => { + const lastBot = (0, import_react21.useRef)(null); + (0, import_react21.useEffect)(() => { if (!roster.ready || !roster.mainBotId) return void 0; const [id, blank3] = mainView.split("|"); const bot = id === "" ? void 0 : roster.byId[id]; @@ -11245,16 +12305,16 @@ function useLandOnMainBot(roster, useSessions, actions) { function FooterAccount(props) { const seated = props.useUi((value) => value.accountSeated === true); if (seated) return null; - return (0, import_react19.createElement)("span", { className: "bt-foot-account" }, (0, import_react19.createElement)(AccountLauncher, { ...props, seat: false })); + return (0, import_react21.createElement)("span", { className: "bt-foot-account" }, (0, import_react21.createElement)(AccountLauncher, { ...props, seat: false })); } function BotReturn({ wide, useSurface, actions }) { const mode = useSurface((value) => value.mode); if (mode !== "agent") return null; - return (0, import_react19.createElement)( + return (0, import_react21.createElement)( "button", { type: "button", className: "bt-return", "aria-label": t("FlyBot"), title: t("FlyBot"), onClick: () => actions.setSurface("bot") }, - (0, import_react19.createElement)(FlyBotMark, { size: 20 }), - wide ? (0, import_react19.createElement)("span", { className: "bt-return-name" }, t("FlyBot")) : null + (0, import_react21.createElement)(FlyBotMark, { size: 20 }), + wide ? (0, import_react21.createElement)("span", { className: "bt-return-name" }, t("FlyBot")) : null ); } var RETURN_CSS = ` @@ -11268,12 +12328,16 @@ var RETURN_CSS = ` .bt-return-name{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} `; function BrandMark({ size = 24 }) { - return (0, import_react19.createElement)("span", { className: "bt-brand-mark" }, (0, import_react19.createElement)(FlyBotMark, { size })); + return (0, import_react21.createElement)("span", { className: "bt-brand-mark" }, (0, import_react21.createElement)(FlyBotMark, { size })); } function BrandName() { - return (0, import_react19.createElement)("span", { style: { fontWeight: 600, fontSize: 14 } }, t("FlyBot")); + return (0, import_react21.createElement)("span", { style: { fontWeight: 600, fontSize: 14 } }, t("FlyBot")); } var SIDEBAR_CSS = ` +.bt-session-filter{display:flex;flex-wrap:wrap;gap:4px;padding:8px 10px 2px;flex:none} +.bt-session-filter-btn{height:26px;padding:0 10px;border:.5px solid var(--bt-line);border-radius:999px;background:transparent;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:26px;cursor:pointer} +.bt-session-filter-btn[aria-checked=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink);font-weight:600} +.bt-session-filter-empty{padding:16px 12px;text-align:center} .bt-side-top .bt-brand{cursor:default;padding-left:6px} .bt-side-top .bt-brand:hover{background:none} .bt-brand .bt-mark{flex:none} @@ -11375,11 +12439,11 @@ function roomBusyAckVisible({ ack, pendingBusy }) { } // src/client/busy-ack.js -var import_react20 = require("react"); +var import_react22 = require("react"); var import_react_dom5 = require("react-dom"); function useRunningHost2(active) { - const [host, setHost] = (0, import_react20.useState)(null); - (0, import_react20.useEffect)(() => { + const [host, setHost] = (0, import_react22.useState)(null); + (0, import_react22.useEffect)(() => { if (!active) { setHost(null); return void 0; @@ -11413,11 +12477,11 @@ function BusyAckBubble({ sessionId, useRoster, useBusyAcks, useSessionStatus, us const visible = room2 ? roomBusyAckVisible({ ack: memberAck, pendingBusy }) : running && busyAckVisible({ hostAck, pendingBusy, streamingText }); const bot = room2 ? roster.byId[memberAck?.botId] : roster.byId[sessionId]; const host = useRunningHost2(visible); - const shown = (0, import_react20.useRef)(null); + const shown = (0, import_react22.useRef)(null); if (visible) shown.current = room2 ? { text: memberAck?.text ?? "", at: memberAck?.at ?? Date.now() } : { text: busyAckText(hostAck), at: hostAck?.at ?? Date.now() }; const text2 = shown.current?.text ?? ""; if (!visible || !host || !shown.current || !bot) return null; - return (0, import_react_dom5.createPortal)((0, import_react20.createElement)( + return (0, import_react_dom5.createPortal)((0, import_react22.createElement)( "div", { className: "bt-busy-ack", @@ -11427,22 +12491,22 @@ function BusyAckBubble({ sessionId, useRoster, useBusyAcks, useSessionStatus, us "aria-busy": text2 ? void 0 : "true", "data-pending": text2 ? void 0 : "" }, - (0, import_react20.createElement)(BotMark, { bot, size: 28, state: "thinking", live: true }), - (0, import_react20.createElement)( + (0, import_react22.createElement)(BotMark, { bot, size: 28, state: "thinking", live: true }), + (0, import_react22.createElement)( "div", { className: "bt-astack" }, - (0, import_react20.createElement)( + (0, import_react22.createElement)( "div", { className: "bt-msg" }, - (0, import_react20.createElement)( + (0, import_react22.createElement)( "div", { className: "bt-msg-line" }, - text2 ? (0, import_react20.createElement)("div", { className: "bt-bubble" }, text2) : (0, import_react20.createElement)( + text2 ? (0, import_react22.createElement)("div", { className: "bt-bubble" }, text2) : (0, import_react22.createElement)( "div", { className: "bt-bubble bt-busy-dots", "aria-hidden": "true" }, - (0, import_react20.createElement)("span", null), - (0, import_react20.createElement)("span", null), - (0, import_react20.createElement)("span", null) + (0, import_react22.createElement)("span", null), + (0, import_react22.createElement)("span", null), + (0, import_react22.createElement)("span", null) ) ) ) @@ -11461,7 +12525,7 @@ var BUSY_ACK_CSS = ` `; // src/client/project-board.js -var import_react21 = require("react"); +var import_react23 = require("react"); var PROJECT_BOARD_CSS = ` /* #1750: the board was a short dialog in the page flow — no stylesheet defines 'bt-overlay', so the bot tree and workflows stayed legible under its rows. It is a modal now, on the same tier as the @@ -11765,7 +12829,7 @@ function projectBoardView({ project, rows, done, canManage, tasks, decisions, me } function projectRowNode(row, onOpen) { const open = row.board === null ? void 0 : () => onOpen?.(row.board); - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "div", { key: row.key, @@ -11780,38 +12844,38 @@ function projectRowNode(row, onOpen) { if (event.key === "Enter" || event.key === " ") open(); } }, - (0, import_react21.createElement)("span", { className: "bt-project-column" }, t(row.column)), - (0, import_react21.createElement)( + (0, import_react23.createElement)("span", { className: "bt-project-column" }, t(row.column)), + (0, import_react23.createElement)( "span", { className: "bt-project-title-wrap" }, - (0, import_react21.createElement)("span", { className: "bt-project-title" }, row.title ?? (row.assignee ? `@${row.assignee}` : "—")), + (0, import_react23.createElement)("span", { className: "bt-project-title" }, row.title ?? (row.assignee ? `@${row.assignee}` : "—")), // The audit text the row already carries (#1730): shown inside the card detail, never a // second read. A row without one renders exactly as before. - row.audit === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-audit" }, row.audit) + row.audit === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-audit" }, row.audit) ), // "Who is doing" is the claim, never the assignee label; a card the Assistant speaks for // says so, so the three identities (Bot, Assistant, user) never read as one. - row.holder === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-holder", "data-holder": row.holder }, `@${row.holder}`), - row.speaksFor === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-speaks-for", "data-speaks-for": row.speaksFor }, t("for {user}", { user: row.speaksFor })), - row.priority === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-priority" }, row.priority), - row.runId === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-ref" }, row.nodeId === null ? row.runId : `${row.runId} · ${row.nodeId}`) + row.holder === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-holder", "data-holder": row.holder }, `@${row.holder}`), + row.speaksFor === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-speaks-for", "data-speaks-for": row.speaksFor }, t("for {user}", { user: row.speaksFor })), + row.priority === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-priority" }, row.priority), + row.runId === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-ref" }, row.nodeId === null ? row.runId : `${row.runId} · ${row.nodeId}`) ); } function ProjectBoardRows({ view, onOpen }) { - if (view.empty) return (0, import_react21.createElement)("div", { className: "bt-project-empty" }, t(view.emptyText)); - return view.groups.map((group) => (0, import_react21.createElement)( + if (view.empty) return (0, import_react23.createElement)("div", { className: "bt-project-empty" }, t(view.emptyText)); + return view.groups.map((group) => (0, import_react23.createElement)( "section", { key: group.source, className: "bt-project-group", "data-source": group.source }, - (0, import_react21.createElement)("h4", null, t(group.label)), + (0, import_react23.createElement)("h4", null, t(group.label)), group.rows.map((row) => projectRowNode(row, onOpen)) )); } function ProjectDoneGroup({ view, onOpen }) { if (view.done.rows.length === 0) return null; - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "details", { className: "bt-project-group bt-project-done", "data-group": "done" }, - (0, import_react21.createElement)("summary", { className: "bt-project-done-summary" }, `${t(view.done.label)} · ${view.done.rows.length}`), + (0, import_react23.createElement)("summary", { className: "bt-project-done-summary" }, `${t(view.done.label)} · ${view.done.rows.length}`), view.done.rows.map((row) => projectRowNode(row, onOpen)) ); } @@ -11892,42 +12956,42 @@ function metricsReasonText(reason) { return named === void 0 ? hostText(code) : t(named[1]); } function ProjectMetrics({ view }) { - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "section", { className: "bt-project-metrics", "data-available": view.available ? "true" : "false" }, - view.available || view.reason === null ? null : (0, import_react21.createElement)("p", { className: "bt-project-metrics-note" }, t("Metrics unavailable: {reason}", { reason: metricsReasonText(view.reason) })), - (0, import_react21.createElement)( + view.available || view.reason === null ? null : (0, import_react23.createElement)("p", { className: "bt-project-metrics-note" }, t("Metrics unavailable: {reason}", { reason: metricsReasonText(view.reason) })), + (0, import_react23.createElement)( "div", { className: "bt-project-metric-cards" }, - view.cards.map((card) => (0, import_react21.createElement)( + view.cards.map((card) => (0, import_react23.createElement)( "div", { key: card.key, className: "bt-project-metric", "data-metric": card.key }, - (0, import_react21.createElement)("span", { className: "bt-project-metric-value" }, card.value), - (0, import_react21.createElement)("span", { className: "bt-project-metric-label" }, t(card.label)), - (0, import_react21.createElement)("span", { className: "bt-project-metric-caption" }, t(card.caption)) + (0, import_react23.createElement)("span", { className: "bt-project-metric-value" }, card.value), + (0, import_react23.createElement)("span", { className: "bt-project-metric-label" }, t(card.label)), + (0, import_react23.createElement)("span", { className: "bt-project-metric-caption" }, t(card.caption)) )) ) ); } function ProjectRunningTable({ view, onOpen }) { - if (view.running.length === 0) return (0, import_react21.createElement)("section", { className: "bt-project-running", "data-running": "0" }, (0, import_react21.createElement)("h4", null, t("Running tasks")), (0, import_react21.createElement)("div", { className: "bt-project-empty" }, t("Nothing is running."))); - return (0, import_react21.createElement)( + if (view.running.length === 0) return (0, import_react23.createElement)("section", { className: "bt-project-running", "data-running": "0" }, (0, import_react23.createElement)("h4", null, t("Running tasks")), (0, import_react23.createElement)("div", { className: "bt-project-empty" }, t("Nothing is running."))); + return (0, import_react23.createElement)( "section", { className: "bt-project-running", "data-running": String(view.running.length) }, - (0, import_react21.createElement)("h4", null, t("Running tasks")), - (0, import_react21.createElement)( + (0, import_react23.createElement)("h4", null, t("Running tasks")), + (0, import_react23.createElement)( "div", { className: "bt-project-running-head" }, - (0, import_react21.createElement)("span", null, t("Task")), - (0, import_react21.createElement)("span", null, t("Status")), - (0, import_react21.createElement)("span", null, t("Who")), - (0, import_react21.createElement)("span", null, t("Claimed for")), - (0, import_react21.createElement)("span", null, t("Source")), - (0, import_react21.createElement)("span", null, t("Last activity")) + (0, import_react23.createElement)("span", null, t("Task")), + (0, import_react23.createElement)("span", null, t("Status")), + (0, import_react23.createElement)("span", null, t("Who")), + (0, import_react23.createElement)("span", null, t("Claimed for")), + (0, import_react23.createElement)("span", null, t("Source")), + (0, import_react23.createElement)("span", null, t("Last activity")) ), view.running.map((row) => { const open = row.board === null ? void 0 : () => onOpen?.(row.board); - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "div", { key: row.key, @@ -11938,25 +13002,25 @@ function ProjectRunningTable({ view, onOpen }) { tabIndex: open === void 0 ? void 0 : 0, onClick: open }, - (0, import_react21.createElement)("span", { className: "bt-project-running-title" }, row.title), - (0, import_react21.createElement)("span", { className: "bt-project-running-status" }, t(row.status)), - (0, import_react21.createElement)("span", null, row.who ?? METRIC_DASH), - (0, import_react21.createElement)("span", null, metricText("since", row.sinceMs)), - (0, import_react21.createElement)("span", null, row.source === null ? METRIC_DASH : t(SOURCE_LABELS[row.source] ?? row.source)), - (0, import_react21.createElement)("span", null, row.lastActivityAt === null ? METRIC_DASH : new Date(row.lastActivityAt).toLocaleString(dateLocale())) + (0, import_react23.createElement)("span", { className: "bt-project-running-title" }, row.title), + (0, import_react23.createElement)("span", { className: "bt-project-running-status" }, t(row.status)), + (0, import_react23.createElement)("span", null, row.who ?? METRIC_DASH), + (0, import_react23.createElement)("span", null, metricText("since", row.sinceMs)), + (0, import_react23.createElement)("span", null, row.source === null ? METRIC_DASH : t(SOURCE_LABELS[row.source] ?? row.source)), + (0, import_react23.createElement)("span", null, row.lastActivityAt === null ? METRIC_DASH : new Date(row.lastActivityAt).toLocaleString(dateLocale())) ); }) ); } function ProjectQueueGroups({ view, onOpen }) { - return view.queues.map((entry) => (0, import_react21.createElement)( + return view.queues.map((entry) => (0, import_react23.createElement)( "section", { key: `queue:${entry.group}`, className: "bt-project-group", "data-queue": entry.group }, - (0, import_react21.createElement)("h4", null, t(entry.label)), + (0, import_react23.createElement)("h4", null, t(entry.label)), entry.items.map((row) => { const open = row.board === null ? void 0 : () => onOpen?.(row.board); - const note = entry.group === "waiting" ? (0, import_react21.createElement)("span", { className: "bt-project-wait" }, [row.role === null ? null : (0, import_react21.createElement)("span", { key: "role", className: "bt-project-role" }, row.role), waitedLabel(row.waitedMs) === null ? null : ` · ${waitedLabel(row.waitedMs)}`]) : entry.group === "inflight" ? (0, import_react21.createElement)("span", { className: "bt-project-state" }, row.holder === null ? t(row.state) : `${row.holder} · ${t(row.state)}`) : (0, import_react21.createElement)("span", { className: "bt-project-reason" }, row.reason === null ? null : waitedLabel(row.waitedMs) === null ? row.reason : `${row.reason} · ${waitedLabel(row.waitedMs)}`); - return (0, import_react21.createElement)( + const note = entry.group === "waiting" ? (0, import_react23.createElement)("span", { className: "bt-project-wait" }, [row.role === null ? null : (0, import_react23.createElement)("span", { key: "role", className: "bt-project-role" }, row.role), waitedLabel(row.waitedMs) === null ? null : ` · ${waitedLabel(row.waitedMs)}`]) : entry.group === "inflight" ? (0, import_react23.createElement)("span", { className: "bt-project-state" }, row.holder === null ? t(row.state) : `${row.holder} · ${t(row.state)}`) : (0, import_react23.createElement)("span", { className: "bt-project-reason" }, row.reason === null ? null : waitedLabel(row.waitedMs) === null ? row.reason : `${row.reason} · ${waitedLabel(row.waitedMs)}`); + return (0, import_react23.createElement)( "div", { key: row.key, @@ -11970,10 +13034,10 @@ function ProjectQueueGroups({ view, onOpen }) { if (event.key === "Enter" || event.key === " ") open(); } }, - (0, import_react21.createElement)( + (0, import_react23.createElement)( "span", { className: "bt-project-title-wrap" }, - (0, import_react21.createElement)("span", { className: "bt-project-title" }, row.title ?? `#${row.id}`) + (0, import_react23.createElement)("span", { className: "bt-project-title" }, row.title ?? `#${row.id}`) ), note ); @@ -11983,7 +13047,7 @@ function ProjectQueueGroups({ view, onOpen }) { var countText = (value) => value === null ? t("unknown") : String(value); function ProjectBoardRecord({ record, projectId, call: call4 }) { const { decisions, meetings } = record; - const [open, setOpen] = (0, import_react21.useState)(null); + const [open, setOpen] = (0, import_react23.useState)(null); const toggle = (path) => { if (open !== null && open.path === path) { setOpen(null); @@ -11997,14 +13061,14 @@ function ProjectBoardRecord({ record, projectId, call: call4 }) { const decisionBody = (file) => { if (open === null || open.path !== file.path) return null; const answer = open.answer; - if (answer === null) return (0, import_react21.createElement)("div", { className: "bt-project-decision-text", "data-open-decision": file.path }, t("Reading the decision…")); - if (answer.ok !== true) return (0, import_react21.createElement)("div", { className: "bt-project-decision-text bt-project-decision-refusal", "data-open-decision": file.path, "data-refused": "true" }, text(answer.reason) || t("not listed")); - return (0, import_react21.createElement)("pre", { className: "bt-project-decision-text", "data-open-decision": file.path }, typeof answer.text === "string" ? answer.text : ""); + if (answer === null) return (0, import_react23.createElement)("div", { className: "bt-project-decision-text", "data-open-decision": file.path }, t("Reading the decision…")); + if (answer.ok !== true) return (0, import_react23.createElement)("div", { className: "bt-project-decision-text bt-project-decision-refusal", "data-open-decision": file.path, "data-refused": "true" }, text(answer.reason) || t("not listed")); + return (0, import_react23.createElement)("pre", { className: "bt-project-decision-text", "data-open-decision": file.path }, typeof answer.text === "string" ? answer.text : ""); }; - const decisionRows = decisions.files.map((file) => (0, import_react21.createElement)( + const decisionRows = decisions.files.map((file) => (0, import_react23.createElement)( "div", { key: file.key, className: "bt-project-decision-wrap" }, - (0, import_react21.createElement)( + (0, import_react23.createElement)( "button", { type: "button", @@ -12015,41 +13079,41 @@ function ProjectBoardRecord({ record, projectId, call: call4 }) { "aria-expanded": open !== null && open.path === file.path ? "true" : "false", onClick: () => toggle(file.path) }, - (0, import_react21.createElement)("span", { className: "bt-project-date" }, file.date), - (0, import_react21.createElement)("span", { className: "bt-project-title" }, file.title === "" ? file.name : file.title), - (0, import_react21.createElement)("span", { className: "bt-project-hash", title: file.sha256 }, file.shortHash) + (0, import_react23.createElement)("span", { className: "bt-project-date" }, file.date), + (0, import_react23.createElement)("span", { className: "bt-project-title" }, file.title === "" ? file.name : file.title), + (0, import_react23.createElement)("span", { className: "bt-project-hash", title: file.sha256 }, file.shortHash) ), decisionBody(file) )); const recipientText = (list) => list.length === 0 ? null : list.map((name) => `@${name}`).join(", "); const proxyText = (meeting) => meeting.participants.filter((participant) => participant.speaksFor !== null).map((participant) => `${participant.name} ${t("for {user}", { user: participant.speaksFor })}`).join(", "); - const proxyRow = (meeting) => proxyText(meeting) === "" ? null : (0, import_react21.createElement)("span", { className: "bt-project-speaks-for", "data-speaks-for": meeting.participants.filter((p) => p.speaksFor !== null).map((p) => p.speaksFor).join(", ") }, proxyText(meeting)); - const levelOf = (meeting) => (0, import_react21.createElement)("span", { className: "bt-project-level", "data-level": meeting.level }, t(meeting.level)); - const decidedRows = meetings.decided.map((meeting) => (0, import_react21.createElement)( + const proxyRow = (meeting) => proxyText(meeting) === "" ? null : (0, import_react23.createElement)("span", { className: "bt-project-speaks-for", "data-speaks-for": meeting.participants.filter((p) => p.speaksFor !== null).map((p) => p.speaksFor).join(", ") }, proxyText(meeting)); + const levelOf = (meeting) => (0, import_react23.createElement)("span", { className: "bt-project-level", "data-level": meeting.level }, t(meeting.level)); + const decidedRows = meetings.decided.map((meeting) => (0, import_react23.createElement)( "div", { key: meeting.key, className: "bt-project-meeting", "data-status": "decided" }, - (0, import_react21.createElement)("span", { className: "bt-project-date" }, meeting.date), - (0, import_react21.createElement)("span", { className: "bt-project-title" }, meeting.question), - meeting.owner === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-owner" }, `@${meeting.owner}`), + (0, import_react23.createElement)("span", { className: "bt-project-date" }, meeting.date), + (0, import_react23.createElement)("span", { className: "bt-project-title" }, meeting.question), + meeting.owner === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-owner" }, `@${meeting.owner}`), proxyRow(meeting), // A decided meeting whose file is gone still reads as decided; the missing path says so // instead of the row disappearing with the file. - meeting.path === "" ? (0, import_react21.createElement)("span", { className: "bt-project-missing" }, "decision file gone") : (0, import_react21.createElement)("span", { className: "bt-project-path" }, meeting.path) + meeting.path === "" ? (0, import_react23.createElement)("span", { className: "bt-project-missing" }, "decision file gone") : (0, import_react23.createElement)("span", { className: "bt-project-path" }, meeting.path) )); - const pendingRows = meetings.pending.map((meeting) => (0, import_react21.createElement)( + const pendingRows = meetings.pending.map((meeting) => (0, import_react23.createElement)( "div", { key: meeting.key, className: "bt-project-meeting", "data-status": meeting.status, "data-level": meeting.level }, - (0, import_react21.createElement)("span", { className: "bt-project-date" }, meeting.date), - (0, import_react21.createElement)("span", { className: "bt-project-title" }, meeting.blockingQuestion === null ? meeting.question : meeting.blockingQuestion), + (0, import_react23.createElement)("span", { className: "bt-project-date" }, meeting.date), + (0, import_react23.createElement)("span", { className: "bt-project-title" }, meeting.blockingQuestion === null ? meeting.question : meeting.blockingQuestion), levelOf(meeting), - recipientText(meeting.recipients) === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-recipients" }, recipientText(meeting.recipients)), - meeting.advance.allowed ? null : (0, import_react21.createElement)("span", { className: "bt-project-paused" }, meeting.advance.reason), + recipientText(meeting.recipients) === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-recipients" }, recipientText(meeting.recipients)), + meeting.advance.allowed ? null : (0, import_react23.createElement)("span", { className: "bt-project-paused" }, meeting.advance.reason), proxyRow(meeting), - (0, import_react21.createElement)("span", { className: "bt-project-status" }, meeting.status) + (0, import_react23.createElement)("span", { className: "bt-project-status" }, meeting.status) )); - const moreLine = (hidden, key) => hidden > 0 ? (0, import_react21.createElement)("div", { key, className: "bt-project-more" }, t("{count} more not shown", { count: hidden })) : null; + const moreLine = (hidden, key) => hidden > 0 ? (0, import_react23.createElement)("div", { key, className: "bt-project-more" }, t("{count} more not shown", { count: hidden })) : null; const emptyLine = (state) => text(state?.host) !== "" ? hostText(state.host) : t(state?.key ?? "", state?.params); - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "section", { className: "bt-project-record", @@ -12058,13 +13122,13 @@ function ProjectBoardRecord({ record, projectId, call: call4 }) { ...decisions.total === null ? {} : { "data-decisions-total": String(decisions.total) }, "data-meetings": String(meetings.count) }, - (0, import_react21.createElement)("h4", null, t("Decisions")), - decisions.empty ? (0, import_react21.createElement)("div", { className: "bt-project-empty bt-project-record-empty" }, emptyLine(decisions.emptyText)) : decisionRows, + (0, import_react23.createElement)("h4", null, t("Decisions")), + decisions.empty ? (0, import_react23.createElement)("div", { className: "bt-project-empty bt-project-record-empty" }, emptyLine(decisions.emptyText)) : decisionRows, moreLine(decisions.hidden, "decisions-more"), - (0, import_react21.createElement)("h4", null, t("Meetings")), - meetings.empty ? (0, import_react21.createElement)("div", { className: "bt-project-empty bt-project-record-empty" }, emptyLine(meetings.emptyText)) : decidedRows, + (0, import_react23.createElement)("h4", null, t("Meetings")), + meetings.empty ? (0, import_react23.createElement)("div", { className: "bt-project-empty bt-project-record-empty" }, emptyLine(meetings.emptyText)) : decidedRows, moreLine(meetings.decidedHidden, "decided-more"), - meetings.pending.length === 0 ? null : (0, import_react21.createElement)("h5", null, t("Not decided")), + meetings.pending.length === 0 ? null : (0, import_react23.createElement)("h5", null, t("Not decided")), meetings.pending.length === 0 ? null : pendingRows, moreLine(meetings.pendingHidden, "pending-more") ); @@ -12093,7 +13157,7 @@ function projectTeamView(project) { choices: idList(project?.choices) }; } -var teamRow = (role, label, botId, onOpenBot, onOpenDossier) => (0, import_react21.createElement)( +var teamRow = (role, label, botId, onOpenBot, onOpenDossier) => (0, import_react23.createElement)( "div", { key: role, @@ -12114,11 +13178,11 @@ var teamRow = (role, label, botId, onOpenBot, onOpenDossier) => (0, import_react } } }, - (0, import_react21.createElement)("span", { key: "label", className: "bt-project-team-label" }, label), - botId === "" ? (0, import_react21.createElement)("span", { key: "value", className: "bt-project-missing" }, t("Not set")) : (0, import_react21.createElement)("span", { key: "value", className: "bt-project-team-bot" }, `@${botId}`), + (0, import_react23.createElement)("span", { key: "label", className: "bt-project-team-label" }, label), + botId === "" ? (0, import_react23.createElement)("span", { key: "value", className: "bt-project-missing" }, t("Not set")) : (0, import_react23.createElement)("span", { key: "value", className: "bt-project-team-bot" }, `@${botId}`), // #1864: the dossier control sits inside the row, so the row still opens the chat (#1860) and a // reader can look a Bot up first. A row with no Bot keeps the control: its panel reads "not set". - (0, import_react21.createElement)("button", { + (0, import_react23.createElement)("button", { key: "dossier", type: "button", className: "bt-project-team-dossier", @@ -12140,31 +13204,31 @@ var teamRow = (role, label, botId, onOpenBot, onOpenDossier) => (0, import_react var POOL_RANKS = [["owner", "owner"], ["maintainer", "maintainers"], ["member", "members"]]; function ProjectTeam({ project, onOpenBot, onOpenDossier }) { const view = projectTeamView(project); - const poolId = (id) => (0, import_react21.createElement)("span", { key: id }, `@${id}`); - const ranks = view.empty ? (0, import_react21.createElement)("span", { className: "bt-project-missing" }, t("No one in this pool yet.")) : (0, import_react21.createElement)( + const poolId = (id) => (0, import_react23.createElement)("span", { key: id }, `@${id}`); + const ranks = view.empty ? (0, import_react23.createElement)("span", { className: "bt-project-missing" }, t("No one in this pool yet.")) : (0, import_react23.createElement)( "span", { className: "bt-project-team-roles" }, - POOL_RANKS.map(([role, key]) => view.roles[key].length === 0 ? null : (0, import_react21.createElement)( + POOL_RANKS.map(([role, key]) => view.roles[key].length === 0 ? null : (0, import_react23.createElement)( "span", { key: role, className: "bt-project-team-role", "data-pool-role": role }, `${roleText(role)}: `, view.roles[key].map((id) => poolId(id)) )) ); - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "section", { className: "bt-project-team", "data-team": "chief,agent,pool" }, - (0, import_react21.createElement)("h4", null, t("Project team")), + (0, import_react23.createElement)("h4", null, t("Project team")), teamRow("chief", t("Project Chief"), view.chief, onOpenBot, onOpenDossier), teamRow("agent", t("My agent"), view.agent, onOpenBot, onOpenDossier), - (0, import_react21.createElement)( + (0, import_react23.createElement)( "div", { key: "pool", className: "bt-project-team-row", "data-team-role": "pool" }, - (0, import_react21.createElement)("span", { key: "label", className: "bt-project-team-label" }, t("Role pool")), + (0, import_react23.createElement)("span", { key: "label", className: "bt-project-team-label" }, t("Role pool")), ranks, // The caller's own rank and what the host said they may switch to: the same answer the // sidebar menu reads, printed where the pool is. - view.role === "" ? null : (0, import_react21.createElement)( + view.role === "" ? null : (0, import_react23.createElement)( "span", { key: "mine", className: "bt-project-team-myrole", "data-team-my-role": view.role }, [ @@ -12183,10 +13247,10 @@ function dossierRowOf(team, botId) { const rows = Array.isArray(team?.rows) ? team.rows : []; return rows.find((row) => row !== null && typeof row === "object" && text(row.botId) === id) ?? null; } -var dossierSection = (title, children) => (0, import_react21.createElement)( +var dossierSection = (title, children) => (0, import_react23.createElement)( "div", { key: title, className: "bt-project-dossier-section" }, - (0, import_react21.createElement)("h4", null, title), + (0, import_react23.createElement)("h4", null, title), children ); function ProjectDossierPanel({ row, label, onClose, onOpenBot } = {}) { @@ -12195,35 +13259,35 @@ function ProjectDossierPanel({ row, label, onClose, onOpenBot } = {}) { const topics = known && Array.isArray(row.memory?.topics) ? row.memory.topics.map((name) => text(name)).filter((name) => name !== "") : []; const skills = known && Array.isArray(row.skills) ? row.skills.map((name) => text(name)).filter((name) => name !== "") : []; const meta = known ? [text(row.role), text(row.model)].filter((value) => value !== "") : []; - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "div", { className: "bt-project-panel bt-project-dossier", "data-panel": "project-dossier", "data-dossier-bot": botId === "" ? void 0 : botId }, - (0, import_react21.createElement)("h3", null, label === "" || label === void 0 ? t("Dossier") : `${label} · ${t("Dossier")}`), + (0, import_react23.createElement)("h3", null, label === "" || label === void 0 ? t("Dossier") : `${label} · ${t("Dossier")}`), known ? [ dossierSection(t("Persona"), [ - meta.length === 0 ? null : (0, import_react21.createElement)("div", { key: "meta", className: "bt-project-dossier-meta" }, meta.map((value) => (0, import_react21.createElement)("span", { key: value }, value))), - (0, import_react21.createElement)("p", { key: "persona", className: "bt-project-dossier-text" }, text(row.persona) || t("Not set")) + meta.length === 0 ? null : (0, import_react23.createElement)("div", { key: "meta", className: "bt-project-dossier-meta" }, meta.map((value) => (0, import_react23.createElement)("span", { key: value }, value))), + (0, import_react23.createElement)("p", { key: "persona", className: "bt-project-dossier-text" }, text(row.persona) || t("Not set")) ]), dossierSection(t("Memory"), [ - (0, import_react21.createElement)("p", { key: "head", className: "bt-project-dossier-text" }, text(row.memory?.head) || t("No memory yet.")), - topics.length === 0 ? null : (0, import_react21.createElement)("div", { key: "topics", className: "bt-project-dossier-topics" }, topics.map((topic) => (0, import_react21.createElement)("span", { key: topic, className: "bt-project-dossier-topic" }, topic))) + (0, import_react23.createElement)("p", { key: "head", className: "bt-project-dossier-text" }, text(row.memory?.head) || t("No memory yet.")), + topics.length === 0 ? null : (0, import_react23.createElement)("div", { key: "topics", className: "bt-project-dossier-topics" }, topics.map((topic) => (0, import_react23.createElement)("span", { key: topic, className: "bt-project-dossier-topic" }, topic))) ]), - dossierSection(t("Skills"), (0, import_react21.createElement)("p", { key: "skills", className: "bt-project-dossier-text" }, skills.length === 0 ? t("No skills attached.") : skills.join(", "))) - ] : (0, import_react21.createElement)("p", { className: "bt-project-missing" }, t("Not set")), - botId === "" || !known ? null : (0, import_react21.createElement)( + dossierSection(t("Skills"), (0, import_react23.createElement)("p", { key: "skills", className: "bt-project-dossier-text" }, skills.length === 0 ? t("No skills attached.") : skills.join(", "))) + ] : (0, import_react23.createElement)("p", { className: "bt-project-missing" }, t("Not set")), + botId === "" || !known ? null : (0, import_react23.createElement)( "div", { key: "actions", className: "bt-project-row-actions" }, - (0, import_react21.createElement)("button", { + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-open-bot": botId, onClick: () => onOpenBot?.(botId) }, t("Open chat")) ), - (0, import_react21.createElement)( + (0, import_react23.createElement)( "div", { className: "bt-project-row-actions" }, - (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) ) ); } @@ -12238,7 +13302,7 @@ function projectAgentFor(bot, selfId) { } function ProjectAgentEntry({ projectId, read, onOpen } = {}) { const present = useProjectPresent(); - const [agentId, setAgentId] = (0, import_react21.useState)(""); + const [agentId, setAgentId] = (0, import_react23.useState)(""); const id = text(projectId); const open = async () => { let target = agentId; @@ -12254,7 +13318,7 @@ function ProjectAgentEntry({ projectId, read, onOpen } = {}) { if (target !== "") onOpen?.(target); }; if (id === "" || !present) return null; - return (0, import_react21.createElement)("button", { + return (0, import_react23.createElement)("button", { type: "button", className: "bt-project-agent-entry", "data-project-agent": id, @@ -12266,58 +13330,58 @@ function ProjectAgentEntry({ projectId, read, onOpen } = {}) { } function ProjectBoardPane({ project, rows, done, canManage, tasks, decisions, meetings, queues, metrics, onOpen, onSettings, onMembers, onOpenBot, onOpenDossier, call: call4 }) { const view = projectBoardView({ project, rows, done, canManage, tasks, decisions, meetings, queues, metrics }); - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "div", { className: "bt-project-board", "data-can-manage": view.canManage ? "true" : "false" }, - (0, import_react21.createElement)("h3", null, view.title), - (0, import_react21.createElement)(ProjectTeam, { project, onOpenBot, onOpenDossier }), + (0, import_react23.createElement)("h3", null, view.title), + (0, import_react23.createElement)(ProjectTeam, { project, onOpenBot, onOpenDossier }), // Header counts (#1768): four numbers read from the host, an unreadable one shown as unknown. - view.counts === null ? null : (0, import_react21.createElement)( + view.counts === null ? null : (0, import_react23.createElement)( "div", { className: "bt-project-counts", "data-counts": "waiting,inflight,blocked,done" }, - (0, import_react21.createElement)("span", null, [t("Waiting"), ": ", (0, import_react21.createElement)("b", { key: "w" }, countText(view.counts.waiting))]), - (0, import_react21.createElement)("span", null, [t("In flight"), ": ", (0, import_react21.createElement)("b", { key: "f" }, countText(view.counts.inflight))]), - (0, import_react21.createElement)("span", null, [t("Blocked"), ": ", (0, import_react21.createElement)("b", { key: "b" }, countText(view.counts.blocked))]), - (0, import_react21.createElement)("span", null, [t("Done"), ": ", (0, import_react21.createElement)("b", { key: "d" }, countText(view.counts.done))]) + (0, import_react23.createElement)("span", null, [t("Waiting"), ": ", (0, import_react23.createElement)("b", { key: "w" }, countText(view.counts.waiting))]), + (0, import_react23.createElement)("span", null, [t("In flight"), ": ", (0, import_react23.createElement)("b", { key: "f" }, countText(view.counts.inflight))]), + (0, import_react23.createElement)("span", null, [t("Blocked"), ": ", (0, import_react23.createElement)("b", { key: "b" }, countText(view.counts.blocked))]), + (0, import_react23.createElement)("span", null, [t("Done"), ": ", (0, import_react23.createElement)("b", { key: "d" }, countText(view.counts.done))]) ), // #1749: both buttons open a panel and neither is hidden from a non-owner. The host refuses // every write a non-owner attempts, so the refusal is an answer the reader sees, not a // control that silently disappeared. - (0, import_react21.createElement)( + (0, import_react23.createElement)( "div", { className: "bt-project-actions" }, - (0, import_react21.createElement)("button", { type: "button", "data-action": "project-settings", onClick: () => onSettings?.() }, t("Project settings")), - (0, import_react21.createElement)("button", { type: "button", "data-action": "project-members", onClick: () => onMembers?.() }, t("Members")) + (0, import_react23.createElement)("button", { type: "button", "data-action": "project-settings", onClick: () => onSettings?.() }, t("Project settings")), + (0, import_react23.createElement)("button", { type: "button", "data-action": "project-members", onClick: () => onMembers?.() }, t("Members")) ), - (0, import_react21.createElement)(ProjectMetrics, { view: view.metrics }), - (0, import_react21.createElement)(ProjectRunningTable, { view: view.metrics, onOpen }), - (0, import_react21.createElement)(ProjectBoardRows, { view, onOpen }), - (0, import_react21.createElement)(ProjectQueueGroups, { view, onOpen }), - (0, import_react21.createElement)(ProjectDoneGroup, { view, onOpen }), - (0, import_react21.createElement)(ProjectBoardRecord, { record: view.record, projectId: view.projectId, call: call4 }) + (0, import_react23.createElement)(ProjectMetrics, { view: view.metrics }), + (0, import_react23.createElement)(ProjectRunningTable, { view: view.metrics, onOpen }), + (0, import_react23.createElement)(ProjectBoardRows, { view, onOpen }), + (0, import_react23.createElement)(ProjectQueueGroups, { view, onOpen }), + (0, import_react23.createElement)(ProjectDoneGroup, { view, onOpen }), + (0, import_react23.createElement)(ProjectBoardRecord, { record: view.record, projectId: view.projectId, call: call4 }) ); } function ProjectSettingsPanel({ project, assistantMine, actions, call: request, onClose, onSaved, locked = false, readOnly = "" } = {}) { const save = request ?? call; - const [kind, setKind] = (0, import_react21.useState)("bot"); - const [memberId, setMemberId] = (0, import_react21.useState)(""); - const [note, setNote] = (0, import_react21.useState)(""); + const [kind, setKind] = (0, import_react23.useState)("bot"); + const [memberId, setMemberId] = (0, import_react23.useState)(""); + const [note, setNote] = (0, import_react23.useState)(""); const noteLength = memoryLength(note); const noteOver = noteLength > MEMORY_TEXT_MAX; const noteSaveDisabled = text(note) === "" || noteOver; - const [assistantOff, setAssistantOff] = (0, import_react21.useState)(assistantMine === void 0 ? project?.assistant?.off === true : assistantMine?.off === true); - const [status, setStatus] = (0, import_react21.useState)(""); + const [assistantOff, setAssistantOff] = (0, import_react23.useState)(assistantMine === void 0 ? project?.assistant?.off === true : assistantMine?.off === true); + const [status, setStatus] = (0, import_react23.useState)(""); const id = text(project?.id); if (locked) { - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "div", { className: "bt-project-panel", "data-panel": "project-settings" }, - (0, import_react21.createElement)("h3", null, t("Project settings")), - readOnlyLine(import_react21.createElement, { readOnly }, actions, { key: "readonly" }), - (0, import_react21.createElement)( + (0, import_react23.createElement)("h3", null, t("Project settings")), + readOnlyLine(import_react23.createElement, { readOnly }, actions, { key: "readonly" }), + (0, import_react23.createElement)( "div", { className: "bt-project-row-actions" }, - (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) ) ); } @@ -12332,51 +13396,51 @@ function ProjectSettingsPanel({ project, assistantMine, actions, call: request, return null; } }; - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "div", { className: "bt-project-panel", "data-panel": "project-settings" }, - (0, import_react21.createElement)("h3", null, t("Project settings")), - (0, import_react21.createElement)( + (0, import_react23.createElement)("h3", null, t("Project settings")), + (0, import_react23.createElement)( "div", { className: "bt-project-field" }, - (0, import_react21.createElement)("label", { htmlFor: "bt-project-member-id" }, t("Bind a member to this Project")), - (0, import_react21.createElement)( + (0, import_react23.createElement)("label", { htmlFor: "bt-project-member-id" }, t("Bind a member to this Project")), + (0, import_react23.createElement)( "div", { className: "bt-project-row-actions" }, - (0, import_react21.createElement)( + (0, import_react23.createElement)( "select", { "aria-label": t("Member kind"), value: kind, onChange: (event) => setKind(event.target.value) }, - (0, import_react21.createElement)("option", { value: "bot" }, t("Bot")), - (0, import_react21.createElement)("option", { value: "group" }, t("Group")) + (0, import_react23.createElement)("option", { value: "bot" }, t("Bot")), + (0, import_react23.createElement)("option", { value: "group" }, t("Group")) ), - (0, import_react21.createElement)("input", { id: "bt-project-member-id", value: memberId, placeholder: t("Member id"), onChange: (event) => setMemberId(event.target.value) }), - (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-bind", onClick: () => run("project-bind", { kind, id: text(memberId), projectId: id }, t("Member bound.")) }, t("Bind")), - (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-unbind", onClick: () => run("project-bind", { kind, id: text(memberId), projectId: null }, t("Member unbound.")) }, t("Unbind")) + (0, import_react23.createElement)("input", { id: "bt-project-member-id", value: memberId, placeholder: t("Member id"), onChange: (event) => setMemberId(event.target.value) }), + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-bind", onClick: () => run("project-bind", { kind, id: text(memberId), projectId: id }, t("Member bound.")) }, t("Bind")), + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-unbind", onClick: () => run("project-bind", { kind, id: text(memberId), projectId: null }, t("Member unbound.")) }, t("Unbind")) ) ), - (0, import_react21.createElement)( + (0, import_react23.createElement)( "div", { className: "bt-project-field" }, - (0, import_react21.createElement)("label", null, t("Project Assistant")), - (0, import_react21.createElement)( + (0, import_react23.createElement)("label", null, t("Project Assistant")), + (0, import_react23.createElement)( "div", { className: "bt-project-row-actions" }, - (0, import_react21.createElement)("label", null, (0, import_react21.createElement)("input", { type: "checkbox", "data-action": "assistant-off", checked: assistantOff, onChange: (event) => setAssistantOff(event.target.checked) }), " ", t("Pause the daily digest")), - (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-assistant-save", onClick: () => run("project-assistant-owner", { id, settings: { off: assistantOff === true } }, t("Assistant settings saved.")) }, t("Save")) + (0, import_react23.createElement)("label", null, (0, import_react23.createElement)("input", { type: "checkbox", "data-action": "assistant-off", checked: assistantOff, onChange: (event) => setAssistantOff(event.target.checked) }), " ", t("Pause the daily digest")), + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-assistant-save", onClick: () => run("project-assistant-owner", { id, settings: { off: assistantOff === true } }, t("Assistant settings saved.")) }, t("Save")) ) ), - (0, import_react21.createElement)( + (0, import_react23.createElement)( "div", { className: "bt-project-field" }, // The host knows two memory kinds; the free text the panel takes is recorded as a decision, // never as a third kind the host would refuse (#1820). - (0, import_react21.createElement)("label", { htmlFor: "bt-project-note" }, t("Add to the assistant memory")), - (0, import_react21.createElement)("textarea", { id: "bt-project-note", value: note, onChange: (event) => setNote(event.target.value) }), - (0, import_react21.createElement)("div", { className: "bt-project-count", "data-role": "project-memory-count", "data-over": noteOver ? "true" : "false" }, `${noteLength}/${MEMORY_TEXT_MAX}`), - (0, import_react21.createElement)( + (0, import_react23.createElement)("label", { htmlFor: "bt-project-note" }, t("Add to the assistant memory")), + (0, import_react23.createElement)("textarea", { id: "bt-project-note", value: note, onChange: (event) => setNote(event.target.value) }), + (0, import_react23.createElement)("div", { className: "bt-project-count", "data-role": "project-memory-count", "data-over": noteOver ? "true" : "false" }, `${noteLength}/${MEMORY_TEXT_MAX}`), + (0, import_react23.createElement)( "div", { className: "bt-project-row-actions" }, - (0, import_react21.createElement)("button", { + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-memory-save", @@ -12390,11 +13454,11 @@ function ProjectSettingsPanel({ project, assistantMine, actions, call: request, }, t("Save memory")) ) ), - (0, import_react21.createElement)("div", { className: "bt-project-status-line", role: "status" }, status), - (0, import_react21.createElement)( + (0, import_react23.createElement)("div", { className: "bt-project-status-line", role: "status" }, status), + (0, import_react23.createElement)( "div", { className: "bt-project-row-actions" }, - (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) ) ); } @@ -12412,38 +13476,38 @@ function ProjectMembersPanel({ project, rows, onClose } = {}) { if (name !== "" && !boardMembers.includes(name)) boardMembers.push(name); } const chief = text(project?.chief?.botId); - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "div", { className: "bt-project-panel", "data-panel": "project-members" }, - (0, import_react21.createElement)("h3", null, t("Members")), - (0, import_react21.createElement)( + (0, import_react23.createElement)("h3", null, t("Members")), + (0, import_react23.createElement)( "ul", { className: "bt-project-members" }, - owners.map((owner) => (0, import_react21.createElement)( + owners.map((owner) => (0, import_react23.createElement)( "li", { key: `owner:${owner}`, className: "bt-project-member", "data-member-role": "owner", "data-member-id": owner }, - (0, import_react21.createElement)("span", null, `@${owner}`), - (0, import_react21.createElement)("span", { className: "bt-project-member-kind" }, t("Owner")) + (0, import_react23.createElement)("span", null, `@${owner}`), + (0, import_react23.createElement)("span", { className: "bt-project-member-kind" }, t("Owner")) )), - chief === "" ? null : (0, import_react21.createElement)( + chief === "" ? null : (0, import_react23.createElement)( "li", { key: `chief:${chief}`, className: "bt-project-member", "data-member-role": "chief", "data-member-id": chief }, - (0, import_react21.createElement)("span", null, t("Project Chief")), - (0, import_react21.createElement)("span", { className: "bt-project-member-kind" }, t("Chief of this Project")) + (0, import_react23.createElement)("span", null, t("Project Chief")), + (0, import_react23.createElement)("span", { className: "bt-project-member-kind" }, t("Chief of this Project")) ), - boardMembers.map((name) => (0, import_react21.createElement)( + boardMembers.map((name) => (0, import_react23.createElement)( "li", { key: `board:${name}`, className: "bt-project-member", "data-member-role": "board", "data-member-id": name }, - (0, import_react21.createElement)("span", null, `@${name}`), - (0, import_react21.createElement)("span", { className: "bt-project-member-kind" }, t("On the board")) + (0, import_react23.createElement)("span", null, `@${name}`), + (0, import_react23.createElement)("span", { className: "bt-project-member-kind" }, t("On the board")) )) ), - owners.length === 0 && boardMembers.length === 0 && chief === "" ? (0, import_react21.createElement)("div", { className: "bt-project-empty" }, t("No member is named yet.")) : null, - (0, import_react21.createElement)("p", { className: "bt-project-note" }, t("Member management is not part of this slice; owners and the members their cards name are listed here.")), - (0, import_react21.createElement)( + owners.length === 0 && boardMembers.length === 0 && chief === "" ? (0, import_react23.createElement)("div", { className: "bt-project-empty" }, t("No member is named yet.")) : null, + (0, import_react23.createElement)("p", { className: "bt-project-note" }, t("Member management is not part of this slice; owners and the members their cards name are listed here.")), + (0, import_react23.createElement)( "div", { className: "bt-project-row-actions" }, - (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) ) ); } @@ -12491,18 +13555,18 @@ function ProjectBoardOverlay({ actions, call: request, useRoster } = {}) { const present = useProjectPresent(); const roster = typeof useRoster === "function" ? useRoster((value) => value) : void 0; const locked = lockedWindow(roster); - const [state, setState] = (0, import_react21.useState)(null); - const [panel, setPanel] = (0, import_react21.useState)(null); - const [dossier, setDossier] = (0, import_react21.useState)(null); - const team = (0, import_react21.useRef)(void 0); - const teamGen = (0, import_react21.useRef)(0); - const [hash, setHash] = (0, import_react21.useState)(() => typeof window === "undefined" ? "" : window.location.hash); - const close = (0, import_react21.useCallback)(() => { + const [state, setState] = (0, import_react23.useState)(null); + const [panel, setPanel] = (0, import_react23.useState)(null); + const [dossier, setDossier] = (0, import_react23.useState)(null); + const team = (0, import_react23.useRef)(void 0); + const teamGen = (0, import_react23.useRef)(0); + const [hash, setHash] = (0, import_react23.useState)(() => typeof window === "undefined" ? "" : window.location.hash); + const close = (0, import_react23.useCallback)(() => { if (typeof window !== "undefined") window.location.hash = ""; setPanel(null); setState(null); }, []); - (0, import_react21.useEffect)(() => { + (0, import_react23.useEffect)(() => { if (typeof window === "undefined") return void 0; const onKey = (event) => { if (event.key !== "Escape") return; @@ -12512,14 +13576,14 @@ function ProjectBoardOverlay({ actions, call: request, useRoster } = {}) { window.addEventListener("keydown", onKey); return () => window.removeEventListener("keydown", onKey); }, [panel, close]); - (0, import_react21.useEffect)(() => { + (0, import_react23.useEffect)(() => { if (typeof window === "undefined") return void 0; const sync = () => setHash(window.location.hash); window.addEventListener("hashchange", sync); sync(); return () => window.removeEventListener("hashchange", sync); }, []); - (0, import_react21.useEffect)(() => { + (0, import_react23.useEffect)(() => { if (typeof window === "undefined") return void 0; if (!present || !hash.startsWith("#project")) { setState(null); @@ -12568,34 +13632,34 @@ function ProjectBoardOverlay({ actions, call: request, useRoster } = {}) { } }; if (state === null || !present) return null; - return (0, import_react21.createElement)( + return (0, import_react23.createElement)( "div", { className: "bt-project-overlay" }, - (0, import_react21.createElement)("div", { className: "bt-scrim", onClick: close }), - (0, import_react21.createElement)( + (0, import_react23.createElement)("div", { className: "bt-scrim", onClick: close }), + (0, import_react23.createElement)( "div", { className: "bt-mem bt-project-dialog", role: "dialog", "aria-modal": true, "aria-label": t("Project board") }, - (0, import_react21.createElement)( + (0, import_react23.createElement)( "div", { className: "bt-mem-head" }, - (0, import_react21.createElement)("h2", {}, t("Project board")), - (0, import_react21.createElement)("span", { className: "bt-mem-head-gap" }), - (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-project-close", autoFocus: true, onClick: close }, t("Close")) + (0, import_react23.createElement)("h2", {}, t("Project board")), + (0, import_react23.createElement)("span", { className: "bt-mem-head-gap" }), + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-project-close", autoFocus: true, onClick: close }, t("Close")) ), - (0, import_react21.createElement)( + (0, import_react23.createElement)( "div", { className: "bt-project-body" }, - state.project === null ? (0, import_react21.createElement)( + state.project === null ? (0, import_react23.createElement)( "div", { className: "bt-project-empty" }, - locked ? null : (0, import_react21.createElement)("p", null, t("No Project yet — create one.")), - locked ? (0, import_react21.createElement)("p", null, t("No Project yet.")) : null, - locked ? readOnlyLine(import_react21.createElement, roster, actions, { key: "read-only" }) : null, - (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { + locked ? null : (0, import_react23.createElement)("p", null, t("No Project yet — create one.")), + locked ? (0, import_react23.createElement)("p", null, t("No Project yet.")) : null, + locked ? readOnlyLine(import_react23.createElement, roster, actions, { key: "read-only" }) : null, + (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { close(); actions?.openSettings?.("projects"); } }, t("Open Projects in Settings")) - ) : panel === "dossier" ? (0, import_react21.createElement)(ProjectDossierPanel, { + ) : panel === "dossier" ? (0, import_react23.createElement)(ProjectDossierPanel, { row: dossierRowOf(state.team, dossier?.botId), label: dossier?.label ?? "", onClose: () => setPanel(null), @@ -12603,7 +13667,7 @@ function ProjectBoardOverlay({ actions, call: request, useRoster } = {}) { close(); actions?.openSession?.(id); } - }) : panel === "settings" ? (0, import_react21.createElement)(ProjectSettingsPanel, { project: state.project, assistantMine: state.assistantMine, actions, call: read, locked, readOnly: roster?.readOnly, onClose: () => setPanel(null) }) : panel === "members" ? (0, import_react21.createElement)(ProjectMembersPanel, { project: state.project, rows: state.rows, onClose: () => setPanel(null) }) : (0, import_react21.createElement)(ProjectBoardPane, { + }) : panel === "settings" ? (0, import_react23.createElement)(ProjectSettingsPanel, { project: state.project, assistantMine: state.assistantMine, actions, call: read, locked, readOnly: roster?.readOnly, onClose: () => setPanel(null) }) : panel === "members" ? (0, import_react23.createElement)(ProjectMembersPanel, { project: state.project, rows: state.rows, onClose: () => setPanel(null) }) : (0, import_react23.createElement)(ProjectBoardPane, { project: state.project, rows: state.rows, done: state.done, @@ -12641,16 +13705,33 @@ function ProjectBoardOverlay({ actions, call: request, useRoster } = {}) { ); } +// src/shared/session-pin.js +function sessionPinTarget(roster, sessionId) { + if (sessionId == null || sessionId === "") return null; + return roster?.byId?.[sessionId] ?? roster?.roomsById?.[sessionId] ?? null; +} +function canPinSession(roster, sessionId) { + if (isLockedRoster(roster)) return false; + const entry = sessionPinTarget(roster, sessionId); + if (entry == null) return false; + if (roster?.byId?.[sessionId]?.remote) return false; + if (roster?.mainBotId === sessionId) return false; + return true; +} +function sessionPinned(roster, sessionId) { + return sessionPinTarget(roster, sessionId)?.pinned === true; +} + // src/client/header.js -var import_react22 = require("react"); +var import_react24 = require("react"); var import_react_dom6 = require("react-dom"); -var GoArrow = () => (0, import_react22.createElement)("svg", { width: 14, height: 14, viewBox: "-12 -12 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2.2, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react22.createElement)("path", { d: "M-7 0H7M2 -5L7 0L2 5" })); +var GoArrow = () => (0, import_react24.createElement)("svg", { width: 14, height: 14, viewBox: "-12 -12 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2.2, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react24.createElement)("path", { d: "M-7 0H7M2 -5L7 0L2 5" })); var MEMORY_NOTICE_MS = 3200; var noNews = (select) => select({}); function useMemoryNotice(ids, useMemoryNews) { const seen = useMemoryNews((map) => Math.max(0, ...ids.map((id) => map?.[id]?.seen ?? 0))); - const [shown, setShown] = (0, import_react22.useState)(false); - (0, import_react22.useEffect)(() => { + const [shown, setShown] = (0, import_react24.useState)(false); + (0, import_react24.useEffect)(() => { const left = seen + MEMORY_NOTICE_MS - Date.now(); setShown(seen > 0 && left > 0); if (seen === 0 || left <= 0) return void 0; @@ -12660,83 +13741,198 @@ function useMemoryNotice(ids, useMemoryNews) { return shown; } function MemoryNotice({ shown }) { - const inner = (0, import_react22.useRef)(null); - const [width, setWidth] = (0, import_react22.useState)(0); + const inner = (0, import_react24.useRef)(null); + const [width, setWidth] = (0, import_react24.useState)(0); const label = t("Memory updated"); - (0, import_react22.useLayoutEffect)(() => { + (0, import_react24.useLayoutEffect)(() => { if (shown) setWidth(inner.current?.scrollWidth ?? 0); }, [label, shown]); - return (0, import_react22.createElement)( + return (0, import_react24.createElement)( "span", { className: "bt-pill-mem", "aria-hidden": true, style: { "--bt-mem-w": `${width}px` } }, - (0, import_react22.createElement)("span", { className: "bt-pill-mem-in", ref: inner }, (0, import_react22.createElement)("span", { className: "bt-pill-mem-ico" }, (0, import_react22.createElement)(MemoryIcon)), label) - ); -} -function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSession, useActivity, useBusyAcks, useMemoryNews, useTurnClock, useUi, useLive, actions }) { - const roster = useRoster((value) => value); - const title = useSessions((list) => list.byId[sessionId]?.displayTitle ?? list.byId[sessionId]?.title ?? ""); - const firstTurns = useSessions((list) => { - const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline; - return Array.isArray(outline) ? outline.slice(0, 8).map((entry) => entry.turn).join(",") : ""; - }); - const hiddenTurns = roster.exchangeTurns?.[sessionId]; - const visit = useUi((state) => state.visits?.[sessionId]); - const opening = useTurnClock((state) => { - const first = openingTurn(state[sessionId], firstTurns, hiddenTurns); - return first && !unseenSince(visit, first.start) ? clockLabel(first.start) : ""; - }); - (0, import_react22.useEffect)(() => { - if (opening) document.body.style.setProperty("--bt-first-sep", JSON.stringify(opening)); - else document.body.style.removeProperty("--bt-first-sep"); - return () => document.body.style.removeProperty("--bt-first-sep"); - }, [opening]); - const running = useSessionStatus((map) => map.get(sessionId)?.running === true); - const owner = roster.byId[sessionId]?.id ?? sessionId; - const doing = useActivity((map) => map[owner]); - const bot = roster.byId[sessionId]; - const projectAgent = projectAgentFor(bot, roster.self?.memberId); - const room2 = roster.roomsById[sessionId]; - const detailsOpen = useUi((state) => state.details === sessionId); - const full2 = bot?.remote ? friendBotTitle(bot) : roomTitle(room2) || bot?.name || ""; - const face = room2?.origin === "face-to-face"; - const name = face ? faceRowTitle(full2) : full2; - const useNews = useMemoryNews ?? noNews; - const memoryIds = bot ? [bot.id] : room2?.members ?? []; - const notice = useMemoryNotice(memoryIds, useNews); - const changed2 = useNews((map) => latestMemoryChange(map, memoryIds)); - const memoryNotice = notice && changed2 !== null && roster.memory !== false; - return (0, import_react22.createElement)( - "div", - { className: "bt-head" }, - (0, import_react22.createElement)( - "button", - { - type: "button", - className: "bt-pill", - "aria-expanded": detailsOpen, - "data-memory": memoryNotice ? "updated" : void 0, - "aria-label": memoryNotice ? t("Memory updated. Open {name}'s memory", { name: roster.byId[changed2]?.name ?? full2 }) : t("View conversation details"), - onClick: () => memoryNotice ? actions.openMemory(changed2) : actions.toggleDetails(sessionId) - }, - bot ? (0, import_react22.createElement)(BotAvatar, { bot, size: 24, state: botState(running, doing, roster.questions?.[currentPart(bot)] !== void 0), badge: false }) : room2 ? (0, import_react22.createElement)(RoomAvatar, { room: room2, roster, size: 24 }) : null, - (0, import_react22.createElement)("span", { className: face ? "bt-pill-name bt-pill-name-face" : "bt-pill-name", title: face ? full2 : void 0 }, name || title || t("New chat")), - (0, import_react22.createElement)(MemoryNotice, { shown: memoryNotice }), - (0, import_react22.createElement)("span", { className: "bt-pill-go", "aria-hidden": true }, (0, import_react22.createElement)(GoArrow)) - ), - (0, import_react22.createElement)("span", { className: "bt-sr", role: "status" }, memoryNotice ? t("Memory updated") : ""), - projectAgent === null ? null : (0, import_react22.createElement)(ProjectAgentEntry, { - projectId: projectAgent.projectId, - read: call, - onOpen: (id) => actions?.openSession?.(id) - }), - (0, import_react22.createElement)(NewMessagePills, { key: sessionId, sessionId, hiddenTurns, useSessions, useUi, useTurnClock, actions }), - (0, import_react22.createElement)(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, actions }), - (0, import_react22.createElement)(BusyAckBubble, { key: `busy-ack:${sessionId}`, sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive }) + (0, import_react24.createElement)("span", { className: "bt-pill-mem-in", ref: inner }, (0, import_react24.createElement)("span", { className: "bt-pill-mem-ico" }, (0, import_react24.createElement)(MemoryIcon)), label) + ); +} +function SessionOverflow({ sessionId, roster, actions, unread }) { + const [open, setOpen] = (0, import_react24.useState)(false); + const [note, setNote] = (0, import_react24.useState)(""); + const button = (0, import_react24.useRef)(null); + const menu = (0, import_react24.useRef)(null); + const [box, setBox] = (0, import_react24.useState)(null); + const bot = roster.byId?.[sessionId]; + const targetId = unreadEntryId(roster, sessionId); + const marked = isManuallyUnread(unread, targetId); + const social = typeof globalThis !== "undefined" ? globalThis.__flybot__?.social : void 0; + const canInvite = Boolean(bot && !bot.remote && typeof social?.createInvite === "function" && social.canInvite?.(bot.id) !== false); + (0, import_react24.useEffect)(() => { + if (!open) return void 0; + const onDown = (event) => { + if ([button.current, menu.current].some((node) => node?.contains(event.target))) return; + setOpen(false); + }; + const onKey = (event) => { + if (event.key === "Escape") { + event.stopPropagation(); + setOpen(false); + button.current?.focus(); + } + }; + window.addEventListener("mousedown", onDown); + window.addEventListener("keydown", onKey, true); + return () => { + window.removeEventListener("mousedown", onDown); + window.removeEventListener("keydown", onKey, true); + }; + }, [open]); + (0, import_react24.useEffect)(() => { + if (!note) return void 0; + const timer = setTimeout(() => setNote(""), 2400); + return () => clearTimeout(timer); + }, [note]); + const toggle = () => { + const rect = button.current?.getBoundingClientRect(); + if (rect) setBox({ right: window.innerWidth - rect.right, top: rect.bottom + 6 }); + setOpen((value) => !value); + setNote(""); + }; + const openDetails = () => { + setOpen(false); + actions.toggleDetails(sessionId); + }; + const copyInvite = async () => { + try { + const invite = await social.createInvite(bot.id); + const link = invite?.link ?? invite?.url ?? invite?.text; + if (!link) throw new Error("missing link"); + await navigator.clipboard.writeText(link); + setNote(t("Invite link copied")); + } catch { + setNote(t("Could not copy the invite link")); + } + }; + return (0, import_react24.createElement)( + import_react24.Fragment, + null, + (0, import_react24.createElement)( + "div", + { className: "bt-head-actions" }, + typeof actions?.openPalette === "function" ? (0, import_react24.createElement)("button", { + type: "button", + className: "bt-head-more", + "aria-label": t("Search"), + title: t("Search"), + onClick: () => actions.openPalette() + }, (0, import_react24.createElement)(SearchIcon)) : null, + (0, import_react24.createElement)("button", { + ref: button, + type: "button", + className: "bt-head-more", + "aria-label": t("Conversation settings"), + title: t("Conversation settings"), + "aria-haspopup": "menu", + "aria-expanded": open, + onClick: toggle + }, (0, import_react24.createElement)(DotsIcon)) + ), + open && box ? (0, import_react_dom6.createPortal)((0, import_react24.createElement)( + "div", + { + ref: menu, + className: "bt-menu bt-head-menu", + role: "menu", + "aria-label": t("Conversation settings"), + style: { right: box.right, top: box.top } + }, + (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: openDetails }, (0, import_react24.createElement)(GearIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Conversation settings"))), + typeof actions?.openPalette === "function" ? (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { + setOpen(false); + actions.openPalette(); + } }, (0, import_react24.createElement)(SearchIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Search"))) : null, + marked ? (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { + setOpen(false); + actions.clearUnread?.(targetId); + } }, (0, import_react24.createElement)(UnreadIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Clear unread mark"))) : (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { + setOpen(false); + actions.markUnread?.(targetId); + } }, (0, import_react24.createElement)(UnreadIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Mark as Unread"))), + canPinSession(roster, sessionId) && typeof actions?.setFlags === "function" ? (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { + setOpen(false); + void Promise.resolve(actions.setFlags(sessionId, { pinned: !sessionPinned(roster, sessionId) })).catch((error) => actions.reportError?.(error, "menu")); + } }, (0, import_react24.createElement)(PinIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, sessionPinned(roster, sessionId) ? t("Unpin") : t("Pin"))) : null, + canInvite ? (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { + void copyInvite(); + } }, (0, import_react24.createElement)(ShareIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Copy invite link"))) : null, + note ? (0, import_react24.createElement)("div", { className: "bt-menu-hint", role: "status" }, note) : null + ), document.body) : null + ); +} +function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSession, useActivity, useBusyAcks, useMemoryNews, useTurnClock, useUi, useLive, actions }) { + const roster = useRoster((value) => value); + const title = useSessions((list) => list.byId[sessionId]?.displayTitle ?? list.byId[sessionId]?.title ?? ""); + const firstTurns = useSessions((list) => { + const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline; + return Array.isArray(outline) ? outline.slice(0, 8).map((entry) => entry.turn).join(",") : ""; + }); + const hiddenTurns = roster.exchangeTurns?.[sessionId]; + const visit = useUi((state) => state.visits?.[sessionId]); + const opening = useTurnClock((state) => { + const first = openingTurn(state[sessionId], firstTurns, hiddenTurns); + return first && !unseenSince(visit, first.start) ? clockLabel(first.start) : ""; + }); + (0, import_react24.useEffect)(() => { + if (opening) document.body.style.setProperty("--bt-first-sep", JSON.stringify(opening)); + else document.body.style.removeProperty("--bt-first-sep"); + return () => document.body.style.removeProperty("--bt-first-sep"); + }, [opening]); + const running = useSessionStatus((map) => map.get(sessionId)?.running === true); + const owner = roster.byId[sessionId]?.id ?? sessionId; + const doing = useActivity((map) => map[owner]); + const bot = roster.byId[sessionId]; + const projectAgent = projectAgentFor(bot, roster.self?.memberId); + const room2 = roster.roomsById[sessionId]; + const detailsOpen = useUi((state) => state.details === sessionId); + const unread = useUi((state) => state.unread); + const full2 = bot?.remote ? friendBotTitle(bot) : roomTitle(room2) || bot?.name || ""; + const face = room2?.origin === "face-to-face"; + const name = face ? faceRowTitle(full2) : full2; + const useNews = useMemoryNews ?? noNews; + const memoryIds = bot ? [bot.id] : room2?.members ?? []; + const notice = useMemoryNotice(memoryIds, useNews); + const changed2 = useNews((map) => latestMemoryChange(map, memoryIds)); + const memoryNotice = notice && changed2 !== null && roster.memory !== false; + return (0, import_react24.createElement)( + "div", + { className: "bt-head" }, + (0, import_react24.createElement)( + "button", + { + type: "button", + className: "bt-pill", + "aria-expanded": detailsOpen, + "data-memory": memoryNotice ? "updated" : void 0, + "aria-label": memoryNotice ? t("Memory updated. Open {name}'s memory", { name: roster.byId[changed2]?.name ?? full2 }) : t("View conversation details"), + onClick: () => memoryNotice ? actions.openMemory(changed2) : actions.toggleDetails(sessionId) + }, + bot ? (0, import_react24.createElement)(BotAvatar, { bot, size: 24, state: botState(running, doing, roster.questions?.[currentPart(bot)] !== void 0), badge: false }) : room2 ? (0, import_react24.createElement)(RoomAvatar, { room: room2, roster, size: 24 }) : null, + (0, import_react24.createElement)("span", { className: face ? "bt-pill-name bt-pill-name-face" : "bt-pill-name", title: face ? full2 : void 0 }, name || title || t("New chat")), + (0, import_react24.createElement)(MemoryNotice, { shown: memoryNotice }), + (0, import_react24.createElement)("span", { className: "bt-pill-go", "aria-hidden": true }, (0, import_react24.createElement)(GoArrow)) + ), + (0, import_react24.createElement)("span", { className: "bt-sr", role: "status" }, memoryNotice ? t("Memory updated") : ""), + projectAgent === null ? null : (0, import_react24.createElement)(ProjectAgentEntry, { + projectId: projectAgent.projectId, + read: call, + onOpen: (id) => actions?.openSession?.(id) + }), + (0, import_react24.createElement)(NewMessagePills, { key: sessionId, sessionId, hiddenTurns, useSessions, useUi, useTurnClock, actions }), + (0, import_react24.createElement)(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, actions }), + (0, import_react24.createElement)(BusyAckBubble, { key: `busy-ack:${sessionId}`, sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive }), + (0, import_react24.createElement)(SessionOverflow, { sessionId, roster, actions, unread }) ); } function useTranscriptView() { - const [view, setView] = (0, import_react22.useState)(null); - (0, import_react22.useEffect)(() => { + const [view, setView] = (0, import_react24.useState)(null); + (0, import_react24.useEffect)(() => { let frame = 0; let watched = null; const observer = new MutationObserver(() => schedule()); @@ -12812,26 +14008,26 @@ function NewMessagePills({ sessionId, hiddenTurns, useSessions, useUi, useTurnCl const entry = state[sessionId]?.[view.tail]; return entry?.end ?? entry?.first ?? null; }); - (0, import_react22.useEffect)(() => { + (0, import_react24.useEffect)(() => { if (tailAt !== null) actions?.noteVisitTail?.(sessionId, tailAt); }, [tailAt, sessionId]); const unpinned = view?.unpinned === true; - const [release, setRelease] = (0, import_react22.useState)({ base: null, dismissed: false }); - const [above, setAbove] = (0, import_react22.useState)({ seen: false, dismissed: false }); - (0, import_react22.useEffect)(() => { + const [release, setRelease] = (0, import_react24.useState)({ base: null, dismissed: false }); + const [above, setAbove] = (0, import_react24.useState)({ seen: false, dismissed: false }); + (0, import_react24.useEffect)(() => { setRelease({ base: unpinned ? replies : null, dismissed: false }); }, [unpinned]); - (0, import_react22.useEffect)(() => { + (0, import_react24.useEffect)(() => { if (view?.divider === "in-view") setAbove((state) => state.seen ? state : { ...state, seen: true }); }, [view?.divider]); const movedOn = useTurnClock((state) => movedOnSince(visit, state[sessionId], hiddenTurns)); - (0, import_react22.useEffect)(() => { + (0, import_react24.useEffect)(() => { if (above.seen && movedOn) actions?.settleVisit?.(sessionId); }, [above.seen, movedOn, sessionId]); const fresh = release.base === null ? 0 : replies - release.base; const showDown = unpinned && fresh > 0 && !release.dismissed; const showUp = view?.divider === "above" && !above.seen && !above.dismissed; - (0, import_react22.useEffect)(() => { + (0, import_react24.useEffect)(() => { const scroller = document.querySelector("[data-conversation-scroll]"); if (!scroller) return void 0; scroller.toggleAttribute("data-bt-news", showDown); @@ -12839,16 +14035,16 @@ function NewMessagePills({ sessionId, hiddenTurns, useSessions, useUi, useTurnCl }, [showDown]); if (!view || !showDown && !showUp) return null; const label = (count) => count === 1 ? t("1 new message") : count > 0 ? t("{count} new messages", { count }) : t("New messages"); - const pill = (direction, count, style, onJump, onDismiss) => (0, import_react22.createElement)( + const pill = (direction, count, style, onJump, onDismiss) => (0, import_react24.createElement)( "div", { className: "bt-news", "data-direction": direction, style }, - (0, import_react22.createElement)( + (0, import_react24.createElement)( "button", { type: "button", className: "bt-news-jump", onClick: onJump }, - (0, import_react22.createElement)("span", { className: "bt-news-ico" }, (0, import_react22.createElement)(direction === "up" ? ArrowUpIcon : ArrowDownIcon)), + (0, import_react24.createElement)("span", { className: "bt-news-ico" }, (0, import_react24.createElement)(direction === "up" ? ArrowUpIcon : ArrowDownIcon)), label(count) ), - (0, import_react22.createElement)("button", { + (0, import_react24.createElement)("button", { type: "button", className: "bt-news-x", "aria-label": t("Dismiss new messages"), @@ -12856,7 +14052,7 @@ function NewMessagePills({ sessionId, hiddenTurns, useSessions, useUi, useTurnCl event.stopPropagation(); onDismiss(); } - }, (0, import_react22.createElement)(CloseIcon)) + }, (0, import_react24.createElement)(CloseIcon)) ); const toLatest = () => { const scroller = document.querySelector("[data-conversation-scroll]"); @@ -12866,8 +14062,8 @@ function NewMessagePills({ sessionId, hiddenTurns, useSessions, useUi, useTurnCl }; const toDivider = () => document.querySelector("[data-conversation-scroll] .bt-new-sep")?.scrollIntoView({ block: "center", behavior: "smooth" }); return (0, import_react_dom6.createPortal)( - (0, import_react22.createElement)( - import_react22.Fragment, + (0, import_react24.createElement)( + import_react24.Fragment, null, showUp ? pill("up", unread, { left: view.center, top: view.top }, toDivider, () => setAbove((state) => ({ ...state, dismissed: true }))) : null, showDown ? pill("down", fresh, { left: view.center, bottom: view.bottom }, toLatest, () => setRelease((state) => ({ ...state, dismissed: true }))) : null @@ -12993,18 +14189,39 @@ function installHeaderEffects({ sessions, roster, actions, doc = globalThis.docu } // src/client/composer.js -var import_react23 = require("react"); +var import_react25 = require("react"); var import_react_dom7 = require("react-dom"); var speechApi = () => window.SpeechRecognition ?? window.webkitSpeechRecognition; var keepComposerFocus = (event) => event.preventDefault(); +function installSendShortcut(useRoster) { + const onKey = (event) => { + if (event.defaultPrevented) return; + const field = composerFieldOf(event); + if (!field) return; + const card = composerCardOf(field); + if (!card) return; + const snapshot = useRoster?.getSnapshot?.(); + if (lockedWindow(snapshot) || field.disabled || field.readOnly || field.getAttribute?.("aria-readonly") === "true") return; + const prefs = snapshot?.prefs ?? {}; + handleComposerSendKey(event, sendKeyOf(prefs), { + send: () => { + const button = findSendButton(card); + if (button && !button.disabled && button.getAttribute?.("aria-disabled") !== "true") button.click(); + }, + insertNewline: () => insertComposerNewline(field) + }); + }; + window.addEventListener("keydown", onKey, true); + return () => window.removeEventListener("keydown", onKey, true); +} function useDictation(onText) { - const [listening, setListening] = (0, import_react23.useState)(false); - const [note, setNote] = (0, import_react23.useState)(""); - const recognition = (0, import_react23.useRef)(null); - const latest = (0, import_react23.useRef)(onText); + const [listening, setListening] = (0, import_react25.useState)(false); + const [note, setNote] = (0, import_react25.useState)(""); + const recognition = (0, import_react25.useRef)(null); + const latest = (0, import_react25.useRef)(onText); latest.current = onText; - (0, import_react23.useEffect)(() => () => recognition.current?.abort(), []); - (0, import_react23.useEffect)(() => { + (0, import_react25.useEffect)(() => () => recognition.current?.abort(), []); + (0, import_react25.useEffect)(() => { if (!note) return void 0; const timer = setTimeout(() => setNote(""), 2600); return () => clearTimeout(timer); @@ -13058,14 +14275,14 @@ function ComposerIdentity({ sessionId, useRoster }) { const self = roster.self; const humans = (room2?.participants ?? []).filter((p) => p.kind === "human" && p.leftSeq === void 0); if (room2?.viewerRole === "invited-owner") { - return (0, import_react23.createElement)( + return (0, import_react25.createElement)( "span", { className: "bt-composer-as", title: t("You can remove your Bot from this room") }, t("Shared room from {name}", { name: room2.sharedFrom?.inviterName || t("a friend") }) ); } if (!self || !room2 || humans.length < 2) return null; - return (0, import_react23.createElement)( + return (0, import_react25.createElement)( "span", { className: "bt-composer-as", title: t("Messages in this room are attributed to you") }, t("Sending as {name}", { name: self.displayName || self.memberId }) @@ -13076,7 +14293,7 @@ function ComposerVoice({ sessionId, inputActions, actions, useUi }) { if (final && inputActions) inputActions.insertText(text2, inputActions.captureInsertion()); }); const quote = useUi((state) => state.quote?.sessionId === sessionId ? state.quote : null); - (0, import_react23.useEffect)(() => { + (0, import_react25.useEffect)(() => { if (!quote || !inputActions) return; actions.clearQuote(quote.token); const excerpt = quote.text.replace(/\s+/g, " ").trim(); @@ -13094,10 +14311,10 @@ function ComposerVoice({ sessionId, inputActions, actions, useUi }) { }, [quote?.token]); if (sessionId === void 0) return null; const pluginMic = actions.speech() !== void 0; - return (0, import_react23.createElement)( - import_react23.Fragment, + return (0, import_react25.createElement)( + import_react25.Fragment, null, - pluginMic ? null : (0, import_react23.createElement)("button", { + pluginMic ? null : (0, import_react25.createElement)("button", { type: "button", className: "bt-mic", "aria-label": dictation.listening ? t("Stop dictation") : t("Dictate"), @@ -13105,16 +14322,16 @@ function ComposerVoice({ sessionId, inputActions, actions, useUi }) { title: dictation.listening ? t("Stop dictation") : t("Dictate"), onMouseDown: keepComposerFocus, onClick: () => dictation.listening ? dictation.stop() : dictation.start() - }, (0, import_react23.createElement)(MicIcon)), - (0, import_react23.createElement)("button", { + }, (0, import_react25.createElement)(MicIcon)), + (0, import_react25.createElement)("button", { type: "button", className: "bt-voice", "aria-label": t("Start voice chat"), title: t("Voice chat"), onMouseDown: keepComposerFocus, onClick: () => actions.openVoice(sessionId) - }, (0, import_react23.createElement)(WaveIcon, { size: 18 })), - dictation.note ? (0, import_react23.createElement)("span", { className: "bt-mic-note", role: "status" }, dictation.note) : null + }, (0, import_react25.createElement)(WaveIcon, { size: 18 })), + dictation.note ? (0, import_react25.createElement)("span", { className: "bt-mic-note", role: "status" }, dictation.note) : null ); } function menuIcons(roster) { @@ -13122,17 +14339,17 @@ function menuIcons(roster) { return (row) => { if (!row.bot) return PeopleIcon; const id = row.bot.id; - if (!marks.has(id)) marks.set(id, ({ size = 14 }) => (0, import_react23.createElement)(BotMark, { bot: markBotForMention(row.bot, roster.getSnapshot()), size })); + if (!marks.has(id)) marks.set(id, ({ size = 14 }) => (0, import_react25.createElement)(BotMark, { bot: markBotForMention(row.bot, roster.getSnapshot()), size })); return marks.get(id); }; } function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { const roster = useRoster((value) => value); - const [open, setOpen] = (0, import_react23.useState)(null); + const [open, setOpen] = (0, import_react25.useState)(null); const [shown, leaving] = useLinger(open, 120); - const button = (0, import_react23.useRef)(null); - const menu = (0, import_react23.useRef)(null); - (0, import_react23.useEffect)(() => { + const button = (0, import_react25.useRef)(null); + const menu = (0, import_react25.useRef)(null); + (0, import_react25.useEffect)(() => { if (!open) return void 0; const onDown = (event) => { if (![button.current, menu.current].some((node) => node?.contains(event.target))) setOpen(null); @@ -13170,10 +14387,10 @@ function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { actions.referenceChat(sessionId, inputActions?.captureInsertion?.()); }; const canReference = typeof inputActions?.captureInsertion === "function" && actions.canReferenceChat(); - return (0, import_react23.createElement)( - import_react23.Fragment, + return (0, import_react25.createElement)( + import_react25.Fragment, null, - (0, import_react23.createElement)("button", { + (0, import_react25.createElement)("button", { ref: button, type: "button", className: "bt-plus", @@ -13183,8 +14400,8 @@ function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { "aria-expanded": Boolean(open), onMouseDown: keepComposerFocus, onClick: toggle - }, (0, import_react23.createElement)(PlusIcon)), - shown ? (0, import_react_dom7.createPortal)((0, import_react23.createElement)( + }, (0, import_react25.createElement)(PlusIcon)), + shown ? (0, import_react_dom7.createPortal)((0, import_react25.createElement)( "div", { ref: menu, @@ -13194,12 +14411,36 @@ function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { style: { left: shown.left, bottom: shown.bottom }, "data-leaving": leaving || void 0 }, - (0, import_react23.createElement)("button", { type: "button", role: "menuitem", onClick: attach }, (0, import_react23.createElement)(PaperclipIcon), (0, import_react23.createElement)("span", { className: "bt-menu-label" }, t("Add files"))), - canReference ? (0, import_react23.createElement)("button", { type: "button", role: "menuitem", onMouseDown: keepComposerFocus, onClick: reference }, (0, import_react23.createElement)(ChatsIcon), (0, import_react23.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat"))) : null, - locked ? null : (0, import_react23.createElement)("button", { type: "button", role: "menuitem", onClick: () => { - setOpen(null); - actions.openSettings("schedules", target); - } }, (0, import_react23.createElement)(ClockIcon), (0, import_react23.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task"))) + (0, import_react25.createElement)( + "div", + { className: "bt-plus-group", role: "group", "aria-label": t("Attach") }, + (0, import_react25.createElement)("button", { type: "button", role: "menuitem", onClick: attach }, (0, import_react25.createElement)(PaperclipIcon), (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Add files"))) + ), + (0, import_react25.createElement)( + "div", + { className: "bt-plus-group", role: "group", "aria-label": t("Reference a chat") }, + canReference ? (0, import_react25.createElement)("button", { type: "button", role: "menuitem", onMouseDown: keepComposerFocus, onClick: reference }, (0, import_react25.createElement)(ChatsIcon), (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat"))) : (0, import_react25.createElement)( + "button", + { type: "button", role: "menuitem", disabled: true, title: t("Reference a chat is available in a Bot or group chat.") }, + (0, import_react25.createElement)(ChatsIcon), + (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat")), + (0, import_react25.createElement)("span", { className: "bt-menu-hint" }, t("Reference a chat is available in a Bot or group chat.")) + ) + ), + (0, import_react25.createElement)( + "div", + { className: "bt-plus-group", role: "group", "aria-label": t("Scheduled tasks") }, + locked ? (0, import_react25.createElement)( + "button", + { type: "button", role: "menuitem", disabled: true, title: t("A read-only window cannot create a scheduled task.") }, + (0, import_react25.createElement)(ClockIcon), + (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task")), + (0, import_react25.createElement)("span", { className: "bt-menu-hint" }, t("A read-only window cannot create a scheduled task.")) + ) : (0, import_react25.createElement)("button", { type: "button", role: "menuitem", onClick: () => { + setOpen(null); + actions.openSettings("schedules", target); + } }, (0, import_react25.createElement)(ClockIcon), (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task"))) + ) ), document.body) : null ); } @@ -13554,8 +14795,169 @@ function turnDetector({ loud = 0.12, quiet = 0.06, quietMs = 1200 } = {}) { }; } +// src/client/history-hit.js +var import_react26 = require("react"); +function useHistoryHit(read, hitToken, accessKey) { + const [attempt, setAttempt] = (0, import_react26.useState)(0); + const [state, setState] = (0, import_react26.useState)({ key: "", status: "loading", value: null }); + const serial = (0, import_react26.useRef)(0); + const key = `${hitToken ?? ""}:${accessKey}:${attempt}`; + (0, import_react26.useEffect)(() => { + const ticket = ++serial.current; + const abort = new AbortController(); + setState({ key, status: "loading", value: null }); + if (!hitToken || typeof read !== "function") { + setState({ key, status: "error", value: null }); + return () => { + serial.current += 1; + abort.abort(); + }; + } + void Promise.resolve().then(() => read({ hitToken }, abort.signal)).then((value) => { + if (serial.current !== ticket || abort.signal.aborted) return; + if (value?.scope !== "read-only-history" || !Array.isArray(value.entries)) throw new Error("Invalid history response"); + setState({ key, status: "ready", value }); + }).catch(() => { + if (serial.current === ticket && !abort.signal.aborted) setState({ key, status: "error", value: null }); + }); + return () => { + serial.current += 1; + abort.abort(); + }; + }, [read, key]); + return { ...state.key === key ? state : { status: "loading", value: null }, reload: () => setAttempt((value) => value + 1) }; +} +function HistoryHitDialog({ hit, roster, actions, onBack }) { + const ref = (0, import_react26.useRef)(null); + useEscape(onBack); + useDialogFocus(ref); + const bot = roster.byId[hit.botId]; + const accessKey = JSON.stringify([Boolean(bot), bot?.ownerId, bot?.sessionId, bot?.parts, roster.self?.memberId]); + const state = useHistoryHit(actions.readHistoryHit, bot ? hit.hitToken : null, accessKey); + const view = state.status === "ready" ? state.value : null; + return (0, import_react26.createElement)( + "div", + { className: "bt-palette-layer" }, + (0, import_react26.createElement)("div", { className: "bt-backdrop", onMouseDown: onBack }), + (0, import_react26.createElement)( + "section", + { className: "bt-palette bt-history-view", role: "dialog", "aria-modal": true, "aria-label": t("Read-only history match"), tabIndex: -1, ref }, + (0, import_react26.createElement)( + "header", + { className: "bt-palette-head" }, + (0, import_react26.createElement)("h2", null, t("Read-only history match")), + (0, import_react26.createElement)("button", { type: "button", className: "bt-palette-clear", "aria-label": t("Back to search"), onClick: onBack }, (0, import_react26.createElement)(CloseIcon)) + ), + (0, import_react26.createElement)("p", { className: "bt-history-disclaimer" }, t("This is segment history, not the current chat. No Bot is activated.")), + (0, import_react26.createElement)("p", { className: "bt-history-disclaimer" }, t("Shows the match and up to two nearby visible messages on each side.")), + (0, import_react26.createElement)( + "div", + { className: "bt-history-content" }, + state.status === "loading" ? (0, import_react26.createElement)("p", { role: "status" }, t("Loading authorized history…")) : null, + state.status === "error" ? (0, import_react26.createElement)("p", { role: "alert" }, t("History changed, expired, or is no longer accessible. Search again.")) : null, + view ? (0, import_react26.createElement)( + "div", + null, + (0, import_react26.createElement)("p", null, t("Segment {part} of {count}", { part: view.part, count: view.partCount })), + (0, import_react26.createElement)("p", null, t("History session"), ": ", (0, import_react26.createElement)("code", null, view.sessionId)), + view.entries.map((entry) => (0, import_react26.createElement)( + "section", + { key: entry.seq, className: "bt-history-entry", "data-hit": entry.hit || void 0 }, + (0, import_react26.createElement)( + "h3", + null, + entry.hit ? t("Matched message") : t("Nearby message"), + " · ", + t(entry.role === "user" ? "You" : "Bot"), + " · ", + t("Sequence"), + " ", + entry.seq, + entry.turn === null ? null : ` · ${t("Turn")} ${entry.turn}` + ), + entry.omittedBefore ? (0, import_react26.createElement)("span", null, "…") : null, + (0, import_react26.createElement)("pre", null, entry.text), + entry.truncated ? (0, import_react26.createElement)("p", { className: "bt-hint" }, t("Text truncated by the byte limit; this is not complete history.")) : null + )) + ) : null + ), + (0, import_react26.createElement)( + "footer", + { className: "bt-history-foot" }, + (0, import_react26.createElement)("button", { type: "button", className: "bt-soft", onClick: onBack }, t("Back to search")), + (0, import_react26.createElement)("button", { type: "button", className: "bt-soft", disabled: state.status === "loading", onClick: state.reload }, t("Reload history context")) + ) + ) + ); +} + +// src/client/history-search.js +var import_react27 = require("react"); +var HISTORY_DISPLAY_MAX = 100; +function useHistorySearch(search, query) { + const [state, setState] = (0, import_react27.useState)({ query: "", items: [], status: "idle", cursor: null }); + const latest = (0, import_react27.useRef)(0); + const alive = (0, import_react27.useRef)(true); + const activeAbort = (0, import_react27.useRef)(null); + (0, import_react27.useEffect)(() => { + alive.current = true; + return () => { + alive.current = false; + latest.current += 1; + activeAbort.current?.abort(); + }; + }, []); + const request = async (wanted, previous, ticket) => { + activeAbort.current?.abort(); + const abort = new AbortController(); + activeAbort.current = abort; + try { + const reply = await search({ query: wanted, limit: Math.min(20, HISTORY_DISPLAY_MAX - previous.items.length), ...previous.cursor ? { cursor: previous.cursor } : {} }, abort.signal); + if (!alive.current || latest.current !== ticket) return; + if (reply?.scope !== "local-bot-chats" || !Array.isArray(reply.items)) throw new Error("Unsupported history response"); + const items = [...previous.items, ...reply.items].slice(0, HISTORY_DISPLAY_MAX); + setState({ + query: wanted, + items, + status: "ready", + cursor: items.length < HISTORY_DISPLAY_MAX ? reply.cursor : null, + incomplete: reply.incomplete, + limited: reply.limited || items.length >= HISTORY_DISPLAY_MAX && Boolean(reply.cursor) + }); + } catch { + if (alive.current && latest.current === ticket) setState({ query: wanted, items: [], status: "error", cursor: null }); + } finally { + if (activeAbort.current === abort) activeAbort.current = null; + } + }; + (0, import_react27.useEffect)(() => { + const ticket = ++latest.current; + const initial = { query, items: [], cursor: null }; + if (typeof search !== "function" || !query.trim() || [...query].length > 256) { + setState({ ...initial, status: "idle" }); + return void 0; + } + setState({ ...initial, status: "loading" }); + const timer = setTimeout(() => { + void request(query, initial, ticket); + }, 250); + return () => { + clearTimeout(timer); + activeAbort.current?.abort(); + }; + }, [search, query]); + const current = state.query === query ? state : { query, items: [], cursor: null, status: typeof search === "function" && query.trim() ? "loading" : "idle" }; + const more = () => { + if (current.status !== "ready" || !current.cursor) return; + const ticket = ++latest.current; + setState({ ...current, status: "loading" }); + void request(query, current, ticket); + }; + return { ...current, more }; +} + // src/client/model-menu.js -var import_react24 = require("react"); +var import_react28 = require("react"); var import_react_dom8 = require("react-dom"); var MENU_EXIT_MS = 120; function groupModels(models) { @@ -13578,8 +14980,8 @@ function groupModels(models) { var servedOf = (roster, ref) => (roster.models ?? []).find((model) => model.ref === ref); var effortCache = /* @__PURE__ */ new Map(); function useEfforts(served, ref, actions) { - const [fetched, setFetched] = (0, import_react24.useState)(void 0); - (0, import_react24.useEffect)(() => { + const [fetched, setFetched] = (0, import_react28.useState)(void 0); + (0, import_react28.useEffect)(() => { setFetched(void 0); if (ref === void 0 || served?.reasoning !== void 0 || actions?.efforts === void 0) return void 0; let live = true; @@ -13604,12 +15006,12 @@ function effortRows(reasoning) { ]; } function EffortRows({ reasoning, current, onPick }) { - return (0, import_react24.createElement)( - import_react24.Fragment, + return (0, import_react28.createElement)( + import_react28.Fragment, null, - (0, import_react24.createElement)("div", { className: "bt-menu-sep", role: "separator" }), - (0, import_react24.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Thinking level")), - effortRows(reasoning).map((row) => (0, import_react24.createElement)( + (0, import_react28.createElement)("div", { className: "bt-menu-sep", role: "separator" }), + (0, import_react28.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Thinking level")), + effortRows(reasoning).map((row) => (0, import_react28.createElement)( "button", { key: row.effort ?? "default", @@ -13618,17 +15020,17 @@ function EffortRows({ reasoning, current, onPick }) { "aria-checked": row.effort === current, onClick: () => onPick(row.effort) }, - (0, import_react24.createElement)("span", { className: "bt-menu-label" }, row.label), - (0, import_react24.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, row.effort === current ? (0, import_react24.createElement)(CheckIcon) : null) + (0, import_react28.createElement)("span", { className: "bt-menu-label" }, row.label), + (0, import_react28.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, row.effort === current ? (0, import_react28.createElement)(CheckIcon) : null) )) ); } function ModelRows({ roster, current, onPick }) { - return groupModels(roster.models).map(([provider, list]) => (0, import_react24.createElement)( - import_react24.Fragment, + return groupModels(roster.models).map(([provider, list]) => (0, import_react28.createElement)( + import_react28.Fragment, { key: list[0].provider ?? provider }, - (0, import_react24.createElement)("div", { className: "bt-model-group", role: "presentation" }, provider), - list.map((model) => (0, import_react24.createElement)( + (0, import_react28.createElement)("div", { className: "bt-model-group", role: "presentation" }, provider), + list.map((model) => (0, import_react28.createElement)( "button", { key: model.ref, @@ -13638,20 +15040,20 @@ function ModelRows({ roster, current, onPick }) { title: model.ref, onClick: () => onPick(model.ref) }, - (0, import_react24.createElement)("span", { className: "bt-menu-label" }, model.name), - model.ref === roster.defaultModel ? (0, import_react24.createElement)("span", { className: "bt-menu-hint" }, t("Default")) : null, - (0, import_react24.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, model.ref === current ? (0, import_react24.createElement)(CheckIcon) : null) + (0, import_react28.createElement)("span", { className: "bt-menu-label" }, model.name), + model.ref === roster.defaultModel ? (0, import_react28.createElement)("span", { className: "bt-menu-hint" }, t("Default")) : null, + (0, import_react28.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, model.ref === current ? (0, import_react28.createElement)(CheckIcon) : null) )) )); } -var Caret = () => (0, import_react24.createElement)("svg", { className: "bt-model-caret", width: 12, height: 12, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react24.createElement)("path", { d: "M5.5 8l4.5 4.5L14.5 8" })); +var Caret = () => (0, import_react28.createElement)("svg", { className: "bt-model-caret", width: 12, height: 12, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react28.createElement)("path", { d: "M5.5 8l4.5 4.5L14.5 8" })); function useAnchoredMenu() { - const [place, setPlace] = (0, import_react24.useState)(null); + const [place, setPlace] = (0, import_react28.useState)(null); const [shownPlace, leaving] = useLinger(place, MENU_EXIT_MS); - const button = (0, import_react24.useRef)(null); - const menu = (0, import_react24.useRef)(null); + const button = (0, import_react28.useRef)(null); + const menu = (0, import_react28.useRef)(null); const close = () => setPlace(null); - (0, import_react24.useEffect)(() => { + (0, import_react28.useEffect)(() => { if (place === null) return void 0; const onDown = (event) => { if (menu.current?.contains(event.target) || button.current?.contains(event.target)) return; @@ -13714,10 +15116,10 @@ function ModelMenu({ bot, roster, actions, run, wide = false, onPick, onPickEffo else if (effort !== bot.effort) void run(actions.updateBot(bot.id, { effort: effort ?? null })); }; const models = roster.models ?? []; - return (0, import_react24.createElement)( - import_react24.Fragment, + return (0, import_react28.createElement)( + import_react28.Fragment, null, - (0, import_react24.createElement)( + (0, import_react28.createElement)( "button", { ref: button, @@ -13730,38 +15132,38 @@ function ModelMenu({ bot, roster, actions, run, wide = false, onPick, onPickEffo "data-missing": shown !== void 0 && !shown.served && models.length > 0 ? "" : void 0, onClick: toggle }, - (0, import_react24.createElement)( + (0, import_react28.createElement)( "span", { className: "bt-model-copy" }, - (0, import_react24.createElement)("span", { className: "bt-model-name" }, shown?.name ?? t("Choose a model")), - shown ? (0, import_react24.createElement)("span", { className: "bt-model-provider" }, shown.served || models.length === 0 ? effortLabel === void 0 ? shown.provider : `${shown.provider} · ${effortLabel}` : t("{provider} · not available", { provider: shown.provider })) : null + (0, import_react28.createElement)("span", { className: "bt-model-name" }, shown?.name ?? t("Choose a model")), + shown ? (0, import_react28.createElement)("span", { className: "bt-model-provider" }, shown.served || models.length === 0 ? effortLabel === void 0 ? shown.provider : `${shown.provider} · ${effortLabel}` : t("{provider} · not available", { provider: shown.provider })) : null ), - (0, import_react24.createElement)(Caret) + (0, import_react28.createElement)(Caret) ), - shownPlace ? (0, import_react_dom8.createPortal)((0, import_react24.createElement)( + shownPlace ? (0, import_react_dom8.createPortal)((0, import_react28.createElement)( "div", { ref: menu, className: `bt-menu bt-model-menu${shownPlace.bottom !== void 0 ? " bt-menu-up" : ""}`, role: "menu", "aria-label": t("Model for {name}", { name: bot.name }), style: shownPlace, "data-leaving": leaving || void 0 }, - models.length > 0 ? (0, import_react24.createElement)(ModelRows, { roster, current, onPick: pick2 }) : (0, import_react24.createElement)("div", { className: "bt-model-none" }, t("No models are set up in DeepSeek Harness yet.")), - effortRows(reasoning).length > 0 ? (0, import_react24.createElement)(EffortRows, { reasoning, current: picked, onPick: pickEffort }) : null, - (0, import_react24.createElement)("div", { className: "bt-menu-sep", role: "separator" }), - (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { + models.length > 0 ? (0, import_react28.createElement)(ModelRows, { roster, current, onPick: pick2 }) : (0, import_react28.createElement)("div", { className: "bt-model-none" }, t("No models are set up in DeepSeek Harness yet.")), + effortRows(reasoning).length > 0 ? (0, import_react28.createElement)(EffortRows, { reasoning, current: picked, onPick: pickEffort }) : null, + (0, import_react28.createElement)("div", { className: "bt-menu-sep", role: "separator" }), + (0, import_react28.createElement)("button", { type: "button", role: "menuitem", onClick: () => { close(); openHarnessModels(); - } }, (0, import_react24.createElement)(SlidersIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Models and providers…"))) + } }, (0, import_react28.createElement)(SlidersIcon), (0, import_react28.createElement)("span", { className: "bt-menu-label" }, t("Models and providers…"))) ), document.body) : null ); } function ModelChoiceDock({ sessionId, useRoster, actions }) { const roster = useRoster((value) => value); const bot = roster.byId[sessionId]; - const [busy, setBusy] = (0, import_react24.useState)(""); - const [error, setError] = (0, import_react24.useState)(""); + const [busy, setBusy] = (0, import_react28.useState)(""); + const [error, setError] = (0, import_react28.useState)(""); const shown = Boolean(bot) && currentPart(bot) === sessionId && roster.ready; - (0, import_react24.useEffect)(() => { + (0, import_react28.useEffect)(() => { if (shown) void actions.refreshModels?.(); }, [shown, sessionId]); if (!bot || currentPart(bot) !== sessionId || !roster.ready) return null; - if (bot.remote) return bot.remote.gone ? (0, import_react24.createElement)(RemoteGoneDock, { bot }) : null; + if (bot.remote) return bot.remote.gone ? (0, import_react28.createElement)(RemoteGoneDock, { bot }) : null; const models = roster.models ?? []; const lost = bot.model ? !models.some((model) => model.ref === bot.model) : false; if (bot.model && (!lost || models.length === 0)) return null; @@ -13774,12 +15176,12 @@ function ModelChoiceDock({ sessionId, useRoster, actions }) { }).finally(() => setBusy("")); }; const text2 = lost ? t("{model} is not available anymore. Pick another model for me.", { model: bot.model.split("/").slice(1).join("/") }) : models.length === 0 ? t("Hi, I'm {name}. I don't have a model yet. How do you want to set one up?", { name: bot.name }) : t("Hi, I'm {name}. Pick a model for me first. You can change it later in my details.", { name: bot.name }); - const choices = models.length === 0 ? [...setupChoices(actions).map(([label, run]) => (0, import_react24.createElement)("button", { key: label, type: "button", className: "bt-model-chip", onClick: run }, label)), (0, import_react24.createElement)(KeyHelpLink, { key: "key-help" })] : [ - ...groupModels(models).map(([provider, list]) => (0, import_react24.createElement)( + const choices = models.length === 0 ? [...setupChoices(actions).map(([label, run]) => (0, import_react28.createElement)("button", { key: label, type: "button", className: "bt-model-chip", onClick: run }, label)), (0, import_react28.createElement)(KeyHelpLink, { key: "key-help" })] : [ + ...groupModels(models).map(([provider, list]) => (0, import_react28.createElement)( "div", { key: list[0].provider ?? provider, className: "bt-model-choice-group", role: "group", "aria-label": provider }, - (0, import_react24.createElement)("div", { className: "bt-model-choice-provider", "aria-hidden": true }, provider), - (0, import_react24.createElement)("div", { className: "bt-model-choice-chips" }, list.map((model) => (0, import_react24.createElement)("button", { + (0, import_react28.createElement)("div", { className: "bt-model-choice-provider", "aria-hidden": true }, provider), + (0, import_react28.createElement)("div", { className: "bt-model-choice-chips" }, list.map((model) => (0, import_react28.createElement)("button", { key: model.ref, type: "button", className: "bt-model-chip", @@ -13788,46 +15190,46 @@ function ModelChoiceDock({ sessionId, useRoster, actions }) { "aria-label": `${model.name} · ${provider}`, title: model.ref === roster.defaultModel ? `${model.ref} · ${t("Harness default")}` : model.ref, onClick: () => pick2(model.ref) - }, model.name, busy === model.ref ? (0, import_react24.createElement)("span", { className: "bt-model-spin", "aria-label": t("Saving…") }) : null))) + }, model.name, busy === model.ref ? (0, import_react28.createElement)("span", { className: "bt-model-spin", "aria-label": t("Saving…") }) : null))) )), - (0, import_react24.createElement)("button", { key: "manage", type: "button", className: "bt-model-chip bt-model-chip-quiet", onClick: openHarnessModels }, (0, import_react24.createElement)(SlidersIcon), t("Manage models")) + (0, import_react28.createElement)("button", { key: "manage", type: "button", className: "bt-model-chip bt-model-chip-quiet", onClick: openHarnessModels }, (0, import_react28.createElement)(SlidersIcon), t("Manage models")) ]; - return (0, import_react24.createElement)( + return (0, import_react28.createElement)( "div", { className: "bt-model-dock" }, - (0, import_react24.createElement)( + (0, import_react28.createElement)( "div", { className: "bt-astack", "data-lead": "" }, - (0, import_react24.createElement)( + (0, import_react28.createElement)( "div", { className: "bt-msg" }, - (0, import_react24.createElement)( + (0, import_react28.createElement)( "div", { className: "bt-msg-line" }, - (0, import_react24.createElement)(BotMark, { bot, size: 22 }), - (0, import_react24.createElement)("div", { className: "bt-bubble" }, text2) + (0, import_react28.createElement)(BotMark, { bot, size: 22 }), + (0, import_react28.createElement)("div", { className: "bt-bubble" }, text2) ) ) ), - (0, import_react24.createElement)("div", { className: "bt-model-chips", role: "group", "aria-label": t("Choose a model") }, choices), - error ? (0, import_react24.createElement)("div", { className: "bt-secret-error bt-model-error", role: "alert" }, error) : null + (0, import_react28.createElement)("div", { className: "bt-model-chips", role: "group", "aria-label": t("Choose a model") }, choices), + error ? (0, import_react28.createElement)("div", { className: "bt-secret-error bt-model-error", role: "alert" }, error) : null ); } function RemoteGoneDock({ bot }) { - return (0, import_react24.createElement)( + return (0, import_react28.createElement)( "div", { className: "bt-model-dock", "data-flybot": "remote-gone" }, - (0, import_react24.createElement)( + (0, import_react28.createElement)( "div", { className: "bt-astack", "data-lead": "" }, - (0, import_react24.createElement)( + (0, import_react28.createElement)( "div", { className: "bt-msg" }, - (0, import_react24.createElement)( + (0, import_react28.createElement)( "div", { className: "bt-msg-line" }, - (0, import_react24.createElement)(BotMark, { bot, size: 22 }), - (0, import_react24.createElement)("div", { className: "bt-bubble" }, t("{name} ({handle}) is no longer shared with you, so messages to it cannot be delivered. It runs on its owner's machine, so another model cannot stand in. Ask its owner for a new invite.", { name: bot.name, handle: bot.remote.handle })) + (0, import_react28.createElement)(BotMark, { bot, size: 22 }), + (0, import_react28.createElement)("div", { className: "bt-bubble" }, t("{name} ({handle}) is no longer shared with you, so messages to it cannot be delivered. It runs on its owner's machine, so another model cannot stand in. Ask its owner for a new invite.", { name: bot.name, handle: bot.remote.handle })) ) ) ) @@ -13842,7 +15244,7 @@ function setupChoices(actions) { } var KEY_HELP_URL = "https://github.com/ThinkFlowLab/FlyBot/blob/main/docs/deepseek-api-key.md"; function KeyHelpLink() { - return (0, import_react24.createElement)("a", { className: "bt-model-help", href: KEY_HELP_URL, target: "_blank", rel: "noopener noreferrer" }, t("How to set a DeepSeek API key")); + return (0, import_react28.createElement)("a", { className: "bt-model-help", href: KEY_HELP_URL, target: "_blank", rel: "noopener noreferrer" }, t("How to set a DeepSeek API key")); } function missingModelKey(message) { const text2 = String(message ?? ""); @@ -13866,22 +15268,22 @@ function TurnErrorCell({ node, t: chatT, actions }) { const message = missing ? t("This Bot's model has no API key yet. Set one up, then send your message again.") : code === "ACCOUNT_SIGNED_OUT" ? shell("message.failure.accountSignedOut", raw) : code === "ACCOUNT_SIGN_IN_REQUIRED" ? shell("message.failure.accountSignInRequired", raw) : code === "QUOTA" || code === "ACCOUNT_QUOTA" ? shell("message.failure.quota", raw) : code === "AUTH" ? shell("message.failure.auth", raw) : raw; const choices = missing ? modelKeyChoices(actions ?? {}, missing.route) : []; const deepseek = missing ? /^deepseek/i.test(missing.route) : false; - return (0, import_react24.createElement)( + return (0, import_react28.createElement)( "div", { className: "bt-turn-error", role: "status", "data-missing-key": missing ? "" : void 0 }, - (0, import_react24.createElement)("span", { className: "bt-turn-error-dot", "aria-hidden": true }), - (0, import_react24.createElement)( + (0, import_react28.createElement)("span", { className: "bt-turn-error-dot", "aria-hidden": true }), + (0, import_react28.createElement)( "div", { className: "bt-turn-error-copy" }, - (0, import_react24.createElement)("span", { className: "bt-turn-error-title" }, title), - (0, import_react24.createElement)("span", { className: "bt-turn-error-message" }, message), - code ? (0, import_react24.createElement)("code", { className: "bt-turn-error-code" }, code) : null + (0, import_react28.createElement)("span", { className: "bt-turn-error-title" }, title), + (0, import_react28.createElement)("span", { className: "bt-turn-error-message" }, message), + code ? (0, import_react28.createElement)("code", { className: "bt-turn-error-code" }, code) : null ), - choices.length > 0 ? (0, import_react24.createElement)( + choices.length > 0 ? (0, import_react28.createElement)( "div", { className: "bt-turn-error-actions" }, - choices.map(([label, run]) => (0, import_react24.createElement)("button", { key: label, type: "button", className: "bt-model-chip", onClick: run }, label)), - deepseek ? (0, import_react24.createElement)(KeyHelpLink, { key: "key-help" }) : null + choices.map(([label, run]) => (0, import_react28.createElement)("button", { key: label, type: "button", className: "bt-model-chip", onClick: run }, label)), + deepseek ? (0, import_react28.createElement)(KeyHelpLink, { key: "key-help" }) : null ) : null ); } @@ -13889,14 +15291,14 @@ function DeepSeekSignIn({ useUi, actions }) { const open = useUi((state) => state.signIn); const entry = open ? actions.signInEntry?.() : null; if (!entry) return null; - return (0, import_react24.createElement)(SignInHost, { key: open, entry, actions }); + return (0, import_react28.createElement)(SignInHost, { key: open, entry, actions }); } function SignInHost({ entry, actions }) { - const [ops] = (0, import_react24.useState)(() => entry.inject?.() ?? {}); + const [ops] = (0, import_react28.useState)(() => entry.inject?.() ?? {}); const close = () => actions.closeSignIn(); - const useHook = (source) => (selector) => (0, import_react24.useSyncExternalStore)(source.subscribe, () => selector(source.getSnapshot())); - const [hooks] = (0, import_react24.useState)(() => ({ useAccount: useHook(ops.hooks.account), useTheme: useHook(ops.hooks.theme) })); - return (0, import_react24.createElement)(entry.component, { + const useHook = (source) => (selector) => (0, import_react28.useSyncExternalStore)(source.subscribe, () => selector(source.getSnapshot())); + const [hooks] = (0, import_react28.useState)(() => ({ useAccount: useHook(ops.hooks.account), useTheme: useHook(ops.hooks.theme) })); + return (0, import_react28.createElement)(entry.component, { ...ops, ...hooks, t: actions.accountT(), @@ -13955,7 +15357,7 @@ var MODEL_CSS = ` `; // src/client/model-test.js -var import_react25 = require("react"); +var import_react29 = require("react"); var FAILURE_COPY = { NO_MODEL: "Pick a model first.", NO_KEY: "This model has no API key yet. Set one up in the model settings.", @@ -13980,12 +15382,12 @@ function testOutcome(result, modelName) { } var testModel = (id) => call("test-model", { id }); function ModelTestRow({ bot, modelName, test = testModel }) { - const [state, setState] = (0, import_react25.useState)({ busy: false, outcome: void 0 }); - const live = (0, import_react25.useRef)(true); - (0, import_react25.useEffect)(() => () => { + const [state, setState] = (0, import_react29.useState)({ busy: false, outcome: void 0 }); + const live = (0, import_react29.useRef)(true); + (0, import_react29.useEffect)(() => () => { live.current = false; }, []); - (0, import_react25.useEffect)(() => { + (0, import_react29.useEffect)(() => { setState({ busy: false, outcome: void 0 }); }, [bot.id, bot.model]); const start = () => { @@ -13999,21 +15401,21 @@ function ModelTestRow({ bot, modelName, test = testModel }) { }); }; const { busy, outcome } = state; - return (0, import_react25.createElement)( + return (0, import_react29.createElement)( "div", { className: "bt-set-row bt-bs-row bt-model-test" }, - (0, import_react25.createElement)( + (0, import_react29.createElement)( "span", { className: "bt-set-copy" }, - (0, import_react25.createElement)("span", { className: "bt-set-hint" }, t("Sends one short request to this model. It may be billed.")), - (0, import_react25.createElement)( + (0, import_react29.createElement)("span", { className: "bt-set-hint" }, t("Sends one short request to this model. It may be billed.")), + (0, import_react29.createElement)( "span", { className: "bt-model-test-result", role: "status", "aria-live": "polite", "data-ok": outcome === void 0 ? void 0 : String(outcome.ok) }, busy ? t("Testing…") : outcome === void 0 ? null : outcome.text, - outcome?.code ? (0, import_react25.createElement)("code", { className: "bt-model-test-code" }, outcome.code) : null + outcome?.code ? (0, import_react29.createElement)("code", { className: "bt-model-test-code" }, outcome.code) : null ) ), - (0, import_react25.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, "aria-busy": busy || void 0, onClick: start }, t("Test connection")) + (0, import_react29.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, "aria-busy": busy || void 0, onClick: start }, t("Test connection")) ); } var MODEL_TEST_CSS = ` @@ -14033,17 +15435,17 @@ var MODEL_TEST_CSS = ` `; // src/client/folder-menu.js -var import_react26 = require("react"); +var import_react30 = require("react"); var import_react_dom9 = require("react-dom"); var folderName = (path) => String(path).replace(/[\\/]+$/, "").split(/[\\/]/).pop() || String(path); -var Tick = ({ on }) => (0, import_react26.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, on ? (0, import_react26.createElement)(CheckIcon) : null); +var Tick = ({ on }) => (0, import_react30.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, on ? (0, import_react30.createElement)(CheckIcon) : null); function FolderMenu({ value, group = false, actions, run, onPick, wide = false }) { const { isOpen, shownPlace, leaving, button, menu, open, close } = useAnchoredMenu(); - const [info, setInfo] = (0, import_react26.useState)(null); - const [view, setView] = (0, import_react26.useState)("list"); - const [draft, setDraft] = (0, import_react26.useState)(""); - const [listing, setListing] = (0, import_react26.useState)(null); - const [problem, setProblem] = (0, import_react26.useState)(""); + const [info, setInfo] = (0, import_react30.useState)(null); + const [view, setView] = (0, import_react30.useState)("list"); + const [draft, setDraft] = (0, import_react30.useState)(""); + const [listing, setListing] = (0, import_react30.useState)(null); + const [problem, setProblem] = (0, import_react30.useState)(""); const fallback = group ? t("Each Bot's own folder") : t("Team workspace"); const toggle = () => { if (isOpen) { @@ -14076,35 +15478,35 @@ function FolderMenu({ value, group = false, actions, run, onPick, wide = false } }; const known = info?.folders ?? []; const folders = value && !known.some((folder) => folder.path === value) ? [{ path: value, title: folderName(value) }, ...known] : known; - const listView = (0, import_react26.createElement)( + const listView = (0, import_react30.createElement)( "div", { key: "list", className: "bt-folder-view" }, - (0, import_react26.createElement)( + (0, import_react30.createElement)( "button", { type: "button", role: "menuitemradio", "aria-checked": !value, title: group ? void 0 : info?.team ?? void 0, onClick: () => choose("") }, - (0, import_react26.createElement)("span", { className: "bt-menu-label" }, fallback), - (0, import_react26.createElement)(Tick, { on: !value }) + (0, import_react30.createElement)("span", { className: "bt-menu-label" }, fallback), + (0, import_react30.createElement)(Tick, { on: !value }) ), - folders.length > 0 ? (0, import_react26.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Folders")) : null, - folders.map((folder) => (0, import_react26.createElement)( + folders.length > 0 ? (0, import_react30.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Folders")) : null, + folders.map((folder) => (0, import_react30.createElement)( "button", { key: folder.path, type: "button", role: "menuitemradio", "aria-checked": folder.path === value, title: folder.path, onClick: () => choose(folder.path) }, - (0, import_react26.createElement)("span", { className: "bt-folder-copy" }, (0, import_react26.createElement)("span", { className: "bt-menu-label" }, folder.title), (0, import_react26.createElement)("span", { className: "bt-folder-path" }, folder.path)), - (0, import_react26.createElement)(Tick, { on: folder.path === value }) + (0, import_react30.createElement)("span", { className: "bt-folder-copy" }, (0, import_react30.createElement)("span", { className: "bt-menu-label" }, folder.title), (0, import_react30.createElement)("span", { className: "bt-folder-path" }, folder.path)), + (0, import_react30.createElement)(Tick, { on: folder.path === value }) )), - (0, import_react26.createElement)("div", { className: "bt-menu-sep", role: "separator" }), - info?.picker === "native" ? (0, import_react26.createElement)("button", { type: "button", role: "menuitem", onClick: pickNative }, (0, import_react26.createElement)(FolderIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Choose a folder…"))) : null, - info?.picker === "browse" ? (0, import_react26.createElement)("button", { type: "button", role: "menuitem", onClick: () => browse(value) }, (0, import_react26.createElement)(FolderIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Browse folders…"))) : null, - (0, import_react26.createElement)("button", { type: "button", role: "menuitem", onClick: () => { + (0, import_react30.createElement)("div", { className: "bt-menu-sep", role: "separator" }), + info?.picker === "native" ? (0, import_react30.createElement)("button", { type: "button", role: "menuitem", onClick: pickNative }, (0, import_react30.createElement)(FolderIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Choose a folder…"))) : null, + info?.picker === "browse" ? (0, import_react30.createElement)("button", { type: "button", role: "menuitem", onClick: () => browse(value) }, (0, import_react30.createElement)(FolderIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Browse folders…"))) : null, + (0, import_react30.createElement)("button", { type: "button", role: "menuitem", onClick: () => { setDraft(value ?? ""); setView("type"); - } }, (0, import_react26.createElement)(PencilIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Enter a path…"))) + } }, (0, import_react30.createElement)(PencilIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Enter a path…"))) ); - const typeView = (0, import_react26.createElement)( + const typeView = (0, import_react30.createElement)( "div", { key: "type", className: "bt-folder-view" }, - (0, import_react26.createElement)("button", { type: "button", className: "bt-folder-back", onClick: () => setView("list") }, (0, import_react26.createElement)(ChevronLeftIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Back"))), - (0, import_react26.createElement)("input", { + (0, import_react30.createElement)("button", { type: "button", className: "bt-folder-back", onClick: () => setView("list") }, (0, import_react30.createElement)(ChevronLeftIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Back"))), + (0, import_react30.createElement)("input", { className: "bt-folder-input", autoFocus: true, value: draft, @@ -14116,33 +15518,33 @@ function FolderMenu({ value, group = false, actions, run, onPick, wide = false } if (event.key === "Enter" && !event.nativeEvent.isComposing) typed(); } }), - (0, import_react26.createElement)("button", { type: "button", className: "bt-folder-use", disabled: draft.trim() === "", onClick: typed }, t("Use this folder")) + (0, import_react30.createElement)("button", { type: "button", className: "bt-folder-use", disabled: draft.trim() === "", onClick: typed }, t("Use this folder")) ); const parent = listing?.crumbs?.length > 1 ? listing.crumbs.at(-2) : void 0; const inside = listing?.entries?.filter((entry) => !entry.hidden) ?? []; - const browseView = listing ? (0, import_react26.createElement)( + const browseView = listing ? (0, import_react30.createElement)( "div", { key: `browse:${listing.path}`, className: "bt-folder-view" }, - (0, import_react26.createElement)("button", { type: "button", className: "bt-folder-back", onClick: () => setView("list") }, (0, import_react26.createElement)(ChevronLeftIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Back"))), - (0, import_react26.createElement)("div", { className: "bt-folder-path bt-folder-here" }, listing.path), - parent ? (0, import_react26.createElement)("button", { type: "button", role: "menuitem", title: parent.path, onClick: () => browse(parent.path) }, (0, import_react26.createElement)(FolderIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Up one level"))) : null, - inside.map((entry) => (0, import_react26.createElement)( + (0, import_react30.createElement)("button", { type: "button", className: "bt-folder-back", onClick: () => setView("list") }, (0, import_react30.createElement)(ChevronLeftIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Back"))), + (0, import_react30.createElement)("div", { className: "bt-folder-path bt-folder-here" }, listing.path), + parent ? (0, import_react30.createElement)("button", { type: "button", role: "menuitem", title: parent.path, onClick: () => browse(parent.path) }, (0, import_react30.createElement)(FolderIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Up one level"))) : null, + inside.map((entry) => (0, import_react30.createElement)( "button", { key: entry.path, type: "button", role: "menuitem", onClick: () => browse(entry.path) }, - (0, import_react26.createElement)(FolderIcon), - (0, import_react26.createElement)("span", { className: "bt-menu-label" }, entry.name), - (0, import_react26.createElement)(ChevronRightIcon) + (0, import_react30.createElement)(FolderIcon), + (0, import_react30.createElement)("span", { className: "bt-menu-label" }, entry.name), + (0, import_react30.createElement)(ChevronRightIcon) )), - inside.length === 0 ? (0, import_react26.createElement)("div", { className: "bt-model-none" }, t("No folders inside.")) : null, - listing.truncated ? (0, import_react26.createElement)("div", { className: "bt-folder-path bt-folder-here" }, t("Some folders are not shown.")) : null, - (0, import_react26.createElement)("div", { className: "bt-menu-sep", role: "separator" }), - (0, import_react26.createElement)("button", { type: "button", className: "bt-folder-use", onClick: () => choose(listing.path) }, t("Use this folder")) + inside.length === 0 ? (0, import_react30.createElement)("div", { className: "bt-model-none" }, t("No folders inside.")) : null, + listing.truncated ? (0, import_react30.createElement)("div", { className: "bt-folder-path bt-folder-here" }, t("Some folders are not shown.")) : null, + (0, import_react30.createElement)("div", { className: "bt-menu-sep", role: "separator" }), + (0, import_react30.createElement)("button", { type: "button", className: "bt-folder-use", onClick: () => choose(listing.path) }, t("Use this folder")) ) : null; const shownView = view === "type" ? typeView : view === "browse" && browseView ? browseView : listView; - return (0, import_react26.createElement)( - import_react26.Fragment, + return (0, import_react30.createElement)( + import_react30.Fragment, null, - (0, import_react26.createElement)( + (0, import_react30.createElement)( "button", { ref: button, @@ -14155,19 +15557,19 @@ function FolderMenu({ value, group = false, actions, run, onPick, wide = false } title: value, onClick: toggle }, - (0, import_react26.createElement)( + (0, import_react30.createElement)( "span", { className: "bt-model-copy" }, - (0, import_react26.createElement)("span", { className: "bt-model-name" }, value ? folderName(value) : fallback), - value ? (0, import_react26.createElement)("span", { className: "bt-model-provider" }, value) : null + (0, import_react30.createElement)("span", { className: "bt-model-name" }, value ? folderName(value) : fallback), + value ? (0, import_react30.createElement)("span", { className: "bt-model-provider" }, value) : null ), - (0, import_react26.createElement)(Caret) + (0, import_react30.createElement)(Caret) ), - shownPlace ? (0, import_react_dom9.createPortal)((0, import_react26.createElement)( + shownPlace ? (0, import_react_dom9.createPortal)((0, import_react30.createElement)( "div", { ref: menu, className: `bt-menu bt-model-menu bt-folder-menu${shownPlace.bottom !== void 0 ? " bt-menu-up" : ""}`, role: "menu", "aria-label": t("Working folder"), style: shownPlace, "data-leaving": leaving || void 0 }, shownView, - problem ? (0, import_react26.createElement)("div", { className: "bt-folder-error", role: "alert" }, problem) : null + problem ? (0, import_react30.createElement)("div", { className: "bt-folder-error", role: "alert" }, problem) : null ), document.body) : null ); } @@ -14187,7 +15589,7 @@ var FOLDER_CSS = ` `; // src/client/capability-settings.js -var import_react27 = require("react"); +var import_react31 = require("react"); var blank = () => ({ name: "", kind: "mcp", description: "", transport: "stdio", command: "", argsText: "", envText: "{}", url: "", headersText: "{}", content: "", items: [] }); var parseMap = (text2, label) => { let value; @@ -14201,11 +15603,11 @@ var parseMap = (text2, label) => { }; var statusText = (status) => !status ? void 0 : status.state === "ready" ? t("Ready") : status.state === "needs-approval" ? t("Needs approval") : status.state === "error" ? t("Could not connect: {error}", { error: status.error ?? "" }) : t("Connecting…"); function Field({ label, value, onChange, multiline = false, disabled = false, placeholder }) { - return (0, import_react27.createElement)( + return (0, import_react31.createElement)( "label", { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react27.createElement)("span", { className: "bt-set-copy" }, (0, import_react27.createElement)("span", { className: "bt-bs-label" }, t(label))), - (0, import_react27.createElement)(multiline ? "textarea" : "input", { + (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t(label))), + (0, import_react31.createElement)(multiline ? "textarea" : "input", { className: multiline ? "bt-input bt-input-area" : "bt-input", value, disabled, @@ -14217,7 +15619,7 @@ function Field({ label, value, onChange, multiline = false, disabled = false, pl ); } function CapabilityForm({ draft, setDraft, items, actions, onClose }) { - const [error, setError] = (0, import_react27.useState)(""); + const [error, setError] = (0, import_react31.useState)(""); const set = (key, value) => setDraft((previous) => ({ ...previous, [key]: value })); const submit = async (event) => { event.preventDefault(); @@ -14248,95 +15650,95 @@ function CapabilityForm({ draft, setDraft, items, actions, onClose }) { } }; const available = items.filter((item) => item.name !== draft.name && ["mcp", "skill"].includes(item.kind)); - return (0, import_react27.createElement)( + return (0, import_react31.createElement)( "form", { className: "bt-connector-form", onSubmit: submit }, - (0, import_react27.createElement)(Field, { label: "Name", value: draft.name, disabled: draft.originalName !== void 0, onChange: (value) => set("name", value), placeholder: "my-tool" }), - (0, import_react27.createElement)( + (0, import_react31.createElement)(Field, { label: "Name", value: draft.name, disabled: draft.originalName !== void 0, onChange: (value) => set("name", value), placeholder: "my-tool" }), + (0, import_react31.createElement)( "label", { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react27.createElement)("span", { className: "bt-set-copy" }, (0, import_react27.createElement)("span", { className: "bt-bs-label" }, t("Type"))), - (0, import_react27.createElement)( + (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Type"))), + (0, import_react31.createElement)( "select", { className: "bt-input", value: draft.kind, disabled: draft.originalName !== void 0, onChange: (event) => set("kind", event.target.value) }, - ["mcp", "skill", "pack"].map((kind) => (0, import_react27.createElement)("option", { key: kind, value: kind }, t(kind === "mcp" ? "MCP server" : kind === "skill" ? "Skill" : "Pack"))) + ["mcp", "skill", "pack"].map((kind) => (0, import_react31.createElement)("option", { key: kind, value: kind }, t(kind === "mcp" ? "MCP server" : kind === "skill" ? "Skill" : "Pack"))) ) ), - (0, import_react27.createElement)(Field, { label: "Description", value: draft.description, onChange: (value) => set("description", value) }), - draft.kind === "mcp" ? (0, import_react27.createElement)( + (0, import_react31.createElement)(Field, { label: "Description", value: draft.description, onChange: (value) => set("description", value) }), + draft.kind === "mcp" ? (0, import_react31.createElement)( "label", { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react27.createElement)("span", { className: "bt-set-copy" }, (0, import_react27.createElement)("span", { className: "bt-bs-label" }, t("Connection"))), - (0, import_react27.createElement)( + (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Connection"))), + (0, import_react31.createElement)( "select", { className: "bt-input", value: draft.transport, onChange: (event) => set("transport", event.target.value) }, - (0, import_react27.createElement)("option", { value: "stdio" }, t("Local command")), - (0, import_react27.createElement)("option", { value: "streamable-http" }, t("HTTP server")) + (0, import_react31.createElement)("option", { value: "stdio" }, t("Local command")), + (0, import_react31.createElement)("option", { value: "streamable-http" }, t("HTTP server")) ) ) : null, - draft.kind === "mcp" && draft.transport === "stdio" ? (0, import_react27.createElement)( + draft.kind === "mcp" && draft.transport === "stdio" ? (0, import_react31.createElement)( "div", null, - (0, import_react27.createElement)(Field, { label: "Command", value: draft.command, onChange: (value) => set("command", value) }), - (0, import_react27.createElement)(Field, { label: "Arguments (one per line)", value: draft.argsText, onChange: (value) => set("argsText", value), multiline: true }), - (0, import_react27.createElement)(Field, { label: "Environment (JSON)", value: draft.envText, onChange: (value) => set("envText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) + (0, import_react31.createElement)(Field, { label: "Command", value: draft.command, onChange: (value) => set("command", value) }), + (0, import_react31.createElement)(Field, { label: "Arguments (one per line)", value: draft.argsText, onChange: (value) => set("argsText", value), multiline: true }), + (0, import_react31.createElement)(Field, { label: "Environment (JSON)", value: draft.envText, onChange: (value) => set("envText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) ) : null, - draft.kind === "mcp" && draft.transport === "streamable-http" ? (0, import_react27.createElement)( + draft.kind === "mcp" && draft.transport === "streamable-http" ? (0, import_react31.createElement)( "div", null, - (0, import_react27.createElement)(Field, { label: "URL", value: draft.url, onChange: (value) => set("url", value) }), - (0, import_react27.createElement)(Field, { label: "Headers (JSON)", value: draft.headersText, onChange: (value) => set("headersText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) + (0, import_react31.createElement)(Field, { label: "URL", value: draft.url, onChange: (value) => set("url", value) }), + (0, import_react31.createElement)(Field, { label: "Headers (JSON)", value: draft.headersText, onChange: (value) => set("headersText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) ) : null, - draft.kind === "skill" ? (0, import_react27.createElement)(Field, { label: "Skill instructions", value: draft.content, onChange: (value) => set("content", value), multiline: true }) : null, - draft.kind === "pack" ? (0, import_react27.createElement)( + draft.kind === "skill" ? (0, import_react31.createElement)(Field, { label: "Skill instructions", value: draft.content, onChange: (value) => set("content", value), multiline: true }) : null, + draft.kind === "pack" ? (0, import_react31.createElement)( "div", { className: "bt-set-card" }, - available.length === 0 ? (0, import_react27.createElement)("div", { className: "bt-set-row" }, (0, import_react27.createElement)("span", { className: "bt-set-hint" }, t("Save an MCP server or skill first."))) : available.map((item) => (0, import_react27.createElement)( + available.length === 0 ? (0, import_react31.createElement)("div", { className: "bt-set-row" }, (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("Save an MCP server or skill first."))) : available.map((item) => (0, import_react31.createElement)( "label", { key: item.name, className: "bt-set-row bt-bs-row" }, - (0, import_react27.createElement)("span", { className: "bt-set-copy" }, (0, import_react27.createElement)("span", { className: "bt-bs-label" }, item.name)), - (0, import_react27.createElement)("input", { type: "checkbox", checked: draft.items.includes(item.name), onChange: (event) => set("items", event.target.checked ? [...draft.items, item.name] : draft.items.filter((name) => name !== item.name)) }) + (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, item.name)), + (0, import_react31.createElement)("input", { type: "checkbox", checked: draft.items.includes(item.name), onChange: (event) => set("items", event.target.checked ? [...draft.items, item.name] : draft.items.filter((name) => name !== item.name)) }) )) ) : null, - error ? (0, import_react27.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null, - (0, import_react27.createElement)( + error ? (0, import_react31.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null, + (0, import_react31.createElement)( "div", { className: "bt-connector-form-row" }, - (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onClose }, t("Cancel")), - (0, import_react27.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, draft.originalName ? t("Save changes") : t("Add capability")) + (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onClose }, t("Cancel")), + (0, import_react31.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, draft.originalName ? t("Save changes") : t("Add capability")) ) ); } function CapabilityRow({ item, onEdit, onDelete, onApprove, confirming }) { const detail = item.kind === "pack" ? `${t("Pack")}: ${(item.items ?? []).join(", ") || t("No items")}` : item.kind === "mcp" ? item.transport === "stdio" ? t("Local command") : t("HTTP server") : t("Skill"); const secondary = item.kind === "pack" ? [item.description, (item.items ?? []).join(", ") || t("No items")].filter(Boolean).join(" · ") : item.description || detail; - return (0, import_react27.createElement)( + return (0, import_react31.createElement)( "div", { className: "bt-connector" }, - (0, import_react27.createElement)( + (0, import_react31.createElement)( "div", { className: "bt-connector-head" }, - (0, import_react27.createElement)( + (0, import_react31.createElement)( "span", { className: "bt-connector-text" }, - (0, import_react27.createElement)("span", { className: "bt-connector-name" }, item.name), - (0, import_react27.createElement)("span", { className: "bt-connector-status" }, secondary) + (0, import_react31.createElement)("span", { className: "bt-connector-name" }, item.name), + (0, import_react31.createElement)("span", { className: "bt-connector-status" }, secondary) ), - (0, import_react27.createElement)( + (0, import_react31.createElement)( "span", { className: "bt-connector-actions" }, - item.kind === "mcp" && item.transport === "stdio" && !item.approved ? (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onApprove }, t("Allow")) : null, - (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onEdit }, t("Edit")), - (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDelete }, confirming ? t("Click again to delete.") : t("Delete")) + item.kind === "mcp" && item.transport === "stdio" && !item.approved ? (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onApprove }, t("Allow")) : null, + (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onEdit }, t("Edit")), + (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDelete }, confirming ? t("Click again to delete.") : t("Delete")) ) ) ); } function CapabilitiesPage({ roster, actions, run }) { const items = [...roster.capabilities ?? []].sort((a, b) => a.name.localeCompare(b.name)); - const [draft, setDraft] = (0, import_react27.useState)(null); - const [confirming, setConfirming] = (0, import_react27.useState)(""); - (0, import_react27.useEffect)(() => { + const [draft, setDraft] = (0, import_react31.useState)(null); + const [confirming, setConfirming] = (0, import_react31.useState)(""); + (0, import_react31.useEffect)(() => { if (!confirming) return void 0; const timer = setTimeout(() => setConfirming(""), 4e3); return () => clearTimeout(timer); @@ -14360,40 +15762,40 @@ function CapabilitiesPage({ roster, actions, run }) { void run(actions.deleteCapability(item.name)); }; if (lockedWindow(roster)) { - return (0, import_react27.createElement)( + return (0, import_react31.createElement)( "section", { className: "bt-set-section" }, - (0, import_react27.createElement)("h3", null, t("Shared capabilities")), - (0, import_react27.createElement)( + (0, import_react31.createElement)("h3", null, t("Shared capabilities")), + (0, import_react31.createElement)( "div", { className: "bt-set-card bt-connectors-card" }, - items.length === 0 ? (0, import_react27.createElement)("div", { className: "bt-set-row" }, (0, import_react27.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react27.createElement)( + items.length === 0 ? (0, import_react31.createElement)("div", { className: "bt-set-row" }, (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react31.createElement)( "div", { key: item.name, className: "bt-set-row" }, - (0, import_react27.createElement)( + (0, import_react31.createElement)( "span", { className: "bt-set-copy" }, - (0, import_react27.createElement)("span", { className: "bt-bs-label" }, item.name), - (0, import_react27.createElement)("span", { className: "bt-set-hint" }, item.description || (item.kind === "pack" ? `${t("Pack")}: ${(item.items ?? []).join(", ") || t("No items")}` : item.kind === "mcp" ? item.transport === "stdio" ? t("Local command") : t("HTTP server") : t("Skill"))) + (0, import_react31.createElement)("span", { className: "bt-bs-label" }, item.name), + (0, import_react31.createElement)("span", { className: "bt-set-hint" }, item.description || (item.kind === "pack" ? `${t("Pack")}: ${(item.items ?? []).join(", ") || t("No items")}` : item.kind === "mcp" ? item.transport === "stdio" ? t("Local command") : t("HTTP server") : t("Skill"))) ) )) ) ); } - return (0, import_react27.createElement)( + return (0, import_react31.createElement)( "section", { className: "bt-set-section" }, - (0, import_react27.createElement)("h3", null, t("Shared capabilities")), - (0, import_react27.createElement)( + (0, import_react31.createElement)("h3", null, t("Shared capabilities")), + (0, import_react31.createElement)( "div", { className: "bt-actions" }, - (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: startNew }, t("Add capability")) + (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: startNew }, t("Add capability")) ), - draft ? (0, import_react27.createElement)(CapabilityForm, { draft, setDraft, items, actions, onClose: () => setDraft(null) }) : null, - (0, import_react27.createElement)( + draft ? (0, import_react31.createElement)(CapabilityForm, { draft, setDraft, items, actions, onClose: () => setDraft(null) }) : null, + (0, import_react31.createElement)( "div", { className: "bt-set-card bt-connectors-card" }, - items.length === 0 ? (0, import_react27.createElement)("div", { className: "bt-set-row" }, (0, import_react27.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react27.createElement)(CapabilityRow, { + items.length === 0 ? (0, import_react31.createElement)("div", { className: "bt-set-row" }, (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react31.createElement)(CapabilityRow, { key: item.name, item, confirming: confirming === item.name, @@ -14409,10 +15811,10 @@ function BotCapabilitiesCard({ bot, roster, actions, run, Card: Card2, SwitchRow const attached = new Set(bot.capabilities ?? []); const statuses = roster.capabilityStatuses?.[bot.id] ?? {}; if (items.length === 0) return null; - return (0, import_react27.createElement)( + return (0, import_react31.createElement)( Card2, { title: t("Capabilities") }, - items.map((item) => (0, import_react27.createElement)(SwitchRow2, { + items.map((item) => (0, import_react31.createElement)(SwitchRow2, { key: item.name, label: item.name, hint: attached.has(item.name) ? statusText(statuses[item.name]) : void 0, @@ -14423,7 +15825,7 @@ function BotCapabilitiesCard({ bot, roster, actions, run, Card: Card2, SwitchRow } // src/client/connector-bots.js -var import_react28 = require("react"); +var import_react32 = require("react"); function ownBots(roster) { const me = roster?.self?.memberId; return (roster?.bots ?? []).filter((bot) => !bot.remote && (me === void 0 || me === null || bot.ownerId === void 0 || bot.ownerId === me)); @@ -14438,31 +15840,31 @@ function usageText(roster, id) { return own === 0 ? t("Off for every Bot. Choose which Bots may use it.") : own === bots.length ? t("On for all {total} Bots", { total: bots.length }) : t("On for {count} of {total} Bots", { count: own, total: bots.length }); } function BotSwitch({ bot, connector, name, actions, run, SwitchRow: SwitchRow2 }) { - return (0, import_react28.createElement)(SwitchRow2, { label: name, hint: ownHint(bot, connector.id), on: isOn(bot, connector.id), disabled: false, onChange: (on) => void run(actions.setBotConnector(bot.id, connector.id, on)) }); + return (0, import_react32.createElement)(SwitchRow2, { label: name, hint: ownHint(bot, connector.id), on: isOn(bot, connector.id), disabled: false, onChange: (on) => void run(actions.setBotConnector(bot.id, connector.id, on)) }); } function ConnectorBots({ connector, roster, actions, run, SwitchRow: SwitchRow2 }) { const bots = ownBots(roster); - return (0, import_react28.createElement)( + return (0, import_react32.createElement)( "div", { className: "bt-connector-bots" }, - bots.length === 0 ? (0, import_react28.createElement)("span", { className: "bt-set-hint" }, t("No Bots")) : bots.map((bot) => (0, import_react28.createElement)( + bots.length === 0 ? (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("No Bots")) : bots.map((bot) => (0, import_react32.createElement)( "div", { key: bot.id, className: "bt-connector-bot" }, - (0, import_react28.createElement)(BotSwitch, { bot, connector, name: bot.name, actions, run, SwitchRow: SwitchRow2 }) + (0, import_react32.createElement)(BotSwitch, { bot, connector, name: bot.name, actions, run, SwitchRow: SwitchRow2 }) )), - (0, import_react28.createElement)("span", { className: "bt-set-hint" }, t("On by default for each of your Bots, on every turn: in its own chat, in groups, on schedules and when a friend uses it. A friend's own Bot never gets it.")) + (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("On by default for each of your Bots, on every turn: in its own chat, in groups, on schedules and when a friend uses it. A friend's own Bot never gets it.")) ); } function BotConnectorsCard({ bot, roster, actions, run, Card: Card2, SwitchRow: SwitchRow2 }) { const connected = connectedConnectors(roster); if (connected.length === 0) return null; - return (0, import_react28.createElement)( + return (0, import_react32.createElement)( Card2, { title: t("Connectors") }, - connected.map((connector) => (0, import_react28.createElement)( + connected.map((connector) => (0, import_react32.createElement)( "div", { key: connector.id, className: "bt-connector-bot" }, - (0, import_react28.createElement)(BotSwitch, { bot, connector, name: connector.name, actions, run, SwitchRow: SwitchRow2 }) + (0, import_react32.createElement)(BotSwitch, { bot, connector, name: connector.name, actions, run, SwitchRow: SwitchRow2 }) )) ); } @@ -14480,8 +15882,49 @@ function memoryBlockedNotice(view) { return blockedSentence(paths); } +// src/shared/memory-catalog.js +function memoryTopics(entries2) { + const map = /* @__PURE__ */ new Map(); + for (const entry of entries2 ?? []) { + const scope = entry.scope === "team" ? "team" : "own"; + const topic = typeof entry.topic === "string" && entry.topic.trim() !== "" ? entry.topic : null; + const key = `${scope}:${topic ?? ""}`; + const item = map.get(key); + if (item) item.count += 1; + else map.set(key, { scope, topic, count: 1 }); + } + return [...map.values()].sort((a, b) => { + if (a.scope !== b.scope) return a.scope === "own" ? -1 : 1; + if (a.topic === null !== (b.topic === null)) return a.topic === null ? -1 : 1; + return String(a.topic ?? "").localeCompare(String(b.topic ?? "")); + }); +} +function memoryStats(entries2) { + const list = entries2 ?? []; + const topics = /* @__PURE__ */ new Set(); + for (const entry of list) { + if (typeof entry.topic === "string" && entry.topic.trim() !== "") topics.add(`${entry.scope === "team" ? "team" : "own"}:${entry.topic.trim()}`); + } + return { entries: list.length, topics: topics.size }; +} +function filterMemoryEntries(entries2, query) { + const terms = String(query ?? "").trim().toLowerCase().split(/\s+/).filter(Boolean); + if (terms.length === 0) return [...entries2 ?? []]; + return (entries2 ?? []).filter((entry) => { + const hay = `${entry.text ?? ""} ${entry.topic ?? ""} ${entry.by ?? ""}`.toLowerCase(); + return terms.every((term) => hay.includes(term)); + }); +} +function topicKey(item) { + if (!item) return ""; + return `${item.scope === "team" ? "team" : "own"}:${item.topic ?? ""}`; +} +function sameTopic(a, b) { + return Boolean(a) && Boolean(b) && topicKey(a) === topicKey(b); +} + // src/client/memory-panel.js -var import_react29 = require("react"); +var import_react33 = require("react"); var POLL_MS5 = 1500; var MENU_EXIT_MS2 = 120; var counts = /* @__PURE__ */ new Map(); @@ -14503,8 +15946,8 @@ function noteFailure(botId, reason) { } var countState = (botId) => ({ count: counts.get(botId) ?? null, failure: failures.get(botId) ?? null }); function useMemoryCount(botId, actions) { - const [state, setState] = (0, import_react29.useState)(() => countState(botId)); - (0, import_react29.useEffect)(() => { + const [state, setState] = (0, import_react33.useState)(() => countState(botId)); + (0, import_react33.useEffect)(() => { const listener = () => setState(countState(botId)); countListeners.add(listener); listener(); @@ -14533,18 +15976,18 @@ function memoryCountText({ count, failure }) { function MemoryRow({ bot, actions }) { const { count, failure } = useMemoryCount(bot.id, actions); const label = memoryCountText({ count, failure }); - return (0, import_react29.createElement)( + return (0, import_react33.createElement)( "div", null, - (0, import_react29.createElement)("div", { className: "bt-section-title" }, t("Memory")), - (0, import_react29.createElement)( + (0, import_react33.createElement)("div", { className: "bt-section-title" }, t("Memory")), + (0, import_react33.createElement)( "button", { type: "button", className: "bt-mem-row", "aria-label": t("Manage {name}'s memory", { name: bot.name }), onClick: () => actions.openMemory(bot.id) }, - (0, import_react29.createElement)(MemoryIcon), - (0, import_react29.createElement)("span", { className: "bt-mem-row-copy" }, label), - (0, import_react29.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react29.createElement)(ChevronRightIcon)) + (0, import_react33.createElement)(MemoryIcon), + (0, import_react33.createElement)("span", { className: "bt-mem-row-copy" }, label), + (0, import_react33.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react33.createElement)(ChevronRightIcon)) ), - failure === null ? null : (0, import_react29.createElement)("div", { className: "bt-note", role: "status" }, label) + failure === null ? null : (0, import_react33.createElement)("div", { className: "bt-note", role: "status" }, label) ); } function ago(at, now) { @@ -14558,50 +16001,50 @@ function ago(at, now) { return format.format(-Math.round(hours / 24), "day"); } function Skeleton({ label }) { - return (0, import_react29.createElement)( + return (0, import_react33.createElement)( "div", { className: "bt-mem-skel", "aria-busy": true }, - [0, 1].map((block) => (0, import_react29.createElement)( + [0, 1].map((block) => (0, import_react33.createElement)( "div", { key: block, className: "bt-mem-skel-block" }, - (0, import_react29.createElement)("span", { className: "bt-mem-skel-head" }), - (0, import_react29.createElement)("span", null), - (0, import_react29.createElement)("span", null), - (0, import_react29.createElement)("span", { style: { width: block === 0 ? "62%" : "48%" } }) + (0, import_react33.createElement)("span", { className: "bt-mem-skel-head" }), + (0, import_react33.createElement)("span", null), + (0, import_react33.createElement)("span", null), + (0, import_react33.createElement)("span", { style: { width: block === 0 ? "62%" : "48%" } }) )), - label ? (0, import_react29.createElement)("div", { className: "bt-mem-skel-label" }, label) : null + label ? (0, import_react33.createElement)("div", { className: "bt-mem-skel-label" }, label) : null ); } function Summary({ bot, view, regenerate }) { if (view.entries.length === 0) { const notice = memoryEmptyNotice(view); - return (0, import_react29.createElement)( + return (0, import_react33.createElement)( "div", { className: "bt-mem-empty" }, - (0, import_react29.createElement)("div", { className: "bt-mem-empty-mark" }, (0, import_react29.createElement)(MemoryIcon)), - notice === null ? null : (0, import_react29.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, notice), - (0, import_react29.createElement)("div", { className: "bt-mem-empty-title" }, t("{name} has not saved anything yet", { name: bot.name })), - (0, import_react29.createElement)("div", { className: "bt-mem-empty-text" }, t("Bots keep lasting preferences, decisions, and what you ask them to remember. Tell {name} below, or in its chat.", { name: bot.name })) + (0, import_react33.createElement)("div", { className: "bt-mem-empty-mark" }, (0, import_react33.createElement)(MemoryIcon)), + notice === null ? null : (0, import_react33.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, notice), + (0, import_react33.createElement)("div", { className: "bt-mem-empty-title" }, t("{name} has not saved anything yet", { name: bot.name })), + (0, import_react33.createElement)("div", { className: "bt-mem-empty-text" }, t("Bots keep lasting preferences, decisions, and what you ask them to remember. Tell {name} below, or in its chat.", { name: bot.name })) ); } - const failed = view.error && !view.summarizing ? (0, import_react29.createElement)( + const failed = view.error && !view.summarizing ? (0, import_react33.createElement)( "div", { className: "bt-mem-failed", role: "alert" }, - (0, import_react29.createElement)("span", null, view.summary ? t("The summary is out of date: {reason}", { reason: hostText(view.error) }) : t("The summary could not be written: {reason}", { reason: hostText(view.error) })), - (0, import_react29.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: regenerate }, t("Try again")) + (0, import_react33.createElement)("span", null, view.summary ? t("The summary is out of date: {reason}", { reason: hostText(view.error) }) : t("The summary could not be written: {reason}", { reason: hostText(view.error) })), + (0, import_react33.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: regenerate }, t("Try again")) ) : null; const refused = memoryBlockedNotice(view); - const blocked = refused === null ? null : (0, import_react29.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, refused); - if (!view.summary) return (0, import_react29.createElement)(import_react29.Fragment, null, blocked, failed, failed ? null : (0, import_react29.createElement)(Skeleton, { label: t("Writing the summary…") })); - return (0, import_react29.createElement)( - import_react29.Fragment, + const blocked = refused === null ? null : (0, import_react33.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, refused); + if (!view.summary) return (0, import_react33.createElement)(import_react33.Fragment, null, blocked, failed, failed ? null : (0, import_react33.createElement)(Skeleton, { label: t("Writing the summary…") })); + return (0, import_react33.createElement)( + import_react33.Fragment, null, blocked, failed, - (0, import_react29.createElement)( + (0, import_react33.createElement)( "div", { key: view.summary.at, className: "bt-mem-summary", "data-stale": !view.fresh || void 0 }, - summaryBlocks(view.summary.text).map((block, index) => block.kind === "h" ? (0, import_react29.createElement)("h3", { key: index }, block.text) : (0, import_react29.createElement)("p", { key: index }, block.text)) + summaryBlocks(view.summary.text).map((block, index) => block.kind === "h" ? (0, import_react33.createElement)("h3", { key: index }, block.text) : (0, import_react33.createElement)("p", { key: index }, block.text)) ) ); } @@ -14613,9 +16056,9 @@ var groupEntries = (entries2) => entries2.reduce((groups, entry) => { return groups; }, []); function EntryRow({ entry, remove }) { - const [confirming, setConfirming] = (0, import_react29.useState)(false); - const [busy, setBusy] = (0, import_react29.useState)(false); - (0, import_react29.useEffect)(() => { + const [confirming, setConfirming] = (0, import_react33.useState)(false); + const [busy, setBusy] = (0, import_react33.useState)(false); + (0, import_react33.useEffect)(() => { if (!confirming) return void 0; const timer = setTimeout(() => setConfirming(false), 3e3); return () => clearTimeout(timer); @@ -14630,16 +16073,16 @@ function EntryRow({ entry, remove }) { setBusy(true); if (!await remove(entry)) setBusy(false); }; - return (0, import_react29.createElement)( + return (0, import_react33.createElement)( "li", { className: "bt-mem-entry", "data-busy": busy || void 0 }, - (0, import_react29.createElement)( + (0, import_react33.createElement)( "div", { className: "bt-mem-entry-copy" }, - (0, import_react29.createElement)("span", { className: "bt-mem-entry-text" }, entry.text), - meta ? (0, import_react29.createElement)("span", { className: "bt-mem-entry-meta" }, meta) : null + (0, import_react33.createElement)("span", { className: "bt-mem-entry-text" }, entry.text), + meta ? (0, import_react33.createElement)("span", { className: "bt-mem-entry-meta" }, meta) : null ), - remove ? (0, import_react29.createElement)("button", { + remove ? (0, import_react33.createElement)("button", { type: "button", className: "bt-mem-remove", "data-confirm": confirming || void 0, @@ -14647,36 +16090,36 @@ function EntryRow({ entry, remove }) { "aria-label": confirming ? t("Click again to remove") : t("Remove from memory"), title: confirming ? void 0 : t("Remove from memory"), onClick: click - }, confirming ? t("Remove") : (0, import_react29.createElement)(TrashIcon)) : null + }, confirming ? t("Remove") : (0, import_react33.createElement)(TrashIcon)) : null ); } -function Entries({ bot, view, remove }) { +function Entries({ bot, view, remove, subset = false }) { const groups = groupEntries(view.entries); const refused = memoryBlockedNotice(view); const sections = [ { scope: "own", title: t("{name}'s memory", { name: bot.name }), size: view.sizes.own }, { scope: "team", title: t("Team memory"), hint: t("Every Bot reads it"), size: view.sizes.team } - ]; - return (0, import_react29.createElement)( + ].filter((section) => !subset || groups.some((group) => group.scope === section.scope)); + return (0, import_react33.createElement)( "div", { className: "bt-mem-entries" }, - refused === null ? null : (0, import_react29.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, refused), - sections.map((section) => (0, import_react29.createElement)( + refused === null ? null : (0, import_react33.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, refused), + sections.map((section) => (0, import_react33.createElement)( "section", { key: section.scope, className: "bt-mem-section" }, - (0, import_react29.createElement)( + (0, import_react33.createElement)( "div", { className: "bt-mem-section-head" }, - (0, import_react29.createElement)("h3", null, section.title), - section.hint ? (0, import_react29.createElement)("span", null, section.hint) : null, - (0, import_react29.createElement)("span", { className: "bt-mem-size", title: t("MEMORY.md, which every conversation reads") }, t("{used} of {limit} characters", { used: section.size.toLocaleString(dateLocale()), limit: view.limits.main.toLocaleString(dateLocale()) })) + (0, import_react33.createElement)("h3", null, section.title), + section.hint ? (0, import_react33.createElement)("span", null, section.hint) : null, + (0, import_react33.createElement)("span", { className: "bt-mem-size", title: t("MEMORY.md, which every conversation reads") }, t("{used} of {limit} characters", { used: section.size.toLocaleString(dateLocale()), limit: view.limits.main.toLocaleString(dateLocale()) })) ), - groups.some((group) => group.scope === section.scope) ? groups.filter((group) => group.scope === section.scope).map((group) => (0, import_react29.createElement)( - import_react29.Fragment, + groups.some((group) => group.scope === section.scope) ? groups.filter((group) => group.scope === section.scope).map((group) => (0, import_react33.createElement)( + import_react33.Fragment, { key: group.key }, - group.topic ? (0, import_react29.createElement)("div", { className: "bt-mem-topic" }, group.topic) : null, - (0, import_react29.createElement)("ul", { className: "bt-mem-list" }, group.entries.map((entry) => (0, import_react29.createElement)(EntryRow, { key: `${entry.topic ?? ""}:${entry.text}`, entry, remove }))) - )) : (0, import_react29.createElement)("div", { className: "bt-mem-none" }, t("Nothing saved yet")) + group.topic ? (0, import_react33.createElement)("div", { className: "bt-mem-topic" }, group.topic) : null, + (0, import_react33.createElement)("ul", { className: "bt-mem-list" }, group.entries.map((entry) => (0, import_react33.createElement)(EntryRow, { key: `${entry.topic ?? ""}:${entry.text}`, entry, remove }))) + )) : (0, import_react33.createElement)("div", { className: "bt-mem-none" }, t("Nothing saved yet")) )) ); } @@ -14688,40 +16131,40 @@ function changeLine(change) { return change.scope === "team" ? t("Added to team memory: {text}", { text: text2 }) : t("Added: {text}", { text: text2 }); } function Reply({ answer, dismiss }) { - return (0, import_react29.createElement)( + return (0, import_react33.createElement)( "div", { className: "bt-mem-reply", role: "status" }, - (0, import_react29.createElement)( + (0, import_react33.createElement)( "div", { className: "bt-mem-reply-head" }, - (0, import_react29.createElement)("span", { className: "bt-mem-reply-asked" }, answer.asked), - answer.pending ? null : (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Dismiss"), onClick: dismiss }, (0, import_react29.createElement)(CloseIcon)) + (0, import_react33.createElement)("span", { className: "bt-mem-reply-asked" }, answer.asked), + answer.pending ? null : (0, import_react33.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Dismiss"), onClick: dismiss }, (0, import_react33.createElement)(CloseIcon)) ), - answer.pending ? (0, import_react29.createElement)("div", { className: "bt-mem-reply-text bt-shimmer" }, t("Thinking…")) : answer.error ? (0, import_react29.createElement)("div", { className: "bt-mem-reply-text bt-danger" }, hostText(answer.error)) : (0, import_react29.createElement)( - import_react29.Fragment, + answer.pending ? (0, import_react33.createElement)("div", { className: "bt-mem-reply-text bt-shimmer" }, t("Thinking…")) : answer.error ? (0, import_react33.createElement)("div", { className: "bt-mem-reply-text bt-danger" }, hostText(answer.error)) : (0, import_react33.createElement)( + import_react33.Fragment, null, - answer.reply ? (0, import_react29.createElement)("div", { className: "bt-mem-reply-text" }, answer.reply) : null, - answer.changes.length > 0 ? (0, import_react29.createElement)("ul", { className: "bt-mem-changes" }, answer.changes.map((change, index) => (0, import_react29.createElement)( + answer.reply ? (0, import_react33.createElement)("div", { className: "bt-mem-reply-text" }, answer.reply) : null, + answer.changes.length > 0 ? (0, import_react33.createElement)("ul", { className: "bt-mem-changes" }, answer.changes.map((change, index) => (0, import_react33.createElement)( "li", { key: index, "data-ok": change.ok || void 0 }, - change.ok ? (0, import_react29.createElement)(CheckIcon) : (0, import_react29.createElement)(CloseIcon), - (0, import_react29.createElement)("span", null, changeLine(change)) + change.ok ? (0, import_react33.createElement)(CheckIcon) : (0, import_react33.createElement)(CloseIcon), + (0, import_react33.createElement)("span", null, changeLine(change)) ))) : null ) ); } function useMemoryView(botId, actions) { - const [view, setView] = (0, import_react29.useState)(null); - const [error, setError] = (0, import_react29.useState)(""); - const timer = (0, import_react29.useRef)(0); - const latest = (0, import_react29.useRef)(0); - const alive = (0, import_react29.useRef)(true); - const show = (0, import_react29.useCallback)((next) => { + const [view, setView] = (0, import_react33.useState)(null); + const [error, setError] = (0, import_react33.useState)(""); + const timer = (0, import_react33.useRef)(0); + const latest = (0, import_react33.useRef)(0); + const alive = (0, import_react33.useRef)(true); + const show = (0, import_react33.useCallback)((next) => { setView(next); setError(""); noteCount(botId, next.entries.length); }, [botId]); - const load = (0, import_react29.useCallback)(async (flags = {}) => { + const load = (0, import_react33.useCallback)(async (flags = {}) => { clearTimeout(timer.current); const ticket = ++latest.current; try { @@ -14733,7 +16176,7 @@ function useMemoryView(botId, actions) { if (alive.current && ticket === latest.current) setError(failure?.message ?? String(failure)); } }, [botId]); - (0, import_react29.useEffect)(() => { + (0, import_react33.useEffect)(() => { alive.current = true; void load({ summarize: true }); return () => { @@ -14744,28 +16187,84 @@ function useMemoryView(botId, actions) { return { view, error, load, show }; } function useNow3(every) { - const [now, setNow] = (0, import_react29.useState)(Date.now()); - (0, import_react29.useEffect)(() => { + const [now, setNow] = (0, import_react33.useState)(Date.now()); + (0, import_react33.useEffect)(() => { const id = setInterval(() => setNow(Date.now()), every); return () => clearInterval(id); }, [every]); return now; } +function MemoryNav({ bot, view, page, topic, query, setQuery, openOverview, openEntries, openTopic }) { + const stats = memoryStats(view?.entries); + const topics = memoryTopics(view?.entries); + const own = topics.filter((item2) => item2.scope === "own"); + const team = topics.filter((item2) => item2.scope === "team"); + const labelOf = (item2) => item2.topic ?? t("Main memory"); + const item = (kind, title, count, on, current) => (0, import_react33.createElement)( + "button", + { + type: "button", + className: "bt-mem-nav-item", + "aria-current": current ? "page" : void 0, + onClick: on + }, + (0, import_react33.createElement)("span", { className: "bt-mem-nav-label" }, title), + count === void 0 ? null : (0, import_react33.createElement)("span", { className: "bt-mem-nav-count" }, String(count)) + ); + const block = (title, items) => items.length === 0 ? null : (0, import_react33.createElement)( + "div", + { className: "bt-mem-nav-group" }, + (0, import_react33.createElement)("div", { className: "bt-mem-nav-heading" }, title), + items.map((entry) => (0, import_react33.createElement)( + import_react33.Fragment, + { key: `${entry.scope}:${entry.topic ?? ""}` }, + item("topic", labelOf(entry), entry.count, () => openTopic(entry), page === "entries" && sameTopic(topic, entry)) + )) + ); + return (0, import_react33.createElement)( + "nav", + { className: "bt-mem-nav", "aria-label": t("Memory directory") }, + (0, import_react33.createElement)( + "label", + { className: "bt-mem-search" }, + (0, import_react33.createElement)(SearchIcon), + (0, import_react33.createElement)("input", { + className: "bt-mem-search-input", + type: "search", + value: query, + placeholder: t("Search memory"), + "aria-label": t("Search memory"), + onChange: (event) => setQuery(event.target.value) + }) + ), + (0, import_react33.createElement)( + "div", + { className: "bt-mem-nav-list" }, + item("overview", t("Overview"), void 0, openOverview, page === "summary" && query.trim() === ""), + item("entries", t("All entries"), stats.entries, () => openEntries(null), page === "entries" && !topic && query.trim() === ""), + block(t("{name}'s memory", { name: bot.name }), own), + block(t("Team memory"), team) + ) + ); +} function MemoryDialog({ bot, actions, roster, leaving = false }) { const { view, error, load, show } = useMemoryView(bot.id, actions); const locked = typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; - const [page, setPage] = (0, import_react29.useState)("summary"); - const [menu, setMenu] = (0, import_react29.useState)(false); + const [page, setPage] = (0, import_react33.useState)("summary"); + const [topic, setTopic] = (0, import_react33.useState)(null); + const [query, setQuery] = (0, import_react33.useState)(""); + const [navHidden, setNavHidden] = (0, import_react33.useState)(false); + const [menu, setMenu] = (0, import_react33.useState)(false); const [menuShown, menuLeaving] = useLinger(menu, MENU_EXIT_MS2); - const [text2, setText] = (0, import_react29.useState)(""); - const [answer, setAnswer] = (0, import_react29.useState)(null); - const menuRef = (0, import_react29.useRef)(null); - const dotsRef = (0, import_react29.useRef)(null); - const inputRef = (0, import_react29.useRef)(null); + const [text2, setText] = (0, import_react33.useState)(""); + const [answer, setAnswer] = (0, import_react33.useState)(null); + const menuRef = (0, import_react33.useRef)(null); + const dotsRef = (0, import_react33.useRef)(null); + const inputRef = (0, import_react33.useRef)(null); const now = useNow3(3e4); - const close = (0, import_react29.useCallback)(() => actions.closeMemory(), []); + const close = (0, import_react33.useCallback)(() => actions.closeMemory(), []); useEscape(close); - (0, import_react29.useEffect)(() => { + (0, import_react33.useEffect)(() => { if (!menu) return void 0; const onDown = (event) => { if (menuRef.current?.contains(event.target) || dotsRef.current?.contains(event.target)) return; @@ -14788,16 +16287,24 @@ function MemoryDialog({ bot, actions, roster, leaving = false }) { const regenerate = () => { setMenu(false); setPage("summary"); + setTopic(null); + setQuery(""); void load({ regenerate: true }); }; - const openEntries = () => { + const openEntries = (nextTopic = null) => { setMenu(false); setPage("entries"); + setTopic(nextTopic); + setQuery(""); }; - const backToSummary = () => { + const openOverview = () => { + setMenu(false); setPage("summary"); + setTopic(null); + setQuery(""); void load({ summarize: true }); }; + const backToSummary = () => openOverview(); const remove = async (entry) => { try { show(await actions.memoryForget(bot.id, entry)); @@ -14824,69 +16331,109 @@ function MemoryDialog({ bot, actions, roster, leaving = false }) { inputRef.current?.focus(); }; const count = view?.entries.length ?? 0; + const stats = memoryStats(view?.entries); const when3 = view?.summary ? ago(view.summary.at, now) : null; - const status = view === null ? "" : page === "entries" ? count === 1 ? t("1 entry") : t("{count} entries", { count }) : view.summarizing && view.summary ? t("Updating…") : view.summary && view.fresh ? when3 ? t("Updated {time}", { time: when3 }) : t("Updated just now") : ""; + const searching = query.trim() !== ""; + const filtered = view === null ? [] : searching ? filterMemoryEntries(view.entries, query) : topic ? view.entries.filter((entry) => sameTopic({ scope: entry.scope, topic: entry.topic ?? null }, topic)) : view.entries; + const listed = view === null ? null : { ...view, entries: filtered }; + const status = view === null ? "" : searching ? filtered.length === 1 ? t("1 entry") : t("{count} entries", { count: filtered.length }) : page === "entries" ? filtered.length === 1 ? t("1 entry") : t("{count} entries", { count: filtered.length }) : view.summarizing && view.summary ? t("Updating…") : view.summary && view.fresh ? when3 ? t("Updated {time}", { time: when3 }) : t("Updated just now") : [ + stats.entries ? stats.entries === 1 ? t("1 entry") : t("{count} entries", { count: stats.entries }) : null, + stats.topics ? stats.topics === 1 ? t("1 topic") : t("{count} topics", { count: stats.topics }) : null + ].filter(Boolean).join(" · "); + const title = searching ? t("Search memory") : page === "entries" ? topic ? topic.topic ?? t("Main memory") : t("All entries") : t("Memory summary"); + const showEntries = searching || page === "entries"; const busy = answer?.pending === true; - return (0, import_react29.createElement)( + return (0, import_react33.createElement)( "div", { className: "bt-mem-layer", "data-leaving": leaving || void 0 }, - (0, import_react29.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), - (0, import_react29.createElement)( + (0, import_react33.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), + (0, import_react33.createElement)( "div", - { className: "bt-mem", role: "dialog", "aria-modal": true, "aria-label": t("{name}'s memory", { name: bot.name }) }, - (0, import_react29.createElement)( + { className: "bt-mem", role: "dialog", "aria-modal": true, "aria-label": t("{name}'s memory", { name: bot.name }), "data-nav": navHidden ? "hidden" : void 0 }, + (0, import_react33.createElement)( "div", { className: "bt-mem-head" }, - page === "entries" ? (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to the summary"), onClick: backToSummary }, (0, import_react29.createElement)(ChevronLeftIcon)) : null, - (0, import_react29.createElement)("h2", null, page === "entries" ? t("All entries") : t("Memory summary")), - (0, import_react29.createElement)("span", { className: "bt-mem-status" }, page === "summary" ? [bot.name, status].filter(Boolean).join(" · ") : status), - (0, import_react29.createElement)("span", { className: "bt-mem-head-gap" }), - (0, import_react29.createElement)("button", { ref: dotsRef, type: "button", className: "bt-icon-btn", "aria-label": t("Memory options"), "aria-haspopup": "menu", "aria-expanded": menu, onClick: () => setMenu((value) => !value) }, (0, import_react29.createElement)(DotsIcon)), - (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close memory"), onClick: close }, (0, import_react29.createElement)(CloseIcon)), - menuShown ? (0, import_react29.createElement)( + (0, import_react33.createElement)("button", { + type: "button", + className: "bt-icon-btn", + "aria-label": navHidden ? t("Show directory") : t("Hide directory"), + "aria-pressed": !navHidden, + onClick: () => setNavHidden((value) => !value) + }, navHidden ? (0, import_react33.createElement)(ChevronRightIcon) : (0, import_react33.createElement)(ChevronLeftIcon)), + page === "entries" || searching ? (0, import_react33.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to the summary"), onClick: backToSummary }, (0, import_react33.createElement)(ChevronLeftIcon)) : null, + (0, import_react33.createElement)("h2", null, title), + (0, import_react33.createElement)("span", { className: "bt-mem-status" }, page === "summary" && !searching ? [bot.name, status].filter(Boolean).join(" · ") : status), + (0, import_react33.createElement)("span", { className: "bt-mem-head-gap" }), + (0, import_react33.createElement)("button", { ref: dotsRef, type: "button", className: "bt-icon-btn", "aria-label": t("Memory options"), "aria-haspopup": "menu", "aria-expanded": menu, onClick: () => setMenu((value) => !value) }, (0, import_react33.createElement)(DotsIcon)), + (0, import_react33.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close memory"), onClick: close }, (0, import_react33.createElement)(CloseIcon)), + menuShown ? (0, import_react33.createElement)( "div", { ref: menuRef, className: "bt-menu bt-mem-menu", role: "menu", "aria-label": t("Memory options"), "data-leaving": menuLeaving || void 0 }, - (0, import_react29.createElement)( + (0, import_react33.createElement)( "button", - { type: "button", role: "menuitem", onClick: openEntries }, - (0, import_react29.createElement)("span", { className: "bt-menu-label" }, t("All entries")), - (0, import_react29.createElement)("span", { className: "bt-menu-hint" }, String(count)) + { type: "button", role: "menuitem", onClick: () => openEntries(null) }, + (0, import_react33.createElement)("span", { className: "bt-menu-label" }, t("All entries")), + (0, import_react33.createElement)("span", { className: "bt-menu-hint" }, String(count)) ), - (0, import_react29.createElement)( + (0, import_react33.createElement)( "button", { type: "button", role: "menuitem", disabled: count === 0 || view?.summarizing, onClick: regenerate }, - (0, import_react29.createElement)("span", { className: "bt-menu-label" }, t("Regenerate summary")) + (0, import_react33.createElement)("span", { className: "bt-menu-label" }, t("Regenerate summary")) ) ) : null ), - (0, import_react29.createElement)( - "div", - { className: "bt-mem-body" }, - readOnlyLine(import_react29.createElement, roster, actions), - error ? (0, import_react29.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, hostText(error)) : null, - view === null ? error ? null : (0, import_react29.createElement)(Skeleton) : page === "entries" ? (0, import_react29.createElement)(Entries, { bot, view, remove: locked ? null : remove }) : (0, import_react29.createElement)(Summary, { bot, view, regenerate }) - ), - (0, import_react29.createElement)( + (0, import_react33.createElement)( "div", - { className: "bt-mem-foot" }, - answer ? (0, import_react29.createElement)(Reply, { answer, dismiss: () => setAnswer(null) }) : null, - locked ? null : (0, import_react29.createElement)( - "form", - { className: "bt-mem-ask", onSubmit: ask }, - (0, import_react29.createElement)("input", { - ref: inputRef, - className: "bt-mem-input", - value: text2, - maxLength: 2e3, - disabled: view === null, - placeholder: t("Ask or update"), - "aria-label": t("Ask about or update {name}'s memory", { name: bot.name }), - onChange: (event) => setText(event.target.value) - }), - (0, import_react29.createElement)( - "button", - { type: "submit", className: "bt-mem-send", disabled: busy || text2.trim() === "", "aria-label": t("Send") }, - busy ? (0, import_react29.createElement)("span", { className: "bt-mem-spin", "aria-hidden": true }) : (0, import_react29.createElement)(ArrowUpIcon) + { className: "bt-mem-shell" }, + navHidden ? null : (0, import_react33.createElement)(MemoryNav, { + bot, + view, + page, + topic, + query, + setQuery, + openOverview, + openEntries, + openTopic: (item) => openEntries(item) + }), + (0, import_react33.createElement)( + "div", + { className: "bt-mem-main" }, + (0, import_react33.createElement)( + "div", + { className: "bt-mem-body" }, + readOnlyLine(import_react33.createElement, roster, actions), + error ? (0, import_react33.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, hostText(error)) : null, + view === null ? error ? null : (0, import_react33.createElement)(Skeleton) : showEntries ? searching && filtered.length === 0 ? (0, import_react33.createElement)( + "div", + { className: "bt-mem-empty" }, + (0, import_react33.createElement)("div", { className: "bt-mem-empty-title" }, t('No entries match "{query}"', { query: query.trim() })), + (0, import_react33.createElement)("div", { className: "bt-mem-empty-text" }, t("Try a different word, or clear the search to see every entry.")) + ) : (0, import_react33.createElement)(Entries, { bot, view: listed, remove: locked ? null : remove, subset: searching || Boolean(topic) }) : (0, import_react33.createElement)(Summary, { bot, view, regenerate }) + ), + (0, import_react33.createElement)( + "div", + { className: "bt-mem-foot" }, + answer ? (0, import_react33.createElement)(Reply, { answer, dismiss: () => setAnswer(null) }) : null, + locked ? null : (0, import_react33.createElement)( + "form", + { className: "bt-mem-ask", onSubmit: ask }, + (0, import_react33.createElement)("input", { + ref: inputRef, + className: "bt-mem-input", + value: text2, + maxLength: 2e3, + disabled: view === null, + placeholder: t("Ask or update"), + "aria-label": t("Ask about or update {name}'s memory", { name: bot.name }), + onChange: (event) => setText(event.target.value) + }), + (0, import_react33.createElement)( + "button", + { type: "submit", className: "bt-mem-send", disabled: busy || text2.trim() === "", "aria-label": t("Send") }, + busy ? (0, import_react33.createElement)("span", { className: "bt-mem-spin", "aria-hidden": true }) : (0, import_react33.createElement)(ArrowUpIcon) + ) + ) ) ) ) @@ -14895,7 +16442,7 @@ function MemoryDialog({ bot, actions, roster, leaving = false }) { } // src/client/standing-approvals.js -var import_react30 = require("react"); +var import_react34 = require("react"); var standingOf = (target, roster) => { const me = roster?.self?.memberId; return (target?.standingApprovals ?? []).filter((grant) => me === void 0 || grant.ownerId === me); @@ -14904,19 +16451,19 @@ function StandingApprovalsCard({ scope, target, roster, actions, run, Card: Card const grants = scope === "room" ? standingOf(target, roster) : target?.standingApprovals ?? []; if (grants.length === 0) return null; const hint = scope === "room" ? t("Your Bots in this group do these without asking.") : t("This Bot does these without asking."); - return (0, import_react30.createElement)( + return (0, import_react34.createElement)( Card2, { title: t("Always allowed") }, - grants.map((grant) => (0, import_react30.createElement)( + grants.map((grant) => (0, import_react34.createElement)( "div", { key: grant.kind, className: "bt-set-row bt-bs-row", "data-standing": grant.kind }, - (0, import_react30.createElement)( + (0, import_react34.createElement)( "span", { className: "bt-set-copy" }, - (0, import_react30.createElement)("span", { className: "bt-bs-label" }, grant.label || grant.kind), - (0, import_react30.createElement)("span", { className: "bt-set-hint" }, hint) + (0, import_react34.createElement)("span", { className: "bt-bs-label" }, grant.label || grant.kind), + (0, import_react34.createElement)("span", { className: "bt-set-hint" }, hint) ), - (0, import_react30.createElement)("button", { + (0, import_react34.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "aria-label": t("Remove always allow for {kind}", { kind: grant.label || grant.kind }), @@ -14927,7 +16474,7 @@ function StandingApprovalsCard({ scope, target, roster, actions, run, Card: Card } // src/client/bot-settings.js -var import_react31 = require("react"); +var import_react35 = require("react"); var capitalize = (word) => word[0].toUpperCase() + word.slice(1); async function avatarImage(file) { if (!/^image\/(png|jpeg|webp|gif)$/.test(file.type)) throw new Error(t("Choose a PNG, JPEG, WebP, or GIF image")); @@ -14951,8 +16498,8 @@ async function avatarImage(file) { throw new Error(t("That image is too large")); } function InlineText({ label, value, placeholder, required = false, maxLength, multiline = false, onSave }) { - const [draft, setDraft] = (0, import_react31.useState)(null); - const reverting = (0, import_react31.useRef)(false); + const [draft, setDraft] = (0, import_react35.useState)(null); + const reverting = (0, import_react35.useRef)(false); const commit = () => { const next = draft?.trim(); setDraft(null); @@ -14963,7 +16510,7 @@ function InlineText({ label, value, placeholder, required = false, maxLength, mu if (next === void 0 || next === (value ?? "") || required && next === "") return; void onSave(next); }; - return (0, import_react31.createElement)(multiline ? "textarea" : "input", { + return (0, import_react35.createElement)(multiline ? "textarea" : "input", { className: multiline ? "bt-bs-input bt-bs-area" : "bt-bs-input", value: draft ?? value ?? "", placeholder, @@ -14984,29 +16531,29 @@ function InlineText({ label, value, placeholder, required = false, maxLength, mu }); } function Row({ label, hint, stack = false, children }) { - return (0, import_react31.createElement)( + return (0, import_react35.createElement)( "label", { className: stack ? "bt-set-row bt-bs-row bt-bs-stack" : "bt-set-row bt-bs-row" }, - (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, label), hint ? (0, import_react31.createElement)("span", { className: "bt-set-hint" }, hint) : null), + (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-bs-label" }, label), hint ? (0, import_react35.createElement)("span", { className: "bt-set-hint" }, hint) : null), children ); } function Card({ title, children }) { - return (0, import_react31.createElement)("section", { className: "bt-set-section" }, title ? (0, import_react31.createElement)("h3", null, title) : null, (0, import_react31.createElement)("div", { className: "bt-set-card" }, children)); + return (0, import_react35.createElement)("section", { className: "bt-set-section" }, title ? (0, import_react35.createElement)("h3", null, title) : null, (0, import_react35.createElement)("div", { className: "bt-set-card" }, children)); } function Switch({ on, label, disabled, onChange }) { - return (0, import_react31.createElement)( + return (0, import_react35.createElement)( "button", { type: "button", role: "switch", className: "bt-switch", "aria-checked": on, "aria-label": label, disabled, onClick: () => onChange(!on) }, - (0, import_react31.createElement)("span", { className: "bt-switch-knob", "aria-hidden": true }) + (0, import_react35.createElement)("span", { className: "bt-switch-knob", "aria-hidden": true }) ); } function SwitchRow({ label, hint, on, disabled, onChange, showLabel = true }) { - return (0, import_react31.createElement)( + return (0, import_react35.createElement)( "div", { className: "bt-set-row bt-bs-row" }, - (0, import_react31.createElement)("span", { className: "bt-set-copy" }, showLabel ? (0, import_react31.createElement)("span", { className: "bt-bs-label" }, label) : null, hint ? (0, import_react31.createElement)("span", { className: "bt-set-hint" }, hint) : null), - (0, import_react31.createElement)(Switch, { on, label, disabled, onChange }) + (0, import_react35.createElement)("span", { className: "bt-set-copy" }, showLabel ? (0, import_react35.createElement)("span", { className: "bt-bs-label" }, label) : null, hint ? (0, import_react35.createElement)("span", { className: "bt-set-hint" }, hint) : null), + (0, import_react35.createElement)(Switch, { on, label, disabled, onChange }) ); } function modelHint(bot, roster) { @@ -15017,22 +16564,22 @@ function modelHint(bot, roster) { return t("Applies from the next message."); } function ShapeRing({ shape, size }) { - const maskId = (0, import_react31.useRef)(""); + const maskId = (0, import_react35.useRef)(""); if (maskId.current === "") maskId.current = `bt-ring-${nextMarkSerial()}`; const def = shapeOf(shape); const unit = def.size / size; const markup = `${holes(def, `${bodyOf(def, "#000", true)}`)}${bodyOf(def, "currentColor", true)}`; - return (0, import_react31.createElement)("svg", { className: "bt-ring", viewBox: `0 0 ${def.size} ${def.size}`, "aria-hidden": true, dangerouslySetInnerHTML: { __html: markup } }); + return (0, import_react35.createElement)("svg", { className: "bt-ring", viewBox: `0 0 ${def.size} ${def.size}`, "aria-hidden": true, dangerouslySetInnerHTML: { __html: markup } }); } function CharacterGrid({ look, hasPhoto = false, onShape, onColor }) { const shapes = [...PICKER_SHAPES, ...Object.keys(SHAPES).filter((id) => !Object.hasOwn(CHARACTERS, id))]; if (!shapes.includes(look.shape)) shapes.push(look.shape); const rows = []; for (let index = 0; index < shapes.length; index += PICKER_COLUMNS) rows.push(shapes.slice(index, index + PICKER_COLUMNS)); - return (0, import_react31.createElement)( - import_react31.Fragment, + return (0, import_react35.createElement)( + import_react35.Fragment, null, - (0, import_react31.createElement)("div", { className: "bt-shapes", role: "group", "aria-label": t("Character shape") }, rows.map((row, index) => (0, import_react31.createElement)("div", { key: index, className: "bt-shape-row" }, row.map((id) => (0, import_react31.createElement)("button", { + (0, import_react35.createElement)("div", { className: "bt-shapes", role: "group", "aria-label": t("Character shape") }, rows.map((row, index) => (0, import_react35.createElement)("div", { key: index, className: "bt-shape-row" }, row.map((id) => (0, import_react35.createElement)("button", { key: id, type: "button", className: "bt-shape", @@ -15040,8 +16587,8 @@ function CharacterGrid({ look, hasPhoto = false, onShape, onColor }) { title: t(shapeOf(id).label), "aria-pressed": !hasPhoto && look.shape === id, onClick: () => onShape(id) - }, (0, import_react31.createElement)(ShapeRing, { shape: id, size: 36 }), (0, import_react31.createElement)(BotMark, { look: { shape: id, color: look.color }, size: 36 })))))), - (0, import_react31.createElement)("div", { className: "bt-colors", role: "group", "aria-label": t("Character color") }, CHARACTER_COLORS.map((color) => (0, import_react31.createElement)("button", { + }, (0, import_react35.createElement)(ShapeRing, { shape: id, size: 36 }), (0, import_react35.createElement)(BotMark, { look: { shape: id, color: look.color }, size: 36 })))))), + (0, import_react35.createElement)("div", { className: "bt-colors", role: "group", "aria-label": t("Character color") }, CHARACTER_COLORS.map((color) => (0, import_react35.createElement)("button", { key: color, type: "button", className: "bt-color", @@ -15049,19 +16596,19 @@ function CharacterGrid({ look, hasPhoto = false, onShape, onColor }) { title: t(capitalize(color)), "aria-pressed": look.color === color, onClick: () => onColor(color) - }, (0, import_react31.createElement)("span", { style: { background: paintCss(color) } })))) + }, (0, import_react35.createElement)("span", { style: { background: paintCss(color) } })))) ); } function AvatarEditor({ bot, actions, run, onClose }) { const look = lookOf(bot); - const [tab, setTab] = (0, import_react31.useState)(look.image ? "upload" : "bot"); - const [over, setOver] = (0, import_react31.useState)(false); - const ref = (0, import_react31.useRef)(null); - const fileRef = (0, import_react31.useRef)(null); + const [tab, setTab] = (0, import_react35.useState)(look.image ? "upload" : "bot"); + const [over, setOver] = (0, import_react35.useState)(false); + const ref = (0, import_react35.useRef)(null); + const fileRef = (0, import_react35.useRef)(null); const upload = (file) => { if (file) void run(avatarImage(file).then((image) => actions.updateBot(bot.id, { avatar: { ...bot.avatar ?? {}, image } }))); }; - (0, import_react31.useEffect)(() => { + (0, import_react35.useEffect)(() => { const onDown = (event) => { if (!(event.target instanceof Element) || ref.current?.contains(event.target) || event.target.closest(".bt-avatar-trigger")) return; onClose(); @@ -15079,7 +16626,7 @@ function AvatarEditor({ bot, actions, run, onClose }) { window.removeEventListener("keydown", onKey, true); }; }, [onClose]); - (0, import_react31.useEffect)(() => { + (0, import_react35.useEffect)(() => { if (tab !== "upload") return void 0; const onPaste = (event) => { const file = [...event.clipboardData?.files ?? []].find((item) => item.type.startsWith("image/")); @@ -15093,32 +16640,32 @@ function AvatarEditor({ bot, actions, run, onClose }) { }, [tab, bot]); const hasPhoto = Boolean(look.image); const glide = useGlide(tab); - return (0, import_react31.createElement)( + return (0, import_react35.createElement)( "div", { ref, className: "bt-avedit", role: "dialog", "aria-label": t("Avatar editor") }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "div", { className: "bt-avedit-top" }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "div", { ref: glide.box, role: "tablist", "aria-label": t("Avatar source"), className: "bt-avedit-tabs" }, - (0, import_react31.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), - [["bot", "Bot"], ["upload", "Upload"]].map(([id, label]) => (0, import_react31.createElement)("button", { key: id, type: "button", role: "tab", className: "bt-avedit-tab", "aria-selected": tab === id, onClick: () => setTab(id) }, t(label))) + (0, import_react35.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), + [["bot", "Bot"], ["upload", "Upload"]].map(([id, label]) => (0, import_react35.createElement)("button", { key: id, type: "button", role: "tab", className: "bt-avedit-tab", "aria-selected": tab === id, onClick: () => setTab(id) }, t(label))) ), - (0, import_react31.createElement)("button", { + (0, import_react35.createElement)("button", { type: "button", className: "bt-avedit-tab bt-avedit-reset", title: t("Reset character to default"), onClick: () => run(actions.updateBot(bot.id, { avatar: null, color: null })) }, t("Reset")) ), - tab === "bot" ? (0, import_react31.createElement)(CharacterGrid, { + tab === "bot" ? (0, import_react35.createElement)(CharacterGrid, { look, hasPhoto, onShape: (shape) => run(actions.updateBot(bot.id, { avatar: { shape } })), onColor: (color) => run(actions.updateBot(bot.id, { color })) }) : null, - tab === "upload" ? (0, import_react31.createElement)( + tab === "upload" ? (0, import_react35.createElement)( "div", { className: "bt-dropzone", @@ -15134,15 +16681,15 @@ function AvatarEditor({ bot, actions, run, onClose }) { upload(event.dataTransfer.files?.[0]); } }, - hasPhoto ? (0, import_react31.createElement)("img", { src: look.image, alt: "" }) : null, - (0, import_react31.createElement)("div", null, t("Drag, drop, or paste an image")), - (0, import_react31.createElement)( + hasPhoto ? (0, import_react35.createElement)("img", { src: look.image, alt: "" }) : null, + (0, import_react35.createElement)("div", null, t("Drag, drop, or paste an image")), + (0, import_react35.createElement)( "div", { className: "bt-actions", style: { justifyContent: "center" } }, - (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, hasPhoto ? t("Replace") : t("Browse files")), - hasPhoto ? (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.updateBot(bot.id, { avatar: hasShape(bot.avatar?.shape) ? { shape: bot.avatar.shape } : null })) }, t("Remove photo")) : null + (0, import_react35.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, hasPhoto ? t("Replace") : t("Browse files")), + hasPhoto ? (0, import_react35.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.updateBot(bot.id, { avatar: hasShape(bot.avatar?.shape) ? { shape: bot.avatar.shape } : null })) }, t("Remove photo")) : null ), - (0, import_react31.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { + (0, import_react35.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { const file = event.target.files?.[0]; event.target.value = ""; upload(file); @@ -15153,67 +16700,67 @@ function AvatarEditor({ bot, actions, run, onClose }) { function MemoryCard({ bot, actions }) { const { count, failure } = useMemoryCount(bot.id, actions); const label = memoryCountText({ count, failure }); - return (0, import_react31.createElement)( + return (0, import_react35.createElement)( Card, { title: t("Memory") }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "button", { type: "button", className: "bt-set-row bt-bs-row", "aria-label": t("Manage {name}'s memory", { name: bot.name }), onClick: () => actions.openMemory(bot.id) }, - (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, label)), - (0, import_react31.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react31.createElement)(ChevronRightIcon)) + (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-bs-label" }, label)), + (0, import_react35.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react35.createElement)(ChevronRightIcon)) ) ); } function BotSettingsForm({ bot, roster, actions, run }) { - const [editing, setEditing] = (0, import_react31.useState)(false); - const [confirming, setConfirming] = (0, import_react31.useState)(false); - const closeEditor = (0, import_react31.useCallback)(() => setEditing(false), []); - (0, import_react31.useEffect)(() => { + const [editing, setEditing] = (0, import_react35.useState)(false); + const [confirming, setConfirming] = (0, import_react35.useState)(false); + const closeEditor = (0, import_react35.useCallback)(() => setEditing(false), []); + (0, import_react35.useEffect)(() => { if (!confirming) return void 0; const timer = setTimeout(() => setConfirming(false), 4e3); return () => clearTimeout(timer); }, [confirming]); if (bot.remote) return null; - (0, import_react31.useEffect)(() => { + (0, import_react35.useEffect)(() => { void actions.refreshModels?.(); }, [bot.id]); const isMainBot = isMainOf(roster, bot.id); const onlyMain = isMainBot && (roster.mainBotIds ?? []).length === 1; const isTile = roster.mainBotId === bot.id; if (lockedWindow(roster)) { - return (0, import_react31.createElement)( + return (0, import_react35.createElement)( "div", { className: "bt-bs" }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "div", { className: "bt-bs-hero" }, - (0, import_react31.createElement)(BotMark, { bot, size: 64, live: false }), - (0, import_react31.createElement)( + (0, import_react35.createElement)(BotMark, { bot, size: 64, live: false }), + (0, import_react35.createElement)( "div", { className: "bt-bs-who" }, - (0, import_react31.createElement)("span", { className: "bt-bs-name" }, bot.name), - (0, import_react31.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) + (0, import_react35.createElement)("span", { className: "bt-bs-name" }, bot.name), + (0, import_react35.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) ) ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( Card, { title: t("Profile") }, - (0, import_react31.createElement)(Row, { label: t("Label"), hint: bot.role || t("Bot") }) + (0, import_react35.createElement)(Row, { label: t("Label"), hint: bot.role || t("Bot") }) ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( Card, { title: t("Model") }, - (0, import_react31.createElement)(Row, { label: t("Model"), hint: modelOf(bot, roster)?.name ?? modelHint(bot, roster) }) + (0, import_react35.createElement)(Row, { label: t("Model"), hint: modelOf(bot, roster)?.name ?? modelHint(bot, roster) }) ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( Card, { title: t("Working folder") }, - (0, import_react31.createElement)(Row, { label: t("Folder"), hint: bot.workDir || t("Not set") }) + (0, import_react35.createElement)(Row, { label: t("Folder"), hint: bot.workDir || t("Not set") }) ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( Card, { title: t("Instructions") }, - (0, import_react31.createElement)(Row, { label: t("What this Bot does"), hint: bot.instructions || t("None"), stack: true }) + (0, import_react35.createElement)(Row, { label: t("What this Bot does"), hint: bot.instructions || t("None"), stack: true }) ) ); } @@ -15223,113 +16770,113 @@ function BotSettingsForm({ bot, roster, actions, run }) { if (confirming) void run(actions.deleteBot(bot.id)); else setConfirming(true); }; - return (0, import_react31.createElement)( + return (0, import_react35.createElement)( "div", { className: "bt-bs" }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "div", { className: "bt-bs-hero" }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "div", { className: "bt-avatar-anchor" }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "button", { type: "button", className: "bt-avatar-trigger", "aria-label": t("Edit Bot avatar"), "aria-expanded": editing, onClick: () => setEditing((value) => !value) }, - (0, import_react31.createElement)(BotMark, { bot, size: 64, live: true }), - (0, import_react31.createElement)("span", { className: "bt-avatar-pencil", "aria-hidden": true }, (0, import_react31.createElement)(PencilIcon)) + (0, import_react35.createElement)(BotMark, { bot, size: 64, live: true }), + (0, import_react35.createElement)("span", { className: "bt-avatar-pencil", "aria-hidden": true }, (0, import_react35.createElement)(PencilIcon)) ), - editing ? (0, import_react31.createElement)(AvatarEditor, { bot, actions, run, onClose: closeEditor }) : null + editing ? (0, import_react35.createElement)(AvatarEditor, { bot, actions, run, onClose: closeEditor }) : null ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( "div", { className: "bt-bs-who" }, - (0, import_react31.createElement)("span", { className: "bt-bs-name" }, bot.name), - (0, import_react31.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) + (0, import_react35.createElement)("span", { className: "bt-bs-name" }, bot.name), + (0, import_react35.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) ) ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( Card, { title: t("Profile") }, - (0, import_react31.createElement)(Row, { label: t("Name") }, (0, import_react31.createElement)(InlineText, { label: t("Name"), value: bot.name, placeholder: "Bob", required: true, maxLength: 40, onSave: (name) => save({ name }) })), - (0, import_react31.createElement)(Row, { label: t("Label"), hint: t("Optional. Shown under the name.") }, (0, import_react31.createElement)(InlineText, { label: t("Label"), value: bot.role, placeholder: t("Research, admin…"), maxLength: 24, onSave: (role) => save({ role }) })) + (0, import_react35.createElement)(Row, { label: t("Name") }, (0, import_react35.createElement)(InlineText, { label: t("Name"), value: bot.name, placeholder: "Bob", required: true, maxLength: 40, onSave: (name) => save({ name }) })), + (0, import_react35.createElement)(Row, { label: t("Label"), hint: t("Optional. Shown under the name.") }, (0, import_react35.createElement)(InlineText, { label: t("Label"), value: bot.role, placeholder: t("Research, admin…"), maxLength: 24, onSave: (role) => save({ role }) })) ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( Card, { title: t("Model") }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "div", { className: "bt-set-row bt-bs-row" }, - (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-set-hint" }, modelHint(bot, roster))), - (0, import_react31.createElement)(ModelMenu, { bot, roster, actions, run }) + (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-set-hint" }, modelHint(bot, roster))), + (0, import_react35.createElement)(ModelMenu, { bot, roster, actions, run }) ), - bot.model ? (0, import_react31.createElement)(ModelTestRow, { bot, modelName: modelOf(bot, roster)?.name }) : null + bot.model ? (0, import_react35.createElement)(ModelTestRow, { bot, modelName: modelOf(bot, roster)?.name }) : null ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( Card, { title: t("Working folder") }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "div", { className: "bt-set-row bt-bs-row" }, - (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), - (0, import_react31.createElement)(FolderMenu, { value: bot.workDir, actions, run, onPick: (workDir) => save({ workDir }) }) + (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), + (0, import_react35.createElement)(FolderMenu, { value: bot.workDir, actions, run, onPick: (workDir) => save({ workDir }) }) ) ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( Card, { title: t("Instructions") }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( Row, { label: t("What this Bot does"), hint: t("Its job on the team. Part of the Bot's system prompt."), stack: true }, - (0, import_react31.createElement)(InlineText, { label: t("Instructions"), value: bot.instructions, multiline: true, placeholder: t("What this Bot is responsible for…"), onSave: (instructions) => save({ instructions }) }) + (0, import_react35.createElement)(InlineText, { label: t("Instructions"), value: bot.instructions, multiline: true, placeholder: t("What this Bot is responsible for…"), onSave: (instructions) => save({ instructions }) }) ) ), // Sharing sits near the top with a title like Profile and Model, not at the end of the page (#406). - (0, import_react31.createElement)(FlyBotDetails, { bot, roster, actions, wrap: (children) => (0, import_react31.createElement)(Card, { title: t("Sharing") }, children) }), - (0, import_react31.createElement)(BotCapabilitiesCard, { bot, roster, actions, run, Card, SwitchRow }), - (0, import_react31.createElement)(BotConnectorsCard, { bot, roster, actions, run, Card, SwitchRow }), - roster.memory === false ? null : (0, import_react31.createElement)(MemoryCard, { bot, actions }), - (0, import_react31.createElement)(BotSchedules, { bot, roster, actions }), - (0, import_react31.createElement)(StandingApprovalsCard, { scope: "bot", target: bot, roster, actions, run, Card }), - (0, import_react31.createElement)( + (0, import_react35.createElement)(FlyBotDetails, { bot, roster, actions, wrap: (children) => (0, import_react35.createElement)(Card, { title: t("Sharing") }, children) }), + (0, import_react35.createElement)(BotCapabilitiesCard, { bot, roster, actions, run, Card, SwitchRow }), + (0, import_react35.createElement)(BotConnectorsCard, { bot, roster, actions, run, Card, SwitchRow }), + roster.memory === false ? null : (0, import_react35.createElement)(MemoryCard, { bot, actions }), + (0, import_react35.createElement)(BotSchedules, { bot, roster, actions }), + (0, import_react35.createElement)(StandingApprovalsCard, { scope: "bot", target: bot, roster, actions, run, Card }), + (0, import_react35.createElement)( Card, { title: t("Main Bot") }, - onlyMain ? (0, import_react31.createElement)( + onlyMain ? (0, import_react35.createElement)( "div", { className: "bt-set-row bt-bs-row" }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "span", { className: "bt-set-copy" }, - (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("The only Main Bot. To hand the role to another Bot, use Main Bot on the Bots page.")) + (0, import_react35.createElement)("span", { className: "bt-set-hint" }, t("The only Main Bot. To hand the role to another Bot, use Main Bot on the Bots page.")) ), - (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.openSettings("bots") }, t("Change")) - ) : (0, import_react31.createElement)(SwitchRow, { label: t("Main Bot"), showLabel: false, hint: t("Can create and change Bots, and runs every group chat."), on: isMainBot, onChange: (on) => run(actions.setMain(bot.id, on)) }) + (0, import_react35.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.openSettings("bots") }, t("Change")) + ) : (0, import_react35.createElement)(SwitchRow, { label: t("Main Bot"), showLabel: false, hint: t("Can create and change Bots, and runs every group chat."), on: isMainBot, onChange: (on) => run(actions.setMain(bot.id, on)) }) ), // The Main Bot tile is always first and always shown, like in the context menu. - isTile ? null : (0, import_react31.createElement)( + isTile ? null : (0, import_react35.createElement)( Card, { title: t("Sidebar") }, - (0, import_react31.createElement)(SwitchRow, { label: t("Pin"), hint: t("Kept above the other chats."), on: bot.pinned === true, onChange: (pinned) => run(actions.setFlags(bot.id, { pinned })) }), - isMainBot ? null : (0, import_react31.createElement)(SwitchRow, { label: t("Hide from sidebar"), hint: t("Search still finds it."), on: bot.hidden === true, onChange: (hidden) => run(actions.setFlags(bot.id, { hidden })) }) + (0, import_react35.createElement)(SwitchRow, { label: t("Pin"), hint: t("Kept above the other chats."), on: bot.pinned === true, onChange: (pinned) => run(actions.setFlags(bot.id, { pinned })) }), + isMainBot ? null : (0, import_react35.createElement)(SwitchRow, { label: t("Hide from sidebar"), hint: t("Search still finds it."), on: bot.hidden === true, onChange: (hidden) => run(actions.setFlags(bot.id, { hidden })) }) ), - (0, import_react31.createElement)( + (0, import_react35.createElement)( Card, { title: t("More") }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "button", { type: "button", className: "bt-set-row bt-bs-row", onClick: duplicate }, - (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Duplicate")), (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("A copy with the same job and model, and fresh memory."))), - (0, import_react31.createElement)("span", { className: "bt-chevron" }, (0, import_react31.createElement)(ChevronRightIcon)) + (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-bs-label" }, t("Duplicate")), (0, import_react35.createElement)("span", { className: "bt-set-hint" }, t("A copy with the same job and model, and fresh memory."))), + (0, import_react35.createElement)("span", { className: "bt-chevron" }, (0, import_react35.createElement)(ChevronRightIcon)) ), - isMainBot ? null : (0, import_react31.createElement)( + isMainBot ? null : (0, import_react35.createElement)( "button", { type: "button", className: "bt-set-row bt-bs-row bt-bs-danger", "data-confirm": confirming || void 0, onClick: remove }, - (0, import_react31.createElement)( + (0, import_react35.createElement)( "span", { className: "bt-set-copy" }, - (0, import_react31.createElement)("span", { className: "bt-bs-label" }, confirming ? t("Delete {name}?", { name: bot.name }) : t("Delete Bot")), - (0, import_react31.createElement)("span", { className: "bt-set-hint" }, confirming ? t("Click again to delete. Its chats are archived.") : t("Removes the Bot from the team.")) + (0, import_react35.createElement)("span", { className: "bt-bs-label" }, confirming ? t("Delete {name}?", { name: bot.name }) : t("Delete Bot")), + (0, import_react35.createElement)("span", { className: "bt-set-hint" }, confirming ? t("Click again to delete. Its chats are archived.") : t("Removes the Bot from the team.")) ), - (0, import_react31.createElement)("span", { className: "bt-chevron" }, (0, import_react31.createElement)(ChevronRightIcon)) + (0, import_react35.createElement)("span", { className: "bt-chevron" }, (0, import_react35.createElement)(ChevronRightIcon)) ) ) ); @@ -15384,8 +16931,25 @@ ${MODEL_TEST_CSS} } `; +// src/shared/group-create.js +function groupMemberQuery(query) { + return String(query ?? "").trim().toLowerCase(); +} +function groupMemberMatches(bot, query) { + const wanted = groupMemberQuery(query); + if (!wanted) return true; + if (!bot) return false; + const name = String(bot.name ?? "").toLowerCase(); + const role = String(bot.role ?? "").toLowerCase(); + const label = pickerBotLabel(bot).toLowerCase(); + return name.includes(wanted) || role.includes(wanted) || label.includes(wanted); +} +function canCreateGroup(admin, members) { + return admin != null && admin !== "" && Array.isArray(members) && members.length > 0; +} + // src/client/group-settings.js -var import_react32 = require("react"); +var import_react36 = require("react"); var ROOM_MODES = [ ["admin", "Admin leads", "Plain messages go to the admin, who calls others with @Name."], ["everyone", "Everyone", "Every member answers in turn, admin first."] @@ -15417,9 +16981,9 @@ function faceMarks(person, roster, size) { for (const seat of person?.seats ?? []) { const bot = faceSeatBot(seat, roster); if (!bot) continue; - marks.push((0, import_react32.createElement)(BotMark, { key: seat.key, bot, size, live: false })); + marks.push((0, import_react36.createElement)(BotMark, { key: seat.key, bot, size, live: false })); } - if (marks.length === 0) return [(0, import_react32.createElement)(PersonMark, { key: "person", size, name: person?.name })]; + if (marks.length === 0) return [(0, import_react36.createElement)(PersonMark, { key: "person", size, name: person?.name })]; return marks; } function faceRoomCount(room2, roster) { @@ -15433,31 +16997,31 @@ var handleKey = (handle) => String(handle ?? "").trim().replace(/^@+/, "").toLow var isLeadSeat = (seat, lead) => Boolean(handleKey(lead) && handleKey(seat.record?.handle) === handleKey(lead)); function FacePersonRow({ person, onOpenBot, lead, roster, className = "bt-set-row bt-bs-row bt-gs-member", size = 26 }) { const bots = person.seats.flatMap((seat, index) => { - const name = seat.local && onOpenBot ? (0, import_react32.createElement)("button", { key: seat.key, type: "button", className: "bt-face-bot", title: t("Open {name}'s chat", { name: seat.bot }), onClick: () => onOpenBot(seat.local.id) }, seat.bot) : (0, import_react32.createElement)("span", { key: seat.key, className: "bt-face-bot", title: seat.record?.handle || void 0 }, seat.bot); - const marked = isLeadSeat(seat, lead) ? [name, (0, import_react32.createElement)("span", { key: `${seat.key}-lead`, className: "bt-tag", "data-flybot": "face-lead-tag" }, t("Lead"))] : [name]; - return index === 0 ? marked : [(0, import_react32.createElement)("span", { key: `${seat.key}-sep` }, t(", ")), ...marked]; + const name = seat.local && onOpenBot ? (0, import_react36.createElement)("button", { key: seat.key, type: "button", className: "bt-face-bot", title: t("Open {name}'s chat", { name: seat.bot }), onClick: () => onOpenBot(seat.local.id) }, seat.bot) : (0, import_react36.createElement)("span", { key: seat.key, className: "bt-face-bot", title: seat.record?.handle || void 0 }, seat.bot); + const marked = isLeadSeat(seat, lead) ? [name, (0, import_react36.createElement)("span", { key: `${seat.key}-lead`, className: "bt-tag", "data-flybot": "face-lead-tag" }, t("Lead"))] : [name]; + return index === 0 ? marked : [(0, import_react36.createElement)("span", { key: `${seat.key}-sep` }, t(", ")), ...marked]; }); - return (0, import_react32.createElement)( + return (0, import_react36.createElement)( "div", { className, role: "listitem", "data-flybot": "face-person", "data-mine": person.mine || void 0 }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "span", { className: "bt-gs-who bt-face-person" }, - (0, import_react32.createElement)("span", { className: "bt-face-marks", "data-flybot": "face-person-avatars" }, faceMarks(person, roster, size)), - (0, import_react32.createElement)( + (0, import_react36.createElement)("span", { className: "bt-face-marks", "data-flybot": "face-person-avatars" }, faceMarks(person, roster, size)), + (0, import_react36.createElement)( "span", { className: "bt-face-person-text" }, - (0, import_react32.createElement)("span", { className: "bt-row-title" }, facePersonLabel(person)), - (0, import_react32.createElement)("span", { className: "bt-face-bots" }, bots) + (0, import_react36.createElement)("span", { className: "bt-row-title" }, facePersonLabel(person)), + (0, import_react36.createElement)("span", { className: "bt-face-bots" }, bots) ) ) ); } function FaceLead({ room: room2, roster, pick: pick2 }) { const lead = room2.face?.lead; - const [open, setOpen] = (0, import_react32.useState)(false); - const [busy, setBusy] = (0, import_react32.useState)(false); - const [error, setError] = (0, import_react32.useState)(""); + const [open, setOpen] = (0, import_react36.useState)(false); + const [busy, setBusy] = (0, import_react36.useState)(false); + const [error, setError] = (0, import_react36.useState)(""); const seats = faceSeats(room2, roster); const current = seats.find((seat) => isLeadSeat(seat, lead?.handle)); if (!current) return null; @@ -15475,30 +17039,30 @@ function FaceLead({ room: room2, roster, pick: pick2 }) { setBusy(false); } }; - return (0, import_react32.createElement)( + return (0, import_react36.createElement)( "div", { className: "bt-face-lead", "data-flybot": "face-lead" }, - (0, import_react32.createElement)("div", { className: "bt-section-title" }, t("Room lead")), - (0, import_react32.createElement)( + (0, import_react36.createElement)("div", { className: "bt-section-title" }, t("Room lead")), + (0, import_react36.createElement)( "div", { className: "bt-set-row" }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "span", { className: "bt-set-copy" }, - (0, import_react32.createElement)("span", { className: "bt-row-title" }, faceSeatLabel(current)), - (0, import_react32.createElement)("span", { className: "bt-set-hint" }, lead.picked ? t("Writes the plan and gives each Bot its part.") : t("Default: the first Bot of the room creator that joined.")) + (0, import_react36.createElement)("span", { className: "bt-row-title" }, faceSeatLabel(current)), + (0, import_react36.createElement)("span", { className: "bt-set-hint" }, lead.picked ? t("Writes the plan and gives each Bot its part.") : t("Default: the first Bot of the room creator that joined.")) ), - canPick ? (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", "aria-expanded": open, onClick: () => setOpen(!open) }, open ? t("Done") : t("Change")) : null + canPick ? (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", "aria-expanded": open, onClick: () => setOpen(!open) }, open ? t("Done") : t("Change")) : null ), - open && canPick ? seats.map((seat) => (0, import_react32.createElement)( + open && canPick ? seats.map((seat) => (0, import_react36.createElement)( "div", { key: seat.key, className: "bt-set-row" }, - (0, import_react32.createElement)("span", { className: "bt-set-copy" }, faceSeatLabel(seat)), - seat === current ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Lead")) : (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", disabled: busy, onClick: () => void choose(seat.record?.handle) }, t("Make lead")) + (0, import_react36.createElement)("span", { className: "bt-set-copy" }, faceSeatLabel(seat)), + seat === current ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Lead")) : (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", disabled: busy, onClick: () => void choose(seat.record?.handle) }, t("Make lead")) )) : null, - open && canPick && lead.picked ? (0, import_react32.createElement)("button", { type: "button", className: "bt-more", disabled: busy, onClick: () => void choose(null) }, t("Use the default lead")) : null, - canPick || locked || !lead.supported ? null : (0, import_react32.createElement)("div", { className: "bt-set-hint" }, t("Only the person who created this room can change it.")), - error ? (0, import_react32.createElement)("div", { className: "bt-set-hint", role: "alert" }, error) : null + open && canPick && lead.picked ? (0, import_react36.createElement)("button", { type: "button", className: "bt-more", disabled: busy, onClick: () => void choose(null) }, t("Use the default lead")) : null, + canPick || locked || !lead.supported ? null : (0, import_react36.createElement)("div", { className: "bt-set-hint" }, t("Only the person who created this room can change it.")), + error ? (0, import_react36.createElement)("div", { className: "bt-set-hint", role: "alert" }, error) : null ); } function seatedCount(room2) { @@ -15514,9 +17078,9 @@ function roomSubtitle(room2, roster) { return [t(count === 1 ? "{count} member" : "{count} members", { count }), admin ? t("Admin {name}", { name: admin.name }) : t("No admin")].join(" · "); } function GroupSettingsForm({ room: room2, roster, actions, run, onDeleted }) { - const [adding, setAdding] = (0, import_react32.useState)(false); - const [confirming, setConfirming] = (0, import_react32.useState)(false); - (0, import_react32.useEffect)(() => { + const [adding, setAdding] = (0, import_react36.useState)(false); + const [confirming, setConfirming] = (0, import_react36.useState)(false); + (0, import_react36.useEffect)(() => { if (!confirming) return void 0; const timer = setTimeout(() => setConfirming(false), 4e3); return () => clearTimeout(timer); @@ -15542,39 +17106,39 @@ function GroupSettingsForm({ room: room2, roster, actions, run, onDeleted }) { const modeHint = ROOM_MODES.find(([id]) => id === mode)?.[2] ?? ""; const modeLabel = ROOM_MODES.find(([id]) => id === mode)?.[1] ?? "Everyone"; if (lockedWindow(roster)) { - return (0, import_react32.createElement)( + return (0, import_react36.createElement)( "div", { className: "bt-bs" }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "div", { className: "bt-bs-hero" }, - (0, import_react32.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), - (0, import_react32.createElement)( + (0, import_react36.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), + (0, import_react36.createElement)( "div", { className: "bt-bs-who" }, - (0, import_react32.createElement)("span", { className: "bt-bs-name" }, room2.name), - (0, import_react32.createElement)("span", { className: "bt-bs-sub" }, roomSubtitle(room2, roster)) + (0, import_react36.createElement)("span", { className: "bt-bs-name" }, room2.name), + (0, import_react36.createElement)("span", { className: "bt-bs-sub" }, roomSubtitle(room2, roster)) ) ), - (0, import_react32.createElement)( + (0, import_react36.createElement)( Card, { title: t("Members · {count}", { count: face ? people2.length : members.length + humans.length + remotes.length }) }, - face ? people2.map((person) => (0, import_react32.createElement)(FacePersonRow, { key: person.key, person, roster, lead: room2.face?.lead?.handle })) : [ + face ? people2.map((person) => (0, import_react36.createElement)(FacePersonRow, { key: person.key, person, roster, lead: room2.face?.lead?.handle })) : [ // The stored name, cleaned by the same reader the friend's-Bot rows use (#2474). - humans.map((person) => (0, import_react32.createElement)(Row, { key: person.id, label: remoteBotName(person, person.id), hint: t("Human") })), - members.map((member) => (0, import_react32.createElement)(Row, { + humans.map((person) => (0, import_react36.createElement)(Row, { key: person.id, label: remoteBotName(person, person.id), hint: t("Human") })), + members.map((member) => (0, import_react36.createElement)(Row, { key: member.id, label: member.name, hint: [room2.admin === member.id ? t("Admin") : "", room2.taskLead === member.id ? t("Task lead") : ""].filter(Boolean).join(" · ") || t("Bot") })), - remotes.map((person) => (0, import_react32.createElement)(Row, { key: person.handle || person.id, label: person.label || remoteBotTitle(person), hint: t("Friend's Bot") })) + remotes.map((person) => (0, import_react36.createElement)(Row, { key: person.handle || person.id, label: person.label || remoteBotTitle(person), hint: t("Friend's Bot") })) ] ), // Both facts are reads (`shownMode` and `room.workDir`), so a locked page keeps them as // text for every group, the way a face-to-face room already did (#2492). - (0, import_react32.createElement)(Card, { title: t("Who answers") }, (0, import_react32.createElement)(Row, { label: t(modeLabel), hint: t(modeHint) })), - (0, import_react32.createElement)(Card, { title: t("Working folder") }, (0, import_react32.createElement)(Row, { label: t("Folder"), hint: room2.workDir || t("Not set") })), - room2.notice ? (0, import_react32.createElement)(Card, { title: t("Notice") }, (0, import_react32.createElement)(Row, { label: t("Group notice"), hint: room2.notice, stack: true })) : null + (0, import_react36.createElement)(Card, { title: t("Who answers") }, (0, import_react36.createElement)(Row, { label: t(modeLabel), hint: t(modeHint) })), + (0, import_react36.createElement)(Card, { title: t("Working folder") }, (0, import_react36.createElement)(Row, { label: t("Folder"), hint: room2.workDir || t("Not set") })), + room2.notice ? (0, import_react36.createElement)(Card, { title: t("Notice") }, (0, import_react36.createElement)(Row, { label: t("Group notice"), hint: room2.notice, stack: true })) : null ); } const update = (patch) => run(actions.updateRoom(room2.id, patch)); @@ -15591,41 +17155,41 @@ function GroupSettingsForm({ room: room2, roster, actions, run, onDeleted }) { if (done) onDeleted?.(); }); }; - return (0, import_react32.createElement)( + return (0, import_react36.createElement)( "div", { className: "bt-bs" }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "div", { className: "bt-bs-hero" }, - (0, import_react32.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), - (0, import_react32.createElement)( + (0, import_react36.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), + (0, import_react36.createElement)( "div", { className: "bt-bs-who" }, - (0, import_react32.createElement)("span", { className: "bt-bs-name" }, room2.name), - (0, import_react32.createElement)("span", { className: "bt-bs-sub" }, roomSubtitle(room2, roster)) + (0, import_react36.createElement)("span", { className: "bt-bs-name" }, room2.name), + (0, import_react36.createElement)("span", { className: "bt-bs-sub" }, roomSubtitle(room2, roster)) ) ), - (0, import_react32.createElement)( + (0, import_react36.createElement)( Card, { title: t("Profile") }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( Row, { label: t("Name"), hint: t("Leave it empty to name the group after its members.") }, - (0, import_react32.createElement)(InlineText, { label: t("Group name"), value: room2.named ? room2.name : "", placeholder: t("Name after members"), maxLength: 60, onSave: (name) => update({ name }) }) + (0, import_react36.createElement)(InlineText, { label: t("Group name"), value: room2.named ? room2.name : "", placeholder: t("Name after members"), maxLength: 60, onSave: (name) => update({ name }) }) ), - (0, import_react32.createElement)( + (0, import_react36.createElement)( Row, { label: t("Notice"), hint: t("Every member reads it before speaking in this group."), stack: true }, - (0, import_react32.createElement)(InlineText, { label: t("Group notice"), value: room2.notice, multiline: true, maxLength: 2e3, placeholder: t("Shared instructions every member reads before speaking…"), onSave: (notice) => update({ notice }) }) + (0, import_react36.createElement)(InlineText, { label: t("Group notice"), value: room2.notice, multiline: true, maxLength: 2e3, placeholder: t("Shared instructions every member reads before speaking…"), onSave: (notice) => update({ notice }) }) ) ), - (0, import_react32.createElement)( + (0, import_react36.createElement)( Card, { title: t("Who answers") }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "div", { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react32.createElement)(Segmented, { label: t("Who answers"), value: mode }, ROOM_MODES.map(([id, label]) => (0, import_react32.createElement)("button", { + (0, import_react36.createElement)(Segmented, { label: t("Who answers"), value: mode }, ROOM_MODES.map(([id, label]) => (0, import_react36.createElement)("button", { key: id, type: "button", "aria-pressed": mode === id, @@ -15635,108 +17199,108 @@ function GroupSettingsForm({ room: room2, roster, actions, run, onDeleted }) { if (mode !== id) void update({ mode: id }); } }, t(label)))), - (0, import_react32.createElement)("span", { key: mode, className: "bt-set-hint bt-veil" }, `${t(modeHint)} ${t("@mentions always pick who answers.")}`) + (0, import_react36.createElement)("span", { key: mode, className: "bt-set-hint bt-veil" }, `${t(modeHint)} ${t("@mentions always pick who answers.")}`) ) ), - (0, import_react32.createElement)( + (0, import_react36.createElement)( Card, { title: t("Working folder") }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "div", { className: "bt-set-row bt-bs-row" }, - (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), - (0, import_react32.createElement)(FolderMenu, { value: room2.workDir, group: true, actions, run, onPick: (workDir) => update({ workDir }) }) + (0, import_react36.createElement)("span", { className: "bt-set-copy" }, (0, import_react36.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), + (0, import_react36.createElement)(FolderMenu, { value: room2.workDir, group: true, actions, run, onPick: (workDir) => update({ workDir }) }) ) ), - face ? (0, import_react32.createElement)( + face ? (0, import_react36.createElement)( Card, { title: t("Members · {count}", { count: people2.length }) }, - people2.map((person) => (0, import_react32.createElement)(FacePersonRow, { key: person.key, person, roster, onOpenBot: openBot, lead: room2.face?.lead?.handle })) + people2.map((person) => (0, import_react36.createElement)(FacePersonRow, { key: person.key, person, roster, onOpenBot: openBot, lead: room2.face?.lead?.handle })) ) : null, - face ? null : (0, import_react32.createElement)( + face ? null : (0, import_react36.createElement)( Card, { title: t("Members · {count}", { count: members.length + humans.length + remotes.length }) }, - humans.map((person) => (0, import_react32.createElement)( + humans.map((person) => (0, import_react36.createElement)( "div", { key: person.id, className: "bt-set-row bt-bs-row bt-gs-member" }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "span", { className: "bt-gs-who" }, - (0, import_react32.createElement)("span", { className: "bt-row-title" }, person.displayName || person.id), - (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Human")), - person.role === "admin" ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Admin")) : null + (0, import_react36.createElement)("span", { className: "bt-row-title" }, person.displayName || person.id), + (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Human")), + person.role === "admin" ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Admin")) : null ), - humans.length + members.length + remotes.length > 2 && person.id !== roster.self?.memberId ? (0, import_react32.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: person.displayName || person.id }), title: t("Remove from group"), onClick: () => update({ removeParticipants: [{ kind: "human", id: person.id }] }) }, "×") : null + humans.length + members.length + remotes.length > 2 && person.id !== roster.self?.memberId ? (0, import_react36.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: person.displayName || person.id }), title: t("Remove from group"), onClick: () => update({ removeParticipants: [{ kind: "human", id: person.id }] }) }, "×") : null )), members.map((member) => { const leads = room2.admin === member.id; const boardHere = room2.origin !== "face-to-face" && room2.origin !== "inbound-share"; const taskLead = room2.taskLead === member.id; - return (0, import_react32.createElement)( + return (0, import_react36.createElement)( "div", { key: member.id, className: "bt-set-row bt-bs-row bt-gs-member" }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "button", { type: "button", className: "bt-gs-who", title: t("Open {name}'s chat", { name: member.name }), onClick: () => openBot(member.id) }, - (0, import_react32.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: leads, live: false }), - (0, import_react32.createElement)("span", { className: "bt-row-title" }, member.name), - leads ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Admin")) : null, - taskLead ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Task lead")) : null, - (roster.humans ?? []).some((person) => person.designatedChiefId === member.id) ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Chief")) : null + (0, import_react36.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: leads, live: false }), + (0, import_react36.createElement)("span", { className: "bt-row-title" }, member.name), + leads ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Admin")) : null, + taskLead ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Task lead")) : null, + (roster.humans ?? []).some((person) => person.designatedChiefId === member.id) ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Chief")) : null ), - leads ? (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", title: t("Leave the group without an admin"), onClick: () => update({ admin: null }) }, t("Unset")) : (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ admin: member.id }) }, t("Make admin")), - boardHere ? taskLead ? (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ taskLead: null }) }, t("Use the admin")) : (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ taskLead: member.id }) }, t("Make task lead")) : null, - members.length > 2 ? (0, import_react32.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: member.name }), title: t("Remove from group"), onClick: () => update({ remove: [member.id] }) }, "×") : null + leads ? (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", title: t("Leave the group without an admin"), onClick: () => update({ admin: null }) }, t("Unset")) : (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ admin: member.id }) }, t("Make admin")), + boardHere ? taskLead ? (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ taskLead: null }) }, t("Use the admin")) : (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ taskLead: member.id }) }, t("Make task lead")) : null, + members.length > 2 ? (0, import_react36.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: member.name }), title: t("Remove from group"), onClick: () => update({ remove: [member.id] }) }, "×") : null ); }), - remotes.map((person) => (0, import_react32.createElement)( + remotes.map((person) => (0, import_react36.createElement)( "div", { key: person.handle || person.id, className: "bt-set-row bt-bs-row bt-gs-member" }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "span", { className: "bt-gs-who" }, - (0, import_react32.createElement)(BotAvatar, { bot: lookBotForRemote(person, roster), size: 26, badge: false, live: false }), - (0, import_react32.createElement)("span", { className: "bt-row-title", title: person.handle || void 0 }, person.label || remoteBotTitle(person)), + (0, import_react36.createElement)(BotAvatar, { bot: lookBotForRemote(person, roster), size: 26, badge: false, live: false }), + (0, import_react36.createElement)("span", { className: "bt-row-title", title: person.handle || void 0 }, person.label || remoteBotTitle(person)), // #904: a host's roster entry is not a friend's Bot, and one this home cannot confirm is // labelled as such; a Bot with no Bot Social identity can never be written to at all. - room2.origin === "face-to-face" ? null : (0, import_react32.createElement)("span", { className: "bt-tag" }, person.unconnected ? t("Not connected") : room2.origin === "inbound-share" && person.verified === false ? t("Unconfirmed") : t("Friend's Bot")) + room2.origin === "face-to-face" ? null : (0, import_react36.createElement)("span", { className: "bt-tag" }, person.unconnected ? t("Not connected") : room2.origin === "inbound-share" && person.verified === false ? t("Unconfirmed") : t("Friend's Bot")) ), // A guest's mirror is not theirs to edit: the host's membership is changed on the host side. - room2.origin === "face-to-face" || room2.origin === "inbound-share" || members.length + remotes.length <= 2 ? null : (0, import_react32.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: remoteBotTitle(person) }), title: t("Remove from group"), onClick: () => update({ removeParticipants: [{ kind: "bot", id: person.handle || person.id, remote: true }] }) }, "×") + room2.origin === "face-to-face" || room2.origin === "inbound-share" || members.length + remotes.length <= 2 ? null : (0, import_react36.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: remoteBotTitle(person) }), title: t("Remove from group"), onClick: () => update({ removeParticipants: [{ kind: "bot", id: person.handle || person.id, remote: true }] }) }, "×") )), room2.origin === "face-to-face" ? null : adding ? [ - ...outsidePeople.map((person) => (0, import_react32.createElement)( + ...outsidePeople.map((person) => (0, import_react36.createElement)( "button", { key: person.id, type: "button", className: "bt-set-row bt-bs-row bt-gs-pick", onClick: () => { setAdding(false); void update({ addParticipants: [{ kind: "human", id: person.id, displayName: person.displayName }] }); } }, - (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, person.displayName || person.id)), - (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("Add person")) + (0, import_react36.createElement)("span", { className: "bt-set-copy" }, (0, import_react36.createElement)("span", { className: "bt-bs-label" }, person.displayName || person.id)), + (0, import_react36.createElement)("span", { className: "bt-set-hint" }, t("Add person")) )), - ...outside.map((bot) => (0, import_react32.createElement)( + ...outside.map((bot) => (0, import_react36.createElement)( "button", { key: bot.id, type: "button", className: "bt-set-row bt-bs-row bt-gs-pick", onClick: () => { setAdding(false); void update({ add: [bot.id] }); } }, - (0, import_react32.createElement)(BotMark, { bot, size: 22 }), - (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, bot.name)), - (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("Add")) + (0, import_react36.createElement)(BotMark, { bot, size: 22 }), + (0, import_react36.createElement)("span", { className: "bt-set-copy" }, (0, import_react36.createElement)("span", { className: "bt-bs-label" }, bot.name)), + (0, import_react36.createElement)("span", { className: "bt-set-hint" }, t("Add")) )), - ...outsideRemotes.map((bot) => (0, import_react32.createElement)( + ...outsideRemotes.map((bot) => (0, import_react36.createElement)( "button", { key: bot.handle, type: "button", className: "bt-set-row bt-bs-row bt-gs-pick", onClick: () => { setAdding(false); void update({ addParticipants: [{ kind: "bot", remote: true, handle: bot.handle }] }); } }, - (0, import_react32.createElement)(BotAvatar, { bot: lookBotForRemote({ handle: bot.handle, displayName: bot.name, avatar: bot.avatar, color: bot.color }, roster), size: 22, badge: false, live: false }), - (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, remoteBotTitle({ displayName: bot.name, ownerName: bot.homeName || bot.owner, handle: bot.handle, isChief: bot.isChief }))), - (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("Add friend's Bot")) + (0, import_react36.createElement)(BotAvatar, { bot: lookBotForRemote({ handle: bot.handle, displayName: bot.name, avatar: bot.avatar, color: bot.color }, roster), size: 22, badge: false, live: false }), + (0, import_react36.createElement)("span", { className: "bt-set-copy" }, (0, import_react36.createElement)("span", { className: "bt-bs-label" }, remoteBotTitle({ displayName: bot.name, ownerName: bot.homeName || bot.owner, handle: bot.handle, isChief: bot.isChief }))), + (0, import_react36.createElement)("span", { className: "bt-set-hint" }, t("Add friend's Bot")) )), - (0, import_react32.createElement)("button", { key: "cancel", type: "button", className: "bt-set-row bt-bs-row bt-gs-add", onClick: () => setAdding(false) }, t("Cancel")) - ] : outside.length + outsidePeople.length + outsideRemotes.length > 0 ? (0, import_react32.createElement)("button", { type: "button", className: "bt-set-row bt-bs-row bt-gs-add", onClick: () => setAdding(true) }, (0, import_react32.createElement)(PlusIcon), t("Add member")) : null, - (0, import_react32.createElement)("div", { className: "bt-set-row bt-gs-note" }, (0, import_react32.createElement)( + (0, import_react36.createElement)("button", { key: "cancel", type: "button", className: "bt-set-row bt-bs-row bt-gs-add", onClick: () => setAdding(false) }, t("Cancel")) + ] : outside.length + outsidePeople.length + outsideRemotes.length > 0 ? (0, import_react36.createElement)("button", { type: "button", className: "bt-set-row bt-bs-row bt-gs-add", onClick: () => setAdding(true) }, (0, import_react36.createElement)(PlusIcon), t("Add member")) : null, + (0, import_react36.createElement)("div", { className: "bt-set-row bt-gs-note" }, (0, import_react36.createElement)( "span", { className: "bt-set-hint" }, // The host's two-Bot floor guards membership changes; this hint warns before one. @@ -15744,101 +17308,206 @@ function GroupSettingsForm({ room: room2, roster, actions, run, onDeleted }) { )), // #876: a plugin's rows for this room (Invite by link), only in a group that lives here. Last, after // the note on who leads, so that note stays with the members it is about (#892). - room2.origin === "face-to-face" || room2.origin === "inbound-share" ? null : (0, import_react32.createElement)(FlyBotRoomMembers, { room: room2, roster, actions }) + room2.origin === "face-to-face" || room2.origin === "inbound-share" ? null : (0, import_react36.createElement)(FlyBotRoomMembers, { room: room2, roster, actions }) ), - (0, import_react32.createElement)(StandingApprovalsCard, { scope: "room", target: room2, roster, actions, run, Card }), - (0, import_react32.createElement)( + (0, import_react36.createElement)(StandingApprovalsCard, { scope: "room", target: room2, roster, actions, run, Card }), + (0, import_react36.createElement)( Card, { title: t("Sidebar") }, - (0, import_react32.createElement)(SwitchRow, { label: t("Pin"), hint: t("Kept above the other chats."), on: room2.pinned === true, onChange: (pinned) => run(actions.setFlags(room2.id, { pinned })) }), - (0, import_react32.createElement)(SwitchRow, { label: t("Hide from sidebar"), hint: t("Search still finds it."), on: room2.hidden === true, onChange: (hidden) => run(actions.setFlags(room2.id, { hidden })) }) + (0, import_react36.createElement)(SwitchRow, { label: t("Pin"), hint: t("Kept above the other chats."), on: room2.pinned === true, onChange: (pinned) => run(actions.setFlags(room2.id, { pinned })) }), + (0, import_react36.createElement)(SwitchRow, { label: t("Hide from sidebar"), hint: t("Search still finds it."), on: room2.hidden === true, onChange: (hidden) => run(actions.setFlags(room2.id, { hidden })) }) ), - (0, import_react32.createElement)( + (0, import_react36.createElement)( Card, { title: t("More") }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "button", { type: "button", className: "bt-set-row bt-bs-row bt-bs-danger", "data-confirm": confirming || void 0, onClick: remove }, - (0, import_react32.createElement)( + (0, import_react36.createElement)( "span", { className: "bt-set-copy" }, - (0, import_react32.createElement)("span", { className: "bt-bs-label" }, confirming ? t("Delete {name}?", { name: room2.name }) : t("Delete group")), - (0, import_react32.createElement)("span", { className: "bt-set-hint" }, confirming ? t("Click again to delete. Its history is archived.") : t("Removes the group chat. Its members stay on the team.")) + (0, import_react36.createElement)("span", { className: "bt-bs-label" }, confirming ? t("Delete {name}?", { name: room2.name }) : t("Delete group")), + (0, import_react36.createElement)("span", { className: "bt-set-hint" }, confirming ? t("Click again to delete. Its history is archived.") : t("Removes the group chat. Its members stay on the team.")) ), - (0, import_react32.createElement)("span", { className: "bt-chevron" }, (0, import_react32.createElement)(ChevronRightIcon)) + (0, import_react36.createElement)("span", { className: "bt-chevron" }, (0, import_react36.createElement)(ChevronRightIcon)) ) ) ); } function NewGroupForm({ roster, actions, run, onCreated, onCancel }) { - const [admin, setAdmin] = (0, import_react32.useState)(null); - const [members, setMembers] = (0, import_react32.useState)([]); - const [name, setName] = (0, import_react32.useState)(""); - const [busy, setBusy] = (0, import_react32.useState)(false); - const toggle = (id) => setMembers((list) => list.includes(id) ? list.filter((item) => item !== id) : [...list, id]); + const [admin, setAdmin] = (0, import_react36.useState)(null); + const [members, setMembers] = (0, import_react36.useState)([]); + const [name, setName] = (0, import_react36.useState)(""); + const [query, setQuery] = (0, import_react36.useState)(""); + const [busy, setBusy] = (0, import_react36.useState)(false); + const locked = lockedWindow(roster); + const bots = listedChatBots(roster); + const selectedIds = admin === null ? members : [admin, ...members]; + const selected = selectedIds.map((id) => roster.byId[id]).filter(Boolean); + const available = bots.filter((bot) => !selectedIds.includes(bot.id) && groupMemberMatches(bot, query)); + const ready = canCreateGroup(admin, members); + const add = (bot) => { + if (admin === null && !bot.remote) { + setAdmin(bot.id); + return; + } + setMembers((list) => list.includes(bot.id) ? list : [...list, bot.id]); + }; + const remove = (id) => { + if (id === admin) { + const nextAdmin = members.find((other) => !roster.byId[other]?.remote) ?? null; + setAdmin(nextAdmin); + setMembers((list) => list.filter((item) => item !== nextAdmin)); + return; + } + setMembers((list) => list.filter((item) => item !== id)); + }; const pickAdmin = (id) => { + if (id === admin || roster.byId[id]?.remote) return; + setMembers((list) => { + const without2 = list.filter((item) => item !== id); + return admin === null ? without2 : [...without2, admin]; + }); setAdmin(id); - setMembers((list) => list.filter((item) => item !== id)); }; - const locked = lockedWindow(roster); const create = async () => { - if (locked || busy || admin === null || members.length === 0) return; + if (locked || busy || !ready) return; setBusy(true); let room2; - const done = await run(actions.createRoom([admin, ...members], { admin, ...name.trim() ? { name: name.trim() } : {} }).then((value) => { + const { members: localIds, remotes } = splitRoomPicks(roster, [admin, ...members]); + const participants = remotes.length === 0 ? void 0 : [ + ...localIds.map((id) => ({ kind: "bot", id, role: id === admin ? "admin" : "member" })), + ...remotes + ]; + const done = await run(actions.createRoom(localIds, { + admin, + ...name.trim() ? { name: name.trim() } : {}, + ...participants ? { participants } : {} + }).then((value) => { room2 = value; })); if (done && room2) onCreated(room2); else setBusy(false); }; - const chip = (bot, on, onClick, role) => (0, import_react32.createElement)("button", { - key: bot.id, - type: "button", - role, - className: "bt-ng-chip", - "aria-checked": on, - onClick - }, (0, import_react32.createElement)(BotAvatar, { bot, size: 22, badge: false, live: false }), (0, import_react32.createElement)("span", { className: "bt-ng-name" }, bot.name), on && role === "radio" ? (0, import_react32.createElement)(AdminStar) : null); - return (0, import_react32.createElement)( - "div", - { className: "bt-set-card bt-ng" }, - (0, import_react32.createElement)( - "div", - { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label bt-ng-label" }, (0, import_react32.createElement)(AdminStar), t("Choose the group admin"))), - (0, import_react32.createElement)( - "div", - { className: "bt-ng-picks", role: "radiogroup", "aria-label": t("Group admin") }, - roster.bots.map((bot) => chip(bot, admin === bot.id, () => pickAdmin(bot.id), "radio")) - ) - ), - admin === null ? null : (0, import_react32.createElement)( - "div", - { className: "bt-set-row bt-bs-row bt-bs-stack bt-ng-step" }, - (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, t("Who to chat with…"))), - (0, import_react32.createElement)( - "div", - { className: "bt-ng-picks", role: "group", "aria-label": t("Members") }, - roster.bots.filter((bot) => bot.id !== admin).map((bot) => chip(bot, members.includes(bot.id), () => toggle(bot.id), "checkbox")) - ) - ), - admin === null || members.length === 0 ? null : (0, import_react32.createElement)( - "label", - { className: "bt-set-row bt-bs-row bt-ng-step" }, - (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, t("Name"))), - (0, import_react32.createElement)("input", { className: "bt-bs-input", value: name, maxLength: 60, placeholder: t("Name after members"), onChange: (event) => setName(event.target.value) }) - ), - (0, import_react32.createElement)( - "div", - { className: "bt-set-row bt-task-foot" }, - (0, import_react32.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onCancel }, t("Cancel")), - locked ? (0, import_react32.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : (0, import_react32.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy || admin === null || members.length === 0, onClick: () => void create() }, t("Create group chat")) - ) + const pickRow = (bot, selectedRow) => (0, import_react36.createElement)( + "button", + { + key: bot.id, + type: "button", + className: selectedRow ? "bt-ng-pick bt-ng-pick-on" : "bt-ng-pick", + "data-bot-id": bot.id, + role: selectedRow ? bot.id === admin ? "radio" : "checkbox" : "option", + "aria-checked": selectedRow ? true : void 0, + onClick: () => { + selectedRow ? remove(bot.id) : add(bot); + } + }, + (0, import_react36.createElement)(BotAvatar, { bot, size: 22, badge: false, live: false }), + (0, import_react36.createElement)("span", { className: "bt-ng-name" }, pickerBotLabel(bot)), + selectedRow && bot.id === admin ? (0, import_react36.createElement)(AdminStar) : null, + selectedRow && bot.id !== admin && !bot.remote ? (0, import_react36.createElement)("span", { + className: "bt-ng-make-admin", + role: "button", + tabIndex: 0, + "aria-label": t("Make admin"), + onClick: (event) => { + event.preventDefault(); + event.stopPropagation(); + pickAdmin(bot.id); + }, + onKeyDown: (event) => { + if (event.key === "Enter" || event.key === " ") { + event.preventDefault(); + event.stopPropagation(); + pickAdmin(bot.id); + } + } + }, (0, import_react36.createElement)(AdminStar)) : null + ); + const availHint = bots.every((bot) => selectedIds.includes(bot.id)) ? t("No more Bots to add") : t("No Bots match"); + return (0, import_react36.createElement)( + "div", + { className: "bt-set-card bt-ng" }, + (0, import_react36.createElement)("p", { className: "bt-ng-intro" }, t("Add a name, then pick Bots to chat with.")), + (0, import_react36.createElement)( + "label", + { className: "bt-ng-name-row" }, + (0, import_react36.createElement)("span", { className: "bt-ng-name-label" }, t("Group name")), + (0, import_react36.createElement)("input", { + className: "bt-ng-name-input", + value: name, + maxLength: 60, + placeholder: t("Group name (optional)"), + "aria-label": t("Group name"), + onChange: (event) => setName(event.target.value) + }) + ), + (0, import_react36.createElement)( + "div", + { className: "bt-ng-split" }, + (0, import_react36.createElement)( + "div", + { className: "bt-ng-col" }, + (0, import_react36.createElement)( + "label", + { className: "bt-ng-search" }, + (0, import_react36.createElement)(SearchIcon), + (0, import_react36.createElement)("input", { + className: "bt-ng-search-input", + type: "search", + value: query, + placeholder: t("Search"), + "aria-label": t("Search members"), + onChange: (event) => setQuery(event.target.value) + }) + ), + available.length === 0 ? (0, import_react36.createElement)("div", { className: "bt-ng-empty" }, availHint) : (0, import_react36.createElement)( + "div", + { className: "bt-ng-list", role: "listbox", "aria-label": t("Members") }, + available.map((bot) => pickRow(bot, false)) + ) + ), + (0, import_react36.createElement)( + "div", + { className: "bt-ng-col" }, + (0, import_react36.createElement)("div", { className: "bt-ng-sel-head" }, t("Selected {count}", { count: selected.length })), + selected.length === 0 ? (0, import_react36.createElement)("div", { className: "bt-ng-empty" }, t("No members selected")) : (0, import_react36.createElement)( + "div", + { className: "bt-ng-list", role: "group", "aria-label": t("Selected members") }, + selected.map((bot) => pickRow(bot, true)) + ) + ) + ), + (0, import_react36.createElement)( + "div", + { className: "bt-set-row bt-task-foot" }, + (0, import_react36.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onCancel }, t("Cancel")), + locked ? (0, import_react36.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : (0, import_react36.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy || !ready, onClick: () => void create() }, t("Create group chat")) + ) ); } var GROUP_SETTINGS_CSS = ` -.bt-ng{animation:bt-q-in .4s cubic-bezier(.22,1,.36,1),bt-veil-in .2s ease-out} -.bt-ng-step{animation:bt-veil-in .22s ease-out} +.bt-ng{padding:16px 16px 8px;animation:bt-q-in .4s cubic-bezier(.22,1,.36,1),bt-veil-in .2s ease-out} +.bt-ng-intro{margin:0 0 14px;color:var(--bt-ink-2);font-size:13px;line-height:18px} +.bt-ng-name-row{display:flex;align-items:center;gap:12px;margin:0 0 12px} +.bt-ng-name-label{flex:none;min-width:4.5em;font-size:13px;color:var(--bt-ink)} +.bt-ng-name-input{flex:1;min-width:0;height:36px;box-sizing:border-box;padding:0 12px;border:.5px solid var(--bt-line-2);border-radius:10px;background:var(--bt-main);color:var(--bt-ink);font:inherit;font-size:13px;outline:none} +.bt-ng-name-input::placeholder{color:var(--bt-ink-3)} +.bt-ng-split{display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:10px;min-height:220px;margin:0 0 8px} +.bt-ng-col{display:flex;flex-direction:column;min-width:0;min-height:220px;border:.5px solid var(--bt-line);border-radius:12px;background:var(--bt-main);overflow:hidden} +.bt-ng-search{display:flex;align-items:center;gap:8px;margin:8px;padding:0 10px;height:32px;border-radius:999px;background:var(--bt-card);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2)} +.bt-ng-search svg{flex:none;width:14px;height:14px} +.bt-ng-search-input{flex:1;min-width:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;outline:none} +.bt-ng-sel-head{display:flex;align-items:center;min-height:32px;margin:8px 12px 0;color:var(--bt-ink-2);font-size:13px} +.bt-ng-list{flex:1;overflow:auto;padding:4px 8px 8px;display:flex;flex-direction:column;gap:2px} +.bt-ng-empty{flex:1;display:flex;align-items:center;justify-content:center;padding:16px;color:var(--bt-ink-3);font-size:13px;text-align:center} +.bt-ng-pick{display:flex;align-items:center;gap:8px;width:100%;border:0;background:none;color:inherit;font:inherit;font-size:13px;padding:6px 8px;border-radius:8px;cursor:pointer;text-align:left} +.bt-ng-pick:hover{background:var(--bt-hover)} +.bt-ng-pick-on{background:var(--bt-card)} +.bt-ng-make-admin{display:inline-flex;margin-left:auto;padding:2px;border-radius:999px;color:var(--bt-ink-3)} +.bt-ng-make-admin:hover{color:var(--bt-ink);background:var(--bt-hover)} +.bt-ng-pick-on>.bt-admin-star{margin-left:auto} +.bt-ng-name{max-width:160px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .bt-ng-label{display:inline-flex;align-items:center;gap:6px} .bt-ng-picks{display:flex;flex-wrap:wrap;gap:6px} .bt-ng-chip{display:inline-flex;align-items:center;gap:6px;height:32px;padding:0 10px 0 5px;border-radius:999px;border:.5px solid var(--bt-line);background:var(--bt-card);color:var(--bt-ink-2);font:inherit;font-size:13px;cursor:pointer;transition:background-color .12s ease,color .12s ease,border-color .12s ease,scale .3s cubic-bezier(.34,1.56,.64,1)} @@ -15846,8 +17515,7 @@ var GROUP_SETTINGS_CSS = ` .bt-ng-chip:active{scale:.96} .bt-ng-chip[aria-checked=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink)} .bt-ng-chip .bt-admin-star{animation:bt-check-pop .4s cubic-bezier(.34,1.56,.64,1)} -.bt-ng-name{max-width:140px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -@media (prefers-reduced-motion:reduce){.bt-ng,.bt-ng-step,.bt-ng-chip .bt-admin-star{animation:none}} +@media (prefers-reduced-motion:reduce){.bt-ng,.bt-ng-chip .bt-admin-star{animation:none}} .bt-gs-member{gap:8px} .bt-gs-who{flex:1;display:flex;align-items:center;gap:8px;min-width:0;padding:0;border:0;background:none;color:inherit;font:inherit;text-align:left;cursor:pointer} .bt-gs-who .bt-row-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap} @@ -15867,16 +17535,38 @@ button.bt-face-bot:hover{color:var(--bt-ink);text-decoration:underline;text-unde @media (prefers-reduced-motion:reduce){.bt-gs-pick{animation:none}} `; +// src/shared/palette-search.js +var PALETTE_FILTERS = ["all", "chats", "messages", "commands"]; +var PALETTE_MESSAGE_MIN = 2; +function paletteFilterAllows(filter, kind) { + if (filter === "chats") return kind === "chats"; + if (filter === "messages") return kind === "messages"; + if (filter === "commands") return kind === "commands"; + return true; +} +function paletteEmptyKind(query, filter, min = PALETTE_MESSAGE_MIN) { + const wanted = String(query ?? "").trim(); + if (wanted === "") return "empty"; + if (filter === "messages" && wanted.length < min) return "short"; + return "none"; +} + // src/client/palette.js -var import_react33 = require("react"); -var import_dsh_client_ui_primitives3 = require("@deepseek-ai/dsh-client-ui-primitives"); +var import_react37 = require("react"); +var import_dsh_client_ui_primitives4 = require("@deepseek-ai/dsh-client-ui-primitives"); var paletteText = (raw, names) => readableLine(String(raw ?? ""), names); var PALETTE_EXIT_MS = 160; function CommandPalette({ start, token, roster, actions, useSessions }) { - const [query, setQuery] = (0, import_react33.useState)(start ?? ""); - const [cursor, setCursor] = (0, import_react33.useState)(0); - const [leaving, setLeaving] = (0, import_react33.useState)(false); + const [query, setQuery] = (0, import_react37.useState)(start ?? ""); + const [cursor, setCursor] = (0, import_react37.useState)(0); + const [leaving, setLeaving] = (0, import_react37.useState)(false); + const [filter, setFilter] = (0, import_react37.useState)("all"); + const [selectedHit, setSelectedHit] = (0, import_react37.useState)(null); + const history = useHistorySearch(!selectedHit && paletteFilterAllows(filter, "messages") ? actions.searchMessages : void 0, query.trim()); + const historyEnabled = typeof actions.searchMessages === "function"; + const historyVisible = paletteFilterAllows(filter, "messages"); const wanted = query.trim().toLowerCase(); + const emptyKind = paletteEmptyKind(query, filter); const close = () => { if (leaving) return; setLeaving(true); @@ -15886,7 +17576,7 @@ function CommandPalette({ start, token, roster, actions, useSessions }) { const ids = [...roster.bots.map(currentPart), ...roster.rooms.map((item) => item.id)]; const names = botNames(roster); const found = useSessions((list) => { - if (wanted.length < 2) return "[]"; + if (wanted.length < PALETTE_MESSAGE_MIN) return "[]"; const hits = []; for (const id of ids) { const outline = list.projectionsBySession?.[id]?.values?.turnOutline ?? list.byId[id]?.projectionValues?.turnOutline; @@ -15912,7 +17602,7 @@ function CommandPalette({ start, token, roster, actions, useSessions }) { const people2 = [ ...roster.bots.filter((bot) => isListedRemoteChat(bot) && matchesName(bot.name, bot.role, pickerBotLabel(bot))).map((bot) => ({ key: bot.id, - avatar: (0, import_react33.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }), + avatar: (0, import_react37.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }), title: pickerBotLabel(bot), subtitle: [bot.role, isMainOf(roster, bot.id) ? t("Main Bot") : ""].filter(Boolean).join(" · "), badge: bot.hidden ? t("Hidden") : void 0, @@ -15923,7 +17613,7 @@ function CommandPalette({ start, token, roster, actions, useSessions }) { })), ...roster.rooms.filter((room2) => matchesName(room2.name)).map((room2) => ({ key: room2.id, - avatar: (0, import_react33.createElement)(RoomAvatar, { room: room2, roster, size: 24 }), + avatar: (0, import_react37.createElement)(RoomAvatar, { room: room2, roster, size: 24 }), title: room2.name, subtitle: t(seatedCount(room2) === 1 ? "{count} member" : "{count} members", { count: seatedCount(room2) }), badge: room2.hidden ? t("Hidden") : void 0, @@ -15933,34 +17623,44 @@ function CommandPalette({ start, token, roster, actions, useSessions }) { } })) ]; - if (people2.length) sections.push([t("Bots"), people2]); + if (emptyKind !== "empty" && paletteFilterAllows(filter, "chats") && people2.length) sections.push([t("Bots"), people2]); const agents = (roster.agents ?? []).filter(() => matchesName("DSH Agent")).map((agent) => ({ key: agent.id, - avatar: (0, import_react33.createElement)("span", { className: "bt-palette-agent" }, (0, import_react33.createElement)(import_dsh_client_ui_primitives3.FishLogo, { size: 18 })), + avatar: (0, import_react37.createElement)("span", { className: "bt-palette-agent" }, (0, import_react37.createElement)(import_dsh_client_ui_primitives4.FishLogo, { size: 18 })), title: "DSH Agent", subtitle: t("Plain dsh session"), run: () => actions.openAgent(agent.id) })); - if (agents.length) sections.push(["DSH Agent", agents]); - const messages = JSON.parse(found).map(([id, turn, snippet]) => { + if (emptyKind !== "empty" && paletteFilterAllows(filter, "chats") && agents.length) sections.push(["DSH Agent", agents]); + const historyRows = history.items.filter((hit) => roster.byId[hit.botId]).map((hit) => ({ + key: `history:${hit.sessionId}:${hit.seq}`, + title: roster.byId[hit.botId].name, + subtitle: hit.snippet, + avatar: (0, import_react37.createElement)(BotAvatar, { bot: roster.byId[hit.botId], size: 24, badge: false, live: false }), + badge: t(hit.earlier ? "Earlier part; view read-only history" : "View read-only history"), + keepOpen: true, + run: () => setSelectedHit({ botId: hit.botId, sessionId: hit.sessionId, hitToken: hit.hitToken }) + })); + if (emptyKind !== "empty" && historyVisible && historyRows.length) sections.push([t("Local Bot chat history"), historyRows]); + const messages = JSON.parse(found).filter(([id, turn]) => !history.items.some((hit) => hit.sessionId === id && hit.turn === turn)).map(([id, turn, snippet]) => { const bot = roster.byId[id]; const room2 = roster.roomsById[id]; return { key: `${id}:${turn}`, title: bot?.name ?? room2?.name ?? t("Bot"), subtitle: snippet, - avatar: bot ? (0, import_react33.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }) : (0, import_react33.createElement)(RoomAvatar, { room: room2, roster, size: 24 }), + avatar: bot ? (0, import_react37.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }) : (0, import_react37.createElement)(RoomAvatar, { room: room2, roster, size: 24 }), run: () => actions.openSession(id) }; }); - if (messages.length) sections.push([t("Messages"), messages]); + if (emptyKind !== "empty" && paletteFilterAllows(filter, "messages") && messages.length) sections.push([t("Messages"), messages]); const commands = [ - { key: "cmd:new", icon: (0, import_react33.createElement)(PlusIcon), title: t("New chat"), run: () => actions.openNewChat("new") }, - { key: "cmd:bot", icon: (0, import_react33.createElement)(PlusIcon), title: t("Create Bot"), run: () => actions.openNewChat("create") }, - { key: "cmd:group", icon: (0, import_react33.createElement)(PeopleIcon), title: t("Create group chat"), run: () => actions.openNewChat("group") }, - { key: "cmd:settings", icon: (0, import_react33.createElement)(GearIcon), title: t("Settings"), run: () => actions.openSettings("general") } + { key: "cmd:new", icon: (0, import_react37.createElement)(PlusIcon), title: t("New chat"), run: () => actions.openNewChat("new") }, + { key: "cmd:bot", icon: (0, import_react37.createElement)(PlusIcon), title: t("Create Bot"), run: () => actions.openNewChat("create") }, + { key: "cmd:group", icon: (0, import_react37.createElement)(PeopleIcon), title: t("Create group chat"), run: () => actions.openNewChat("group") }, + { key: "cmd:settings", icon: (0, import_react37.createElement)(GearIcon), title: t("Settings"), run: () => actions.openSettings("general") } ].filter((command) => matchesName(command.title)); - if (commands.length) sections.push([t("Commands"), commands]); + if (emptyKind !== "empty" && paletteFilterAllows(filter, "commands") && commands.length) sections.push([t("Commands"), commands]); const rows = sections.flatMap(([, items]) => items); const active = Math.min(cursor, Math.max(rows.length - 1, 0)); const shown = rows.map((row) => row.key).join("\n"); @@ -15968,30 +17668,31 @@ function CommandPalette({ start, token, roster, actions, useSessions }) { ${shown}`, { axis: "y", ...QUICK_EDGES }); const listRef = glide.box; useFlip(listRef, shown, "[data-flip]"); - (0, import_react33.useEffect)(() => { + (0, import_react37.useEffect)(() => { listRef.current?.querySelector("[aria-selected=true]")?.scrollIntoView({ block: "nearest" }); }, [active, query]); const choose = (row) => { if (!row || leaving) return; void Promise.resolve(row.run()).catch((error) => actions.reportError(error, "menu")); - close(); + if (!row.keepOpen) close(); }; + if (selectedHit) return (0, import_react37.createElement)(HistoryHitDialog, { key: selectedHit.hitToken, hit: selectedHit, roster, actions, onBack: () => setSelectedHit(null) }); let index = -1; - return (0, import_react33.createElement)( + return (0, import_react37.createElement)( "div", { className: "bt-palette-layer", "data-leaving": leaving || void 0 }, - (0, import_react33.createElement)("div", { className: "bt-backdrop", onMouseDown: close }), - (0, import_react33.createElement)( + (0, import_react37.createElement)("div", { className: "bt-backdrop", onMouseDown: close }), + (0, import_react37.createElement)( "div", { className: "bt-palette", role: "dialog", "aria-label": t("Search"), "aria-modal": true }, - (0, import_react33.createElement)( + (0, import_react37.createElement)( "div", { className: "bt-palette-head" }, - (0, import_react33.createElement)("span", { className: "bt-palette-glyph", "aria-hidden": true }, (0, import_react33.createElement)(SearchIcon)), - (0, import_react33.createElement)("input", { + (0, import_react37.createElement)("span", { className: "bt-palette-glyph", "aria-hidden": true }, (0, import_react37.createElement)(SearchIcon)), + (0, import_react37.createElement)("input", { autoFocus: true, value: query, - placeholder: t("Search Bots, chats and messages"), + placeholder: t(historyEnabled ? "Search chats and local Bot history" : "Search Bots, chats, and loaded messages"), "aria-label": t("Search"), role: "combobox", "aria-expanded": true, @@ -16014,29 +17715,68 @@ ${shown}`, { axis: "y", ...QUICK_EDGES }); } } }), - query ? (0, import_react33.createElement)("button", { type: "button", className: "bt-palette-clear", "aria-label": t("Clear search"), onClick: () => { - setQuery(""); - setCursor(0); - } }, (0, import_react33.createElement)(CloseIcon)) : null + (0, import_react37.createElement)("button", { type: "button", className: "bt-palette-clear", "aria-label": t("Close"), onClick: close }, (0, import_react37.createElement)(CloseIcon)) ), - (0, import_react33.createElement)( + (0, import_react37.createElement)( + "div", + { className: "bt-palette-filters", role: "tablist", "aria-label": t("Search filters") }, + PALETTE_FILTERS.map((id) => (0, import_react37.createElement)("button", { + key: id, + type: "button", + role: "tab", + className: "bt-palette-filter", + "data-filter": id, + "aria-selected": filter === id, + tabIndex: filter === id ? 0 : -1, + onKeyDown: (event) => { + if (!["ArrowLeft", "ArrowRight", "Home", "End"].includes(event.key)) return; + event.preventDefault(); + const index2 = PALETTE_FILTERS.indexOf(filter); + const next = event.key === "Home" ? 0 : event.key === "End" ? PALETTE_FILTERS.length - 1 : (index2 + (event.key === "ArrowRight" ? 1 : -1) + PALETTE_FILTERS.length) % PALETTE_FILTERS.length; + setFilter(PALETTE_FILTERS[next]); + setCursor(0); + event.currentTarget.parentElement?.querySelectorAll("[role=tab]")?.[next]?.focus(); + }, + onClick: () => { + setFilter(id); + setCursor(0); + } + }, t(id === "all" ? "All" : id === "chats" ? "Chats" : id === "messages" ? "Messages" : "Commands"))) + ), + historyVisible ? (0, import_react37.createElement)( + "div", + { className: "bt-palette-history" }, + (0, import_react37.createElement)("p", { className: "bt-palette-scope" }, t(historyEnabled ? "History: your local Bots in this instance. Other chats: loaded messages only." : "History unavailable; searching loaded messages only.")), + (0, import_react37.createElement)( + "span", + { role: "status", "aria-live": "polite" }, + [...query].length > 256 ? t("History query is limited to 256 characters.") : history.status === "loading" ? t("Searching history…") : history.status === "error" ? t("History query failed; showing loaded messages only.") : history.incomplete ? t("Some history could not be read; results are incomplete.") : "", + history.limited ? t("History search reached a safety limit; narrow your query.") : "" + ), + history.cursor ? (0, import_react37.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: history.status === "loading", onClick: history.more }, t("Search more history")) : null + ) : null, + (0, import_react37.createElement)( "div", { ref: listRef, id: "bt-palette-list", className: "bt-palette-list", role: "listbox", "aria-label": t("Results") }, - (0, import_react33.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), - rows.length === 0 ? (0, import_react33.createElement)( + (0, import_react37.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), + rows.length === 0 ? (0, import_react37.createElement)( "div", { className: "bt-palette-empty" }, - (0, import_react33.createElement)("span", { className: "bt-palette-empty-icon", "aria-hidden": true }, (0, import_react33.createElement)(SearchIcon)), - (0, import_react33.createElement)("span", { className: "bt-palette-empty-label" }, t("No results")), - (0, import_react33.createElement)("span", { className: "bt-palette-empty-hint" }, t("Try a Bot name or words from a message")) - ) : sections.map(([title, items]) => (0, import_react33.createElement)( - import_react33.Fragment, + (0, import_react37.createElement)("span", { className: "bt-palette-empty-icon", "aria-hidden": true }, (0, import_react37.createElement)(SearchIcon)), + (0, import_react37.createElement)("span", { className: "bt-palette-empty-label" }, historyVisible && history.status === "loading" ? t("Searching history…") : historyVisible && history.cursor ? t("More history remains to be searched") : historyVisible && (history.incomplete || history.limited) ? t("No matches in the searched portion") : emptyKind === "none" ? t("No results") : t("Search chats and messages")), + (0, import_react37.createElement)( + "span", + { className: "bt-palette-empty-hint" }, + historyEnabled && historyVisible ? t("Enter text to search local Bot history; other chats use loaded messages.") : emptyKind === "short" ? t("Type at least two characters to search messages already loaded") : emptyKind === "none" ? t("Try a Bot name, a group name, or words from a loaded message") : t("Type a Bot name, a group name, or words from a loaded message") + ) + ) : sections.map(([title, items]) => (0, import_react37.createElement)( + import_react37.Fragment, { key: title }, - (0, import_react33.createElement)("div", { className: "bt-palette-section", role: "presentation", "data-flip": `section:${title}` }, title), + (0, import_react37.createElement)("div", { className: "bt-palette-section", role: "presentation", "data-flip": `section:${title}` }, title), items.map((row) => { index += 1; const at = index; - return (0, import_react33.createElement)( + return (0, import_react37.createElement)( "button", { key: row.key, @@ -16050,14 +17790,14 @@ ${shown}`, { axis: "y", ...QUICK_EDGES }); }, onClick: () => choose(row) }, - (0, import_react33.createElement)("span", { className: "bt-palette-lead" }, row.avatar ?? (0, import_react33.createElement)("span", { className: "bt-palette-cmd" }, row.icon)), - (0, import_react33.createElement)( + (0, import_react37.createElement)("span", { className: "bt-palette-lead" }, row.avatar ?? (0, import_react37.createElement)("span", { className: "bt-palette-cmd" }, row.icon)), + (0, import_react37.createElement)( "span", { className: "bt-palette-text" }, - (0, import_react33.createElement)("span", { className: "bt-palette-title" }, row.title), - row.subtitle ? (0, import_react33.createElement)("span", { className: "bt-palette-sub" }, row.subtitle) : null + (0, import_react37.createElement)("span", { className: "bt-palette-title" }, row.title), + row.subtitle ? (0, import_react37.createElement)("span", { className: "bt-palette-sub" }, row.subtitle) : null ), - row.badge ? (0, import_react33.createElement)("span", { className: "bt-palette-badge" }, row.badge) : null + row.badge ? (0, import_react37.createElement)("span", { className: "bt-palette-badge" }, row.badge) : null ); }) )) @@ -16099,7 +17839,7 @@ async function afterCreate({ id, text: text2, actions }) { } // src/client/create-bot.js -var import_react34 = require("react"); +var import_react38 = require("react"); var pick = (list) => list[Math.floor(Math.random() * list.length)]; var randomLook = (avoid = {}) => { const shapes = DEFAULT_SHAPES.filter((shape) => shape !== avoid.shape); @@ -16107,17 +17847,17 @@ var randomLook = (avoid = {}) => { return { shape: pick(shapes), color: pick(colors) }; }; function CreateBot({ roster, actions, start, onBack, canGoBack, onCreated, inline = false }) { - const [look, setLook] = (0, import_react34.useState)(() => randomLook()); - const [image, setImage] = (0, import_react34.useState)(null); - const [name, setName] = (0, import_react34.useState)(start?.name ?? ""); - const [model, setModel] = (0, import_react34.useState)(() => startModel(roster)); - const [effort, setEffort] = (0, import_react34.useState)(void 0); - const [busy, setBusy] = (0, import_react34.useState)(false); - const [error, setError] = (0, import_react34.useState)(""); - const fileRef = (0, import_react34.useRef)(null); - const frame = (0, import_react34.useRef)(null); + const [look, setLook] = (0, import_react38.useState)(() => randomLook()); + const [image, setImage] = (0, import_react38.useState)(null); + const [name, setName] = (0, import_react38.useState)(start?.name ?? ""); + const [model, setModel] = (0, import_react38.useState)(() => startModel(roster)); + const [effort, setEffort] = (0, import_react38.useState)(void 0); + const [busy, setBusy] = (0, import_react38.useState)(false); + const [error, setError] = (0, import_react38.useState)(""); + const fileRef = (0, import_react38.useRef)(null); + const frame = (0, import_react38.useRef)(null); useEscape(onBack); - (0, import_react34.useEffect)(() => { + (0, import_react38.useEffect)(() => { if (inline) frame.current?.scrollIntoView({ block: "start", behavior: "smooth" }); }, []); const locked = lockedWindow(roster); @@ -16143,25 +17883,25 @@ function CreateBot({ roster, actions, start, onBack, canGoBack, onCreated, inlin avatarImage(file).then(setImage, (failure) => setError(failure?.message ?? String(failure))); }; const previewLook = image ? { ...look, image } : look; - const card = (0, import_react34.createElement)( + const card = (0, import_react38.createElement)( "div", { className: "bt-create-card" }, - (0, import_react34.createElement)( + (0, import_react38.createElement)( "div", { className: "bt-create-preview" }, // The key remounts the mark, so every new pick plays the pop. - (0, import_react34.createElement)( + (0, import_react38.createElement)( "span", { key: `${look.shape}:${look.color}:${image ? "photo" : ""}`, className: "bt-create-pop" }, - (0, import_react34.createElement)(BotMark, { look: previewLook, bot: { id: "new-bot" }, size: 88, live: true, gaze: true, pokeable: true }) + (0, import_react38.createElement)(BotMark, { look: previewLook, bot: { id: "new-bot" }, size: 88, live: true, gaze: true, pokeable: true }) ), - (0, import_react34.createElement)("span", { className: "bt-create-name" }, finalName) + (0, import_react38.createElement)("span", { className: "bt-create-name" }, finalName) ), - (0, import_react34.createElement)("div", { className: "bt-create-step" }, t("Look")), - (0, import_react34.createElement)( + (0, import_react38.createElement)("div", { className: "bt-create-step" }, t("Look")), + (0, import_react38.createElement)( "div", { className: "bt-create-looks" }, - (0, import_react34.createElement)(CharacterGrid, { + (0, import_react38.createElement)(CharacterGrid, { look, hasPhoto: Boolean(image), onShape: (shape) => { @@ -16173,27 +17913,27 @@ function CreateBot({ roster, actions, start, onBack, canGoBack, onCreated, inlin setLook((current) => ({ ...current, color })); } }), - (0, import_react34.createElement)( + (0, import_react38.createElement)( "div", { className: "bt-actions bt-create-lookbar" }, - (0, import_react34.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { + (0, import_react38.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { setImage(null); setLook((current) => randomLook(current)); } }, t("Shuffle")), - (0, import_react34.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, image ? t("Replace photo") : t("Upload photo")), - image ? (0, import_react34.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setImage(null) }, t("Remove photo")) : null, - (0, import_react34.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { + (0, import_react38.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, image ? t("Replace photo") : t("Upload photo")), + image ? (0, import_react38.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setImage(null) }, t("Remove photo")) : null, + (0, import_react38.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { const file = event.target.files?.[0]; event.target.value = ""; upload(file); } }) ) ), - (0, import_react34.createElement)( + (0, import_react38.createElement)( "label", { className: "bt-field" }, - (0, import_react34.createElement)("span", { className: "bt-field-label" }, t("Name")), - (0, import_react34.createElement)("input", { + (0, import_react38.createElement)("span", { className: "bt-field-label" }, t("Name")), + (0, import_react38.createElement)("input", { className: "bt-input", autoFocus: !inline, value: name, @@ -16208,59 +17948,60 @@ function CreateBot({ roster, actions, start, onBack, canGoBack, onCreated, inlin } } }), - problem ? (0, import_react34.createElement)("span", { className: "bt-note bt-danger" }, hostText(problem)) : clash ? (0, import_react34.createElement)("span", { className: "bt-note bt-danger" }, t("A Bot named {name} already exists", { name: finalName })) : null + problem ? (0, import_react38.createElement)("span", { className: "bt-note bt-danger" }, hostText(problem)) : clash ? (0, import_react38.createElement)("span", { className: "bt-note bt-danger" }, t("A Bot named {name} already exists", { name: finalName })) : null ), - (0, import_react34.createElement)( + (0, import_react38.createElement)( "div", { className: "bt-field" }, - (0, import_react34.createElement)("span", { className: "bt-field-label" }, t("Model")), - (0, import_react34.createElement)(ModelMenu, { bot: { id: "new-bot", name: finalName, model: model || void 0, effort }, roster, actions, wide: true, onPick: (ref) => { + (0, import_react38.createElement)("span", { className: "bt-field-label" }, t("Model")), + (0, import_react38.createElement)(ModelMenu, { bot: { id: "new-bot", name: finalName, model: model || void 0, effort }, roster, actions, wide: true, onPick: (ref) => { setModel(ref); setEffort(void 0); }, onPickEffort: setEffort }), - (0, import_react34.createElement)("span", { className: "bt-note" }, (roster.models ?? []).length > 0 ? t("The Bot runs on this model. You can change it later in its details.") : t("Add a provider and a model in DeepSeek Harness first, or pick one in the Bot's chat later.")) + (0, import_react38.createElement)("span", { className: "bt-note" }, (roster.models ?? []).length > 0 ? t("The Bot runs on this model. You can change it later in its details.") : t("Add a provider and a model in DeepSeek Harness first, or pick one in the Bot's chat later.")) ), - error ? (0, import_react34.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, - (0, import_react34.createElement)( + error ? (0, import_react38.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, + (0, import_react38.createElement)( "div", { className: "bt-create-foot" }, // The dialog's header already has Back and Close (#230); only the inline form needs its own. - inline ? (0, import_react34.createElement)("button", { type: "button", className: "bt-soft", onClick: onBack }, canGoBack ? t("Back") : t("Cancel")) : null, - locked ? (0, import_react34.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : (0, import_react34.createElement)("button", { type: "button", className: "bt-send bt-create-go", disabled: busy || clash || Boolean(problem), onClick: () => void create() }, busy ? t("Creating…") : t("Create")) + inline ? (0, import_react38.createElement)("button", { type: "button", className: "bt-soft", onClick: onBack }, canGoBack ? t("Back") : t("Cancel")) : null, + locked ? (0, import_react38.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : (0, import_react38.createElement)("button", { type: "button", className: "bt-send bt-create-go", disabled: busy || clash || Boolean(problem), onClick: () => void create() }, busy ? t("Creating…") : t("Create")) ) ); - if (inline) return (0, import_react34.createElement)("div", { ref: frame, className: "bt-create-inline", role: "group", "aria-label": t("Create Bot") }, card); - return (0, import_react34.createElement)( + if (inline) return (0, import_react38.createElement)("div", { ref: frame, className: "bt-create-inline", role: "group", "aria-label": t("Create Bot") }, card); + return (0, import_react38.createElement)( "div", { className: "bt-create", role: "dialog", "aria-label": t("Create Bot") }, - (0, import_react34.createElement)( + (0, import_react38.createElement)( "div", { className: "bt-create-head" }, - canGoBack ? (0, import_react34.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to new chat"), onClick: onBack }, (0, import_react34.createElement)(ChevronLeftIcon)) : (0, import_react34.createElement)("span", { className: "bt-create-gap" }), - (0, import_react34.createElement)("span", { className: "bt-create-title" }, t("Create Bot")), - (0, import_react34.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close"), onClick: () => actions.closeOverlay() }, (0, import_react34.createElement)(CloseIcon)) + canGoBack ? (0, import_react38.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to new chat"), onClick: onBack }, (0, import_react38.createElement)(ChevronLeftIcon)) : (0, import_react38.createElement)("span", { className: "bt-create-gap" }), + (0, import_react38.createElement)("span", { className: "bt-create-title" }, t("Create Bot")), + (0, import_react38.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close"), onClick: () => actions.closeOverlay() }, (0, import_react38.createElement)(CloseIcon)) ), - (0, import_react34.createElement)("div", { className: "bt-create-body" }, card) + (0, import_react38.createElement)("div", { className: "bt-create-body" }, card) ); } // src/client/new-chat.js -var import_react35 = require("react"); +var import_react39 = require("react"); function NewChat({ mode, roster, actions }) { - const [query, setQuery] = (0, import_react35.useState)(""); - const [picked, setPicked] = (0, import_react35.useState)([]); - const [group, setGroup] = (0, import_react35.useState)(mode === "group"); - const [compose, setCompose] = (0, import_react35.useState)(mode !== "new"); - const [admin, setAdmin] = (0, import_react35.useState)(null); - const [message, setMessage] = (0, import_react35.useState)(""); - const [busy, setBusy] = (0, import_react35.useState)(false); - const [error, setError] = (0, import_react35.useState)(""); - const [fix, setFix] = (0, import_react35.useState)(null); - const [fixNote, setFixNote] = (0, import_react35.useState)(""); - const [inviteLink, setInviteLink] = (0, import_react35.useState)(""); - const [cursor, setCursor] = (0, import_react35.useState)(0); - const [draft, setDraft] = (0, import_react35.useState)(mode === "create" ? { name: "", fromList: false } : null); - const inputRef = (0, import_react35.useRef)(null); + const [query, setQuery] = (0, import_react39.useState)(""); + const [picked, setPicked] = (0, import_react39.useState)([]); + const [group, setGroup] = (0, import_react39.useState)(mode === "group"); + const [compose, setCompose] = (0, import_react39.useState)(mode !== "new"); + const [admin, setAdmin] = (0, import_react39.useState)(null); + const [name, setName] = (0, import_react39.useState)(""); + const [message, setMessage] = (0, import_react39.useState)(""); + const [busy, setBusy] = (0, import_react39.useState)(false); + const [error, setError] = (0, import_react39.useState)(""); + const [fix, setFix] = (0, import_react39.useState)(null); + const [fixNote, setFixNote] = (0, import_react39.useState)(""); + const [inviteLink, setInviteLink] = (0, import_react39.useState)(""); + const [cursor, setCursor] = (0, import_react39.useState)(0); + const [draft, setDraft] = (0, import_react39.useState)(mode === "create" ? { name: "", fromList: false } : null); + const inputRef = (0, import_react39.useRef)(null); const close = () => actions.closeOverlay(); useEscape(close); const paneLeft = usePaneLeft(); @@ -16361,7 +18102,7 @@ function NewChat({ mode, roster, actions }) { ...members.map((id) => ({ kind: "bot", id, role: id === admin ? "admin" : "member" })), ...remotes ]; - const room2 = await actions.createRoom(members, { admin, ...participants ? { participants } : {} }); + const room2 = await actions.createRoom(members, { admin, ...name.trim() ? { name: name.trim() } : {}, ...participants ? { participants } : {} }); if (text2) await actions.send(room2.id, text2); actions.openSession(room2.id); close(); @@ -16395,14 +18136,14 @@ function NewChat({ mode, roster, actions }) { const options = []; if (!group && picked.length === 0 && mode !== "search" && wanted === "") { if (menuOnly) { - options.push({ key: "chat", icon: (0, import_react35.createElement)(ChatIcon), label: t("New chat"), hint: t("Message one of your Bots"), run: () => { + options.push({ key: "chat", icon: (0, import_react39.createElement)(ChatIcon), label: t("New chat"), hint: t("Message one of your Bots"), run: () => { setCompose(true); setCursor(0); setTimeout(() => inputRef.current?.focus()); } }); } - options.push({ key: "new", icon: (0, import_react35.createElement)(BotIcon), label: t("New Bot"), hint: t("Set up a Bot with its own role"), run: createBot }); - options.push({ key: "group", icon: (0, import_react35.createElement)(PeopleIcon), label: t("New group chat"), hint: t("Chat with several of your Bots"), run: () => { + options.push({ key: "new", icon: (0, import_react39.createElement)(BotIcon), label: t("New Bot"), hint: t("Set up a Bot with its own role"), run: createBot }); + options.push({ key: "group", icon: (0, import_react39.createElement)(PeopleIcon), label: t("New group chat"), hint: t("Chat with several of your Bots"), run: () => { setGroup(true); setCompose(true); setCursor(0); @@ -16411,7 +18152,7 @@ function NewChat({ mode, roster, actions }) { for (const action of newChatActionRows({ mode, group, picked, query, roster })) { options.push({ key: action.key, - icon: action.icon ? (0, import_react35.createElement)(SlotIcon, { id: action.key, icon: action.icon, fallback: (0, import_react35.createElement)(PeopleIcon) }) : (0, import_react35.createElement)(PeopleIcon), + icon: action.icon ? (0, import_react39.createElement)(SlotIcon, { id: action.key, icon: action.icon, fallback: (0, import_react39.createElement)(PeopleIcon) }) : (0, import_react39.createElement)(PeopleIcon), label: t(action.label), hint: action.hint ? t(action.hint) : void 0, run: () => { @@ -16423,7 +18164,7 @@ function NewChat({ mode, roster, actions }) { }); } if (!locked && (roster.agents ?? []).length === 0) { - options.push({ key: "agent", icon: (0, import_react35.createElement)(TerminalIcon), label: t("Add coding agent"), hint: t("A coding session without a Bot"), run: () => run(async () => { + options.push({ key: "agent", icon: (0, import_react39.createElement)(TerminalIcon), label: t("Add coding agent"), hint: t("A coding session without a Bot"), run: () => run(async () => { await actions.addAgent(); close(); }) }); @@ -16434,19 +18175,19 @@ function NewChat({ mode, roster, actions }) { options.push({ key: bot.id, bot, label: pickerBotLabel(bot), hint: choosingAdmin ? t("Make admin") : group || picked.length > 0 ? t("Add to group chat") : void 0, run: () => openBot(bot) }); } } - if (wanted !== "" && !exact && mode !== "search") options.push({ key: "create", icon: (0, import_react35.createElement)(PlusIcon), label: t("New Bot “{name}”", { name: query.trim() }), run: createBot }); + if (wanted !== "" && !exact && mode !== "search") options.push({ key: "create", icon: (0, import_react39.createElement)(PlusIcon), label: t("New Bot “{name}”", { name: query.trim() }), run: createBot }); const active = Math.min(cursor, Math.max(options.length - 1, 0)); const listed = options.map((option) => option.key).join("\n"); const glide = useGlide(`${active} ${listed}`, { axis: "y", ...QUICK_EDGES }); useFlip(glide.box, listed, "[data-flip]"); - const drop = (0, import_react35.useRef)(null); + const drop = (0, import_react39.useRef)(null); useMorph(drop, listed); if (draft) { - return (0, import_react35.createElement)( + return (0, import_react39.createElement)( "div", { className: "bt-pane", style: { left: paneLeft } }, - (0, import_react35.createElement)(CreateBot, { + (0, import_react39.createElement)(CreateBot, { roster, actions, start: draft, @@ -16466,7 +18207,7 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); if (picked.length > 0) setPicked((current) => current.slice(0, -1)); else if (admin !== null) setAdmin(null); }; - return (0, import_react35.createElement)( + return (0, import_react39.createElement)( "div", { className: "bt-pane", @@ -16476,31 +18217,31 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); if (event.target === event.currentTarget) close(); } : void 0 }, - (0, import_react35.createElement)( + (0, import_react39.createElement)( "div", { className: "bt-newchat", role: "dialog", "aria-label": mode === "search" ? t("Search") : menuOnly ? t("New…") : t("New chat"), "data-menu": menuOnly || void 0 }, // The popover needs no title row: Escape or a press outside closes it. - menuOnly ? null : (0, import_react35.createElement)( + menuOnly ? null : (0, import_react39.createElement)( "div", { className: "bt-to" }, - (0, import_react35.createElement)("span", { className: "bt-to-label" }, t("To:")), - adminBot ? (0, import_react35.createElement)( + (0, import_react39.createElement)("span", { className: "bt-to-label" }, t("To:")), + adminBot ? (0, import_react39.createElement)( "span", { key: adminBot.id, className: "bt-token bt-token-admin", title: t("Admin") }, - (0, import_react35.createElement)(BotMark, { bot: adminBot, size: 16 }), + (0, import_react39.createElement)(BotMark, { bot: adminBot, size: 16 }), adminBot.name, - (0, import_react35.createElement)(AdminStar), - (0, import_react35.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: adminBot.name }), onClick: () => setAdmin(null) }, "×") + (0, import_react39.createElement)(AdminStar), + (0, import_react39.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: adminBot.name }), onClick: () => setAdmin(null) }, "×") ) : null, - choosingAdmin ? (0, import_react35.createElement)("span", { className: "bt-to-star", "aria-hidden": true }, (0, import_react35.createElement)(AdminStar)) : null, - pickedBots.map((bot) => (0, import_react35.createElement)( + choosingAdmin ? (0, import_react39.createElement)("span", { className: "bt-to-star", "aria-hidden": true }, (0, import_react39.createElement)(AdminStar)) : null, + pickedBots.map((bot) => (0, import_react39.createElement)( "span", { key: bot.id, className: "bt-token" }, - (0, import_react35.createElement)(BotMark, { bot, size: 16 }), + (0, import_react39.createElement)(BotMark, { bot, size: 16 }), bot.name, - (0, import_react35.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: bot.name }), onClick: () => setPicked((current) => current.filter((id) => id !== bot.id)) }, "×") + (0, import_react39.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: bot.name }), onClick: () => setPicked((current) => current.filter((id) => id !== bot.id)) }, "×") )), - (0, import_react35.createElement)("input", { + (0, import_react39.createElement)("input", { ref: inputRef, autoFocus: true, value: query, @@ -16511,7 +18252,7 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); setCursor(0); }, onKeyDown: (event) => { - if (event.nativeEvent.isComposing) return; + if (event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229) return; if (event.key === "ArrowDown") { event.preventDefault(); setCursor(Math.min(active + 1, options.length - 1)); @@ -16524,20 +18265,34 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); } else if (event.key === "Backspace" && query === "") unpick(); } }), - group && admin !== null ? locked ? readOnlyLine(import_react35.createElement, roster, actions, { key: "readonly-admin" }) : (0, import_react35.createElement)("button", { + group ? locked ? readOnlyLine(import_react39.createElement, roster, actions, { key: "readonly-admin" }) : (0, import_react39.createElement)("button", { type: "button", className: "bt-send bt-to-create", - disabled: busy || picked.length === 0, - title: picked.length === 0 ? t("Add at least one more Bot") : void 0, + disabled: busy || admin === null || picked.length === 0, + title: admin === null || picked.length === 0 ? t("Add at least one more Bot") : void 0, onClick: createGroup }, t("Create group chat")) : null, - (0, import_react35.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Close new chat"), onClick: close }, "×") + (0, import_react39.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Close new chat"), onClick: close }, "×") ), - (0, import_react35.createElement)("div", { ref: drop, className: "bt-drop" }, (0, import_react35.createElement)( + group ? (0, import_react39.createElement)( + "label", + { className: "bt-ng-name-row bt-nc-name" }, + (0, import_react39.createElement)("span", { className: "bt-ng-name-label" }, t("Group name")), + (0, import_react39.createElement)("input", { + className: "bt-ng-name-input", + value: name, + maxLength: 60, + readOnly: locked, + placeholder: t("Group name (optional)"), + "aria-label": t("Group name"), + onChange: (event) => setName(event.target.value) + }) + ) : null, + (0, import_react39.createElement)("div", { ref: drop, className: "bt-drop" }, (0, import_react39.createElement)( "div", { ref: glide.box, role: "listbox", "aria-label": t("Recipients"), className: "bt-drop-list" }, - (0, import_react35.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), - options.length === 0 ? (0, import_react35.createElement)("div", { className: "bt-hint" }, mode === "search" ? t("No Bots match") : t("Type a name to create a Bot")) : options.map((option, index) => (0, import_react35.createElement)( + (0, import_react39.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), + options.length === 0 ? (0, import_react39.createElement)("div", { className: "bt-hint" }, mode === "search" || group ? t("No Bots match") : t("Type a name to create a Bot")) : options.map((option, index) => (0, import_react39.createElement)( "button", { key: option.key, @@ -16549,49 +18304,50 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); onMouseEnter: () => setCursor(index), onClick: option.run }, - option.bot ? (0, import_react35.createElement)(BotMark, { bot: option.bot, size: 22 }) : (0, import_react35.createElement)("span", { className: "bt-option-icon" }, option.icon), + option.bot ? (0, import_react39.createElement)(BotMark, { bot: option.bot, size: 22 }) : (0, import_react39.createElement)("span", { className: "bt-option-icon" }, option.icon), // An action row's description sits under its title and is always there (#283): a long line // beside the title squeezed the title to nothing on hover, and a line that appears on hover moves the rows. // A Bot row's short hint stays beside the name and shows on the active row only. - option.bot || !option.hint ? (0, import_react35.createElement)("span", { className: "bt-option-label" }, option.label) : (0, import_react35.createElement)("span", { className: "bt-option-copy" }, (0, import_react35.createElement)("span", { className: "bt-option-label" }, option.label), (0, import_react35.createElement)("span", { className: "bt-option-sub" }, option.hint)), - option.bot && option.hint && index === active ? (0, import_react35.createElement)("span", { className: "bt-option-hint" }, option.hint) : null + option.bot || !option.hint ? (0, import_react39.createElement)("span", { className: "bt-option-label" }, option.label) : (0, import_react39.createElement)("span", { className: "bt-option-copy" }, (0, import_react39.createElement)("span", { className: "bt-option-label" }, option.label), (0, import_react39.createElement)("span", { className: "bt-option-sub" }, option.hint)), + option.bot && option.hint && index === active ? (0, import_react39.createElement)("span", { className: "bt-option-hint" }, option.hint) : null )) )), - menuOnly ? null : (0, import_react35.createElement)("div", { className: "bt-nc-spacer" }), - error && fix ? (0, import_react35.createElement)( + menuOnly ? null : (0, import_react39.createElement)("div", { className: "bt-nc-spacer" }), + error && fix ? (0, import_react39.createElement)( "div", { className: "bt-error bt-fix", role: "alert", "data-fix": "ungranted-local" }, - (0, import_react35.createElement)("div", null, fix.bots.length === 1 ? t("{name} is not shared with {friend}, so it cannot be in a group with their Bot: the group's messages go to their home.", { name: fix.bots[0].name, friend: fix.friends.join(", ") || t("that friend") }) : t("{name} are not shared with {friend}, so they cannot be in a group with their Bot: the group's messages go to their home.", { name: fix.bots.map((bot) => bot.name).join(", "), friend: fix.friends.join(", ") || t("that friend") })), - (0, import_react35.createElement)("div", { className: "bt-fix-actions" }, fix.bots.flatMap((bot) => [ - typeof globalThis.__flybot__?.social?.createInvite === "function" && globalThis.__flybot__.social.canInvite?.(bot.id) !== false ? (0, import_react35.createElement)("button", { key: `invite-${bot.id}`, type: "button", className: "bt-fix-btn", "data-fix-action": "invite", onClick: () => { + (0, import_react39.createElement)("div", null, fix.bots.length === 1 ? t("{name} is not shared with {friend}, so it cannot be in a group with their Bot: the group's messages go to their home.", { name: fix.bots[0].name, friend: fix.friends.join(", ") || t("that friend") }) : t("{name} are not shared with {friend}, so they cannot be in a group with their Bot: the group's messages go to their home.", { name: fix.bots.map((bot) => bot.name).join(", "), friend: fix.friends.join(", ") || t("that friend") })), + (0, import_react39.createElement)("div", { className: "bt-fix-actions" }, fix.bots.flatMap((bot) => [ + typeof globalThis.__flybot__?.social?.createInvite === "function" && globalThis.__flybot__.social.canInvite?.(bot.id) !== false ? (0, import_react39.createElement)("button", { key: `invite-${bot.id}`, type: "button", className: "bt-fix-btn", "data-fix-action": "invite", onClick: () => { void copyInvite(bot); } }, t("Copy invite link for {name}", { name: bot.name })) : null, - (0, import_react35.createElement)("button", { key: `out-${bot.id}`, type: "button", className: "bt-fix-btn", "data-fix-action": "leave-out", onClick: () => leaveOut(bot.id) }, t("Leave {name} out", { name: bot.name })) + (0, import_react39.createElement)("button", { key: `out-${bot.id}`, type: "button", className: "bt-fix-btn", "data-fix-action": "leave-out", onClick: () => leaveOut(bot.id) }, t("Leave {name} out", { name: bot.name })) ])), - fixNote ? (0, import_react35.createElement)("div", { className: "bt-note", role: "status" }, fixNote) : null, - inviteLink ? (0, import_react35.createElement)("input", { className: "bt-input bt-fix-link", type: "text", readOnly: true, value: inviteLink, "aria-label": t("Invite link"), "data-fix-link": "", autoFocus: true, onFocus: (event) => event.target.select(), onClick: (event) => event.target.select() }) : null - ) : error ? (0, import_react35.createElement)("div", { className: "bt-error" }, error) : null, - menuOnly ? null : (0, import_react35.createElement)( + fixNote ? (0, import_react39.createElement)("div", { className: "bt-note", role: "status" }, fixNote) : null, + inviteLink ? (0, import_react39.createElement)("input", { className: "bt-input bt-fix-link", type: "text", readOnly: true, value: inviteLink, "aria-label": t("Invite link"), "data-fix-link": "", autoFocus: true, onFocus: (event) => event.target.select(), onClick: (event) => event.target.select() }) : null + ) : error ? (0, import_react39.createElement)("div", { className: "bt-error" }, error) : null, + menuOnly ? null : (0, import_react39.createElement)( "div", { className: "bt-nc-compose" }, - (0, import_react35.createElement)( + (0, import_react39.createElement)( "div", { className: "bt-nc-card" }, - (0, import_react35.createElement)("span", { className: "bt-nc-plus", "aria-hidden": true }, (0, import_react35.createElement)(PlusIcon)), - (0, import_react35.createElement)("textarea", { + (0, import_react39.createElement)("span", { className: "bt-nc-plus", "aria-hidden": true }, (0, import_react39.createElement)(PlusIcon)), + (0, import_react39.createElement)("textarea", { rows: 1, value: message, placeholder, + readOnly: locked, "aria-label": placeholder, onChange: (event) => setMessage(event.target.value), onKeyDown: (event) => { - if (event.key === "Enter" && !event.shiftKey && !event.nativeEvent.isComposing) { + if (!locked && shouldSendOnKey(event, sendKeyOf(roster.prefs))) { event.preventDefault(); sendMessage(); } } }), - locked ? group && admin !== null ? null : readOnlyLine(import_react35.createElement, roster, actions, { key: "readonly-compose" }) : (0, import_react35.createElement)("button", { type: "button", className: "bt-nc-send", "aria-label": t("Send message"), disabled: busy || message.trim() === "" || picked.length === 0, onClick: sendMessage }, (0, import_react35.createElement)(ArrowUpIcon)) + locked ? group ? null : readOnlyLine(import_react39.createElement, roster, actions, { key: "readonly-compose" }) : (0, import_react39.createElement)("button", { type: "button", className: "bt-nc-send", "aria-label": t("Send message"), disabled: busy || message.trim() === "" || picked.length === 0, onClick: sendMessage }, (0, import_react39.createElement)(ArrowUpIcon)) ) ) ) @@ -16599,7 +18355,7 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); } // src/client/exchange.js -var import_react36 = require("react"); +var import_react40 = require("react"); var SHEET_EXIT_MS = 220; function exchangeText(text2, names = []) { if (typeof text2 !== "string") return ""; @@ -16619,23 +18375,23 @@ function ExchangeLine({ entry, roster, actions }) { const bot = roster.byId[entry.from] ?? { id: entry.from, name: t("You"), color: "gray" }; const body = exchangeText(entry.text, botNames(roster)); if (body === "") return null; - return (0, import_react36.createElement)( + return (0, import_react40.createElement)( "div", { className: "bt-group-msg" }, - (0, import_react36.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, bot.name), - (0, import_react36.createElement)(Bubbles, { texts: [body], roster, selfId: bot.id, actions, lead: (0, import_react36.createElement)("span", { className: "bt-lead" }, (0, import_react36.createElement)(BotMark, { bot, size: 22 })) }) + (0, import_react40.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, bot.name), + (0, import_react40.createElement)(Bubbles, { texts: [body], roster, selfId: bot.id, actions, lead: (0, import_react40.createElement)("span", { className: "bt-lead" }, (0, import_react40.createElement)(BotMark, { bot, size: 22 })) }) ); } function ExchangeDialog({ pair, roster, actions }) { - const [entries2, setEntries] = (0, import_react36.useState)(null); - const [leaving, setLeaving] = (0, import_react36.useState)(false); + const [entries2, setEntries] = (0, import_react40.useState)(null); + const [leaving, setLeaving] = (0, import_react40.useState)(false); const close = () => { if (leaving) return; setLeaving(true); setTimeout(() => actions.closeOverlay(), SHEET_EXIT_MS); }; useEscape(close); - (0, import_react36.useEffect)(() => { + (0, import_react40.useEffect)(() => { let stop = false; let timer; let seen = null; @@ -16659,42 +18415,42 @@ function ExchangeDialog({ pair, roster, actions }) { const right = roster.byId[pair[1]]; let lastDay = 0; const paneLeft = usePaneLeft(); - return (0, import_react36.createElement)( + return (0, import_react40.createElement)( "div", { className: "bt-pane bt-exchange", style: { left: paneLeft }, "data-leaving": leaving || void 0 }, - (0, import_react36.createElement)( + (0, import_react40.createElement)( "div", { className: "bt-dialog", role: "dialog", "aria-label": t("Bot exchange") }, - (0, import_react36.createElement)("div", { className: "bt-head" }, (0, import_react36.createElement)( + (0, import_react40.createElement)("div", { className: "bt-head" }, (0, import_react40.createElement)( "span", { className: "bt-pill", style: { cursor: "default" } }, - left ? (0, import_react36.createElement)(BotMark, { bot: left, size: 22 }) : null, + left ? (0, import_react40.createElement)(BotMark, { bot: left, size: 22 }) : null, left?.name ?? "?", - (0, import_react36.createElement)("span", { className: "bt-swap" }, "⇄"), - right ? (0, import_react36.createElement)(BotMark, { bot: right, size: 22 }) : null, + (0, import_react40.createElement)("span", { className: "bt-swap" }, "⇄"), + right ? (0, import_react40.createElement)(BotMark, { bot: right, size: 22 }) : null, right?.name ?? "?" )), - (0, import_react36.createElement)( + (0, import_react40.createElement)( "div", { className: "bt-dialog-log", role: "log", "aria-label": t("Bot exchange transcript") }, - entries2 === null ? (0, import_react36.createElement)("div", { className: "bt-hint" }, t("Loading…")) : entries2.length === 0 ? (0, import_react36.createElement)("div", { className: "bt-hint" }, t("No messages yet")) : entries2.map((entry) => { + entries2 === null ? (0, import_react40.createElement)("div", { className: "bt-hint" }, t("Loading…")) : entries2.length === 0 ? (0, import_react40.createElement)("div", { className: "bt-hint" }, t("No messages yet")) : entries2.map((entry) => { const showDay = entry.time - lastDay > 30 * 60 * 1e3; lastDay = entry.time; - return (0, import_react36.createElement)( - import_react36.Fragment, + return (0, import_react40.createElement)( + import_react40.Fragment, { key: entry.id }, - showDay ? (0, import_react36.createElement)("time", { className: "bt-time" }, dayLabel(entry.time)) : null, - (0, import_react36.createElement)(ExchangeLine, { entry, roster, actions }) + showDay ? (0, import_react40.createElement)("time", { className: "bt-time" }, dayLabel(entry.time)) : null, + (0, import_react40.createElement)(ExchangeLine, { entry, roster, actions }) ); }) ), - (0, import_react36.createElement)("div", { className: "bt-dialog-foot" }, (0, import_react36.createElement)("button", { type: "button", className: "bt-soft", onClick: close }, t("Close Chat"))) + (0, import_react40.createElement)("div", { className: "bt-dialog-foot" }, (0, import_react40.createElement)("button", { type: "button", className: "bt-soft", onClick: close }, t("Close Chat"))) ) ); } // src/client/voice.js -var import_react37 = require("react"); +var import_react41 = require("react"); var VOICE_LABELS = { listening: "Listening", thinking: "Thinking", @@ -16705,8 +18461,8 @@ var VOICE_LABELS = { }; 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 useMicLevel(enabled) { - const [level, setLevel] = (0, import_react37.useState)(0); - (0, import_react37.useEffect)(() => { + const [level, setLevel] = (0, import_react41.useState)(0); + (0, import_react41.useEffect)(() => { if (!enabled || !navigator.mediaDevices?.getUserMedia) return void 0; let stream = null; let audio = null; @@ -16756,18 +18512,18 @@ function VoiceMode({ sessionId, roster, actions, useSessions, useSessionStatus } const entry = Array.isArray(outline) ? outline[outline.length - 1] : void 0; return entry ? `${outline.length}|${entry.response ?? ""}` : "0|"; }); - const [speech] = (0, import_react37.useState)(() => actions.speech()); - const [phase, setPhase] = (0, import_react37.useState)(speech ? "starting" : speechApi() ? "listening" : "unsupported"); - const [catalog, setCatalog] = (0, import_react37.useState)(null); - const [heard, setHeard] = (0, import_react37.useState)(""); - const [said, setSaid] = (0, import_react37.useState)(""); - const [note, setNote] = (0, import_react37.useState)(""); - const [serviceLevel, setServiceLevel] = (0, import_react37.useState)(0); - const [cycle, setCycle] = (0, import_react37.useState)(0); - const waiting = (0, import_react37.useRef)(null); - const reply = (0, import_react37.useRef)(lastReply); + const [speech] = (0, import_react41.useState)(() => actions.speech()); + const [phase, setPhase] = (0, import_react41.useState)(speech ? "starting" : speechApi() ? "listening" : "unsupported"); + const [catalog, setCatalog] = (0, import_react41.useState)(null); + const [heard, setHeard] = (0, import_react41.useState)(""); + const [said, setSaid] = (0, import_react41.useState)(""); + const [note, setNote] = (0, import_react41.useState)(""); + const [serviceLevel, setServiceLevel] = (0, import_react41.useState)(0); + const [cycle, setCycle] = (0, import_react41.useState)(0); + const waiting = (0, import_react41.useRef)(null); + const reply = (0, import_react41.useRef)(lastReply); reply.current = lastReply; - const turn = (0, import_react37.useRef)(0); + const turn = (0, import_react41.useRef)(0); const paneLeft = usePaneLeft(); const close = () => { turn.current += 1; @@ -16787,12 +18543,12 @@ function VoiceMode({ sessionId, roster, actions, useSessions, useSessionStatus } dictation.stop(); submit(text2); }); - (0, import_react37.useEffect)(() => { + (0, import_react41.useEffect)(() => { if (!note) return void 0; const timer = setTimeout(() => setNote(""), 2600); return () => clearTimeout(timer); }, [note]); - (0, import_react37.useEffect)(() => { + (0, import_react41.useEffect)(() => { if (!speech) return void 0; let live = true; speechCatalog(speech).then(({ catalog: next, usable }) => { @@ -16807,16 +18563,16 @@ function VoiceMode({ sessionId, roster, actions, useSessions, useSessionStatus } }; }, [speech]); const listen = phase === "listening"; - (0, import_react37.useEffect)(() => { + (0, import_react41.useEffect)(() => { if (speech || !listen || dictation.listening) return void 0; const timer = setTimeout(() => dictation.start({ continuous: false, onEnd: () => { } }), 250); return () => clearTimeout(timer); }, [listen, dictation.listening]); - (0, import_react37.useEffect)(() => { + (0, import_react41.useEffect)(() => { if (phase !== "listening") dictation.stop(); }, [phase]); - (0, import_react37.useEffect)(() => { + (0, import_react41.useEffect)(() => { if (!speech || !catalog || !listen) return void 0; const own = turn.current; let capture = null; @@ -16878,7 +18634,7 @@ function VoiceMode({ sessionId, roster, actions, useSessions, useSessionStatus } setServiceLevel(0); }; }, [speech, catalog, listen, cycle]); - (0, import_react37.useEffect)(() => { + (0, import_react41.useEffect)(() => { if (phase !== "thinking" || running || waiting.current === null) return; const [count, text2] = [lastReply.slice(0, lastReply.indexOf("|")), lastReply.slice(lastReply.indexOf("|") + 1)]; if (count === waiting.current || !text2.trim()) return; @@ -16898,7 +18654,7 @@ function VoiceMode({ sessionId, roster, actions, useSessions, useSessionStatus } window.speechSynthesis.cancel(); window.speechSynthesis.speak(utterance); }, [phase, running, lastReply]); - (0, import_react37.useEffect)(() => () => window.speechSynthesis?.cancel(), []); + (0, import_react41.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"; @@ -16915,2262 +18671,2287 @@ function VoiceMode({ sessionId, roster, actions, useSessions, useSessionStatus } const openSetup = phase === "setup" ? actions.voiceSetup() : null; const caption = phase === "speaking" ? said : heard; const shownNote = note || dictation.note; - return (0, import_react37.createElement)( + return (0, import_react41.createElement)( "div", { className: "bt-pane bt-voice-pane", style: { left: paneLeft } }, - (0, import_react37.createElement)( + (0, import_react41.createElement)( "div", { className: "bt-voice-stage", role: "dialog", "aria-label": t("Voice chat with {name}", { name }), "data-phase": phase === "transcribing" ? "thinking" : phase }, - (0, import_react37.createElement)( + (0, import_react41.createElement)( "div", { className: "bt-voice-orb", style: { "--bt-level": level } }, - (0, import_react37.createElement)("span", { className: "bt-voice-ring", "aria-hidden": true }), - (0, import_react37.createElement)("span", { className: "bt-voice-ring bt-voice-ring-2", "aria-hidden": true }), - bot ? (0, import_react37.createElement)(BotMark, { bot, size: 112, state: markState, live: true, gaze: phase === "listening" }) : room2 ? (0, import_react37.createElement)(RoomAvatar, { room: room2, roster, size: 112 }) : null + (0, import_react41.createElement)("span", { className: "bt-voice-ring", "aria-hidden": true }), + (0, import_react41.createElement)("span", { className: "bt-voice-ring bt-voice-ring-2", "aria-hidden": true }), + bot ? (0, import_react41.createElement)(BotMark, { bot, size: 112, state: markState, live: true, gaze: phase === "listening" }) : room2 ? (0, import_react41.createElement)(RoomAvatar, { room: room2, roster, size: 112 }) : null ), - (0, import_react37.createElement)("div", { className: "bt-voice-name" }, name), - (0, import_react37.createElement)( + (0, import_react41.createElement)("div", { className: "bt-voice-name" }, name), + (0, import_react41.createElement)( "div", { className: "bt-voice-status", role: "status" }, - phase === "thinking" ? (0, import_react37.createElement)(Shimmer, null, t("Thinking…")) : phase === "transcribing" ? (0, import_react37.createElement)(Shimmer, null, t("Recognizing…")) : VOICE_LABELS[phase] ? t(VOICE_LABELS[phase]) : "" + phase === "thinking" ? (0, import_react41.createElement)(Shimmer, null, t("Thinking…")) : phase === "transcribing" ? (0, import_react41.createElement)(Shimmer, null, t("Recognizing…")) : VOICE_LABELS[phase] ? t(VOICE_LABELS[phase]) : "" ), - (0, import_react37.createElement)("div", { className: "bt-voice-caption", key: `${phase}:${caption.slice(0, 12)}` }, caption), - openSetup ? (0, import_react37.createElement)("button", { type: "button", className: "bt-voice-setup", onClick: () => { + (0, import_react41.createElement)("div", { className: "bt-voice-caption", key: `${phase}:${caption.slice(0, 12)}` }, caption), + openSetup ? (0, import_react41.createElement)("button", { type: "button", className: "bt-voice-setup", onClick: () => { close(); openSetup(); } }, t("Set up voice input")) : null, - shownNote ? (0, import_react37.createElement)("div", { className: "bt-voice-note" }, shownNote) : null + shownNote ? (0, import_react41.createElement)("div", { className: "bt-voice-note" }, shownNote) : null ), - (0, import_react37.createElement)( + (0, import_react41.createElement)( "div", { className: "bt-voice-bar" }, - (0, import_react37.createElement)("button", { + (0, import_react41.createElement)("button", { type: "button", className: "bt-voice-btn", "aria-pressed": phase === "paused", disabled: blocked, "aria-label": phase === "paused" ? t("Resume listening") : t("Pause"), onClick: togglePause - }, (0, import_react37.createElement)(MicIcon, { size: 20 }), phase === "paused" ? (0, import_react37.createElement)("span", { className: "bt-voice-slash", "aria-hidden": true }) : null), - (0, import_react37.createElement)("button", { type: "button", className: "bt-voice-btn bt-voice-end", "aria-label": t("End voice chat"), onClick: close }, (0, import_react37.createElement)(CloseIcon)) + }, (0, import_react41.createElement)(MicIcon, { size: 20 }), phase === "paused" ? (0, import_react41.createElement)("span", { className: "bt-voice-slash", "aria-hidden": true }) : null), + (0, import_react41.createElement)("button", { type: "button", className: "bt-voice-btn bt-voice-end", "aria-label": t("End voice chat"), onClick: close }, (0, import_react41.createElement)(CloseIcon)) ) ); } -// src/client/workflows.js -var import_react38 = require("react"); -var READ_MS = 8e3; -var POLL_MS6 = 2e3; -var WORKFLOW_PLUGIN_HINT = "The Workflow plugin is not installed or not enabled. A default install includes @flybot/workflow."; -var COLORS = { Planner: "#8b5cf6", Writer: "#f0509a", Coder: "#1fbf6a", Reviewer: "#f5a524", Tester: "#14b8a6", Deployer: "#2f7cf6" }; -function workflowCallMissing(failure) { - const code = failure && typeof failure === "object" ? String(failure.code ?? "") : ""; - const message = typeof failure === "string" ? failure : String(failure?.message ?? ""); - return code === "bot/not-found" || /Unknown FlyBot endpoint workflow\//i.test(message); -} -function workflowCallError(failure, fallback = "Could not read workflows") { - if (workflowCallMissing(failure)) return WORKFLOW_PLUGIN_HINT; - if (typeof failure === "string" && failure.trim()) return failure.trim(); - const message = typeof failure?.message === "string" ? failure.message.trim() : ""; - return message || fallback; -} -function settleWorkflowRead(value, fallback = "Could not read workflows") { - if (!value || value.ok === false || !Array.isArray(value.workflows)) { - const raw = typeof value?.error === "string" && value.error.trim() ? value.error : ""; - const error = workflowCallMissing(value) || workflowCallMissing(raw) ? WORKFLOW_PLUGIN_HINT : raw || fallback; - return { phase: "error", error, pack: null }; +// src/client/connectors.js +var import_react42 = require("react"); +var TOKEN_URL = "https://github.com/settings/personal-access-tokens/new"; +var COMPOSIO_KEY_URL = "https://platform.composio.dev/"; +var FEISHU_WEBHOOK_URL = "https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot"; +var APPS = [ + ["gmail", "Gmail"], + ["googlecalendar", "Google Calendar"], + ["googledrive", "Google Drive"], + ["googledocs", "Google Docs"], + ["googlesheets", "Google Sheets"], + ["outlook", "Outlook"], + ["slack", "Slack"], + ["microsoft_teams", "Microsoft Teams"], + ["discord", "Discord"], + ["telegram", "Telegram"], + ["whatsapp", "WhatsApp"], + ["notion", "Notion"], + ["linear", "Linear"], + ["jira", "Jira"], + ["asana", "Asana"], + ["trello", "Trello"], + ["todoist", "Todoist"], + ["airtable", "Airtable"], + ["dropbox", "Dropbox"], + ["hubspot", "HubSpot"], + ["salesforce", "Salesforce"], + ["stripe", "Stripe"], + ["zoom", "Zoom"], + ["calendly", "Calendly"], + ["figma", "Figma"], + ["twitter", "X (Twitter)"], + ["youtube", "YouTube"] +]; +var appName = (slug) => APPS.find(([id]) => id === slug)?.[1] ?? slug; +var GitHubMark = () => (0, import_react42.createElement)( + "svg", + { width: 20, height: 20, viewBox: "0 0 16 16", fill: "currentColor", "aria-hidden": true }, + (0, import_react42.createElement)("path", { d: "M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z" }) +); +var FeishuMark = () => (0, import_react42.createElement)( + "svg", + { width: 20, height: 20, viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": true }, + (0, import_react42.createElement)("path", { d: "M3.2 6.6c3 .1 6.4 1.5 8.6 3.9-1.9.4-3.5 1.4-4.7 2.9-1.9-.6-3.4-1.9-3.9-3.6-.2-.7-.2-1.5 0-3.2z" }), + (0, import_react42.createElement)("path", { d: "M16.8 5.4c-2.9.2-5.6 1.5-7.4 3.4 1.7 1.2 3.1 2.8 3.9 4.9 2.2-1.1 3.8-3.2 4-5.6.1-.9-.1-1.9-.4-2.7z" }), + (0, import_react42.createElement)("path", { d: "M8.6 12.1c.9.7 1.7 1.6 2.2 2.7-1.1.2-2.3 0-3.3-.6.2-.8.6-1.5 1.1-2.1z" }) +); +var MARKS = { github: GitHubMark, composio: ConnectorIcon, feishu: FeishuMark }; +var ABOUT = { + github: () => t("Repositories, issues, and pull requests"), + composio: () => t("Gmail, Slack, Calendar, Notion and many more apps, through one Composio key"), + feishu: () => t("Posts into one Feishu group through a custom bot webhook") +}; +function statusText2(connector) { + if (connector.state === "connecting") return t("Connecting…"); + if (connector.state === "error") return t("Could not connect: {error}", { error: connector.error ?? "" }); + if (connector.state === "ready" && connector.kind === "channel") { + return connector.mode === "app" ? t("Connected: app, over the long connection") : t("Connected: custom bot webhook"); } - const templates = Array.isArray(value.templates) ? value.templates : []; - const workflows = value.workflows; - const pack = { ...value, templates, workflows }; - if (templates.length === 0 && workflows.length === 0) return { phase: "empty", error: "", pack }; - return { phase: "ready", error: "", pack }; -} -function readWorkflows(call4, { timeoutMs = READ_MS } = {}) { - return new Promise((resolve) => { - let settled = false; - const finish = (value) => { - if (settled) return; - settled = true; - clearTimeout(timer); - resolve(value); - }; - const timer = setTimeout(() => finish(settleWorkflowRead(null)), timeoutMs); - Promise.resolve().then(() => call4("workflow/state")).then((value) => finish(settleWorkflowRead(value))).catch((failure) => finish({ phase: "error", error: workflowCallError(failure), pack: null })); - }); + if (connector.state === "ready" && connector.apps?.length > 0) return t("Connected: {apps}", { apps: connector.apps.map(appName).join(", ") }); + if (connector.state === "ready") return connector.account ? t("Connected as {account}", { account: connector.account }) : t("Connected"); + return ABOUT[connector.id]?.() ?? ""; } -function moveNode(nodes, id, x, y) { - return nodes.map((node) => node.id === id ? { ...node, x, y } : node); -} -function connectNodes(edges, from, to) { - if (!from || !to || from === to) return edges; - if (edges.some((edge) => edge.from === from && edge.to === to)) return edges; - return edges.concat([{ from, to }]); -} -function dropBot(nodes, bot, x, y) { - const ids = new Set(nodes.map((node) => node.id)); - let n = nodes.length + 1; - while (ids.has(`n${n}`)) n += 1; - return nodes.concat([{ id: `n${n}`, name: bot.name, botId: bot.id, role: bot.role ?? "", x, y }]); -} -function removeNode(nodes, edges, id) { - return { - nodes: nodes.filter((node) => node.id !== id), - edges: edges.filter((edge) => edge.from !== id && edge.to !== id) - }; -} -function chainOf(item) { - if (typeof item?.chain === "string" && item.chain) return item.chain; - if (!Array.isArray(item?.layers) || !Array.isArray(item?.nodes)) return ""; - const name = (id) => item.nodes.find((node) => node.id === id)?.name ?? id; - return item.layers.map((layer) => layer.map(name).join(" ‖ ")).join(" → "); -} -function openedGraph(pack, opened) { - if (!pack || !opened) return null; - if (opened.source === "own") return (pack.workflows ?? []).find((item) => item.id === opened.id) ?? null; - return (pack.templates ?? []).find((item) => item.id === opened.id) ?? (pack.workflows ?? []).find((item) => item.id === opened.id) ?? null; -} -function statusLabel2(status) { - if (status === "running") return t("Running"); - if (status === "done") return t("Done"); - if (status === "failed") return t("Failed"); - if (status === "idle") return t("Idle"); - if (status === "skipped") return t("Skipped"); - return t("Queued"); -} -function hitNode(event) { - const direct = event.target?.dataset?.node ? event.target : null; - const nested = event.target?.closest?.("[data-node]"); - return (nested ?? direct)?.dataset?.node || ""; -} -var WIRE_SPAN = 480; -var CARD_HALF = 84; -var CARD_H = 72; -var FRAME_SIDE = 108; -var MIN_FIT = 0.5; -var WIRE_GAP = 14; -var WIRE_LANE = 12; -var FRAME_PAD = 16; -var LANE_REACH = Math.ceil((CARD_HALF + WIRE_GAP) / WIRE_LANE) + 1; -var LANE_STEPS = [0]; -for (let step = 1; step <= LANE_REACH; step += 1) LANE_STEPS.push(step, -step); -function cardBoxes(nodes, heights = {}) { - const boxes = /* @__PURE__ */ new Map(); - for (const node of nodes ?? []) { - const height = Number(heights?.[node.id]) > 0 ? Number(heights[node.id]) : CARD_H; - const top = node.y ?? 0; - boxes.set(node.id, { id: node.id, cx: node.x ?? 0, top, bottom: top + height, height }); - } - return boxes; +function CredentialField({ credential, value, onChange, onEnter, autoFocus }) { + const label = t(credential.label); + if (credential.masked) return (0, import_react42.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react42.createElement)(MaskedInput, { value, onChange, onEnter, label, autoFocus })); + return (0, import_react42.createElement)( + "label", + { className: "bt-q-field" }, + (0, import_react42.createElement)("input", { + className: "bt-input", + type: "text", + value, + "aria-label": label, + placeholder: label, + spellCheck: false, + autoFocus, + onChange: (event) => onChange(event.target.value), + onKeyDown: (event) => { + if (event.key === "Enter") onEnter?.(); + } + }) + ); } -var rightOf = (box) => box.cx + CARD_HALF; -var leftOf = (box) => box.cx - CARD_HALF; -function cutsCard(boxes, x1, y1, x2, y2, from, to) { - const minX = Math.min(x1, x2); - const maxX = Math.max(x1, x2); - const minY = Math.min(y1, y2); - const maxY = Math.max(y1, y2); - return boxes.some((box) => box !== from && box !== to && maxX > leftOf(box) + 1 && minX < rightOf(box) - 1 && maxY > box.top + 1 && minY < box.bottom - 1); +function AllowedSenders({ connector, actions, run, busy }) { + const [openId, setOpenId] = (0, import_react42.useState)(""); + const allowed = connector.allowed ?? []; + const refused = connector.inbound?.refusedSenders ?? []; + const allow = (id) => void run(actions.connectorAllow(connector.id, id)); + return (0, import_react42.createElement)( + "div", + { className: "bt-connector-allowed" }, + (0, import_react42.createElement)("span", { className: "bt-connector-person-title" }, t("Who may talk to the Bots")), + allowed.length === 0 && refused.length === 0 ? (0, import_react42.createElement)("span", { className: "bt-set-hint" }, t("Nobody yet. A message from anyone else starts no turn.")) : null, + allowed.map((entry) => (0, import_react42.createElement)( + "div", + { key: entry.openId, className: "bt-connector-person" }, + (0, import_react42.createElement)("span", { className: "bt-connector-person-name" }, entry.name ?? entry.openId), + (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorBlock(connector.id, entry.openId)) }, t("Block")) + )), + refused.map((entry) => (0, import_react42.createElement)( + "div", + { key: entry.openId, className: "bt-connector-person" }, + (0, import_react42.createElement)("span", { className: "bt-connector-person-name" }, entry.name ?? entry.openId), + (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => allow(entry.openId) }, t("Allow")) + )), + (0, import_react42.createElement)( + "div", + { className: "bt-connector-form-row" }, + (0, import_react42.createElement)("input", { + className: "bt-input", + type: "text", + value: openId, + spellCheck: false, + "aria-label": t("Feishu open_id"), + placeholder: t("Paste an open_id to allow"), + onChange: (event) => setOpenId(event.target.value), + onKeyDown: (event) => { + if (event.key === "Enter" && openId.trim() !== "") { + allow(openId.trim()); + setOpenId(""); + } + } + }), + (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || openId.trim() === "", onClick: () => { + allow(openId.trim()); + setOpenId(""); + } }, t("Allow")) + ) + ); } -function clearRun(boxes, id, y, xa, xb, dir) { - const lo = Math.min(xa, xb); - const hi = Math.max(xa, xb); - let level = y; - for (let step = 0; step < LANE_REACH * 4; step += 1) { - const blocked = boxes.some((box) => box.id !== id && hi > leftOf(box) + 1 && lo < rightOf(box) - 1 && level > box.top + 1 && level < box.bottom - 1); - if (!blocked) return level; - level += dir * WIRE_LANE; - } - return level; +var APP_STATUS = { ready: () => t("Ready"), "sign-in": () => t("Needs sign-in") }; +function AppChip({ name, status, onRemove }) { + const label = APP_STATUS[status]?.(); + return (0, import_react42.createElement)( + "button", + { type: "button", className: "bt-state bt-app-chip", "aria-pressed": true, "data-status": status ?? "unknown", title: t("Remove {app}", { app: name }), onClick: onRemove }, + name, + label ? (0, import_react42.createElement)("span", { className: "bt-app-status" }, ` · ${label}`) : null + ); } -function rowGap(boxes, box, dir) { - const edge = dir < 0 ? box.top : box.bottom; - const others = boxes.filter((one) => one.id !== box.id && (dir < 0 ? one.bottom <= box.top + 1 : one.top >= box.bottom - 1)); - if (!others.length) return edge + dir * WIRE_GAP; - const near = dir < 0 ? Math.max(...others.map((one) => one.bottom)) : Math.min(...others.map((one) => one.top)); - return (near + edge) / 2; +function AppPicker({ apps, onChange, search, statuses = {} }) { + const [query, setQuery] = (0, import_react42.useState)(""); + const [found, setFound] = (0, import_react42.useState)(null); + const [failed, setFailed] = (0, import_react42.useState)(null); + const names = (0, import_react42.useRef)(new Map(APPS)); + const asked = (0, import_react42.useRef)(0); + (0, import_react42.useEffect)(() => { + const text2 = query.trim(); + if (text2 === "" || search === void 0) { + setFound(null); + setFailed(null); + return void 0; + } + const ask = ++asked.current; + const timer = setTimeout(() => { + search(text2).then((list) => { + if (ask !== asked.current) return; + for (const app of list) names.current.set(app.slug, app.name); + setFound(list); + setFailed(null); + }, (failure) => { + if (ask !== asked.current) return; + setFound(null); + setFailed(failure?.message ?? String(failure)); + }); + }, 250); + return () => clearTimeout(timer); + }, [query, search]); + const nameOf = (slug) => names.current.get(slug) ?? appName(slug); + const picked = new Set(apps); + const needle = query.trim().toLowerCase(); + const local = APPS.filter(([slug, name]) => needle === "" || slug.includes(needle) || name.toLowerCase().includes(needle)).map(([slug, name]) => ({ slug, name })); + const results = (found ?? local).filter((app) => !picked.has(app.slug)); + return (0, import_react42.createElement)( + "div", + { className: "bt-connector-apps" }, + apps.length > 0 ? (0, import_react42.createElement)("div", { className: "bt-states", "aria-label": t("Picked apps") }, apps.map((slug) => (0, import_react42.createElement)(AppChip, { key: slug, name: nameOf(slug), status: statuses[slug], onRemove: () => onChange(apps.filter((app) => app !== slug)) }))) : null, + (0, import_react42.createElement)("input", { className: "bt-input", type: "search", value: query, spellCheck: false, "aria-label": t("Search apps"), placeholder: t("Search Composio apps"), onChange: (event) => setQuery(event.target.value) }), + failed ? (0, import_react42.createElement)("span", { className: "bt-set-hint" }, t("Could not search Composio: {error}", { error: failed })) : null, + (0, import_react42.createElement)("div", { className: "bt-states", "aria-label": t("Apps to add") }, results.length === 0 ? (0, import_react42.createElement)("span", { className: "bt-set-hint" }, t("No apps match")) : results.map((app) => (0, import_react42.createElement)("button", { key: app.slug, type: "button", className: "bt-state", "aria-pressed": false, onClick: () => { + names.current.set(app.slug, app.name); + onChange([...apps, app.slug]); + } }, app.name))) + ); } -function laneFor(base, yA, yB, boxes, from, to, taken) { - const lo = Math.min(yA, yB); - const hi = Math.max(yA, yB); - const open = (x) => !taken.some((lane) => Math.abs(lane.x - x) < WIRE_LANE - 0.5 && lane.yA < hi && lo < lane.yB) && !boxes.some((box) => Math.abs(x - box.cx) < CARD_HALF + (box === from || box === to ? 1 : WIRE_GAP) && lo < box.bottom && hi > box.top); - for (const step of LANE_STEPS) if (open(base + step * WIRE_LANE)) return base + step * WIRE_LANE; - for (let step = LANE_REACH + 1; step <= LANE_REACH * 3; step += 1) { - if (open(base + step * WIRE_LANE)) return base + step * WIRE_LANE; - if (open(base - step * WIRE_LANE)) return base - step * WIRE_LANE; - } - return base; +function AppStatusList({ apps, statuses }) { + if (apps.length === 0 || Object.keys(statuses).length === 0) return null; + return (0, import_react42.createElement)("ul", { className: "bt-connector-app-list", "aria-label": t("App status") }, apps.map((slug) => (0, import_react42.createElement)( + "li", + { key: slug, className: "bt-connector-app", "data-status": statuses[slug] ?? "unknown" }, + (0, import_react42.createElement)("span", { className: "bt-connector-app-name" }, appName(slug)), + (0, import_react42.createElement)("span", { className: "bt-app-status" }, APP_STATUS[statuses[slug]]?.() ?? "") + ))); } -function wireRoutes(nodes, edges, heights = {}) { - const boxes = [...cardBoxes(nodes, heights).values()]; - const byId = new Map(boxes.map((box) => [box.id, box])); - const drawn = (edges ?? []).map((edge, index) => ({ index, from: byId.get(edge.from), to: byId.get(edge.to) })).filter((item) => item.from && item.to); - const rightMost = boxes.length ? Math.max(...boxes.map(rightOf)) : 0; - const taken = []; - const routes = []; - drawn.filter((item) => item.to.top < item.from.top).sort((a, b) => a.from.top - b.from.top || a.index - b.index).forEach((item, at) => { - const x1 = rightOf(item.from); - const x2 = rightOf(item.to); - const y1 = item.from.top + item.from.height / 2; - const y2 = item.to.top + item.to.height / 2; - const lane = rightMost + WIRE_GAP + at * WIRE_LANE; - const yA = clearRun(boxes, item.from.id, rowGap(boxes, item.from, -1), x1, lane, -1); - const yB = clearRun(boxes, item.to.id, rowGap(boxes, item.to, 1), x2, lane, 1); - routes.push({ - key: `${item.from.id}>${item.to.id}`, - back: true, - d: `M ${x1} ${y1} L ${x1} ${yA} L ${lane} ${yA} L ${lane} ${yB} L ${x2} ${yB} L ${x2} ${y2}` +function ConnectorRow({ connector, roster, actions }) { + const [form, setForm] = (0, import_react42.useState)(false); + const [bots, setBots] = (0, import_react42.useState)(false); + const [token, setToken] = (0, import_react42.useState)(""); + const [apps, setApps] = (0, import_react42.useState)(() => connector.apps ?? []); + const [picking, setPicking] = (0, import_react42.useState)(false); + const [busy, setBusy] = (0, import_react42.useState)(false); + const [error, setError] = (0, import_react42.useState)(null); + const [message, setMessage] = (0, import_react42.useState)(""); + const [copyState, setCopyState] = (0, import_react42.useState)("idle"); + const run = (task, after) => { + setBusy(true); + setError(null); + return task.then(() => { + after?.(); + }, (failure) => setError(failure?.message ?? String(failure))).finally(() => setBusy(false)); + }; + const gateway = connector.id === "composio"; + const sender = connector.kind === "sender"; + const channel = connector.kind === "channel"; + const modes = connector.modes ?? []; + const [mode, setMode] = (0, import_react42.useState)(() => connector.mode ?? modes[0]?.id); + const [values, setValues] = (0, import_react42.useState)({}); + const chosen = modes.find((entry) => entry.id === mode) ?? modes[0]; + const field = (name) => values[name] ?? ""; + const setField = (name, value) => setValues((current) => ({ ...current, [name]: value })); + const filled = chosen !== void 0 && chosen.credentials.every((credential) => field(credential.name).trim() !== ""); + const [statuses, setStatuses] = (0, import_react42.useState)({}); + const appsKey = (connector.apps ?? []).join(","); + (0, import_react42.useEffect)(() => { + if (!gateway || connector.state !== "ready" || appsKey === "" || actions.connectorAppStatus === void 0) { + setStatuses({}); + return void 0; + } + let live = true; + actions.connectorAppStatus(connector.id).then((value) => { + if (live) setStatuses(value ?? {}); + }, () => { + if (live) setStatuses({}); }); - taken.push({ x: lane, yA: Math.min(yA, yB), yB: Math.max(yA, yB) }); - }); - const centres = []; - for (const item of drawn.filter((one) => one.to.top < one.from.top)) centres.push(item.from.top + item.from.height / 2, item.to.top + item.to.height / 2); - const clearOf = (y, push) => centres.some((centre) => Math.abs(centre - y) < 4) ? y + push * 8 : y; - for (const item of drawn.filter((one) => one.to.top >= one.from.top)) { - const x1 = item.from.cx; - const x2 = item.to.cx; - const y1 = item.from.bottom; - const y2 = item.to.top; - const sameRow = y2 - y1 <= 0; - const rowBottom = Math.max(...boxes.filter((box) => Math.abs(box.top - item.from.top) <= 1.5).map((box) => box.bottom)); - const room2 = y2 - rowBottom; - const gap = sameRow ? WIRE_GAP : Math.min(WIRE_GAP, Math.max(0, room2 / 2)); - const corridor = clearOf(rowBottom + gap, 1); - const cap = sameRow ? Infinity : room2 === 0 ? y2 : y2 - 1; - const yA = sameRow ? corridor : Math.max(y1, Math.min(corridor, cap)); - const yB = clearOf(y2 - gap, -1); - const lane = laneFor((x1 + x2) / 2, yA, yB, boxes, item.from, item.to, taken); - taken.push({ x: lane, yA: Math.min(yA, yB), yB: Math.max(yA, yB) }); - const straight = Math.abs(lane - x1) < 0.5 && Math.abs(lane - x2) < 0.5 && !cutsCard(boxes, x1, y1, x2, y2, item.from, item.to); - routes.push({ - key: `${item.from.id}>${item.to.id}`, - back: false, - d: straight ? `M ${x1} ${y1} L ${x1} ${y2}` : `M ${x1} ${y1} L ${x1} ${yA} L ${lane} ${yA} L ${lane} ${yB} L ${x2} ${yB} L ${x2} ${y2}` + return () => { + live = false; + }; + }, [gateway, connector.state, appsKey, picking]); + (0, import_react42.useEffect)(() => { + setCopyState("idle"); + }, [connector.state, connector.error]); + const search = (0, import_react42.useCallback)((query) => actions.connectorAppSearch(connector.id, query, connector.state === "off" ? token : void 0), [connector.id, connector.state, token]); + const connect = () => { + if (busy) return; + if (channel) { + if (chosen === void 0 || !filled) return; + const credentials = Object.fromEntries(chosen.credentials.map((credential) => [credential.name, field(credential.name)])); + void run(actions.connectorConnect(connector.id, { mode: chosen.id, credentials }), () => { + setValues({}); + setForm(false); + }); + return; + } + if (token.trim() === "") return; + if (gateway && apps.length === 0) { + setError(t("Pick at least one app")); + return; + } + void run(actions.connectorConnect(connector.id, token, gateway ? apps : void 0), () => { + setToken(""); + setForm(false); }); - } - return routes; -} -function parallelFrames(nodes, layers, heights = {}) { - const boxes = cardBoxes(nodes, heights); - const frames = []; - for (const layer of layers ?? []) { - if (!Array.isArray(layer) || layer.length < 2) continue; - const members = layer.map((id) => boxes.get(id)).filter(Boolean); - if (members.length < 2) continue; - const left = Math.min(...members.map(leftOf)) - FRAME_PAD; - const right = Math.max(...members.map(rightOf)) + FRAME_PAD; - const top = Math.min(...members.map((box) => box.top)) - FRAME_PAD; - const bottom = Math.max(...members.map((box) => box.bottom)) + FRAME_PAD; - frames.push({ key: layer.join("+"), left, top, width: right - left, height: bottom - top }); - } - return frames; -} -function sameHeights(one, two) { - if (!one || !two) return false; - const keys = Object.keys(two); - return keys.length === Object.keys(one).length && keys.every((key) => one[key] === two[key]); -} -function fitScale(nodes, width) { - const reach = Math.max(0, ...(nodes ?? []).map((node) => Math.abs(node.x ?? 0) + FRAME_SIDE)); - if (!(width > 0) || reach === 0) return 1; - return Math.min(1, Math.max(MIN_FIT, width / 2 / reach)); -} -function fitLayout(nodes, width) { - const reach = Math.max(0, ...(nodes ?? []).map((node) => Math.abs(node.x ?? 0) + FRAME_SIDE)); - const scale = fitScale(nodes, width); - const spare = width > 0 && reach > 0 ? reach * scale - width / 2 : 0; - const pad2 = spare > 1e-6 ? Math.ceil(spare) : 0; - const centre = width > 0 ? pad2 + width / 2 : 0; - return { - reach, - scale, - pad: pad2, - left: centre - reach * scale, - right: centre + reach * scale, - scrollWidth: Math.max(width + pad2, centre + reach * scale) }; -} -function measureCanvasWidth(el) { - const width = el?.clientWidth; - return Number.isFinite(width) && width > 0 ? width : 0; -} -function GraphCanvas({ graph, editing, roster, onCommit, width: knownWidth = 0, cardHeights: knownHeights = null }) { - const gesture = (0, import_react38.useRef)(null); - const canvasRef = (0, import_react38.useRef)(null); - const [measuredWidth, setCanvasWidth] = (0, import_react38.useState)(0); - const [measuredHeights, setCardHeights] = (0, import_react38.useState)(null); - const [pointedWire, setPointedWire] = (0, import_react38.useState)(null); - const nodes = graph.nodes ?? []; - const edges = graph.edges ?? []; - const status = graph.run?.nodeStatus ?? null; - const locals = (roster?.bots ?? []).filter((bot) => bot && bot.remote !== true && !nodes.some((node) => node.botId === bot.id)); - const canvasWidth = measuredWidth || knownWidth; - const heights = measuredHeights ?? knownHeights ?? {}; - const boxes = cardBoxes(nodes, heights); - const height = Math.max(420, ...nodes.map((node) => (node.y ?? 0) + (boxes.get(node.id)?.height ?? CARD_H) + 78), 0); - const { scale, pad: pad2 } = fitLayout(nodes, canvasWidth); - const drawnHeight = Math.round(height * scale); - const routes = wireRoutes(nodes, edges, heights); - const frames = parallelFrames(nodes, graph.layers, heights); - const nodeKey = nodes.map((node) => node.id).join(","); - (0, import_react38.useEffect)(() => { - const el = canvasRef.current; - const measure = () => { - const width = measureCanvasWidth(el); - if (width > 0 && Math.abs(width - canvasWidth) > 0.5) setCanvasWidth(width); - }; - measure(); - if (typeof ResizeObserver !== "function" || !el) return void 0; - const observer = new ResizeObserver(measure); - observer.observe(el); - return () => observer.disconnect(); - }, [canvasWidth]); - (0, import_react38.useEffect)(() => { - const el = canvasRef.current; - if (!el || typeof el.querySelectorAll !== "function") return void 0; - const measure = () => { - const next = {}; - for (const card of el.querySelectorAll("[data-node]")) { - const cardHeight = card.offsetHeight; - if (cardHeight > 0) next[card.dataset.node] = cardHeight; - } - setCardHeights((previous) => sameHeights(previous, next) ? previous : next); - }; - measure(); - if (typeof ResizeObserver !== "function") return void 0; - const observer = new ResizeObserver(measure); - for (const card of el.querySelectorAll("[data-node]")) observer.observe(card); - return () => observer.disconnect(); - }, [nodeKey, scale]); - const end = (event) => { - const current = gesture.current; - gesture.current = null; - if (!current || !editing) return; - if (current.kind === "move") { - const x = Math.round(current.x + (event.clientX - current.ox) / scale); - const y = Math.round(current.y + (event.clientY - current.oy) / scale); - onCommit?.({ nodes: moveNode(nodes, current.id, x, y), edges }); - } else if (current.kind === "wire") { - const next = connectNodes(edges, current.from, hitNode(event)); - if (next !== edges) onCommit?.({ nodes, edges: next }); - } else if (current.kind === "add" && event.target?.dataset?.plane) { - const x = Number.isFinite(event.offsetX) ? Math.round(event.offsetX / scale) : 24; - const y = Number.isFinite(event.offsetY) ? Math.round(event.offsetY / scale) : 24; - onCommit?.({ nodes: dropBot(nodes, current.bot, x, y), edges }); + const saveApps = () => { + if (busy) return; + if (apps.length === 0) { + setError(t("Pick at least one app")); + return; } + void run(actions.connectorApps(connector.id, apps), () => setPicking(false)); }; - return (0, import_react38.createElement)( + const on = connector.state !== "off"; + const canPost = sender || channel && connector.mode === "webhook"; + const perBot = !sender && (!channel || connector.mode === "app"); + const copyLabel = copyState === "copied" ? t("Copied") : copyState === "failed" ? t("Could not copy the error") : t("Copy error"); + const copyError = () => { + void copiedToClipboard(connector.error ?? "").then((written) => setCopyState(written ? "copied" : "failed")); + }; + const Mark = MARKS[connector.id]; + const row = (0, import_react42.useRef)(null); + useMorph(row, `${form}:${picking}:${bots}:${error !== null}:${connector.state}:${mode}`); + return (0, import_react42.createElement)( "div", - { className: "bt-wf-canvas", ref: canvasRef, onPointerUp: end }, - editing ? (0, import_react38.createElement)( + { ref: row, className: "bt-connector", "data-state": connector.state }, + (0, import_react42.createElement)( "div", - { className: "bt-wf-palette" }, - (0, import_react38.createElement)("span", { className: "bt-wf-hint" }, t("Drag a Bot here")), - locals.map((bot) => (0, import_react38.createElement)("button", { - key: bot.id, + { className: "bt-connector-head" }, + (0, import_react42.createElement)("span", { className: "bt-connector-mark" }, Mark ? (0, import_react42.createElement)(Mark) : null), + (0, import_react42.createElement)( + "span", + { className: "bt-connector-text" }, + (0, import_react42.createElement)("span", { className: "bt-connector-name" }, connector.name), + (0, import_react42.createElement)("span", { className: "bt-connector-status" }, statusText2(connector)) + ), + (0, import_react42.createElement)( + "span", + { className: "bt-connector-actions" }, + connector.state === "error" ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorRetry(connector.id)) }, t("Try again")) : null, + connector.state === "error" ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: copyError }, copyLabel) : null, + on && gateway && !picking ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { + setApps(connector.apps ?? []); + setPicking(true); + } }, t("Choose apps")) : null, + on && perBot ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "aria-expanded": bots, onClick: () => setBots((value) => !value) }, bots ? t("Done") : t("Choose Bots")) : null, + on ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorDisconnect(connector.id)) }, t("Disconnect")) : form ? null : (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setForm(true) }, t("Connect")) + ) + ), + on && gateway && !picking ? (0, import_react42.createElement)(AppStatusList, { apps: connector.apps ?? [], statuses }) : null, + on && perBot ? (0, import_react42.createElement)("span", { className: "bt-connector-uses" }, usageText(roster, connector.id)) : null, + on && bots ? (0, import_react42.createElement)(ConnectorBots, { connector, roster, actions, run, SwitchRow }) : null, + on && channel && connector.mode === "app" ? (0, import_react42.createElement)(AllowedSenders, { connector, actions, run, busy }) : null, + on && canPost ? (0, import_react42.createElement)( + "div", + { className: "bt-connector-form" }, + (0, import_react42.createElement)("label", { className: "bt-q-field" }, (0, import_react42.createElement)("input", { className: "bt-input", type: "text", value: message, "aria-label": t("Message to send to Feishu"), placeholder: t("Type a message for the Feishu group"), onChange: (event) => setMessage(event.target.value) })), + (0, import_react42.createElement)( + "div", + { className: "bt-connector-form-row" }, + (0, import_react42.createElement)("span", { className: "bt-connector-link" }), + (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || message.trim() === "" || actions.connectorSend === void 0, onClick: () => void run(actions.connectorSend(connector.id, message), () => setMessage("")) }, t("Send")) + ) + ) : null, + !on && form ? (0, import_react42.createElement)( + "div", + { className: "bt-connector-form" }, + channel ? (0, import_react42.createElement)("div", { className: "bt-states", role: "group", "aria-label": t("How to connect") }, modes.map((entry) => (0, import_react42.createElement)("button", { + key: entry.id, type: "button", - "data-bot": bot.id, - onPointerDown: (event) => { - event.preventDefault?.(); - gesture.current = { kind: "add", bot }; + className: "bt-state", + "aria-pressed": entry.id === chosen?.id, + onClick: () => { + setMode(entry.id); + setValues({}); + setError(null); } - }, bot.name)) + }, t(entry.label)))) : null, + channel ? (chosen?.credentials ?? []).map((credential, index) => (0, import_react42.createElement)(CredentialField, { + key: credential.name, + credential, + value: field(credential.name), + onChange: (value) => setField(credential.name, value), + onEnter: connect, + autoFocus: index === 0 + })) : (0, import_react42.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react42.createElement)(MaskedInput, { value: token, onChange: setToken, onEnter: connect, label: gateway ? t("Composio API key") : t("GitHub token"), autoFocus: true })), + gateway ? (0, import_react42.createElement)(AppPicker, { apps, onChange: setApps, search: token.trim() === "" ? void 0 : search }) : null, + (0, import_react42.createElement)( + "div", + { className: "bt-connector-form-row" }, + (0, import_react42.createElement)( + "a", + { className: "bt-connector-link", href: channel ? chosen?.link ?? FEISHU_WEBHOOK_URL : gateway ? COMPOSIO_KEY_URL : TOKEN_URL, target: "_blank", rel: "noopener noreferrer" }, + channel ? t(chosen?.linkLabel ?? "Get a webhook URL in Feishu") : gateway ? t("Get a Composio API key") : t("Create a token on GitHub") + ), + (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { + setForm(false); + setToken(""); + setValues({}); + setError(null); + } }, t("Cancel")), + (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || (channel ? !filled : token.trim() === ""), onClick: connect }, busy ? t("Connecting…") : t("Connect")) + ) ) : null, - // A node's system prompt is the run Bot's prompt (plugins/workflow - // nodeConfig). The sidebar panel has this field, so the Settings editor - // writes the same graph instead of only drawing it (#1393). - editing ? (0, import_react38.createElement)("div", { className: "bt-wf-prompts" }, nodes.map((node) => (0, import_react38.createElement)( - "label", - { key: node.id, className: "bt-wf-prompt" }, - (0, import_react38.createElement)("span", null, `${node.name} · ${t("System prompt")}`), - (0, import_react38.createElement)("textarea", { - "data-prompt": node.id, - rows: 3, - defaultValue: node.prompt || "", - onPointerDown: (event) => event.stopPropagation?.(), - onBlur: (event) => { - const prompt = event.target?.value ?? ""; - if (prompt === (node.prompt || "")) return; - onCommit?.({ nodes: nodes.map((item) => item.id === node.id ? { ...item, prompt } : item), edges }); - } - }) - ))) : null, - (0, import_react38.createElement)( + on && gateway && picking ? (0, import_react42.createElement)( "div", - { className: "bt-wf-stage", style: pad2 > 0 ? { height: drawnHeight, paddingLeft: pad2 } : { height: drawnHeight } }, - (0, import_react38.createElement)( + { className: "bt-connector-form" }, + (0, import_react42.createElement)(AppPicker, { apps, onChange: setApps, search, statuses }), + (0, import_react42.createElement)("span", { className: "bt-set-hint" }, t("The first time a Bot uses an app, it shows a sign-in link in the chat.")), + (0, import_react42.createElement)( "div", - { className: "bt-wf-fit", style: { height, transform: `scale(${scale})` } }, - (0, import_react38.createElement)( + { className: "bt-connector-form-row" }, + (0, import_react42.createElement)("span", { className: "bt-connector-link" }), + (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { + setPicking(false); + setError(null); + } }, t("Cancel")), + (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || apps.length === 0, onClick: saveApps }, busy ? t("Connecting…") : t("Save")) + ) + ) : null, + error ? (0, import_react42.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null + ); +} +function connectorsOf(roster, kind) { + const list = roster?.connectors ?? []; + return kind ? list.filter((connector) => connector.kind === kind) : list; +} +function ConnectorsPage({ roster, actions, kind, empty, hint }) { + const list = connectorsOf(roster, kind); + const vacant = empty ?? t("No connectors"); + const note = hint ? (0, import_react42.createElement)("div", { className: "bt-set-row" }, (0, import_react42.createElement)("span", { className: "bt-set-hint" }, hint)) : null; + if (lockedWindow(roster)) { + return (0, import_react42.createElement)( + "section", + { className: "bt-set-section" }, + (0, import_react42.createElement)( + "div", + { className: "bt-set-card bt-connectors-card" }, + note, + list.length === 0 ? (0, import_react42.createElement)("div", { className: "bt-set-row" }, (0, import_react42.createElement)("span", { className: "bt-set-hint" }, vacant)) : list.map((connector) => (0, import_react42.createElement)( "div", - { className: "bt-wf-plane", "data-plane": "1", style: { height, "--bt-wf-wire-span": `${WIRE_SPAN}px` } }, - // P-395: every wire says which two cards it joins, and carries a 10px transparent - // hit path of its own: two wires that end at the same port are one stroke to the - // eye, so pointing at one has to be a hit test on that route, not on the stroke. - // The layer is no longer `aria-hidden`: each route is a named image, and the - // pointer marks the one under it while the rest recede. The geometry stays - // wireRoutes' own; this layer only adds a hit target and its name. - (0, import_react38.createElement)( - "svg", - { - className: "bt-wf-wires", - role: "group", - "aria-label": t("Connections"), - width: WIRE_SPAN * 2, - height, - viewBox: `0 0 ${WIRE_SPAN * 2} ${height}` - }, - (0, import_react38.createElement)( - "defs", - null, - (0, import_react38.createElement)("marker", { - id: "bt-wf-arrow", - viewBox: "0 0 10 10", - refX: "8", - refY: "5", - markerWidth: "6", - markerHeight: "6", - orient: "auto" - }, (0, import_react38.createElement)("path", { d: "M0 0 10 5 0 10z" })) - ), - (0, import_react38.createElement)("g", { transform: `translate(${WIRE_SPAN} 0)` }, routes.map((route) => { - const active = pointedWire === route.key; - const dim = pointedWire !== null && !active; - const [from, to] = String(route.key).split(">"); - const name = (id) => nodes.find((node) => node.id === id)?.name ?? id; - const label = `${name(from)} → ${name(to)}`; - const state = { - "data-key": route.key, - "data-active": active ? "" : void 0, - "data-dim": dim ? "" : void 0 - }; - return [ - (0, import_react38.createElement)("path", { - key: route.key, - d: route.d, - markerEnd: "url(#bt-wf-arrow)", - "data-route": route.back ? "back" : "forward", - ...state - }), - (0, import_react38.createElement)("path", { - key: `${route.key}:hit`, - className: "bt-wf-hit", - d: route.d, - ...state, - "data-hit": "1", - role: "img", - "aria-label": label, - style: { pointerEvents: "stroke", stroke: "transparent", strokeWidth: 10, fill: "none" }, - onPointerEnter: () => setPointedWire(route.key), - onPointerLeave: () => setPointedWire((current) => current === route.key ? null : current) - }, (0, import_react38.createElement)("title", null, label)) - ]; - })) - ), - frames.map((frame) => (0, import_react38.createElement)("div", { - key: frame.key, - className: "bt-wf-par", - style: { left: frame.left, top: frame.top, width: frame.width, height: frame.height } - }, (0, import_react38.createElement)("div", { className: "bt-wf-plabel" }, t("Parallel branch, then join")))), - nodes.map((node) => { - const state = status ? status[node.id] ?? "queued" : "idle"; - return (0, import_react38.createElement)( - "div", - { - key: node.id, - "data-node": node.id, - className: `bt-wf-node ${state}${editing ? " editing" : ""}`, - style: { left: (node.x ?? 0) - CARD_HALF, top: node.y ?? 0 }, - onPointerDown: (event) => { - if (!editing || event.target?.dataset?.port || event.target?.dataset?.remove) return; - gesture.current = { kind: "move", id: node.id, ox: event.clientX, oy: event.clientY, x: node.x ?? 0, y: node.y ?? 0 }; - } - }, - editing ? (0, import_react38.createElement)("button", { - type: "button", - className: "bt-wf-port", - "data-port": "out", - "aria-label": node.name, - onPointerDown: (event) => { - event.preventDefault?.(); - event.stopPropagation?.(); - gesture.current = { kind: "wire", from: node.id }; - } - }) : null, - editing ? (0, import_react38.createElement)("button", { - type: "button", - className: "bt-wf-remove", - "data-remove": node.id, - "aria-label": t("Remove"), - onClick: (event) => { - event.stopPropagation?.(); - const next = removeNode(nodes, edges, node.id); - onCommit?.(next); - } - }, "×") : null, - (0, import_react38.createElement)("span", { className: `bt-wf-chip ${state}` }, statusLabel2(state)), - // #2017: one code point, not one UTF-16 unit — a name that starts with an emoji - // would otherwise put half a surrogate pair in the circle. - (0, import_react38.createElement)("span", { className: "bt-wf-av", style: { background: COLORS[node.name] ?? "#4d6bfe" } }, Array.from(String(node.name ?? "").trim())[0] ?? "?"), - (0, import_react38.createElement)( - "span", - { className: "bt-wf-copy" }, - (0, import_react38.createElement)("span", { className: "bt-wf-name" }, node.name), - (0, import_react38.createElement)("span", { className: "bt-wf-role" }, node.role ?? "") - ) - ); - }) - ) + { key: connector.id, className: "bt-set-row" }, + (0, import_react42.createElement)( + "span", + { className: "bt-set-copy" }, + (0, import_react42.createElement)("span", { className: "bt-bs-label" }, connector.name), + (0, import_react42.createElement)("span", { className: "bt-set-hint" }, statusText2(connector)) + ) + )) ) + ); + } + return (0, import_react42.createElement)( + "section", + { className: "bt-set-section" }, + (0, import_react42.createElement)( + "div", + { className: "bt-set-card bt-connectors-card" }, + note, + list.length === 0 ? (0, import_react42.createElement)("div", { className: "bt-set-row" }, (0, import_react42.createElement)("span", { className: "bt-set-hint" }, vacant)) : list.map((connector) => (0, import_react42.createElement)(ConnectorRow, { key: connector.id, connector, roster, actions })) ) ); } -function Row2({ item, source, onOpen, onRename, onDelete, editable = true }) { - return (0, import_react38.createElement)( - "button", - { - type: "button", - className: "bt-set-row", - "data-workflow": item.id, - "data-source": source, - onClick: () => onOpen?.(item) - }, - (0, import_react38.createElement)( - "span", - { className: "bt-set-copy" }, - (0, import_react38.createElement)("span", null, item.name), - (0, import_react38.createElement)("span", { className: "bt-set-hint" }, item.preview || chainOf(item) || item.description || "") - ), - source === "own" && editable ? (0, import_react38.createElement)( - "span", - { className: "bt-set-actions" }, - (0, import_react38.createElement)("button", { - type: "button", - className: "bt-set-action", - "aria-label": t("Rename"), - title: t("Rename"), - onClick: (event) => { - event.stopPropagation(); - onRename?.(item); - } - }, "✎"), - (0, import_react38.createElement)("button", { - type: "button", - className: "bt-set-action", - "aria-label": t("Delete"), - title: t("Delete"), - onClick: (event) => { - event.stopPropagation(); - onDelete?.(item); - } - }, "×") - ) : null, - (0, import_react38.createElement)("span", { className: "bt-chevron", "aria-hidden": true }, "›") - ); +function ChannelsPage({ roster, actions }) { + return (0, import_react42.createElement)(ConnectorsPage, { + roster, + actions, + kind: "channel", + empty: t("No channels yet."), + hint: t("Only integrations FlyBot already has appear here.") + }); } -function alertCopy(error) { - if (error === WORKFLOW_PLUGIN_HINT) return t("The Workflow plugin is not installed or not enabled. A default install includes @flybot/workflow."); - return error || t("Could not read workflows"); + +// src/client/workflows.js +var import_react43 = require("react"); +var READ_MS = 8e3; +var POLL_MS6 = 2e3; +var WORKFLOW_PLUGIN_HINT = "The Workflow plugin is not installed or not enabled. A default install includes @flybot/workflow."; +var COLORS = { Planner: "#8b5cf6", Writer: "#f0509a", Coder: "#1fbf6a", Reviewer: "#f5a524", Tester: "#14b8a6", Deployer: "#2f7cf6" }; +function workflowCallMissing(failure) { + const code = failure && typeof failure === "object" ? String(failure.code ?? "") : ""; + const message = typeof failure === "string" ? failure : String(failure?.message ?? ""); + return code === "bot/not-found" || /Unknown FlyBot endpoint workflow\//i.test(message); } -function WorkflowsView({ phase = "loading", pack = null, error = "", opened = null, editing = false, roster = null, canvasWidth = 0, cardHeights = null, onOpen, onBack, onEditing, onRetry, onUse, onCommit, onRename, onDelete }) { - const graph = phase === "ready" ? openedGraph(pack, opened) : null; - const templates = pack?.templates ?? []; - const templateIds = new Set(templates.map((item) => item.id)); - const yours = (pack?.workflows ?? []).filter((item) => !templateIds.has(item.id)); - const readOnly = typeof roster?.readOnly === "string" ? roster.readOnly.trim() : ""; - const locked = readOnly !== ""; - const showUse = !locked && (opened?.source === "factory" || opened?.fromFactory !== void 0); - return (0, import_react38.createElement)( - "div", - { className: "bt-wf-page" }, - (0, import_react38.createElement)("p", { className: "bt-wf-hint" }, t("A workflow is a group of your Bots. Drag the flowchart to change who hands work to whom.")), - error ? (0, import_react38.createElement)( - "div", - { className: "bt-error", role: "alert" }, - alertCopy(error), - phase === "error" ? (0, import_react38.createElement)("button", { type: "button", onClick: () => onRetry?.() }, t("Retry")) : null - ) : null, - phase === "loading" ? (0, import_react38.createElement)("p", { className: "bt-wf-status", role: "status" }, t("Reading workflows…")) : null, - phase === "empty" ? (0, import_react38.createElement)("p", { className: "bt-wf-status" }, t("No workflows yet.")) : null, - phase === "ready" && !graph ? (0, import_react38.createElement)( - "div", - { className: "bt-wf-lists" }, - (0, import_react38.createElement)( - "section", - { className: "bt-set-section" }, - (0, import_react38.createElement)("h3", null, t("Factory presets")), - (0, import_react38.createElement)("p", { className: "bt-wf-hint" }, t("Ready-made pipelines. Use one to start your own.")), - (0, import_react38.createElement)( - "div", - { className: "bt-set-card" }, - templates.length === 0 ? (0, import_react38.createElement)("div", { className: "bt-set-row" }, (0, import_react38.createElement)("span", { className: "bt-set-hint" }, t("No workflows yet."))) : templates.map((item) => { - const live = (pack.workflows ?? []).find((workflow) => workflow.id === item.id); - const row = live ? { ...item, name: live.name, preview: live.preview || chainOf(live) || chainOf(item) } : item; - return (0, import_react38.createElement)(Row2, { key: item.id, item: row, source: "factory", onOpen: () => onOpen?.(item, "factory") }); - }) - ) - ), - (0, import_react38.createElement)( - "section", - { className: "bt-set-section" }, - (0, import_react38.createElement)("h3", null, t("Yours")), - (0, import_react38.createElement)("p", { className: "bt-wf-hint" }, t("Workflows saved on this machine.")), - (0, import_react38.createElement)( - "div", - { className: "bt-set-card" }, - yours.length === 0 ? (0, import_react38.createElement)("div", { className: "bt-set-row" }, (0, import_react38.createElement)("span", { className: "bt-set-hint" }, t("No workflows of your own yet."))) : yours.map((item) => (0, import_react38.createElement)(Row2, { key: item.id, item, source: "own", editable: !locked, onOpen: () => onOpen?.(item, "own"), onRename, onDelete })) - ) - ) - ) : null, - graph ? (0, import_react38.createElement)( - "div", - { className: "bt-wf-editor" }, - (0, import_react38.createElement)( - "div", - { className: "bt-wf-actions" }, - (0, import_react38.createElement)("button", { type: "button", onClick: () => onBack?.() }, t("Back")), - showUse ? (0, import_react38.createElement)("button", { type: "button", onClick: () => onUse?.(opened.source === "factory" ? opened.id : opened.fromFactory) }, t("Use this")) : null, - locked ? null : opened?.source === "own" ? (0, import_react38.createElement)("button", { type: "button", onClick: () => onEditing?.(!editing) }, editing ? t("Finish editing") : t("Edit")) : null - ), - (0, import_react38.createElement)("h3", { className: "bt-wf-title" }, graph.name), - graph.description ? (0, import_react38.createElement)("p", { className: "bt-wf-hint" }, graph.description) : null, - (graph.nodes ?? []).length === 0 ? (0, import_react38.createElement)("p", { className: "bt-wf-status" }, t("This workflow has no flowchart yet.")) : (0, import_react38.createElement)(GraphCanvas, { - graph, - roster, - onCommit, - width: canvasWidth, - cardHeights, - editing: opened?.source === "own" && editing === true && !locked - }) - ) : null - ); +function workflowCallError(failure, fallback = "Could not read workflows") { + if (workflowCallMissing(failure)) return WORKFLOW_PLUGIN_HINT; + if (typeof failure === "string" && failure.trim()) return failure.trim(); + const message = typeof failure?.message === "string" ? failure.message.trim() : ""; + return message || fallback; } -function RenameModal({ workflow, onClose, onConfirm }) { - const [name, setName] = (0, import_react38.useState)(workflow?.name ?? ""); - return (0, import_react38.createElement)( - "div", - { className: "bt-modal-mask", onClick: (event) => { - if (event.target === event.currentTarget) onClose?.(); - } }, - (0, import_react38.createElement)( - "div", - { className: "bt-modal", role: "dialog", "aria-modal": true, "aria-label": t("Rename workflow") }, - (0, import_react38.createElement)("h3", null, t("Rename workflow")), - (0, import_react38.createElement)( - "label", - { className: "bt-field" }, - t("Name"), - (0, import_react38.createElement)("input", { type: "text", value: name, onChange: (event) => setName(event.target.value), autoFocus: true }) - ), - (0, import_react38.createElement)( - "div", - { className: "bt-modal-actions" }, - (0, import_react38.createElement)("button", { type: "button", onClick: onClose }, t("Cancel")), - (0, import_react38.createElement)("button", { type: "button", onClick: () => onConfirm?.(name) }, t("Rename")) - ) - ) - ); +function settleWorkflowRead(value, fallback = "Could not read workflows") { + if (!value || value.ok === false || !Array.isArray(value.workflows)) { + const raw = typeof value?.error === "string" && value.error.trim() ? value.error : ""; + const error = workflowCallMissing(value) || workflowCallMissing(raw) ? WORKFLOW_PLUGIN_HINT : raw || fallback; + return { phase: "error", error, pack: null }; + } + const templates = Array.isArray(value.templates) ? value.templates : []; + const workflows = value.workflows; + const pack = { ...value, templates, workflows }; + if (templates.length === 0 && workflows.length === 0) return { phase: "empty", error: "", pack }; + return { phase: "ready", error: "", pack }; } -function DeleteModal({ workflow, onClose, onConfirm }) { - return (0, import_react38.createElement)( - "div", - { className: "bt-modal-mask", onClick: (event) => { - if (event.target === event.currentTarget) onClose?.(); - } }, - (0, import_react38.createElement)( - "div", - { className: "bt-modal", role: "dialog", "aria-modal": true, "aria-label": t("Delete workflow") }, - (0, import_react38.createElement)("h3", null, t("Delete workflow")), - (0, import_react38.createElement)("p", null, t('Are you sure you want to delete "{name}"? This cannot be undone.', { name: workflow?.name ?? "" })), - (0, import_react38.createElement)( - "div", - { className: "bt-modal-actions" }, - (0, import_react38.createElement)("button", { type: "button", onClick: onClose }, t("Cancel")), - (0, import_react38.createElement)("button", { type: "button", className: "bt-danger", onClick: onConfirm }, t("Delete")) - ) - ) - ); -} -function WorkflowsPage({ call: call4, roster, start }) { - const readOnly = typeof roster?.readOnly === "string" && roster.readOnly.trim() ? roster.readOnly : ""; - const [phase, setPhase] = (0, import_react38.useState)("loading"); - const [pack, setPack] = (0, import_react38.useState)(null); - const [error, setError] = (0, import_react38.useState)(""); - const [opened, setOpened] = (0, import_react38.useState)(null); - const [editing, setEditing] = (0, import_react38.useState)(false); - const [renaming, setRenaming] = (0, import_react38.useState)(null); - const [deleting, setDeleting] = (0, import_react38.useState)(null); - const invoke = typeof call4 === "function" ? call4 : () => Promise.reject(new Error("Could not read workflows")); - const startId = typeof start === "string" && start ? start : ""; - const seeded = (0, import_react38.useRef)(false); - const apply2 = (settled) => { - setPhase(settled.phase); - setPack(settled.pack); - setError(settled.error); - if (seeded.current || !startId) return; - seeded.current = true; - const named = settled.phase === "ready" ? (settled.pack?.workflows ?? []).find((item) => item.id === startId) : null; - if (named) setOpened({ source: "own", id: named.id }); - }; - (0, import_react38.useEffect)(() => { - let gone = false; - readWorkflows(invoke).then((settled) => { - if (!gone) apply2(settled); - }); - return () => { - gone = true; - }; - }, []); - const live = (pack?.workflows ?? []).some((item) => (item.activeCount ?? 0) > 0); - (0, import_react38.useEffect)(() => { - if (!live || editing) return void 0; - let gone = false; - const timer = setInterval(() => { - readWorkflows(invoke).then((settled) => { - if (!gone) apply2(settled); - }); - }, POLL_MS6); - return () => { - gone = true; - clearInterval(timer); +function readWorkflows(call4, { timeoutMs = READ_MS } = {}) { + return new Promise((resolve) => { + let settled = false; + const finish = (value) => { + if (settled) return; + settled = true; + clearTimeout(timer); + resolve(value); }; - }, [live, editing]); - const retry = () => { - setPhase("loading"); - setError(""); - setOpened(null); - readWorkflows(invoke).then(apply2); - }; - const open = (item, source) => { - if (source === "factory") { - const live2 = (pack?.workflows ?? []).find((workflow) => workflow.id === item.id); - setOpened(live2 ? { source: "own", id: live2.id, fromFactory: item.id } : { source: "factory", id: item.id }); - setEditing(false); - return; - } - setOpened({ source: "own", id: item.id }); - setEditing(false); - }; - const useTemplate = (id) => { - const template = typeof id === "string" ? id : ""; - if (!template) return; - Promise.resolve(invoke("workflow/create", { template })).then((value) => { - const settled = settleWorkflowRead(value); - if (settled.phase === "error") { - setError(settled.error); - return; - } - const before = new Set((pack?.workflows ?? []).map((item) => item.id)); - const made = settled.pack.workflows.find((item) => !before.has(item.id)); - setPack(settled.pack); - setPhase(settled.phase); - setError(""); - if (made) { - setOpened({ source: "own", id: made.id }); - setEditing(!readOnly); - } - }).catch((failure) => { - setError(workflowCallError(failure, t("Could not copy this workflow"))); - }); - }; - const rename = (item) => { - setRenaming(item); - }; - const confirmRename = (workflowId, name) => { - if (!name.trim()) return; - Promise.resolve(invoke("workflow/rename", { workflowId, name: name.trim() })).then((value) => { - const settled = settleWorkflowRead(value); - if (settled.phase === "error") { - setError(settled.error); - return; - } - setPack(settled.pack); - setPhase("ready"); - setError(""); - setRenaming(null); - }).catch((failure) => { - setError(workflowCallError(failure, t("Could not rename this workflow"))); - }); - }; - const deleteWorkflow = (item) => { - setDeleting(item); - }; - const confirmDelete = (workflowId) => { - Promise.resolve(invoke("workflow/delete", { workflowId })).then((value) => { - const settled = settleWorkflowRead(value); - if (settled.phase === "error") { - setError(settled.error); - return; - } - setPack(settled.pack); - setPhase(settled.phase); - setError(""); - setDeleting(null); - if (opened?.id === workflowId) setOpened(null); - }).catch((failure) => { - setError(workflowCallError(failure, t("Could not delete this workflow"))); - }); - }; - const commit = (graph) => { - if (!opened || opened.source !== "own") return; - if (readOnly) return; - Promise.resolve(invoke("workflow/graph", { workflowId: opened.id, nodes: graph.nodes, edges: graph.edges })).then((value) => { - const settled = settleWorkflowRead(value); - if (settled.phase === "error") { - setError(settled.error); - return; - } - setPack(settled.pack); - setPhase("ready"); - setError(""); - }).catch((failure) => { - setError(workflowCallError(failure, t("Could not save this workflow"))); - }); - }; - return (0, import_react38.createElement)( - "div", - null, - (0, import_react38.createElement)(WorkflowsView, { - phase, - pack, - error, - opened, - editing, - roster, - onOpen: open, - onBack: () => { - setOpened(null); - setEditing(false); - }, - onEditing: setEditing, - onRetry: retry, - onUse: useTemplate, - onCommit: commit, - onRename: rename, - onDelete: deleteWorkflow - }), - renaming ? (0, import_react38.createElement)(RenameModal, { - workflow: renaming, - onClose: () => setRenaming(null), - onConfirm: (name) => confirmRename(renaming.id, name) - }) : null, - deleting ? (0, import_react38.createElement)(DeleteModal, { - workflow: deleting, - onClose: () => setDeleting(null), - onConfirm: () => confirmDelete(deleting.id) - }) : null - ); + const timer = setTimeout(() => finish(settleWorkflowRead(null)), timeoutMs); + Promise.resolve().then(() => call4("workflow/state")).then((value) => finish(settleWorkflowRead(value))).catch((failure) => finish({ phase: "error", error: workflowCallError(failure), pack: null })); + }); } - -// src/client/usage-data.js -var HOUR = 0; -var OWNER = 1; -var MODEL = 2; -var KIND = 3; -var HOUR_MS = 36e5; -var DAY_MS = 864e5; -var RANGES = [ - { id: "24h", unit: "hour", count: 24, stride: 6 }, - { id: "7d", unit: "day", count: 7, stride: 1 }, - { id: "30d", unit: "day", count: 30, stride: 5 }, - { id: "12w", unit: "week", count: 12, stride: 2 }, - { id: "12m", unit: "month", count: 12, stride: 1 } -]; -var hourMs = (key) => Date.UTC(Number(key.slice(0, 4)), Number(key.slice(5, 7)) - 1, Number(key.slice(8, 10)), Number(key.slice(11, 13)) || 0); -var dayKey = (ms) => new Date(ms).toISOString().slice(0, 10); -var hourKey = (ms) => new Date(ms).toISOString().slice(0, 13).replace("T", " "); -var mondayOf = (ms) => ms - (new Date(ms).getUTCDay() + 6) % 7 * DAY_MS; -function spanRange(from, to) { - if (to < from) [from, to] = [to, from]; - const days = Math.round((hourMs(to) - hourMs(from)) / DAY_MS) + 1; - const unit = days <= 2 ? "hour" : days <= 62 ? "day" : days <= 182 ? "week" : "month"; - const range = { id: "custom", unit, from, to, days }; - const count = spanBuckets(range).length; - const stride = unit === "hour" ? 6 : [1, 2, 3, 5, 7, 10, 14].find((step) => count / step <= 12) ?? Math.ceil(count / 12); - return { ...range, count, stride }; +function moveNode(nodes, id, x, y) { + return nodes.map((node) => node.id === id ? { ...node, x, y } : node); } -function spanBuckets(range) { - const first = hourMs(range.from); - const end = hourMs(range.to) + DAY_MS; - const buckets = []; - if (range.unit === "hour" || range.unit === "day") { - const step = range.unit === "hour" ? HOUR_MS : DAY_MS; - for (let start = first; start < end; start += step) buckets.push({ start, end: start + step, key: range.unit === "hour" ? hourKey(start) : dayKey(start) }); - } else if (range.unit === "week") { - for (let monday = mondayOf(first); monday < end; monday += 7 * DAY_MS) { - buckets.push({ start: Math.max(monday, first), end: Math.min(monday + 7 * DAY_MS, end), key: dayKey(monday) }); - } - } else { - const year = new Date(first).getUTCFullYear(); - for (let month = new Date(first).getUTCMonth(); Date.UTC(year, month, 1) < end; month += 1) { - const start = Date.UTC(year, month, 1); - buckets.push({ start: Math.max(start, first), end: Math.min(Date.UTC(year, month + 1, 1), end), key: dayKey(start).slice(0, 7) }); - } - } - return buckets; +function connectNodes(edges, from, to) { + if (!from || !to || from === to) return edges; + if (edges.some((edge) => edge.from === from && edge.to === to)) return edges; + return edges.concat([{ from, to }]); } -function spanOf(range, now) { - if (range.from) { - return { buckets: spanBuckets(range), from: `${range.from} 00`, to: `${range.to} 23`, before: hourKey(hourMs(range.from) - range.days * DAY_MS) }; - } - const buckets = bucketsOf(range, now); - return { buckets: buckets.slice(range.count), from: hourKey(buckets[range.count].start), to: now, before: hourKey(buckets[0].start) }; +function dropBot(nodes, bot, x, y) { + const ids = new Set(nodes.map((node) => node.id)); + let n = nodes.length + 1; + while (ids.has(`n${n}`)) n += 1; + return nodes.concat([{ id: `n${n}`, name: bot.name, botId: bot.id, role: bot.role ?? "", x, y }]); } -function bucketsOf(range, now) { - const end = hourMs(now); - const today = end - end % DAY_MS; - const buckets = []; - for (let back = range.count * 2 - 1; back >= 0; back -= 1) { - let start; - if (range.unit === "hour") start = end - back * HOUR_MS; - else if (range.unit === "day") start = today - back * DAY_MS; - else if (range.unit === "week") start = mondayOf(today) - back * 7 * DAY_MS; - else start = Date.UTC(new Date(end).getUTCFullYear(), new Date(end).getUTCMonth() - back, 1); - buckets.push({ start, key: range.unit === "hour" ? hourKey(start) : range.unit === "month" ? dayKey(start).slice(0, 7) : dayKey(start) }); - } - return buckets; +function removeNode(nodes, edges, id) { + return { + nodes: nodes.filter((node) => node.id !== id), + edges: edges.filter((edge) => edge.from !== id && edge.to !== id) + }; } -var tokensOf = (row) => row[4] + row[5] + row[6] + row[7]; -var blank2 = () => ({ input: 0, cacheRead: 0, output: 0, calls: 0, total: 0 }); -function addRow(sum, row) { - sum.input += row[4] + row[6]; - sum.cacheRead += row[5]; - sum.output += row[7]; - sum.calls += row[8]; - sum.total += tokensOf(row); - return sum; +function chainOf(item) { + if (typeof item?.chain === "string" && item.chain) return item.chain; + if (!Array.isArray(item?.layers) || !Array.isArray(item?.nodes)) return ""; + const name = (id) => item.nodes.find((node) => node.id === id)?.name ?? id; + return item.layers.map((layer) => layer.map(name).join(" ‖ ")).join(" → "); } -function addTo(map, key, row) { - map.set(key, addRow(map.get(key) ?? blank2(), row)); +function openedGraph(pack, opened) { + if (!pack || !opened) return null; + if (opened.source === "own") return (pack.workflows ?? []).find((item) => item.id === opened.id) ?? null; + return (pack.templates ?? []).find((item) => item.id === opened.id) ?? (pack.workflows ?? []).find((item) => item.id === opened.id) ?? null; } -function summarize(view, range, keep = () => true, seriesOf = () => "all") { - const { buckets, from, to, before } = spanOf(range, view.now); - const index = new Map(buckets.map((bucket, at) => [bucket.key, at])); - const weeks = /* @__PURE__ */ new Map(); - const keyOf = (hour) => { - if (range.unit === "hour") return hour; - if (range.unit === "day") return hour.slice(0, 10); - if (range.unit === "month") return hour.slice(0, 7); - const day = hour.slice(0, 10); - let week = weeks.get(day); - if (week === void 0) weeks.set(day, week = dayKey(mondayOf(hourMs(day)))); - return week; - }; - const current = buckets.map((bucket) => ({ ...bucket, sum: blank2(), stacks: /* @__PURE__ */ new Map() })); - const result = { buckets: current, total: blank2(), previous: 0, owners: /* @__PURE__ */ new Map(), models: /* @__PURE__ */ new Map(), kinds: /* @__PURE__ */ new Map() }; - for (const row of view.rows) { - const hour = row[HOUR]; - if (hour < before || hour > to || !keep(row)) continue; - if (hour < from) { - result.previous += tokensOf(row); - continue; - } - const at = index.get(keyOf(hour)); - if (at === void 0) continue; - const bucket = current[at]; - addRow(bucket.sum, row); - addRow(result.total, row); - const series = seriesOf(row); - bucket.stacks.set(series, (bucket.stacks.get(series) ?? 0) + tokensOf(row)); - addTo(result.owners, row[OWNER], row); - addTo(result.models, row[MODEL], row); - addTo(result.kinds, row[KIND], row); - } - return result; +function statusLabel2(status) { + if (status === "running") return t("Running"); + if (status === "done") return t("Done"); + if (status === "failed") return t("Failed"); + if (status === "idle") return t("Idle"); + if (status === "skipped") return t("Skipped"); + return t("Queued"); } -function trimmed2(value) { - const text2 = value >= 100 ? value.toFixed(0) : value >= 10 ? value.toFixed(1) : value.toFixed(2); - return text2.includes(".") ? text2.replace(/\.?0+$/, "") : text2; +function hitNode(event) { + const direct = event.target?.dataset?.node ? event.target : null; + const nested = event.target?.closest?.("[data-node]"); + return (nested ?? direct)?.dataset?.node || ""; } -function compact(count) { - for (const [size, unit] of [[1e9, "B"], [1e6, "M"], [1e3, "K"]]) { - if (count >= size * 0.9995) return `${trimmed2(count / size)}${unit}`; +var WIRE_SPAN = 480; +var CARD_HALF = 84; +var CARD_H = 72; +var FRAME_SIDE = 108; +var MIN_FIT = 0.5; +var WIRE_GAP = 14; +var WIRE_LANE = 12; +var FRAME_PAD = 16; +var LANE_REACH = Math.ceil((CARD_HALF + WIRE_GAP) / WIRE_LANE) + 1; +var LANE_STEPS = [0]; +for (let step = 1; step <= LANE_REACH; step += 1) LANE_STEPS.push(step, -step); +function cardBoxes(nodes, heights = {}) { + const boxes = /* @__PURE__ */ new Map(); + for (const node of nodes ?? []) { + const height = Number(heights?.[node.id]) > 0 ? Number(heights[node.id]) : CARD_H; + const top = node.y ?? 0; + boxes.set(node.id, { id: node.id, cx: node.x ?? 0, top, bottom: top + height, height }); } - return String(Math.round(count)); + return boxes; } -function percent(part, whole) { - if (!(whole > 0) || !(part > 0)) return "0"; - const value = part / whole * 100; - return value < 1 ? "<1" : String(Math.round(value)); +var rightOf = (box) => box.cx + CARD_HALF; +var leftOf = (box) => box.cx - CARD_HALF; +function cutsCard(boxes, x1, y1, x2, y2, from, to) { + const minX = Math.min(x1, x2); + const maxX = Math.max(x1, x2); + const minY = Math.min(y1, y2); + const maxY = Math.max(y1, y2); + return boxes.some((box) => box !== from && box !== to && maxX > leftOf(box) + 1 && minX < rightOf(box) - 1 && maxY > box.top + 1 && minY < box.bottom - 1); } - -// src/client/usage-page.js -var import_react39 = require("react"); -var HEAT_WEEKS = 53; -var TOP_SERIES = 7; -var RING_R = 42; -var RING2 = 2 * Math.PI * RING_R; -var rangeLabel = (id) => ({ "24h": t("24 hours"), "7d": t("7 days"), "30d": t("30 days"), "12w": t("12 weeks"), "12m": t("12 months") })[id]; -var unitLabel = (unit) => ({ hour: t("Per hour"), day: t("Per day"), week: t("Per week"), month: t("Per month") })[unit]; -var MODEL_INKS = ["deepseek", "tangerine", "green", "violet", "sky", "rose", "yellow", "cyan", "magenta", "brown"]; -var PARTS = [["output", 1], ["input", 0.6], ["cacheRead", 0.32]]; -var partLabel = (part) => ({ output: t("Output"), input: t("Input"), cacheRead: t("Cache hit") })[part]; -var soften = (paint, strength = 1) => { - const mix = (color) => `color-mix(in srgb, ${color} ${Math.round(88 * strength)}%, var(--bt-card))`; - return paint.startsWith("linear-gradient(") ? paint.replace(/#[0-9a-f]{6}/gi, mix) : mix(paint); -}; -var full = (count) => new Intl.NumberFormat(dateLocale()).format(Math.round(count)); -var hitRate = (sum) => percent(sum.cacheRead, sum.input + sum.cacheRead); -var dates = (options) => new Intl.DateTimeFormat(dateLocale(), { timeZone: "UTC", ...options }); -var hourText = (ms) => `${String(new Date(ms).getUTCHours()).padStart(2, "0")}:00`; -var yearOf = (ms) => new Date(ms).getUTCFullYear(); -function spanText(from, to) { - const start = hourMs(from); - const end = hourMs(to); - const year = (/* @__PURE__ */ new Date()).getFullYear(); - const format = dates(yearOf(start) !== year || yearOf(end) !== year ? { year: "numeric", month: "short", day: "numeric" } : { month: "short", day: "numeric" }); - return from === to ? format.format(start) : `${format.format(start)} – ${format.format(end)}`; +function clearRun(boxes, id, y, xa, xb, dir) { + const lo = Math.min(xa, xb); + const hi = Math.max(xa, xb); + let level = y; + for (let step = 0; step < LANE_REACH * 4; step += 1) { + const blocked = boxes.some((box) => box.id !== id && hi > leftOf(box) + 1 && lo < rightOf(box) - 1 && level > box.top + 1 && level < box.bottom - 1); + if (!blocked) return level; + level += dir * WIRE_LANE; + } + return level; } -var daysText = (count) => count === 1 ? t("1 day") : t("{count} days", { count }); -var lastText = (range) => range.from ? spanText(range.from, range.to) : t("Last {range}", { range: rangeLabel(range.id) }); -function compareText(range) { - if (!range.from) return t("Compared with the {range} before", { range: rangeLabel(range.id) }); - return range.days === 1 ? t("Compared with the day before") : t("Compared with the {count} days before", { count: range.days }); +function rowGap(boxes, box, dir) { + const edge = dir < 0 ? box.top : box.bottom; + const others = boxes.filter((one) => one.id !== box.id && (dir < 0 ? one.bottom <= box.top + 1 : one.top >= box.bottom - 1)); + if (!others.length) return edge + dir * WIRE_GAP; + const near = dir < 0 ? Math.max(...others.map((one) => one.bottom)) : Math.min(...others.map((one) => one.top)); + return (near + edge) / 2; } -function tickOf(range, bucket) { - if (range.unit === "hour") { - return range.days > 1 && new Date(bucket.start).getUTCHours() === 0 ? dates({ month: "numeric", day: "numeric" }).format(bucket.start) : hourText(bucket.start); +function laneFor(base, yA, yB, boxes, from, to, taken) { + const lo = Math.min(yA, yB); + const hi = Math.max(yA, yB); + const open = (x) => !taken.some((lane) => Math.abs(lane.x - x) < WIRE_LANE - 0.5 && lane.yA < hi && lo < lane.yB) && !boxes.some((box) => Math.abs(x - box.cx) < CARD_HALF + (box === from || box === to ? 1 : WIRE_GAP) && lo < box.bottom && hi > box.top); + for (const step of LANE_STEPS) if (open(base + step * WIRE_LANE)) return base + step * WIRE_LANE; + for (let step = LANE_REACH + 1; step <= LANE_REACH * 3; step += 1) { + if (open(base + step * WIRE_LANE)) return base + step * WIRE_LANE; + if (open(base - step * WIRE_LANE)) return base - step * WIRE_LANE; } - if (range.unit === "month") return dates({ month: "short" }).format(bucket.start); - return dates({ month: "numeric", day: "numeric" }).format(bucket.start); + return base; } -function titleOf(range, bucket) { - if (range.unit === "hour") return `${dates({ month: "short", day: "numeric" }).format(bucket.start)} ${hourText(bucket.start)}–${hourText(bucket.start + HOUR_MS)}`; - if (range.unit === "day") return dates({ month: "long", day: "numeric", weekday: "short" }).format(bucket.start); - if (range.unit === "week") return spanText(dayKey(bucket.start), dayKey((bucket.end ?? bucket.start + 7 * DAY_MS) - DAY_MS)); - if (bucket.end && (new Date(bucket.start).getUTCDate() !== 1 || new Date(bucket.end).getUTCDate() !== 1)) return spanText(dayKey(bucket.start), dayKey(bucket.end - DAY_MS)); - return dates({ year: "numeric", month: "long" }).format(bucket.start); +function wireRoutes(nodes, edges, heights = {}) { + const boxes = [...cardBoxes(nodes, heights).values()]; + const byId = new Map(boxes.map((box) => [box.id, box])); + const drawn = (edges ?? []).map((edge, index) => ({ index, from: byId.get(edge.from), to: byId.get(edge.to) })).filter((item) => item.from && item.to); + const rightMost = boxes.length ? Math.max(...boxes.map(rightOf)) : 0; + const taken = []; + const routes = []; + drawn.filter((item) => item.to.top < item.from.top).sort((a, b) => a.from.top - b.from.top || a.index - b.index).forEach((item, at) => { + const x1 = rightOf(item.from); + const x2 = rightOf(item.to); + const y1 = item.from.top + item.from.height / 2; + const y2 = item.to.top + item.to.height / 2; + const lane = rightMost + WIRE_GAP + at * WIRE_LANE; + const yA = clearRun(boxes, item.from.id, rowGap(boxes, item.from, -1), x1, lane, -1); + const yB = clearRun(boxes, item.to.id, rowGap(boxes, item.to, 1), x2, lane, 1); + routes.push({ + key: `${item.from.id}>${item.to.id}`, + back: true, + d: `M ${x1} ${y1} L ${x1} ${yA} L ${lane} ${yA} L ${lane} ${yB} L ${x2} ${yB} L ${x2} ${y2}` + }); + taken.push({ x: lane, yA: Math.min(yA, yB), yB: Math.max(yA, yB) }); + }); + const centres = []; + for (const item of drawn.filter((one) => one.to.top < one.from.top)) centres.push(item.from.top + item.from.height / 2, item.to.top + item.to.height / 2); + const clearOf = (y, push) => centres.some((centre) => Math.abs(centre - y) < 4) ? y + push * 8 : y; + for (const item of drawn.filter((one) => one.to.top >= one.from.top)) { + const x1 = item.from.cx; + const x2 = item.to.cx; + const y1 = item.from.bottom; + const y2 = item.to.top; + const sameRow = y2 - y1 <= 0; + const rowBottom = Math.max(...boxes.filter((box) => Math.abs(box.top - item.from.top) <= 1.5).map((box) => box.bottom)); + const room2 = y2 - rowBottom; + const gap = sameRow ? WIRE_GAP : Math.min(WIRE_GAP, Math.max(0, room2 / 2)); + const corridor = clearOf(rowBottom + gap, 1); + const cap = sameRow ? Infinity : room2 === 0 ? y2 : y2 - 1; + const yA = sameRow ? corridor : Math.max(y1, Math.min(corridor, cap)); + const yB = clearOf(y2 - gap, -1); + const lane = laneFor((x1 + x2) / 2, yA, yB, boxes, item.from, item.to, taken); + taken.push({ x: lane, yA: Math.min(yA, yB), yB: Math.max(yA, yB) }); + const straight = Math.abs(lane - x1) < 0.5 && Math.abs(lane - x2) < 0.5 && !cutsCard(boxes, x1, y1, x2, y2, item.from, item.to); + routes.push({ + key: `${item.from.id}>${item.to.id}`, + back: false, + d: straight ? `M ${x1} ${y1} L ${x1} ${y2}` : `M ${x1} ${y1} L ${x1} ${yA} L ${lane} ${yA} L ${lane} ${yB} L ${x2} ${yB} L ${x2} ${y2}` + }); + } + return routes; } -function useTween(value) { - const [shown, setShown] = (0, import_react39.useState)(0); - const from = (0, import_react39.useRef)(0); - (0, import_react39.useEffect)(() => { - if (reducedMotion() || typeof requestAnimationFrame !== "function") { - from.current = value; - setShown(value); - return void 0; - } - const begin = from.current; - const started = performance.now(); - let frame; - const step = (now) => { - const progress = Math.min(1, (now - started) / 650); - from.current = begin + (value - begin) * (1 - (1 - progress) ** 3); - setShown(from.current); - if (progress < 1) frame = requestAnimationFrame(step); - }; - frame = requestAnimationFrame(step); - return () => cancelAnimationFrame(frame); - }, [value]); - return shown; +function parallelFrames(nodes, layers, heights = {}) { + const boxes = cardBoxes(nodes, heights); + const frames = []; + for (const layer of layers ?? []) { + if (!Array.isArray(layer) || layer.length < 2) continue; + const members = layer.map((id) => boxes.get(id)).filter(Boolean); + if (members.length < 2) continue; + const left = Math.min(...members.map(leftOf)) - FRAME_PAD; + const right = Math.max(...members.map(rightOf)) + FRAME_PAD; + const top = Math.min(...members.map((box) => box.top)) - FRAME_PAD; + const bottom = Math.max(...members.map((box) => box.bottom)) + FRAME_PAD; + frames.push({ key: layer.join("+"), left, top, width: right - left, height: bottom - top }); + } + return frames; } -var glyphBox = (size, icon3) => (0, import_react39.createElement)("span", { className: "bt-us-glyph", style: { width: size, height: size } }, (0, import_react39.createElement)(icon3)); -function ModelGlyph({ name, paint, size }) { - return (0, import_react39.createElement)("span", { - className: "bt-us-model", - "aria-hidden": true, - style: { width: size, height: size, fontSize: Math.round(size * 0.42), background: `color-mix(in srgb, ${paint} 20%, var(--bt-card))`, color: `color-mix(in srgb, ${paint} 72%, var(--bt-ink))` } - }, (name.match(/[\p{L}\p{N}]/u)?.[0] ?? "?").toUpperCase()); -} -function ownerFace(owner, roster) { - if (owner.kind === "bot") { - const bot = roster.byId[owner.id] ?? { id: owner.id, name: owner.name }; - const name = bot.name || owner.name || t("Deleted Bot"); - const role = bot.role?.trim() ?? ""; - return { - kind: "bot", - name, - sub: owner.deleted ? t("Deleted") : role.toLowerCase() === name.toLowerCase() ? "" : role, - paint: paintCss(colorOf(bot)), - stops: GRADIENTS[colorOf(bot)], - glyph: (size) => (0, import_react39.createElement)(BotAvatar, { bot, size, badge: false, live: false }) - }; - } - if (owner.kind === "room") { - const room2 = roster.roomsById[owner.id]; - return { - kind: "room", - name: owner.name || t("Deleted group chat"), - sub: owner.deleted ? t("Deleted") : t("Group chat"), - paint: "var(--bt-us-rest)", - glyph: (size) => room2 ? (0, import_react39.createElement)(RoomAvatar, { room: room2, roster, size }) : glyphBox(size, ChatsIcon) - }; - } - if (owner.kind === "agent") { - return { - kind: "agent", - name: owner.name || "DSH Agent", - sub: owner.deleted ? t("Deleted") : "", - paint: "var(--bt-us-rest)", - glyph: (size) => glyphBox(size, ChatsIcon) - }; - } - return { kind: "other", name: t("Other"), sub: "", paint: "var(--bt-us-rest)", glyph: (size) => glyphBox(size, ChatsIcon) }; -} -function kindLabel(kind, botFocus) { - const labels = { chat: botFocus ? t("Own chat") : t("Conversations"), group: t("Group chats"), compaction: t("Compaction and handoff"), image: t("Image reading"), memory: t("Memory"), "session-title": t("Titles"), other: t("Other") }; - return labels[kind] ?? kind; +function sameHeights(one, two) { + if (!one || !two) return false; + const keys = Object.keys(two); + return keys.length === Object.keys(one).length && keys.every((key) => one[key] === two[key]); } -function Tabs({ label, value, options, onChange, boxRef }) { - const names = options.map(([, text2]) => text2).join("\n"); - const glide = useGlide(`${value} -${names}`, { box: boxRef }); - return (0, import_react39.createElement)( - "div", - { ref: glide.box, className: "bt-us-tabs", role: "group", "aria-label": label }, - (0, import_react39.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), - options.map(([id, text2, icon3]) => (0, import_react39.createElement)("button", { key: id, type: "button", "aria-pressed": value === id, onClick: () => onChange(id) }, icon3 ? (0, import_react39.createElement)(icon3) : null, text2)) - ); +function fitScale(nodes, width) { + const reach = Math.max(0, ...(nodes ?? []).map((node) => Math.abs(node.x ?? 0) + FRAME_SIDE)); + if (!(width > 0) || reach === 0) return 1; + return Math.min(1, Math.max(MIN_FIT, width / 2 / reach)); } -function Stats({ range, total, previous }) { - const shown = useTween(total.total); - const change = previous > 0 ? Math.round((total.total - previous) / previous * 100) : null; - const cell = (label, value) => (0, import_react39.createElement)("div", { className: "bt-us-stat" }, (0, import_react39.createElement)("span", { className: "bt-us-stat-label" }, label), (0, import_react39.createElement)("span", { className: "bt-us-stat-value" }, value)); - return (0, import_react39.createElement)( - "section", - { className: "bt-us-stats", style: { "--i": 0 } }, - (0, import_react39.createElement)( - "div", - { className: "bt-us-stat bt-us-stat-main" }, - (0, import_react39.createElement)("span", { className: "bt-us-stat-label" }, lastText(range)), - (0, import_react39.createElement)( - "span", - { className: "bt-us-stat-value" }, - compact(shown), - (0, import_react39.createElement)("small", null, t("tokens")), - change === null ? null : (0, import_react39.createElement)( - "span", - { className: "bt-us-delta", title: compareText(range) }, - `${change >= 0 ? "↑" : "↓"} ${Math.abs(change)}%` - ) - ) - ), - cell(t("Cache hit rate"), `${hitRate(total)}%`), - cell(t("Output"), compact(total.output)), - cell(t("Calls"), full(total.calls)) - ); +function fitLayout(nodes, width) { + const reach = Math.max(0, ...(nodes ?? []).map((node) => Math.abs(node.x ?? 0) + FRAME_SIDE)); + const scale = fitScale(nodes, width); + const spare = width > 0 && reach > 0 ? reach * scale - width / 2 : 0; + const pad2 = spare > 1e-6 ? Math.ceil(spare) : 0; + const centre = width > 0 ? pad2 + width / 2 : 0; + return { + reach, + scale, + pad: pad2, + left: centre - reach * scale, + right: centre + reach * scale, + scrollWidth: Math.max(width + pad2, centre + reach * scale) + }; } -function niceTop(max) { - if (!(max > 0)) return 1; - const step = 10 ** Math.floor(Math.log10(max)); - return [1, 1.5, 2, 2.5, 3, 4, 5, 6, 8, 10].map((scale) => scale * step).find((value) => value >= max); +function measureCanvasWidth(el) { + const width = el?.clientWidth; + return Number.isFinite(width) && width > 0 ? width : 0; } -function Chart({ range, columns, series, tipSeries, by, onBy, onPick }) { - const [hover, setHover] = (0, import_react39.useState)(null); - const top = niceTop(Math.max(0, ...columns.map((column) => column.total))); - const count = columns.length; - const fillOf = new Map(series.map((entry) => [entry.key, entry.fill])); - const tipOf = new Map(tipSeries.map((entry) => [entry.key, entry])); - const tip = hover === null ? null : columns[hover]; - const tipSide = hover !== null && hover >= count / 2 ? { right: `calc(${(count - hover) / count * 100}% + 8px)` } : { left: `calc(${(hover + 1) / count * 100}% + 8px)` }; - return (0, import_react39.createElement)( - "section", - { className: "bt-us-card bt-us-chart", style: { "--i": 1 } }, - (0, import_react39.createElement)( +function GraphCanvas({ graph, editing, roster, onCommit, width: knownWidth = 0, cardHeights: knownHeights = null }) { + const gesture = (0, import_react43.useRef)(null); + const canvasRef = (0, import_react43.useRef)(null); + const [measuredWidth, setCanvasWidth] = (0, import_react43.useState)(0); + const [measuredHeights, setCardHeights] = (0, import_react43.useState)(null); + const [pointedWire, setPointedWire] = (0, import_react43.useState)(null); + const nodes = graph.nodes ?? []; + const edges = graph.edges ?? []; + const status = graph.run?.nodeStatus ?? null; + const locals = (roster?.bots ?? []).filter((bot) => bot && bot.remote !== true && !nodes.some((node) => node.botId === bot.id)); + const canvasWidth = measuredWidth || knownWidth; + const heights = measuredHeights ?? knownHeights ?? {}; + const boxes = cardBoxes(nodes, heights); + const height = Math.max(420, ...nodes.map((node) => (node.y ?? 0) + (boxes.get(node.id)?.height ?? CARD_H) + 78), 0); + const { scale, pad: pad2 } = fitLayout(nodes, canvasWidth); + const drawnHeight = Math.round(height * scale); + const routes = wireRoutes(nodes, edges, heights); + const frames = parallelFrames(nodes, graph.layers, heights); + const nodeKey = nodes.map((node) => node.id).join(","); + (0, import_react43.useEffect)(() => { + const el = canvasRef.current; + const measure = () => { + const width = measureCanvasWidth(el); + if (width > 0 && Math.abs(width - canvasWidth) > 0.5) setCanvasWidth(width); + }; + measure(); + if (typeof ResizeObserver !== "function" || !el) return void 0; + const observer = new ResizeObserver(measure); + observer.observe(el); + return () => observer.disconnect(); + }, [canvasWidth]); + (0, import_react43.useEffect)(() => { + const el = canvasRef.current; + if (!el || typeof el.querySelectorAll !== "function") return void 0; + const measure = () => { + const next = {}; + for (const card of el.querySelectorAll("[data-node]")) { + const cardHeight = card.offsetHeight; + if (cardHeight > 0) next[card.dataset.node] = cardHeight; + } + setCardHeights((previous) => sameHeights(previous, next) ? previous : next); + }; + measure(); + if (typeof ResizeObserver !== "function") return void 0; + const observer = new ResizeObserver(measure); + for (const card of el.querySelectorAll("[data-node]")) observer.observe(card); + return () => observer.disconnect(); + }, [nodeKey, scale]); + const end = (event) => { + const current = gesture.current; + gesture.current = null; + if (!current || !editing) return; + if (current.kind === "move") { + const x = Math.round(current.x + (event.clientX - current.ox) / scale); + const y = Math.round(current.y + (event.clientY - current.oy) / scale); + onCommit?.({ nodes: moveNode(nodes, current.id, x, y), edges }); + } else if (current.kind === "wire") { + const next = connectNodes(edges, current.from, hitNode(event)); + if (next !== edges) onCommit?.({ nodes, edges: next }); + } else if (current.kind === "add" && event.target?.dataset?.plane) { + const x = Number.isFinite(event.offsetX) ? Math.round(event.offsetX / scale) : 24; + const y = Number.isFinite(event.offsetY) ? Math.round(event.offsetY / scale) : 24; + onCommit?.({ nodes: dropBot(nodes, current.bot, x, y), edges }); + } + }; + return (0, import_react43.createElement)( + "div", + { className: "bt-wf-canvas", ref: canvasRef, onPointerUp: end }, + editing ? (0, import_react43.createElement)( "div", - { className: "bt-us-card-head" }, - (0, import_react39.createElement)("h3", null, t("Tokens over time"), (0, import_react39.createElement)("span", null, unitLabel(range.unit))), - onBy ? (0, import_react39.createElement)(Tabs, { label: t("Group usage by"), value: by, onChange: onBy, options: [["bot", t("By Bot")], ["model", t("By model")]] }) : null - ), - (0, import_react39.createElement)( + { className: "bt-wf-palette" }, + (0, import_react43.createElement)("span", { className: "bt-wf-hint" }, t("Drag a Bot here")), + locals.map((bot) => (0, import_react43.createElement)("button", { + key: bot.id, + type: "button", + "data-bot": bot.id, + onPointerDown: (event) => { + event.preventDefault?.(); + gesture.current = { kind: "add", bot }; + } + }, bot.name)) + ) : null, + // A node's system prompt is the run Bot's prompt (plugins/workflow + // nodeConfig). The sidebar panel has this field, so the Settings editor + // writes the same graph instead of only drawing it (#1393). + editing ? (0, import_react43.createElement)("div", { className: "bt-wf-prompts" }, nodes.map((node) => (0, import_react43.createElement)( + "label", + { key: node.id, className: "bt-wf-prompt" }, + (0, import_react43.createElement)("span", null, `${node.name} · ${t("System prompt")}`), + (0, import_react43.createElement)("textarea", { + "data-prompt": node.id, + rows: 3, + defaultValue: node.prompt || "", + onPointerDown: (event) => event.stopPropagation?.(), + onBlur: (event) => { + const prompt = event.target?.value ?? ""; + if (prompt === (node.prompt || "")) return; + onCommit?.({ nodes: nodes.map((item) => item.id === node.id ? { ...item, prompt } : item), edges }); + } + }) + ))) : null, + (0, import_react43.createElement)( "div", - { className: "bt-us-chart-body" }, - (0, import_react39.createElement)( + { className: "bt-wf-stage", style: pad2 > 0 ? { height: drawnHeight, paddingLeft: pad2 } : { height: drawnHeight } }, + (0, import_react43.createElement)( "div", - { className: "bt-us-plot", "data-hover": hover === null ? void 0 : "", onMouseLeave: () => setHover(null) }, - [1, 0.5].map((level) => (0, import_react39.createElement)("div", { key: level, className: "bt-us-grid", style: { bottom: `${level * 100}%` } }, (0, import_react39.createElement)("span", null, compact(top * level)))), - (0, import_react39.createElement)("div", { className: "bt-us-grid bt-us-base", style: { bottom: 0 } }, (0, import_react39.createElement)("span", null, "0")), - (0, import_react39.createElement)( - "div", - { className: "bt-us-cols" }, - columns.map((column, at) => (0, import_react39.createElement)("div", { - key: `${range.from ? `${range.from}~${range.to}` : range.id}:${column.key}`, - className: "bt-us-col", - "data-on": hover === at ? "" : void 0, - onMouseEnter: () => setHover(at) - }, column.total > 0 ? (0, import_react39.createElement)( - "div", - { className: "bt-us-stack", style: { height: `${column.total / top * 100}%`, "--i": at } }, - column.parts.map(([key, value]) => value > 0 ? (0, import_react39.createElement)("i", { key, style: { flexGrow: value, background: fillOf.get(key) } }) : null) - ) : (0, import_react39.createElement)("div", { className: "bt-us-stub" }))) - ), - tip ? (0, import_react39.createElement)( + { className: "bt-wf-fit", style: { height, transform: `scale(${scale})` } }, + (0, import_react43.createElement)( "div", - { className: "bt-us-tip", style: tipSide }, - (0, import_react39.createElement)("div", { className: "bt-us-tip-title" }, tip.title), - (0, import_react39.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(tip.total) })), - tip.tip.filter(([, value]) => value > 0).sort((a, b) => b[1] - a[1]).map(([key, value]) => (0, import_react39.createElement)( - "div", - { key, className: "bt-us-tip-row" }, - (0, import_react39.createElement)("i", { className: "bt-us-dot", style: { background: tipOf.get(key)?.fill } }), - (0, import_react39.createElement)("span", null, tipOf.get(key)?.name), - (0, import_react39.createElement)("b", null, compact(value)) - )) - ) : null - ), - (0, import_react39.createElement)( - "div", - { className: "bt-us-ticks", "aria-hidden": true }, - // A preset counts its labels back from now; a picked span forward from its first day. - columns.map((column, at) => (0, import_react39.createElement)( - "span", - { key: column.key, "data-now": at === count - 1 && range.ends !== false ? "" : void 0 }, - (range.from ? at : count - 1 - at) % range.stride === 0 ? column.tick : "" - )) - ) - ), - series.length > 1 || series[0]?.pick ? (0, import_react39.createElement)( - "div", - { className: "bt-us-legend" }, - series.map((entry) => (0, import_react39.createElement)(entry.pick ? "button" : "span", { - key: entry.key, - className: "bt-us-key", - ...entry.pick ? { type: "button", onClick: () => onPick(entry.pick) } : {} - }, (0, import_react39.createElement)("i", { className: "bt-us-dot", style: { background: entry.fill } }), entry.name)) - ) : null - ); -} -function Row3({ kind, glyph, name, sub, sum, whole, fill: fill3, index, onClick }) { - const width = whole > 0 ? Math.max(sum.total > 0 ? 2 : 0, sum.total / whole * 100) : 0; - return (0, import_react39.createElement)( - onClick ? "button" : "div", - { - className: "bt-us-row", - "data-kind": kind, - style: { "--i": index }, - title: t("{tokens} tokens · {calls} calls", { tokens: full(sum.total), calls: full(sum.calls) }), - ...onClick ? { type: "button", onClick } : {} - }, - glyph ? (0, import_react39.createElement)("span", { className: "bt-us-row-glyph" }, glyph) : null, - (0, import_react39.createElement)( - "span", - { className: "bt-us-row-body" }, - (0, import_react39.createElement)( - "span", - { className: "bt-us-row-line" }, - (0, import_react39.createElement)("span", { className: "bt-us-row-name" }, name), - sub ? (0, import_react39.createElement)("span", { className: "bt-us-row-sub" }, sub) : null - ), - (0, import_react39.createElement)("span", { className: "bt-us-track" }, (0, import_react39.createElement)("span", { style: { width: `${width}%`, background: fill3 } })) + { className: "bt-wf-plane", "data-plane": "1", style: { height, "--bt-wf-wire-span": `${WIRE_SPAN}px` } }, + // P-395: every wire says which two cards it joins, and carries a 10px transparent + // hit path of its own: two wires that end at the same port are one stroke to the + // eye, so pointing at one has to be a hit test on that route, not on the stroke. + // The layer is no longer `aria-hidden`: each route is a named image, and the + // pointer marks the one under it while the rest recede. The geometry stays + // wireRoutes' own; this layer only adds a hit target and its name. + (0, import_react43.createElement)( + "svg", + { + className: "bt-wf-wires", + role: "group", + "aria-label": t("Connections"), + width: WIRE_SPAN * 2, + height, + viewBox: `0 0 ${WIRE_SPAN * 2} ${height}` + }, + (0, import_react43.createElement)( + "defs", + null, + (0, import_react43.createElement)("marker", { + id: "bt-wf-arrow", + viewBox: "0 0 10 10", + refX: "8", + refY: "5", + markerWidth: "6", + markerHeight: "6", + orient: "auto" + }, (0, import_react43.createElement)("path", { d: "M0 0 10 5 0 10z" })) + ), + (0, import_react43.createElement)("g", { transform: `translate(${WIRE_SPAN} 0)` }, routes.map((route) => { + const active = pointedWire === route.key; + const dim = pointedWire !== null && !active; + const [from, to] = String(route.key).split(">"); + const name = (id) => nodes.find((node) => node.id === id)?.name ?? id; + const label = `${name(from)} → ${name(to)}`; + const state = { + "data-key": route.key, + "data-active": active ? "" : void 0, + "data-dim": dim ? "" : void 0 + }; + return [ + (0, import_react43.createElement)("path", { + key: route.key, + d: route.d, + markerEnd: "url(#bt-wf-arrow)", + "data-route": route.back ? "back" : "forward", + ...state + }), + (0, import_react43.createElement)("path", { + key: `${route.key}:hit`, + className: "bt-wf-hit", + d: route.d, + ...state, + "data-hit": "1", + role: "img", + "aria-label": label, + style: { pointerEvents: "stroke", stroke: "transparent", strokeWidth: 10, fill: "none" }, + onPointerEnter: () => setPointedWire(route.key), + onPointerLeave: () => setPointedWire((current) => current === route.key ? null : current) + }, (0, import_react43.createElement)("title", null, label)) + ]; + })) + ), + frames.map((frame) => (0, import_react43.createElement)("div", { + key: frame.key, + className: "bt-wf-par", + style: { left: frame.left, top: frame.top, width: frame.width, height: frame.height } + }, (0, import_react43.createElement)("div", { className: "bt-wf-plabel" }, t("Parallel branch, then join")))), + nodes.map((node) => { + const state = status ? status[node.id] ?? "queued" : "idle"; + return (0, import_react43.createElement)( + "div", + { + key: node.id, + "data-node": node.id, + className: `bt-wf-node ${state}${editing ? " editing" : ""}`, + style: { left: (node.x ?? 0) - CARD_HALF, top: node.y ?? 0 }, + onPointerDown: (event) => { + if (!editing || event.target?.dataset?.port || event.target?.dataset?.remove) return; + gesture.current = { kind: "move", id: node.id, ox: event.clientX, oy: event.clientY, x: node.x ?? 0, y: node.y ?? 0 }; + } + }, + editing ? (0, import_react43.createElement)("button", { + type: "button", + className: "bt-wf-port", + "data-port": "out", + "aria-label": node.name, + onPointerDown: (event) => { + event.preventDefault?.(); + event.stopPropagation?.(); + gesture.current = { kind: "wire", from: node.id }; + } + }) : null, + editing ? (0, import_react43.createElement)("button", { + type: "button", + className: "bt-wf-remove", + "data-remove": node.id, + "aria-label": t("Remove"), + onClick: (event) => { + event.stopPropagation?.(); + const next = removeNode(nodes, edges, node.id); + onCommit?.(next); + } + }, "×") : null, + (0, import_react43.createElement)("span", { className: `bt-wf-chip ${state}` }, statusLabel2(state)), + // #2017: one code point, not one UTF-16 unit — a name that starts with an emoji + // would otherwise put half a surrogate pair in the circle. + (0, import_react43.createElement)("span", { className: "bt-wf-av", style: { background: COLORS[node.name] ?? "#4d6bfe" } }, Array.from(String(node.name ?? "").trim())[0] ?? "?"), + (0, import_react43.createElement)( + "span", + { className: "bt-wf-copy" }, + (0, import_react43.createElement)("span", { className: "bt-wf-name" }, node.name), + (0, import_react43.createElement)("span", { className: "bt-wf-role" }, node.role ?? "") + ) + ); + }) + ) + ) + ) + ); +} +function Row2({ item, source, onOpen, onRename, onDelete, editable = true }) { + return (0, import_react43.createElement)( + "button", + { + type: "button", + className: "bt-set-row", + "data-workflow": item.id, + "data-source": source, + onClick: () => onOpen?.(item) + }, + (0, import_react43.createElement)( + "span", + { className: "bt-set-copy" }, + (0, import_react43.createElement)("span", null, item.name), + (0, import_react43.createElement)("span", { className: "bt-set-hint" }, item.preview || chainOf(item) || item.description || "") ), - (0, import_react39.createElement)("span", { className: "bt-us-row-num" }, (0, import_react39.createElement)("b", null, compact(sum.total)), (0, import_react39.createElement)("small", null, `${percent(sum.total, whole)}%`)) + source === "own" && editable ? (0, import_react43.createElement)( + "span", + { className: "bt-set-actions" }, + (0, import_react43.createElement)("button", { + type: "button", + className: "bt-set-action", + "aria-label": t("Rename"), + title: t("Rename"), + onClick: (event) => { + event.stopPropagation(); + onRename?.(item); + } + }, "✎"), + (0, import_react43.createElement)("button", { + type: "button", + className: "bt-set-action", + "aria-label": t("Delete"), + title: t("Delete"), + onClick: (event) => { + event.stopPropagation(); + onDelete?.(item); + } + }, "×") + ) : null, + (0, import_react43.createElement)("span", { className: "bt-chevron", "aria-hidden": true }, "›") ); } -function ListCard({ title, count, index, children }) { - return (0, import_react39.createElement)( - "section", - { className: "bt-us-card", style: { "--i": index } }, - (0, import_react39.createElement)("div", { className: "bt-us-card-head" }, (0, import_react39.createElement)("h3", null, title, count === void 0 ? null : (0, import_react39.createElement)("span", null, count))), - (0, import_react39.createElement)("div", { className: "bt-us-rows" }, children) +function alertCopy(error) { + if (error === WORKFLOW_PLUGIN_HINT) return t("The Workflow plugin is not installed or not enabled. A default install includes @flybot/workflow."); + return error || t("Could not read workflows"); +} +function WorkflowsView({ phase = "loading", pack = null, error = "", opened = null, editing = false, roster = null, canvasWidth = 0, cardHeights = null, onOpen, onBack, onEditing, onRetry, onUse, onCommit, onRename, onDelete }) { + const graph = phase === "ready" ? openedGraph(pack, opened) : null; + const templates = pack?.templates ?? []; + const templateIds = new Set(templates.map((item) => item.id)); + const yours = (pack?.workflows ?? []).filter((item) => !templateIds.has(item.id)); + const readOnly = typeof roster?.readOnly === "string" ? roster.readOnly.trim() : ""; + const locked = readOnly !== ""; + const showUse = !locked && (opened?.source === "factory" || opened?.fromFactory !== void 0); + return (0, import_react43.createElement)( + "div", + { className: "bt-wf-page" }, + (0, import_react43.createElement)("p", { className: "bt-wf-hint" }, t("A workflow is a group of your Bots. Drag the flowchart to change who hands work to whom.")), + error ? (0, import_react43.createElement)( + "div", + { className: "bt-error", role: "alert" }, + alertCopy(error), + phase === "error" ? (0, import_react43.createElement)("button", { type: "button", onClick: () => onRetry?.() }, t("Retry")) : null + ) : null, + phase === "loading" ? (0, import_react43.createElement)("p", { className: "bt-wf-status", role: "status" }, t("Reading workflows…")) : null, + phase === "empty" ? (0, import_react43.createElement)("p", { className: "bt-wf-status" }, t("No workflows yet.")) : null, + phase === "ready" && !graph ? (0, import_react43.createElement)( + "div", + { className: "bt-wf-lists" }, + (0, import_react43.createElement)( + "section", + { className: "bt-set-section" }, + (0, import_react43.createElement)("h3", null, t("Factory presets")), + (0, import_react43.createElement)("p", { className: "bt-wf-hint" }, t("Ready-made pipelines. Use one to start your own.")), + (0, import_react43.createElement)( + "div", + { className: "bt-set-card" }, + templates.length === 0 ? (0, import_react43.createElement)("div", { className: "bt-set-row" }, (0, import_react43.createElement)("span", { className: "bt-set-hint" }, t("No workflows yet."))) : templates.map((item) => { + const live = (pack.workflows ?? []).find((workflow) => workflow.id === item.id); + const row = live ? { ...item, name: live.name, preview: live.preview || chainOf(live) || chainOf(item) } : item; + return (0, import_react43.createElement)(Row2, { key: item.id, item: row, source: "factory", onOpen: () => onOpen?.(item, "factory") }); + }) + ) + ), + (0, import_react43.createElement)( + "section", + { className: "bt-set-section" }, + (0, import_react43.createElement)("h3", null, t("Yours")), + (0, import_react43.createElement)("p", { className: "bt-wf-hint" }, t("Workflows saved on this machine.")), + (0, import_react43.createElement)( + "div", + { className: "bt-set-card" }, + yours.length === 0 ? (0, import_react43.createElement)("div", { className: "bt-set-row" }, (0, import_react43.createElement)("span", { className: "bt-set-hint" }, t("No workflows of your own yet."))) : yours.map((item) => (0, import_react43.createElement)(Row2, { key: item.id, item, source: "own", editable: !locked, onOpen: () => onOpen?.(item, "own"), onRename, onDelete })) + ) + ) + ) : null, + graph ? (0, import_react43.createElement)( + "div", + { className: "bt-wf-editor" }, + (0, import_react43.createElement)( + "div", + { className: "bt-wf-actions" }, + (0, import_react43.createElement)("button", { type: "button", onClick: () => onBack?.() }, t("Back")), + showUse ? (0, import_react43.createElement)("button", { type: "button", onClick: () => onUse?.(opened.source === "factory" ? opened.id : opened.fromFactory) }, t("Use this")) : null, + locked ? null : opened?.source === "own" ? (0, import_react43.createElement)("button", { type: "button", onClick: () => onEditing?.(!editing) }, editing ? t("Finish editing") : t("Edit")) : null + ), + (0, import_react43.createElement)("h3", { className: "bt-wf-title" }, graph.name), + graph.description ? (0, import_react43.createElement)("p", { className: "bt-wf-hint" }, graph.description) : null, + (graph.nodes ?? []).length === 0 ? (0, import_react43.createElement)("p", { className: "bt-wf-status" }, t("This workflow has no flowchart yet.")) : (0, import_react43.createElement)(GraphCanvas, { + graph, + roster, + onCommit, + width: canvasWidth, + cardHeights, + editing: opened?.source === "own" && editing === true && !locked + }) + ) : null ); } -function Profile({ face, share, range }) { - const arc = Math.max(0, Math.min(1, share)) * RING2; - return (0, import_react39.createElement)( - "section", - { className: "bt-us-profile" }, - (0, import_react39.createElement)( - "span", - { className: "bt-us-ring" }, - (0, import_react39.createElement)( - "svg", - { viewBox: "0 0 96 96", "aria-hidden": true }, - face.stops ? (0, import_react39.createElement)("defs", null, (0, import_react39.createElement)( - "linearGradient", - { id: "bt-us-ring-paint", x1: 0, y1: 1, x2: 1, y2: 0 }, - face.stops.map(([offset, color]) => (0, import_react39.createElement)("stop", { key: offset, offset, stopColor: color })) - )) : null, - (0, import_react39.createElement)("circle", { className: "bt-us-ring-track", cx: 48, cy: 48, r: RING_R }), - arc > 0 ? (0, import_react39.createElement)("circle", { className: "bt-us-ring-arc", cx: 48, cy: 48, r: RING_R, style: { stroke: face.stops ? "url(#bt-us-ring-paint)" : face.paint, strokeDasharray: `${arc} ${RING2}` } }) : null +function RenameModal({ workflow, onClose, onConfirm }) { + const [name, setName] = (0, import_react43.useState)(workflow?.name ?? ""); + return (0, import_react43.createElement)( + "div", + { className: "bt-modal-mask", onClick: (event) => { + if (event.target === event.currentTarget) onClose?.(); + } }, + (0, import_react43.createElement)( + "div", + { className: "bt-modal", role: "dialog", "aria-modal": true, "aria-label": t("Rename workflow") }, + (0, import_react43.createElement)("h3", null, t("Rename workflow")), + (0, import_react43.createElement)( + "label", + { className: "bt-field" }, + t("Name"), + (0, import_react43.createElement)("input", { type: "text", value: name, onChange: (event) => setName(event.target.value), autoFocus: true }) ), - (0, import_react39.createElement)("span", { className: "bt-us-ring-face" }, face.glyph(64)) - ), - (0, import_react39.createElement)( + (0, import_react43.createElement)( + "div", + { className: "bt-modal-actions" }, + (0, import_react43.createElement)("button", { type: "button", onClick: onClose }, t("Cancel")), + (0, import_react43.createElement)("button", { type: "button", onClick: () => onConfirm?.(name) }, t("Rename")) + ) + ) + ); +} +function DeleteModal({ workflow, onClose, onConfirm }) { + return (0, import_react43.createElement)( + "div", + { className: "bt-modal-mask", onClick: (event) => { + if (event.target === event.currentTarget) onClose?.(); + } }, + (0, import_react43.createElement)( "div", - { className: "bt-us-profile-copy" }, - (0, import_react39.createElement)("h3", null, face.name), - face.sub ? (0, import_react39.createElement)("span", { className: "bt-us-profile-sub" }, face.sub) : null, - (0, import_react39.createElement)("span", { className: "bt-us-profile-share" }, range.from ? t("{share}% of all usage from {span}", { share: percent(share, 1), span: spanText(range.from, range.to) }) : t("{share}% of all usage in the last {range}", { share: percent(share, 1), range: rangeLabel(range.id) })) + { className: "bt-modal", role: "dialog", "aria-modal": true, "aria-label": t("Delete workflow") }, + (0, import_react43.createElement)("h3", null, t("Delete workflow")), + (0, import_react43.createElement)("p", null, t('Are you sure you want to delete "{name}"? This cannot be undone.', { name: workflow?.name ?? "" })), + (0, import_react43.createElement)( + "div", + { className: "bt-modal-actions" }, + (0, import_react43.createElement)("button", { type: "button", onClick: onClose }, t("Cancel")), + (0, import_react43.createElement)("button", { type: "button", className: "bt-danger", onClick: onConfirm }, t("Delete")) + ) ) ); } -var monthOf = (ms) => Date.UTC(yearOf(ms), new Date(ms).getUTCMonth(), 1); -var addMonths = (ms, count) => Date.UTC(yearOf(ms), new Date(ms).getUTCMonth() + count, 1); -function SpanPicker({ span, today, oldest, active, near, onPick, onClose }) { - const box = (0, import_react39.useRef)(null); - const todayMs = hourMs(today); - const thisMonth = monthOf(todayMs); - const [right, setRight] = (0, import_react39.useState)(() => Math.max(addMonths(oldest, 1), monthOf(hourMs(span?.to ?? today)))); - const [anchor, setAnchor] = (0, import_react39.useState)(null); - const [hover, setHover] = (0, import_react39.useState)(null); - (0, import_react39.useEffect)(() => { - const onDown = (event) => { - if (![box, near].some((ref) => ref.current?.contains(event.target))) onClose(); - }; - const onKey = (event) => { - if (event.key === "Escape") { - event.stopPropagation(); - onClose(); - } - }; - window.addEventListener("mousedown", onDown); - window.addEventListener("keydown", onKey, true); +function WorkflowsPage({ call: call4, roster, start }) { + const readOnly = typeof roster?.readOnly === "string" && roster.readOnly.trim() ? roster.readOnly : ""; + const [phase, setPhase] = (0, import_react43.useState)("loading"); + const [pack, setPack] = (0, import_react43.useState)(null); + const [error, setError] = (0, import_react43.useState)(""); + const [opened, setOpened] = (0, import_react43.useState)(null); + const [editing, setEditing] = (0, import_react43.useState)(false); + const [renaming, setRenaming] = (0, import_react43.useState)(null); + const [deleting, setDeleting] = (0, import_react43.useState)(null); + const invoke = typeof call4 === "function" ? call4 : () => Promise.reject(new Error("Could not read workflows")); + const startId = typeof start === "string" && start ? start : ""; + const seeded = (0, import_react43.useRef)(false); + const apply2 = (settled) => { + setPhase(settled.phase); + setPack(settled.pack); + setError(settled.error); + if (seeded.current || !startId) return; + seeded.current = true; + const named = settled.phase === "ready" ? (settled.pack?.workflows ?? []).find((item) => item.id === startId) : null; + if (named) setOpened({ source: "own", id: named.id }); + }; + (0, import_react43.useEffect)(() => { + let gone = false; + readWorkflows(invoke).then((settled) => { + if (!gone) apply2(settled); + }); return () => { - window.removeEventListener("mousedown", onDown); - window.removeEventListener("keydown", onKey, true); + gone = true; }; }, []); - const [low, high] = anchor ? [anchor, hover ?? anchor].sort() : span ? [span.from, span.to] : [null, null]; - const press = (key) => { - if (!anchor) { - setAnchor(key); + const live = (pack?.workflows ?? []).some((item) => (item.activeCount ?? 0) > 0); + (0, import_react43.useEffect)(() => { + if (!live || editing) return void 0; + let gone = false; + const timer = setInterval(() => { + readWorkflows(invoke).then((settled) => { + if (!gone) apply2(settled); + }); + }, POLL_MS6); + return () => { + gone = true; + clearInterval(timer); + }; + }, [live, editing]); + const retry = () => { + setPhase("loading"); + setError(""); + setOpened(null); + readWorkflows(invoke).then(apply2); + }; + const open = (item, source) => { + if (source === "factory") { + const live2 = (pack?.workflows ?? []).find((workflow) => workflow.id === item.id); + setOpened(live2 ? { source: "own", id: live2.id, fromFactory: item.id } : { source: "factory", id: item.id }); + setEditing(false); return; } - const [from, to] = [anchor, key].sort(); - onPick(from, to); + setOpened({ source: "own", id: item.id }); + setEditing(false); }; - const weekdays = (0, import_react39.useMemo)(() => Array.from({ length: 7 }, (_, at) => dates({ weekday: "narrow" }).format(Date.UTC(2024, 0, 1 + at))), []); - const month = (start, side) => { - const length = new Date(addMonths(start, 1) - DAY_MS).getUTCDate(); - const lead = (new Date(start).getUTCDay() + 6) % 7; - const cells = Array.from({ length: lead }, (_, at) => (0, import_react39.createElement)("span", { key: `b${at}` })); - for (let day = 1; day <= length; day += 1) { - const ms = start + (day - 1) * DAY_MS; - const key = dayKey(ms); - const weekday = (lead + day - 1) % 7; - const flag = (on) => on ? "" : void 0; - cells.push((0, import_react39.createElement)("button", { - key, - type: "button", - className: "bt-us-day", - disabled: ms > todayMs, - "aria-label": dates({ year: "numeric", month: "long", day: "numeric", weekday: "short" }).format(ms), - "aria-pressed": key === low || key === high, - "data-in": flag(low !== null && key >= low && key <= high), - "data-start": flag(key === low), - "data-end": flag(key === high), - "data-l": flag(weekday === 0 || day === 1), - "data-r": flag(weekday === 6 || day === length), - "data-today": flag(key === today), - "data-has": flag(active.has(key)), - onMouseEnter: () => setHover(key), - onClick: () => press(key) - }, (0, import_react39.createElement)("b", null, day))); - } - const nav = side === "left" ? (0, import_react39.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "left", "aria-label": t("Previous month"), disabled: start <= oldest, onClick: () => setRight(addMonths(right, -1)) }, (0, import_react39.createElement)(ChevronLeftIcon)) : (0, import_react39.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "right", "aria-label": t("Next month"), disabled: start >= thisMonth, onClick: () => setRight(addMonths(right, 1)) }, (0, import_react39.createElement)(ChevronRightIcon)); - return (0, import_react39.createElement)( - "div", - { key: start, className: "bt-us-month" }, - (0, import_react39.createElement)("div", { className: "bt-us-month-head" }, nav, (0, import_react39.createElement)("span", null, dates({ year: "numeric", month: "long" }).format(start))), - (0, import_react39.createElement)("div", { className: "bt-us-weekdays", "aria-hidden": true }, weekdays.map((name, at) => (0, import_react39.createElement)("span", { key: at }, name))), - (0, import_react39.createElement)("div", { className: "bt-us-days", onMouseLeave: () => setHover(null) }, cells) - ); + const useTemplate = (id) => { + const template = typeof id === "string" ? id : ""; + if (!template) return; + Promise.resolve(invoke("workflow/create", { template })).then((value) => { + const settled = settleWorkflowRead(value); + if (settled.phase === "error") { + setError(settled.error); + return; + } + const before = new Set((pack?.workflows ?? []).map((item) => item.id)); + const made = settled.pack.workflows.find((item) => !before.has(item.id)); + setPack(settled.pack); + setPhase(settled.phase); + setError(""); + if (made) { + setOpened({ source: "own", id: made.id }); + setEditing(!readOnly); + } + }).catch((failure) => { + setError(workflowCallError(failure, t("Could not copy this workflow"))); + }); }; - const shortcuts = [ - ["month", t("This month"), dayKey(thisMonth), today], - ["last", t("Last month"), dayKey(addMonths(thisMonth, -1)), dayKey(thisMonth - DAY_MS)], - ["year", t("This year"), `${today.slice(0, 4)}-01-01`, today] - ]; - const count = low === null ? 0 : Math.round((hourMs(high) - hourMs(low)) / DAY_MS) + 1; - return (0, import_react39.createElement)( + const rename = (item) => { + setRenaming(item); + }; + const confirmRename = (workflowId, name) => { + if (!name.trim()) return; + Promise.resolve(invoke("workflow/rename", { workflowId, name: name.trim() })).then((value) => { + const settled = settleWorkflowRead(value); + if (settled.phase === "error") { + setError(settled.error); + return; + } + setPack(settled.pack); + setPhase("ready"); + setError(""); + setRenaming(null); + }).catch((failure) => { + setError(workflowCallError(failure, t("Could not rename this workflow"))); + }); + }; + const deleteWorkflow = (item) => { + setDeleting(item); + }; + const confirmDelete = (workflowId) => { + Promise.resolve(invoke("workflow/delete", { workflowId })).then((value) => { + const settled = settleWorkflowRead(value); + if (settled.phase === "error") { + setError(settled.error); + return; + } + setPack(settled.pack); + setPhase(settled.phase); + setError(""); + setDeleting(null); + if (opened?.id === workflowId) setOpened(null); + }).catch((failure) => { + setError(workflowCallError(failure, t("Could not delete this workflow"))); + }); + }; + const commit = (graph) => { + if (!opened || opened.source !== "own") return; + if (readOnly) return; + Promise.resolve(invoke("workflow/graph", { workflowId: opened.id, nodes: graph.nodes, edges: graph.edges })).then((value) => { + const settled = settleWorkflowRead(value); + if (settled.phase === "error") { + setError(settled.error); + return; + } + setPack(settled.pack); + setPhase("ready"); + setError(""); + }).catch((failure) => { + setError(workflowCallError(failure, t("Could not save this workflow"))); + }); + }; + return (0, import_react43.createElement)( "div", - { ref: box, className: "bt-us-pick", role: "dialog", "aria-label": t("Custom range") }, - (0, import_react39.createElement)( - "div", - { className: "bt-us-pick-quick" }, - shortcuts.map(([id, label, from, to]) => (0, import_react39.createElement)("button", { - key: id, - type: "button", - "aria-pressed": span?.from === from && span?.to === to, - onClick: () => onPick(from, to) - }, label)) - ), - (0, import_react39.createElement)("div", { className: "bt-us-pick-months" }, month(addMonths(right, -1), "left"), month(right, "right")), - (0, import_react39.createElement)( - "div", - { className: "bt-us-pick-foot", role: "status" }, - (0, import_react39.createElement)("span", null, anchor ? t("Pick the last day") : t("Pick the first day")), - low === null ? null : (0, import_react39.createElement)("span", null, (0, import_react39.createElement)("b", null, spanText(low, high)), ` · ${daysText(count)}`) - ) + null, + (0, import_react43.createElement)(WorkflowsView, { + phase, + pack, + error, + opened, + editing, + roster, + onOpen: open, + onBack: () => { + setOpened(null); + setEditing(false); + }, + onEditing: setEditing, + onRetry: retry, + onUse: useTemplate, + onCommit: commit, + onRename: rename, + onDelete: deleteWorkflow + }), + renaming ? (0, import_react43.createElement)(RenameModal, { + workflow: renaming, + onClose: () => setRenaming(null), + onConfirm: (name) => confirmRename(renaming.id, name) + }) : null, + deleting ? (0, import_react43.createElement)(DeleteModal, { + workflow: deleting, + onClose: () => setDeleting(null), + onConfirm: () => confirmDelete(deleting.id) + }) : null ); } -function Heat({ view, keep, paint, index }) { - const [hover, setHover] = (0, import_react39.useState)(null); - const today = hourMs(`${view.now.slice(0, 10)} 00`); - const first = mondayOf(today) - (HEAT_WEEKS - 1) * 7 * DAY_MS; - const from = dayKey(first); - const daily = /* @__PURE__ */ new Map(); - for (const row of view.rows) { - const day = row[HOUR].slice(0, 10); - if (day >= from && keep(row)) daily.set(day, (daily.get(day) ?? 0) + tokensOf(row)); - } - const most = Math.max(0, ...daily.values()); - const levels = [0.3, 0.52, 0.76, 1]; - const months = []; - const cells = []; - for (let week = 0; week < HEAT_WEEKS; week += 1) { - const monday = first + week * 7 * DAY_MS; - if (week > 0 && new Date(monday).getUTCMonth() !== new Date(monday - 7 * DAY_MS).getUTCMonth()) { - months.push((0, import_react39.createElement)("span", { key: week, style: { gridColumn: week + 1 } }, dates({ month: "short" }).format(monday))); - } - for (let day = 0; day < 7; day += 1) { - const ms = monday + day * DAY_MS; - const value = daily.get(dayKey(ms)) ?? 0; - const level = value > 0 ? Math.max(1, Math.ceil(4 * Math.sqrt(value / most))) : 0; - cells.push((0, import_react39.createElement)("span", { - key: ms, - className: "bt-us-cell", - style: { "--w": week }, - "data-on": hover?.ms === ms ? "" : void 0, - "data-future": ms > today ? "" : void 0, - "data-today": ms === today ? "" : void 0, - onMouseEnter: ms > today ? void 0 : () => setHover({ ms, week, day }) - }, level > 0 ? (0, import_react39.createElement)("i", { style: { background: soften(paint, levels[level - 1]) } }) : null)); - } - } - const tipSide = hover ? { - ...hover.week >= HEAT_WEEKS / 2 ? { right: `calc(${(HEAT_WEEKS - hover.week) / HEAT_WEEKS * 100}% + 8px)` } : { left: `calc(${(hover.week + 1) / HEAT_WEEKS * 100}% + 8px)` }, - ...hover.day < 4 ? { top: `calc(${hover.day / 7 * 100}% - 2px)` } : { top: "auto", bottom: `calc(${(6 - hover.day) / 7 * 100}% - 2px)` } - } : null; - const active = [...daily.values()].filter((value) => value > 0).length; - const summary = active === 1 ? t("Active on 1 day in the last year") : t("Active on {count} days in the last year", { count: active }); - return (0, import_react39.createElement)( - "section", - { className: "bt-us-card bt-us-heat", style: { "--i": index } }, - (0, import_react39.createElement)("div", { className: "bt-us-card-head" }, (0, import_react39.createElement)("h3", null, t("Activity")), (0, import_react39.createElement)("span", { className: "bt-us-head-note" }, summary)), - (0, import_react39.createElement)("div", { className: "bt-us-heat-months", "aria-hidden": true }, months), - (0, import_react39.createElement)( - "div", - { className: "bt-us-heat-plot", onMouseLeave: () => setHover(null) }, - (0, import_react39.createElement)("div", { className: "bt-us-heat-grid", role: "img", "aria-label": summary }, cells), - hover ? (0, import_react39.createElement)( - "div", - { className: "bt-us-tip bt-us-heat-tip", style: tipSide }, - (0, import_react39.createElement)("div", { className: "bt-us-tip-title" }, dates({ month: "long", day: "numeric", weekday: "short" }).format(hover.ms)), - (0, import_react39.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(daily.get(dayKey(hover.ms)) ?? 0) })) - ) : null - ), - (0, import_react39.createElement)( - "div", - { className: "bt-us-heat-scale", "aria-hidden": true }, - t("Light"), - levels.map((level) => (0, import_react39.createElement)("span", { key: level, className: "bt-us-cell" }, (0, import_react39.createElement)("i", { style: { background: soften(paint, level) } }))), - t("Heavy") - ) - ); -} -function Skeleton2() { - return (0, import_react39.createElement)( - "div", - { className: "bt-us", "aria-busy": true }, - (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 32, width: 320, borderRadius: 999 } }), - (0, import_react39.createElement)( - "div", - { className: "bt-us-sheet bt-us-skel-sheet" }, - (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 94 } }), - (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 318 } }), - (0, import_react39.createElement)( - "div", - { className: "bt-us-pair" }, - (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }), - (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }) - ) - ) - ); + +// src/client/usage-data.js +var HOUR = 0; +var OWNER = 1; +var MODEL = 2; +var KIND = 3; +var HOUR_MS = 36e5; +var DAY_MS = 864e5; +var RANGES = [ + { id: "24h", unit: "hour", count: 24, stride: 6 }, + { id: "7d", unit: "day", count: 7, stride: 1 }, + { id: "30d", unit: "day", count: 30, stride: 5 }, + { id: "12w", unit: "week", count: 12, stride: 2 }, + { id: "12m", unit: "month", count: 12, stride: 1 } +]; +var hourMs = (key) => Date.UTC(Number(key.slice(0, 4)), Number(key.slice(5, 7)) - 1, Number(key.slice(8, 10)), Number(key.slice(11, 13)) || 0); +var dayKey = (ms) => new Date(ms).toISOString().slice(0, 10); +var hourKey = (ms) => new Date(ms).toISOString().slice(0, 13).replace("T", " "); +var mondayOf = (ms) => ms - (new Date(ms).getUTCDay() + 6) % 7 * DAY_MS; +function spanRange(from, to) { + if (to < from) [from, to] = [to, from]; + const days = Math.round((hourMs(to) - hourMs(from)) / DAY_MS) + 1; + const unit = days <= 2 ? "hour" : days <= 62 ? "day" : days <= 182 ? "week" : "month"; + const range = { id: "custom", unit, from, to, days }; + const count = spanBuckets(range).length; + const stride = unit === "hour" ? 6 : [1, 2, 3, 5, 7, 10, 14].find((step) => count / step <= 12) ?? Math.ceil(count / 12); + return { ...range, count, stride }; } -var focusOf = (id) => typeof id !== "string" ? null : id.startsWith("model:") ? { kind: "model", key: id.slice("model:".length) } : id.startsWith("owner:") ? { kind: "owner", key: id.slice("owner:".length) } : null; -function UsagePage({ roster, actions, focusId }) { - const [view, setView] = (0, import_react39.useState)(null); - const [error, setError] = (0, import_react39.useState)(""); - const [rangeId, setRangeId] = (0, import_react39.useState)("7d"); - const [span, setSpan] = (0, import_react39.useState)(null); - const [picking, setPicking] = (0, import_react39.useState)(false); - const [by, setBy] = (0, import_react39.useState)("bot"); - const tabs = (0, import_react39.useRef)(null); - const focus = focusOf(focusId); - (0, import_react39.useEffect)(() => { - let stopped = false; - let timer; - const resized = Promise.all((document.querySelector(".bt-settings")?.getAnimations() ?? []).filter((animation) => animation.transitionProperty === "width" || animation.transitionProperty === "height").map((animation) => animation.finished.catch(() => { - }))); - const load = async () => { - try { - const value = await actions.usage(); - await resized; - if (stopped) return; - (0, import_react39.startTransition)(() => setView(value)); - setError(""); - timer = setTimeout(load, value.scanning ? 3e3 : 2e4); - } catch (failure) { - if (stopped) return; - setError(failure?.message ?? String(failure)); - timer = setTimeout(load, 1e4); - } - }; - void load(); - return () => { - stopped = true; - clearTimeout(timer); - }; - }, []); - const today = view?.now.slice(0, 10); - const range = rangeId === "custom" && span ? { ...spanRange(span.from, span.to), ends: span.to >= today } : RANGES.find((item) => item.id === rangeId); - const shaped = (0, import_react39.useMemo)(() => { - if (!view) return null; - const faces2 = view.owners.map((owner) => ownerFace(owner, roster)); - const lifetime = /* @__PURE__ */ new Map(); - for (const row of view.rows) lifetime.set(row[MODEL], (lifetime.get(row[MODEL]) ?? 0) + tokensOf(row)); - const modelPaint = new Map([...lifetime].sort((a, b) => b[1] - a[1]).map(([model], rank) => [model, `var(--bt-ink-${MODEL_INKS[rank % MODEL_INKS.length]})`])); - const models2 = view.models.map((model, at) => { - const name = model.name || model.model || t("Unknown model"); - const paint = modelPaint.get(at) ?? "var(--bt-us-rest)"; - return { kind: "model", name, sub: model.providerName ?? model.provider, paint, glyph: (size) => (0, import_react39.createElement)(ModelGlyph, { name, paint, size }) }; - }); - const ownerAt2 = focus?.kind === "owner" ? view.owners.findIndex((owner) => owner.key === focus.key) : -1; - const modelAt = focus?.kind === "model" ? view.models.findIndex((model) => model.key === focus.key) : -1; - const isBot2 = (at) => ["bot", "agent"].includes(view.owners[at]?.kind); - const all2 = summarize(view, range, void 0, (row) => by === "bot" ? isBot2(row[OWNER]) ? `o${row[OWNER]}` : "rest" : `m${row[MODEL]}`); - const keep2 = ownerAt2 >= 0 ? (row) => row[OWNER] === ownerAt2 : modelAt >= 0 ? (row) => row[MODEL] === modelAt : () => true; - const face2 = ownerAt2 >= 0 ? faces2[ownerAt2] : modelAt >= 0 ? models2[modelAt] : null; - const part2 = face2 ? summarize(view, range, keep2) : all2; - const activeDays2 = /* @__PURE__ */ new Set(); - let first = view.now; - for (const row of view.rows) { - if (row[HOUR] < first) first = row[HOUR]; - if (keep2(row) && tokensOf(row) > 0) activeDays2.add(row[HOUR].slice(0, 10)); +function spanBuckets(range) { + const first = hourMs(range.from); + const end = hourMs(range.to) + DAY_MS; + const buckets = []; + if (range.unit === "hour" || range.unit === "day") { + const step = range.unit === "hour" ? HOUR_MS : DAY_MS; + for (let start = first; start < end; start += step) buckets.push({ start, end: start + step, key: range.unit === "hour" ? hourKey(start) : dayKey(start) }); + } else if (range.unit === "week") { + for (let monday = mondayOf(first); monday < end; monday += 7 * DAY_MS) { + buckets.push({ start: Math.max(monday, first), end: Math.min(monday + 7 * DAY_MS, end), key: dayKey(monday) }); } - const oldest2 = Math.min(monthOf(hourMs(first)), addMonths(monthOf(hourMs(view.now)), -12)); - const ranked2 = (map) => [...map].filter(([, sum]) => sum.total > 0).sort((a, b) => b[1].total - a[1].total); - let series2; - if (face2) { - series2 = [{ key: "all", name: face2.name, fill: soften(face2.paint) }]; - } else { - if (by === "bot") { - const bots = ranked2(all2.owners).filter(([at]) => isBot2(at)); - series2 = bots.slice(0, TOP_SERIES).map(([at]) => ({ key: `o${at}`, name: faces2[at].name, paint: faces2[at].paint, pick: { kind: "owner", key: view.owners[at].key } })); - if (bots.length > TOP_SERIES) series2.push({ key: "more", name: t("More Bots"), paint: "var(--bt-us-more)" }); - if (ranked2(all2.owners).some(([at]) => !isBot2(at))) series2.push({ key: "rest", name: t("Other"), paint: "var(--bt-us-rest)" }); - } else { - const used = ranked2(all2.models); - series2 = used.slice(0, TOP_SERIES).map(([at]) => ({ key: `m${at}`, name: models2[at].name, paint: models2[at].paint, pick: { kind: "model", key: view.models[at].key } })); - if (used.length > TOP_SERIES) series2.push({ key: "more", name: t("More models"), paint: "var(--bt-us-more)" }); - } - const repeats = /* @__PURE__ */ new Map(); - for (const entry of series2) { - const seen = repeats.get(entry.paint) ?? 0; - repeats.set(entry.paint, seen + 1); - entry.fill = soften(entry.paint, [1, 0.6, 0.36][seen % 3]); - } + } else { + const year = new Date(first).getUTCFullYear(); + for (let month = new Date(first).getUTCMonth(); Date.UTC(year, month, 1) < end; month += 1) { + const start = Date.UTC(year, month, 1); + buckets.push({ start: Math.max(start, first), end: Math.min(Date.UTC(year, month + 1, 1), end), key: dayKey(start).slice(0, 7) }); } - const tipSeries2 = face2 ? PARTS.map(([key, strength]) => ({ key, name: partLabel(key), fill: soften(face2.paint, strength) })) : series2; - const fillOf2 = new Map(series2.map((entry) => [entry.key, entry.fill])); - const shownKeys = new Set(series2.map((entry) => entry.key)); - const columns2 = part2.buckets.map((bucket) => { - const parts = face2 ? [["all", bucket.sum.total]] : series2.map((entry) => [entry.key, entry.key === "more" ? [...bucket.stacks].filter(([key]) => key !== "rest" && !shownKeys.has(key)).reduce((sum, [, value]) => sum + value, 0) : bucket.stacks.get(entry.key) ?? 0]); - const tip = face2 ? PARTS.map(([key]) => [key, bucket.sum[key]]) : parts; - return { key: bucket.key, tick: tickOf(range, bucket), title: titleOf(range, bucket), total: bucket.sum.total, parts, tip }; - }); - return { faces: faces2, models: models2, ownerAt: ownerAt2, modelAt, face: face2, keep: keep2, all: all2, part: part2, series: series2, tipSeries: tipSeries2, fillOf: fillOf2, columns: columns2, ranked: ranked2, isBot: isBot2, activeDays: activeDays2, oldest: oldest2 }; - }, [view, rangeId, span, by, focusId, roster]); - const root = (0, import_react39.useRef)(null); - (0, import_react39.useEffect)(() => { - root.current?.closest(".bt-settings-scroll")?.scrollTo?.({ top: 0 }); - }, [focusId]); - if (!view) { - return error ? (0, import_react39.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : (0, import_react39.createElement)(Skeleton2); - } - if (view.rows.length === 0) { - return (0, import_react39.createElement)( - "div", - { className: "bt-us" }, - (0, import_react39.createElement)( - "div", - { className: "bt-us-empty" }, - (0, import_react39.createElement)(BotMark, { look: MAIN_LOOK, size: 56, live: true }), - (0, import_react39.createElement)("b", null, view.scanning ? t("Reading your chats…") : t("No usage yet.")), - (0, import_react39.createElement)("span", null, t("Token usage shows up here after a model is called.")) - ) - ); } - const { faces, models, ownerAt, face, keep, all, part, series, tipSeries, fillOf, columns, ranked, isBot, activeDays, oldest } = shaped; - const pick2 = (next) => actions.openSettings("usage", `${next.kind}:${next.key}`); - const chooseRange = (id) => { - if (id !== "custom") { - setRangeId(id); - setPicking(false); - return; - } - if (span) setRangeId("custom"); - setPicking((open) => !open); - }; - const pickSpan = (from, to) => { - setSpan({ from, to }); - setRangeId("custom"); - setPicking(false); - }; - const rangeOptions = [ - ...RANGES.map((item) => [item.id, rangeLabel(item.id)]), - ["custom", rangeId === "custom" && span ? spanText(span.from, span.to) : t("Custom"), CalendarIcon] - ]; - const whole = part.total.total; - const ownerRow = ([at, sum], index, total = whole) => (0, import_react39.createElement)(Row3, { - key: `o${at}`, - kind: faces[at].kind, - glyph: faces[at].glyph(32), - name: faces[at].name, - sub: faces[at].sub, - sum, - whole: total, - index, - fill: face ? soften(face.paint, 0.8) : fillOf.get(`o${at}`) ?? soften(faces[at].paint), - onClick: () => pick2({ kind: "owner", key: view.owners[at].key }) - }); - const modelRow = ([at, sum], index) => (0, import_react39.createElement)(Row3, { - key: `m${at}`, - kind: "model", - glyph: models[at].glyph(32), - name: models[at].name, - sub: models[at].sub, - sum, - whole, - index, - fill: face ? soften(face.paint, 0.8) : fillOf.get(`m${at}`) ?? soften(models[at].paint), - onClick: () => pick2({ kind: "model", key: view.models[at].key }) - }); - const nothing = (0, import_react39.createElement)("div", { className: "bt-us-none" }, t("Nothing in this range.")); - let body; - if (face) { - const kinds = ranked(part.kinds); - const usedModels = ranked(part.models); - const owners = ranked(part.owners); - body = [ - (0, import_react39.createElement)(Profile, { key: "profile", face, range, share: all.total.total > 0 ? whole / all.total.total : 0 }), - (0, import_react39.createElement)( - "div", - { key: "sheet", className: "bt-us-sheet" }, - (0, import_react39.createElement)(Stats, { key: "stats", range, total: part.total, previous: part.previous }), - (0, import_react39.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, onPick: pick2 }), - (0, import_react39.createElement)( - "div", - { key: "pair", className: "bt-us-pair" }, - ownerAt >= 0 ? (0, import_react39.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 2 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) : (0, import_react39.createElement)(ListCard, { title: t("Who used it"), count: owners.length, index: 2 }, owners.length > 0 ? owners.map((entry, index) => ownerRow(entry, index)) : nothing), - (0, import_react39.createElement)( - ListCard, - { title: t("What for"), index: 3 }, - kinds.length > 0 ? kinds.map(([at, sum], index) => (0, import_react39.createElement)(Row3, { key: at, name: kindLabel(view.kinds[at], ownerAt >= 0 && isBot(ownerAt)), sum, whole, index, fill: soften(face.paint, 0.8) })) : nothing - ) - ), - (0, import_react39.createElement)(Heat, { key: "heat", view, keep, paint: face.paint, index: 4 }) - ) - ]; - } else { - const owners = ranked(all.owners); - const bots = owners.filter(([at]) => isBot(at)); - const rest = owners.filter(([at]) => !isBot(at)); - const usedModels = ranked(all.models); - body = [ - (0, import_react39.createElement)( - "div", - { key: "sheet", className: "bt-us-sheet" }, - (0, import_react39.createElement)(Stats, { key: "stats", range, total: all.total, previous: all.previous }), - (0, import_react39.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, by, onBy: setBy, onPick: pick2 }), - (0, import_react39.createElement)( - "div", - { key: "pair", className: "bt-us-pair" }, - (0, import_react39.createElement)( - ListCard, - { title: t("Bots"), count: bots.length, index: 2 }, - owners.length > 0 ? null : nothing, - bots.map((entry, index) => ownerRow(entry, index)), - bots.length > 0 && rest.length > 0 ? (0, import_react39.createElement)("div", { className: "bt-us-split", role: "separator" }) : null, - rest.map((entry, index) => ownerRow(entry, bots.length + index)) - ), - (0, import_react39.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 3 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) - ), - (0, import_react39.createElement)(Heat, { key: "heat", view, keep, paint: "var(--bt-accent)", index: 4 }) - ) - ]; + return buckets; +} +function spanOf(range, now) { + if (range.from) { + return { buckets: spanBuckets(range), from: `${range.from} 00`, to: `${range.to} 23`, before: hourKey(hourMs(range.from) - range.days * DAY_MS) }; } - return (0, import_react39.createElement)( - "div", - { ref: root, className: "bt-us", key: focusId ?? "all" }, - (0, import_react39.createElement)( - "div", - { className: "bt-us-top" }, - (0, import_react39.createElement)(Tabs, { label: t("Time range"), value: rangeId, onChange: chooseRange, options: rangeOptions, boxRef: tabs }), - view.scanning ? (0, import_react39.createElement)("span", { className: "bt-us-note", role: "status" }, t("Still reading older chats; totals may grow.")) : null, - picking ? (0, import_react39.createElement)(SpanPicker, { span, today, oldest, active: activeDays, near: tabs, onPick: pickSpan, onClose: () => setPicking(false) }) : null - ), - error ? (0, import_react39.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, - body - ); + const buckets = bucketsOf(range, now); + return { buckets: buckets.slice(range.count), from: hourKey(buckets[range.count].start), to: now, before: hourKey(buckets[0].start) }; +} +function bucketsOf(range, now) { + const end = hourMs(now); + const today = end - end % DAY_MS; + const buckets = []; + for (let back = range.count * 2 - 1; back >= 0; back -= 1) { + let start; + if (range.unit === "hour") start = end - back * HOUR_MS; + else if (range.unit === "day") start = today - back * DAY_MS; + else if (range.unit === "week") start = mondayOf(today) - back * 7 * DAY_MS; + else start = Date.UTC(new Date(end).getUTCFullYear(), new Date(end).getUTCMonth() - back, 1); + buckets.push({ start, key: range.unit === "hour" ? hourKey(start) : range.unit === "month" ? dayKey(start).slice(0, 7) : dayKey(start) }); + } + return buckets; +} +var tokensOf = (row) => row[4] + row[5] + row[6] + row[7]; +var blank2 = () => ({ input: 0, cacheRead: 0, output: 0, calls: 0, total: 0 }); +function addRow(sum, row) { + sum.input += row[4] + row[6]; + sum.cacheRead += row[5]; + sum.output += row[7]; + sum.calls += row[8]; + sum.total += tokensOf(row); + return sum; +} +function addTo(map, key, row) { + map.set(key, addRow(map.get(key) ?? blank2(), row)); +} +function summarize(view, range, keep = () => true, seriesOf = () => "all") { + const { buckets, from, to, before } = spanOf(range, view.now); + const index = new Map(buckets.map((bucket, at) => [bucket.key, at])); + const weeks = /* @__PURE__ */ new Map(); + const keyOf = (hour) => { + if (range.unit === "hour") return hour; + if (range.unit === "day") return hour.slice(0, 10); + if (range.unit === "month") return hour.slice(0, 7); + const day = hour.slice(0, 10); + let week = weeks.get(day); + if (week === void 0) weeks.set(day, week = dayKey(mondayOf(hourMs(day)))); + return week; + }; + const current = buckets.map((bucket) => ({ ...bucket, sum: blank2(), stacks: /* @__PURE__ */ new Map() })); + const result = { buckets: current, total: blank2(), previous: 0, owners: /* @__PURE__ */ new Map(), models: /* @__PURE__ */ new Map(), kinds: /* @__PURE__ */ new Map() }; + for (const row of view.rows) { + const hour = row[HOUR]; + if (hour < before || hour > to || !keep(row)) continue; + if (hour < from) { + result.previous += tokensOf(row); + continue; + } + const at = index.get(keyOf(hour)); + if (at === void 0) continue; + const bucket = current[at]; + addRow(bucket.sum, row); + addRow(result.total, row); + const series = seriesOf(row); + bucket.stacks.set(series, (bucket.stacks.get(series) ?? 0) + tokensOf(row)); + addTo(result.owners, row[OWNER], row); + addTo(result.models, row[MODEL], row); + addTo(result.kinds, row[KIND], row); + } + return result; +} +function trimmed2(value) { + const text2 = value >= 100 ? value.toFixed(0) : value >= 10 ? value.toFixed(1) : value.toFixed(2); + return text2.includes(".") ? text2.replace(/\.?0+$/, "") : text2; +} +function compact(count) { + for (const [size, unit] of [[1e9, "B"], [1e6, "M"], [1e3, "K"]]) { + if (count >= size * 0.9995) return `${trimmed2(count / size)}${unit}`; + } + return String(Math.round(count)); +} +function percent(part, whole) { + if (!(whole > 0) || !(part > 0)) return "0"; + const value = part / whole * 100; + return value < 1 ? "<1" : String(Math.round(value)); } -var USAGE_CSS = ` -.bt-us{--bt-us-ease:cubic-bezier(.22,1,.36,1);--bt-us-rest:color-mix(in srgb,var(--bt-ink) 30%,var(--bt-card));--bt-us-more:color-mix(in srgb,var(--bt-ink) 16%,var(--bt-card));display:flex;flex-direction:column;gap:14px;padding-bottom:4px} -.bt-us-top{position:relative;z-index:4;display:flex;align-items:center;gap:14px;flex-wrap:wrap} -.bt-us-tabs{position:relative;display:inline-flex;flex:none;padding:3px;border-radius:999px;background:var(--bt-hover)} -.bt-us-tabs button{position:relative;z-index:1;display:inline-flex;align-items:center;gap:5px;height:26px;padding:0 12px;border:0;border-radius:999px;background:none;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:26px;white-space:nowrap;cursor:pointer;transition:color .15s ease} -.bt-us-tabs button svg{flex:none;width:13px;height:13px;margin-left:-2px} -.bt-us-pick{position:absolute;top:calc(100% + 8px);left:0;max-width:100%;box-sizing:border-box;padding:14px 16px 12px;border-radius:18px;border:.5px solid var(--bt-line-2);background:var(--bt-card);box-shadow:0 22px 50px -18px rgba(0,0,0,.32),0 2px 8px rgba(0,0,0,.05);transform-origin:24px 0;animation:bt-us-drop .2s var(--bt-us-ease)} -.bt-us-pick-quick{display:flex;gap:6px;margin-bottom:12px} -.bt-us-pick-quick button{height:26px;padding:0 11px;border:0;border-radius:999px;background:var(--bt-hover);color:var(--bt-ink-2);font:inherit;font-size:12px;cursor:pointer;transition:background-color .12s ease,color .12s ease} -.bt-us-pick-quick button:hover{background:var(--bt-active);color:var(--bt-ink)} -.bt-us-pick-quick button[aria-pressed=true]{background:color-mix(in srgb,var(--bt-accent) 14%,transparent);color:var(--bt-accent)} -.bt-us-pick-months{display:flex;flex-wrap:wrap;gap:8px 28px} -.bt-us-month{width:252px;animation:bt-us-fade .22s ease} -.bt-us-month-head{position:relative;display:flex;align-items:center;justify-content:center;height:28px;margin-bottom:4px;font-size:13px;line-height:18px;font-weight:600} -.bt-us-month-nav{position:absolute;top:0;width:28px;height:28px;padding:0;border:0;border-radius:9px;background:none;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;transition:background-color .12s ease} -.bt-us-month-nav[data-side=left]{left:0} -.bt-us-month-nav[data-side=right]{right:0} -.bt-us-month-nav:hover:not(:disabled){background:var(--bt-hover);color:var(--bt-ink)} -.bt-us-month-nav:disabled{opacity:.3;cursor:default} -.bt-us-weekdays,.bt-us-days{display:grid;grid-template-columns:repeat(7,36px)} -.bt-us-weekdays span{height:24px;font-size:11px;line-height:24px;text-align:center;color:var(--bt-ink-3)} -.bt-us-day{position:relative;height:36px;padding:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:12px;font-variant-numeric:tabular-nums;cursor:pointer} -.bt-us-day::before{content:'';position:absolute;top:4px;bottom:4px;left:0;right:0;transition:background-color .12s ease} -.bt-us-day>b{position:relative;z-index:1;display:inline-flex;align-items:center;justify-content:center;width:28px;height:28px;border-radius:50%;font-weight:400;transition:background-color .12s ease,color .12s ease} -.bt-us-day:hover:not(:disabled)>b{background:var(--bt-hover)} -.bt-us-day[data-today]>b{color:var(--bt-accent);font-weight:600} -.bt-us-day[data-has]::after{content:'';position:absolute;z-index:2;left:50%;bottom:6px;width:3px;height:3px;margin-left:-1.5px;border-radius:50%;background:var(--bt-ink-3)} -.bt-us-day[data-in]::before{background:color-mix(in srgb,var(--bt-accent) 13%,transparent)} -.bt-us-day[data-in][data-l]::before{left:4px;border-radius:14px 0 0 14px} -.bt-us-day[data-in][data-r]::before{right:4px;border-radius:0 14px 14px 0} -.bt-us-day[data-in][data-l][data-r]::before{border-radius:14px} -.bt-us-day[data-in][data-start]::before{left:50%;border-radius:0} -.bt-us-day[data-in][data-end]::before{right:50%;border-radius:0} -.bt-us-day[data-in][data-start][data-r]::before,.bt-us-day[data-in][data-end][data-l]::before,.bt-us-day[data-in][data-start][data-end]::before{display:none} -.bt-us-day[data-start]>b,.bt-us-day[data-end]>b,.bt-us-day[data-start]:hover>b,.bt-us-day[data-end]:hover>b{background:var(--bt-accent);color:var(--bt-accent-ink,#fff);font-weight:600} -.bt-us-day[data-start][data-has]::after,.bt-us-day[data-end][data-has]::after{background:color-mix(in srgb,var(--bt-accent-ink,#fff) 75%,transparent)} -.bt-us-day:disabled{color:var(--bt-ink-3);opacity:.45;cursor:default} -.bt-us-pick-foot{display:flex;align-items:center;justify-content:space-between;gap:16px;margin-top:8px;padding-top:10px;border-top:1px solid var(--bt-line);font-size:12px;line-height:16px;color:var(--bt-ink-3);white-space:nowrap} -.bt-us-pick-foot b{color:var(--bt-ink);font-weight:500} -.bt-us-tabs button:hover,.bt-us-tabs button[aria-pressed=true]{color:var(--bt-ink)} -.bt-us-tabs:not([data-glide]) button[aria-pressed=true]{background:var(--bt-card)} -.bt-us-tabs>.bt-thumb{top:3px;bottom:3px;border-radius:999px;background:var(--bt-card);box-shadow:0 1px 3px rgba(0,0,0,.08),0 0 0 .5px var(--bt-line-2)} -.bt-us-note{display:inline-flex;align-items:center;gap:8px;font-size:12px;line-height:16px;color:var(--bt-ink-3)} -.bt-us-note::before{content:'';width:6px;height:6px;border-radius:50%;background:var(--bt-accent);animation:bt-us-pulse 1.4s ease-in-out infinite} -.bt-us-sheet{display:flex;flex-direction:column;gap:4px} -.bt-us-sheet>.bt-us-stats,.bt-us-sheet>.bt-us-card,.bt-us-sheet>.bt-us-pair>.bt-us-card{border-radius:0} -.bt-us-sheet>:first-child{border-radius:16px 16px 0 0} -.bt-us-sheet>:last-child{border-radius:0 0 16px 16px} -.bt-us-stats{display:grid;grid-template-columns:1.6fr 1fr 1fr 1fr;border-radius:16px;border:1px solid var(--bt-line);background:var(--bt-card);animation:bt-us-in .45s var(--bt-us-ease) backwards} -.bt-us-stat{display:flex;flex-direction:column;justify-content:flex-end;gap:6px;min-width:0;padding:16px 18px} -.bt-us-stat+.bt-us-stat{border-left:1px solid var(--bt-line)} -.bt-us-stat-label{overflow:hidden;font-size:12px;line-height:16px;color:var(--bt-ink-3);white-space:nowrap;text-overflow:ellipsis} -.bt-us-stat-value{display:flex;align-items:baseline;gap:6px;min-width:0;font-size:22px;line-height:28px;font-weight:600;letter-spacing:-.01em;font-variant-numeric:tabular-nums;white-space:nowrap} -.bt-us-stat-main .bt-us-stat-value{font-size:34px;line-height:40px;letter-spacing:-.025em} -.bt-us-stat-value small{font-size:13px;font-weight:400;letter-spacing:0;color:var(--bt-ink-3)} -.bt-us-delta{align-self:center;margin-left:2px;padding:0 8px;border-radius:999px;background:var(--bt-tag-bg);color:var(--bt-ink-2);font-size:11px;line-height:20px;font-weight:500;letter-spacing:0} -.bt-us-card{display:flex;flex-direction:column;gap:12px;min-width:0;padding:14px 18px 16px;border-radius:16px;border:1px solid var(--bt-line);background:var(--bt-card);animation:bt-us-in .45s var(--bt-us-ease) backwards;animation-delay:calc(var(--i,0) * 45ms)} -.bt-us-card-head{display:flex;align-items:center;justify-content:space-between;gap:12px;min-height:32px} -.bt-us-card-head h3{display:flex;align-items:baseline;gap:8px;min-width:0;margin:0;font-size:13px;line-height:18px;font-weight:600} -.bt-us-card-head h3 span,.bt-us-head-note{font-size:12px;font-weight:400;color:var(--bt-ink-3)} -.bt-us-chart-body{display:flex;flex-direction:column;gap:8px;padding-top:6px} -.bt-us-plot{position:relative;height:200px;margin-left:40px} -.bt-us-grid{position:absolute;left:0;right:0;border-top:1px dashed var(--bt-line-2);pointer-events:none} -.bt-us-grid.bt-us-base{border-top:1px solid var(--bt-line-2)} -.bt-us-grid span{position:absolute;right:calc(100% + 8px);top:-8px;font-size:10px;line-height:16px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums;white-space:nowrap} -.bt-us-cols{position:absolute;inset:0;display:flex;align-items:flex-end} -.bt-us-col{position:relative;flex:1 1 0;min-width:0;height:100%;display:flex;align-items:flex-end;justify-content:center} -.bt-us-stack{display:flex;flex-direction:column-reverse;gap:2px;width:56%;min-width:4px;max-width:28px;transform-origin:50% 100%;animation:bt-us-grow .6s var(--bt-us-ease) backwards;animation-delay:calc(var(--i,0) * 14ms);transition:height .45s var(--bt-us-ease),opacity .18s ease} -.bt-us-stack>i{flex:1 1 0;min-height:2px;border-radius:5px;transition:flex-grow .45s var(--bt-us-ease)} -.bt-us-plot[data-hover] .bt-us-col:not([data-on]) .bt-us-stack{opacity:.3} -.bt-us-stub{width:4px;height:4px;margin-bottom:-2px;border-radius:50%;background:var(--bt-line-2)} -.bt-us-ticks{display:flex;margin-left:40px;font-size:11px;line-height:14px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums} -.bt-us-ticks span{flex:1 1 0;min-width:0;text-align:center;white-space:nowrap} -.bt-us-ticks span[data-now]{color:var(--bt-ink);font-weight:500} -.bt-us-tip{position:absolute;top:6px;z-index:3;min-width:160px;max-width:240px;padding:10px 12px;border-radius:12px;border:.5px solid var(--bt-line-2);background:color-mix(in srgb,var(--bt-card) 90%,transparent);-webkit-backdrop-filter:blur(14px);backdrop-filter:blur(14px);box-shadow:0 14px 34px -12px rgba(0,0,0,.28);font-size:12px;line-height:16px;pointer-events:none;animation:bt-us-pop .16s var(--bt-us-ease)} -.bt-us-tip-title{color:var(--bt-ink-3)} -.bt-us-tip-total{margin:2px 0 8px;font-size:15px;line-height:20px;font-weight:600;font-variant-numeric:tabular-nums} -.bt-us-tip-total:last-child{margin-bottom:0} -.bt-us-tip-row{display:flex;align-items:center;gap:8px;color:var(--bt-ink-2)} -.bt-us-tip-row+.bt-us-tip-row{margin-top:5px} -.bt-us-tip-row span{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -.bt-us-tip-row b{font-weight:500;color:var(--bt-ink);font-variant-numeric:tabular-nums} -.bt-us-legend{display:flex;flex-wrap:wrap;gap:6px} -.bt-us-key{display:inline-flex;align-items:center;gap:6px;min-width:0;height:24px;padding:0 10px 0 8px;border:0;border-radius:999px;background:var(--bt-hover);color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:24px} -button.bt-us-key{cursor:pointer;transition:background-color .12s ease,color .12s ease} -button.bt-us-key:hover{background:var(--bt-active);color:var(--bt-ink)} -.bt-us-dot{flex:none;width:8px;height:8px;border-radius:50%} -.bt-us-pair{display:grid;grid-template-columns:repeat(auto-fit,minmax(280px,1fr));gap:4px} -.bt-us-rows{display:flex;flex-direction:column;margin:0 -8px} -.bt-us-row{display:flex;align-items:center;gap:12px;width:100%;box-sizing:border-box;padding:8px;border:0;border-radius:12px;background:none;color:var(--bt-ink);font:inherit;text-align:left;animation:bt-us-in .4s var(--bt-us-ease) backwards;animation-delay:calc(var(--i,0) * 35ms + 90ms)} -button.bt-us-row{cursor:pointer;transition:background-color .12s ease} -button.bt-us-row:hover{background:var(--bt-hover)} -.bt-us-row-glyph{flex:none;display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px} -.bt-us-row-body{flex:1;min-width:0;display:flex;flex-direction:column;gap:7px} -.bt-us-row-line{display:flex;align-items:baseline;gap:8px;min-width:0;font-size:13px;line-height:18px} -.bt-us-row-name{flex:0 1 auto;min-width:0;overflow:hidden;font-weight:500;text-overflow:ellipsis;white-space:nowrap} -.bt-us-row-sub{flex:0 1 auto;min-width:0;overflow:hidden;font-size:12px;color:var(--bt-ink-3);text-overflow:ellipsis;white-space:nowrap} -.bt-us-track{display:block;height:4px;border-radius:999px;background:var(--bt-hover);overflow:hidden} -.bt-us-track>span{display:block;height:100%;border-radius:inherit;transform-origin:0 50%;animation:bt-us-fill .7s var(--bt-us-ease) backwards;animation-delay:calc(var(--i,0) * 35ms + 140ms);transition:width .45s var(--bt-us-ease)} -.bt-us-row-num{flex:none;display:flex;flex-direction:column;align-items:flex-end;gap:1px;min-width:52px;font-variant-numeric:tabular-nums} -.bt-us-row-num b{font-size:13px;line-height:18px;font-weight:600} -.bt-us-row-num small{font-size:11px;line-height:14px;color:var(--bt-ink-3)} -.bt-us-split{height:1px;margin:6px 8px;background:var(--bt-line)} -.bt-us-none{padding:18px 8px;font-size:12px;color:var(--bt-ink-3);text-align:center} -.bt-us-glyph{display:inline-flex;align-items:center;justify-content:center;border-radius:50%;background:var(--bt-hover);color:var(--bt-ink-2)} -.bt-us-model{display:inline-flex;align-items:center;justify-content:center;border-radius:30%;font-weight:600;line-height:1} -.bt-us-profile{display:flex;align-items:center;gap:20px;padding:6px 4px 2px;animation:bt-us-in .45s var(--bt-us-ease) backwards} -.bt-us-ring{position:relative;flex:none;width:96px;height:96px} -.bt-us-ring>svg{position:absolute;inset:0;width:100%;height:100%;transform:rotate(-90deg)} -.bt-us-ring>svg circle{fill:none;stroke-width:4} -.bt-us-ring-track{stroke:var(--bt-line)} -.bt-us-ring-arc{stroke-linecap:round;transition:stroke-dasharray .6s var(--bt-us-ease);animation:bt-us-ring 1s var(--bt-us-ease) .1s backwards} -.bt-us-ring-face{position:absolute;inset:0;display:flex;align-items:center;justify-content:center} -.bt-us-profile-copy{display:flex;flex-direction:column;gap:3px;min-width:0} -.bt-us-profile-copy h3{margin:0;overflow:hidden;font-size:22px;line-height:28px;font-weight:600;letter-spacing:-.01em;text-overflow:ellipsis;white-space:nowrap} -.bt-us-profile-sub{font-size:13px;line-height:18px;color:var(--bt-ink-2)} -.bt-us-profile-share{font-size:12px;line-height:16px;color:var(--bt-ink-3)} -.bt-us-heat{gap:8px} -.bt-us-heat-months,.bt-us-heat-grid{display:grid;grid-template-columns:repeat(${HEAT_WEEKS},1fr);gap:3px} -.bt-us-heat-months{height:14px;font-size:10px;line-height:14px;color:var(--bt-ink-3)} -.bt-us-heat-months span{white-space:nowrap} -.bt-us-heat-plot{position:relative} -.bt-us-heat-grid{grid-template-rows:repeat(7,auto);grid-auto-flow:column} -.bt-us-heat-grid .bt-us-cell[data-on]{outline:1.5px solid var(--bt-ink-2);outline-offset:1px} -.bt-us-heat-tip{min-width:0;white-space:nowrap} -.bt-us-cell{position:relative;aspect-ratio:1;border-radius:3px;background:var(--bt-hover);overflow:hidden} -.bt-us-heat-grid .bt-us-cell{animation:bt-us-cell .5s var(--bt-us-ease) backwards;animation-delay:calc(var(--w,0) * 7ms + 120ms)} -.bt-us-cell>i{position:absolute;inset:0} -.bt-us-cell[data-today]{outline:1.5px solid var(--bt-ink-3);outline-offset:1px} -.bt-us-cell[data-future]{visibility:hidden} -.bt-us-heat-scale{display:flex;align-items:center;justify-content:flex-end;gap:4px;font-size:11px;line-height:14px;color:var(--bt-ink-3)} -.bt-us-heat-scale .bt-us-cell{width:10px} -.bt-us-skel{border-radius:16px;background:linear-gradient(90deg,var(--bt-hover) 0%,var(--bt-active) 50%,var(--bt-hover) 100%);background-size:200% 100%;animation:bt-us-shine 1.4s ease-in-out infinite} -.bt-us-skel-sheet>.bt-us-skel:first-child{border-radius:16px 16px 0 0} -.bt-us-skel-sheet>.bt-us-skel:not(:first-child){border-radius:0} -.bt-us-skel-sheet>.bt-us-pair>.bt-us-skel:first-child{border-radius:0 0 0 16px} -.bt-us-skel-sheet>.bt-us-pair>.bt-us-skel:last-child{border-radius:0 0 16px 0} -.bt-us-empty{display:flex;flex-direction:column;align-items:center;gap:8px;padding:72px 16px;text-align:center;font-size:13px;line-height:18px;color:var(--bt-ink-3)} -.bt-us-empty b{margin-top:6px;font-size:15px;font-weight:600;color:var(--bt-ink)} -@keyframes bt-us-in{from{opacity:0;transform:translateY(6px)}} -@keyframes bt-us-grow{from{transform:scaleY(0)}} -@keyframes bt-us-fill{from{transform:scaleX(0)}} -@keyframes bt-us-pop{from{opacity:0;transform:translateY(3px) scale(.97)}} -@keyframes bt-us-drop{from{opacity:0;transform:translateY(-4px) scale(.96)}} -@keyframes bt-us-fade{from{opacity:0}} -@keyframes bt-us-cell{from{opacity:0;transform:scale(.5)}} -@keyframes bt-us-ring{from{stroke-dasharray:0 ${Math.ceil(RING2)}}} -@keyframes bt-us-pulse{50%{opacity:.25}} -@keyframes bt-us-shine{from{background-position:200% 0}to{background-position:-200% 0}} -@media (prefers-reduced-motion:reduce){.bt-us *,.bt-us *::before{animation:none!important;transition:none!important}} -`; -// src/client/connectors.js -var import_react40 = require("react"); -var TOKEN_URL = "https://github.com/settings/personal-access-tokens/new"; -var COMPOSIO_KEY_URL = "https://platform.composio.dev/"; -var FEISHU_WEBHOOK_URL = "https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot"; -var APPS = [ - ["gmail", "Gmail"], - ["googlecalendar", "Google Calendar"], - ["googledrive", "Google Drive"], - ["googledocs", "Google Docs"], - ["googlesheets", "Google Sheets"], - ["outlook", "Outlook"], - ["slack", "Slack"], - ["microsoft_teams", "Microsoft Teams"], - ["discord", "Discord"], - ["telegram", "Telegram"], - ["whatsapp", "WhatsApp"], - ["notion", "Notion"], - ["linear", "Linear"], - ["jira", "Jira"], - ["asana", "Asana"], - ["trello", "Trello"], - ["todoist", "Todoist"], - ["airtable", "Airtable"], - ["dropbox", "Dropbox"], - ["hubspot", "HubSpot"], - ["salesforce", "Salesforce"], - ["stripe", "Stripe"], - ["zoom", "Zoom"], - ["calendly", "Calendly"], - ["figma", "Figma"], - ["twitter", "X (Twitter)"], - ["youtube", "YouTube"] -]; -var appName = (slug) => APPS.find(([id]) => id === slug)?.[1] ?? slug; -var GitHubMark = () => (0, import_react40.createElement)( - "svg", - { width: 20, height: 20, viewBox: "0 0 16 16", fill: "currentColor", "aria-hidden": true }, - (0, import_react40.createElement)("path", { d: "M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z" }) -); -var FeishuMark = () => (0, import_react40.createElement)( - "svg", - { width: 20, height: 20, viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": true }, - (0, import_react40.createElement)("path", { d: "M3.2 6.6c3 .1 6.4 1.5 8.6 3.9-1.9.4-3.5 1.4-4.7 2.9-1.9-.6-3.4-1.9-3.9-3.6-.2-.7-.2-1.5 0-3.2z" }), - (0, import_react40.createElement)("path", { d: "M16.8 5.4c-2.9.2-5.6 1.5-7.4 3.4 1.7 1.2 3.1 2.8 3.9 4.9 2.2-1.1 3.8-3.2 4-5.6.1-.9-.1-1.9-.4-2.7z" }), - (0, import_react40.createElement)("path", { d: "M8.6 12.1c.9.7 1.7 1.6 2.2 2.7-1.1.2-2.3 0-3.3-.6.2-.8.6-1.5 1.1-2.1z" }) -); -var MARKS = { github: GitHubMark, composio: ConnectorIcon, feishu: FeishuMark }; -var ABOUT = { - github: () => t("Repositories, issues, and pull requests"), - composio: () => t("Gmail, Slack, Calendar, Notion and many more apps, through one Composio key"), - feishu: () => t("Posts into one Feishu group through a custom bot webhook") +// src/client/usage-page.js +var import_react44 = require("react"); +var HEAT_WEEKS = 53; +var TOP_SERIES = 7; +var RING_R = 42; +var RING2 = 2 * Math.PI * RING_R; +var rangeLabel = (id) => ({ "24h": t("24 hours"), "7d": t("7 days"), "30d": t("30 days"), "12w": t("12 weeks"), "12m": t("12 months") })[id]; +var unitLabel = (unit) => ({ hour: t("Per hour"), day: t("Per day"), week: t("Per week"), month: t("Per month") })[unit]; +var MODEL_INKS = ["deepseek", "tangerine", "green", "violet", "sky", "rose", "yellow", "cyan", "magenta", "brown"]; +var PARTS = [["output", 1], ["input", 0.6], ["cacheRead", 0.32]]; +var partLabel = (part) => ({ output: t("Output"), input: t("Input"), cacheRead: t("Cache hit") })[part]; +var soften = (paint, strength = 1) => { + const mix = (color) => `color-mix(in srgb, ${color} ${Math.round(88 * strength)}%, var(--bt-card))`; + return paint.startsWith("linear-gradient(") ? paint.replace(/#[0-9a-f]{6}/gi, mix) : mix(paint); }; -function statusText2(connector) { - if (connector.state === "connecting") return t("Connecting…"); - if (connector.state === "error") return t("Could not connect: {error}", { error: connector.error ?? "" }); - if (connector.state === "ready" && connector.kind === "channel") { - return connector.mode === "app" ? t("Connected: app, over the long connection") : t("Connected: custom bot webhook"); +var full = (count) => new Intl.NumberFormat(dateLocale()).format(Math.round(count)); +var hitRate = (sum) => percent(sum.cacheRead, sum.input + sum.cacheRead); +var dates = (options) => new Intl.DateTimeFormat(dateLocale(), { timeZone: "UTC", ...options }); +var hourText = (ms) => `${String(new Date(ms).getUTCHours()).padStart(2, "0")}:00`; +var yearOf = (ms) => new Date(ms).getUTCFullYear(); +function spanText(from, to) { + const start = hourMs(from); + const end = hourMs(to); + const year = (/* @__PURE__ */ new Date()).getFullYear(); + const format = dates(yearOf(start) !== year || yearOf(end) !== year ? { year: "numeric", month: "short", day: "numeric" } : { month: "short", day: "numeric" }); + return from === to ? format.format(start) : `${format.format(start)} – ${format.format(end)}`; +} +var daysText = (count) => count === 1 ? t("1 day") : t("{count} days", { count }); +var lastText = (range) => range.from ? spanText(range.from, range.to) : t("Last {range}", { range: rangeLabel(range.id) }); +function compareText(range) { + if (!range.from) return t("Compared with the {range} before", { range: rangeLabel(range.id) }); + return range.days === 1 ? t("Compared with the day before") : t("Compared with the {count} days before", { count: range.days }); +} +function tickOf(range, bucket) { + if (range.unit === "hour") { + return range.days > 1 && new Date(bucket.start).getUTCHours() === 0 ? dates({ month: "numeric", day: "numeric" }).format(bucket.start) : hourText(bucket.start); } - if (connector.state === "ready" && connector.apps?.length > 0) return t("Connected: {apps}", { apps: connector.apps.map(appName).join(", ") }); - if (connector.state === "ready") return connector.account ? t("Connected as {account}", { account: connector.account }) : t("Connected"); - return ABOUT[connector.id]?.() ?? ""; + if (range.unit === "month") return dates({ month: "short" }).format(bucket.start); + return dates({ month: "numeric", day: "numeric" }).format(bucket.start); +} +function titleOf(range, bucket) { + if (range.unit === "hour") return `${dates({ month: "short", day: "numeric" }).format(bucket.start)} ${hourText(bucket.start)}–${hourText(bucket.start + HOUR_MS)}`; + if (range.unit === "day") return dates({ month: "long", day: "numeric", weekday: "short" }).format(bucket.start); + if (range.unit === "week") return spanText(dayKey(bucket.start), dayKey((bucket.end ?? bucket.start + 7 * DAY_MS) - DAY_MS)); + if (bucket.end && (new Date(bucket.start).getUTCDate() !== 1 || new Date(bucket.end).getUTCDate() !== 1)) return spanText(dayKey(bucket.start), dayKey(bucket.end - DAY_MS)); + return dates({ year: "numeric", month: "long" }).format(bucket.start); +} +function useTween(value) { + const [shown, setShown] = (0, import_react44.useState)(0); + const from = (0, import_react44.useRef)(0); + (0, import_react44.useEffect)(() => { + if (reducedMotion() || typeof requestAnimationFrame !== "function") { + from.current = value; + setShown(value); + return void 0; + } + const begin = from.current; + const started = performance.now(); + let frame; + const step = (now) => { + const progress = Math.min(1, (now - started) / 650); + from.current = begin + (value - begin) * (1 - (1 - progress) ** 3); + setShown(from.current); + if (progress < 1) frame = requestAnimationFrame(step); + }; + frame = requestAnimationFrame(step); + return () => cancelAnimationFrame(frame); + }, [value]); + return shown; +} +var glyphBox = (size, icon3) => (0, import_react44.createElement)("span", { className: "bt-us-glyph", style: { width: size, height: size } }, (0, import_react44.createElement)(icon3)); +function ModelGlyph({ name, paint, size }) { + return (0, import_react44.createElement)("span", { + className: "bt-us-model", + "aria-hidden": true, + style: { width: size, height: size, fontSize: Math.round(size * 0.42), background: `color-mix(in srgb, ${paint} 20%, var(--bt-card))`, color: `color-mix(in srgb, ${paint} 72%, var(--bt-ink))` } + }, (name.match(/[\p{L}\p{N}]/u)?.[0] ?? "?").toUpperCase()); +} +function ownerFace(owner, roster) { + if (owner.kind === "bot") { + const bot = roster.byId[owner.id] ?? { id: owner.id, name: owner.name }; + const name = bot.name || owner.name || t("Deleted Bot"); + const role = bot.role?.trim() ?? ""; + return { + kind: "bot", + name, + sub: owner.deleted ? t("Deleted") : role.toLowerCase() === name.toLowerCase() ? "" : role, + paint: paintCss(colorOf(bot)), + stops: GRADIENTS[colorOf(bot)], + glyph: (size) => (0, import_react44.createElement)(BotAvatar, { bot, size, badge: false, live: false }) + }; + } + if (owner.kind === "room") { + const room2 = roster.roomsById[owner.id]; + return { + kind: "room", + name: owner.name || t("Deleted group chat"), + sub: owner.deleted ? t("Deleted") : t("Group chat"), + paint: "var(--bt-us-rest)", + glyph: (size) => room2 ? (0, import_react44.createElement)(RoomAvatar, { room: room2, roster, size }) : glyphBox(size, ChatsIcon) + }; + } + if (owner.kind === "agent") { + return { + kind: "agent", + name: owner.name || "DSH Agent", + sub: owner.deleted ? t("Deleted") : "", + paint: "var(--bt-us-rest)", + glyph: (size) => glyphBox(size, ChatsIcon) + }; + } + return { kind: "other", name: t("Other"), sub: "", paint: "var(--bt-us-rest)", glyph: (size) => glyphBox(size, ChatsIcon) }; +} +function kindLabel(kind, botFocus) { + const labels = { chat: botFocus ? t("Own chat") : t("Conversations"), group: t("Group chats"), compaction: t("Compaction and handoff"), image: t("Image reading"), memory: t("Memory"), "session-title": t("Titles"), other: t("Other") }; + return labels[kind] ?? kind; +} +function Tabs({ label, value, options, onChange, boxRef }) { + const names = options.map(([, text2]) => text2).join("\n"); + const glide = useGlide(`${value} +${names}`, { box: boxRef }); + return (0, import_react44.createElement)( + "div", + { ref: glide.box, className: "bt-us-tabs", role: "group", "aria-label": label }, + (0, import_react44.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), + options.map(([id, text2, icon3]) => (0, import_react44.createElement)("button", { key: id, type: "button", "aria-pressed": value === id, onClick: () => onChange(id) }, icon3 ? (0, import_react44.createElement)(icon3) : null, text2)) + ); +} +function Stats({ range, total, previous }) { + const shown = useTween(total.total); + const change = previous > 0 ? Math.round((total.total - previous) / previous * 100) : null; + const cell = (label, value) => (0, import_react44.createElement)("div", { className: "bt-us-stat" }, (0, import_react44.createElement)("span", { className: "bt-us-stat-label" }, label), (0, import_react44.createElement)("span", { className: "bt-us-stat-value" }, value)); + return (0, import_react44.createElement)( + "section", + { className: "bt-us-stats", style: { "--i": 0 } }, + (0, import_react44.createElement)( + "div", + { className: "bt-us-stat bt-us-stat-main" }, + (0, import_react44.createElement)("span", { className: "bt-us-stat-label" }, lastText(range)), + (0, import_react44.createElement)( + "span", + { className: "bt-us-stat-value" }, + compact(shown), + (0, import_react44.createElement)("small", null, t("tokens")), + change === null ? null : (0, import_react44.createElement)( + "span", + { className: "bt-us-delta", title: compareText(range) }, + `${change >= 0 ? "↑" : "↓"} ${Math.abs(change)}%` + ) + ) + ), + cell(t("Cache hit rate"), `${hitRate(total)}%`), + cell(t("Output"), compact(total.output)), + cell(t("Calls"), full(total.calls)) + ); +} +function niceTop(max) { + if (!(max > 0)) return 1; + const step = 10 ** Math.floor(Math.log10(max)); + return [1, 1.5, 2, 2.5, 3, 4, 5, 6, 8, 10].map((scale) => scale * step).find((value) => value >= max); +} +function Chart({ range, columns, series, tipSeries, by, onBy, onPick }) { + const [hover, setHover] = (0, import_react44.useState)(null); + const top = niceTop(Math.max(0, ...columns.map((column) => column.total))); + const count = columns.length; + const fillOf = new Map(series.map((entry) => [entry.key, entry.fill])); + const tipOf = new Map(tipSeries.map((entry) => [entry.key, entry])); + const tip = hover === null ? null : columns[hover]; + const tipSide = hover !== null && hover >= count / 2 ? { right: `calc(${(count - hover) / count * 100}% + 8px)` } : { left: `calc(${(hover + 1) / count * 100}% + 8px)` }; + return (0, import_react44.createElement)( + "section", + { className: "bt-us-card bt-us-chart", style: { "--i": 1 } }, + (0, import_react44.createElement)( + "div", + { className: "bt-us-card-head" }, + (0, import_react44.createElement)("h3", null, t("Tokens over time"), (0, import_react44.createElement)("span", null, unitLabel(range.unit))), + onBy ? (0, import_react44.createElement)(Tabs, { label: t("Group usage by"), value: by, onChange: onBy, options: [["bot", t("By Bot")], ["model", t("By model")]] }) : null + ), + (0, import_react44.createElement)( + "div", + { className: "bt-us-chart-body" }, + (0, import_react44.createElement)( + "div", + { className: "bt-us-plot", "data-hover": hover === null ? void 0 : "", onMouseLeave: () => setHover(null) }, + [1, 0.5].map((level) => (0, import_react44.createElement)("div", { key: level, className: "bt-us-grid", style: { bottom: `${level * 100}%` } }, (0, import_react44.createElement)("span", null, compact(top * level)))), + (0, import_react44.createElement)("div", { className: "bt-us-grid bt-us-base", style: { bottom: 0 } }, (0, import_react44.createElement)("span", null, "0")), + (0, import_react44.createElement)( + "div", + { className: "bt-us-cols" }, + columns.map((column, at) => (0, import_react44.createElement)("div", { + key: `${range.from ? `${range.from}~${range.to}` : range.id}:${column.key}`, + className: "bt-us-col", + "data-on": hover === at ? "" : void 0, + onMouseEnter: () => setHover(at) + }, column.total > 0 ? (0, import_react44.createElement)( + "div", + { className: "bt-us-stack", style: { height: `${column.total / top * 100}%`, "--i": at } }, + column.parts.map(([key, value]) => value > 0 ? (0, import_react44.createElement)("i", { key, style: { flexGrow: value, background: fillOf.get(key) } }) : null) + ) : (0, import_react44.createElement)("div", { className: "bt-us-stub" }))) + ), + tip ? (0, import_react44.createElement)( + "div", + { className: "bt-us-tip", style: tipSide }, + (0, import_react44.createElement)("div", { className: "bt-us-tip-title" }, tip.title), + (0, import_react44.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(tip.total) })), + tip.tip.filter(([, value]) => value > 0).sort((a, b) => b[1] - a[1]).map(([key, value]) => (0, import_react44.createElement)( + "div", + { key, className: "bt-us-tip-row" }, + (0, import_react44.createElement)("i", { className: "bt-us-dot", style: { background: tipOf.get(key)?.fill } }), + (0, import_react44.createElement)("span", null, tipOf.get(key)?.name), + (0, import_react44.createElement)("b", null, compact(value)) + )) + ) : null + ), + (0, import_react44.createElement)( + "div", + { className: "bt-us-ticks", "aria-hidden": true }, + // A preset counts its labels back from now; a picked span forward from its first day. + columns.map((column, at) => (0, import_react44.createElement)( + "span", + { key: column.key, "data-now": at === count - 1 && range.ends !== false ? "" : void 0 }, + (range.from ? at : count - 1 - at) % range.stride === 0 ? column.tick : "" + )) + ) + ), + series.length > 1 || series[0]?.pick ? (0, import_react44.createElement)( + "div", + { className: "bt-us-legend" }, + series.map((entry) => (0, import_react44.createElement)(entry.pick ? "button" : "span", { + key: entry.key, + className: "bt-us-key", + ...entry.pick ? { type: "button", onClick: () => onPick(entry.pick) } : {} + }, (0, import_react44.createElement)("i", { className: "bt-us-dot", style: { background: entry.fill } }), entry.name)) + ) : null + ); } -function CredentialField({ credential, value, onChange, onEnter, autoFocus }) { - const label = t(credential.label); - if (credential.masked) return (0, import_react40.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react40.createElement)(MaskedInput, { value, onChange, onEnter, label, autoFocus })); - return (0, import_react40.createElement)( - "label", - { className: "bt-q-field" }, - (0, import_react40.createElement)("input", { - className: "bt-input", - type: "text", - value, - "aria-label": label, - placeholder: label, - spellCheck: false, - autoFocus, - onChange: (event) => onChange(event.target.value), - onKeyDown: (event) => { - if (event.key === "Enter") onEnter?.(); - } - }) +function Row3({ kind, glyph, name, sub, sum, whole, fill: fill3, index, onClick }) { + const width = whole > 0 ? Math.max(sum.total > 0 ? 2 : 0, sum.total / whole * 100) : 0; + return (0, import_react44.createElement)( + onClick ? "button" : "div", + { + className: "bt-us-row", + "data-kind": kind, + style: { "--i": index }, + title: t("{tokens} tokens · {calls} calls", { tokens: full(sum.total), calls: full(sum.calls) }), + ...onClick ? { type: "button", onClick } : {} + }, + glyph ? (0, import_react44.createElement)("span", { className: "bt-us-row-glyph" }, glyph) : null, + (0, import_react44.createElement)( + "span", + { className: "bt-us-row-body" }, + (0, import_react44.createElement)( + "span", + { className: "bt-us-row-line" }, + (0, import_react44.createElement)("span", { className: "bt-us-row-name" }, name), + sub ? (0, import_react44.createElement)("span", { className: "bt-us-row-sub" }, sub) : null + ), + (0, import_react44.createElement)("span", { className: "bt-us-track" }, (0, import_react44.createElement)("span", { style: { width: `${width}%`, background: fill3 } })) + ), + (0, import_react44.createElement)("span", { className: "bt-us-row-num" }, (0, import_react44.createElement)("b", null, compact(sum.total)), (0, import_react44.createElement)("small", null, `${percent(sum.total, whole)}%`)) ); } -function AllowedSenders({ connector, actions, run, busy }) { - const [openId, setOpenId] = (0, import_react40.useState)(""); - const allowed = connector.allowed ?? []; - const refused = connector.inbound?.refusedSenders ?? []; - const allow = (id) => void run(actions.connectorAllow(connector.id, id)); - return (0, import_react40.createElement)( - "div", - { className: "bt-connector-allowed" }, - (0, import_react40.createElement)("span", { className: "bt-connector-person-title" }, t("Who may talk to the Bots")), - allowed.length === 0 && refused.length === 0 ? (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("Nobody yet. A message from anyone else starts no turn.")) : null, - allowed.map((entry) => (0, import_react40.createElement)( - "div", - { key: entry.openId, className: "bt-connector-person" }, - (0, import_react40.createElement)("span", { className: "bt-connector-person-name" }, entry.name ?? entry.openId), - (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorBlock(connector.id, entry.openId)) }, t("Block")) - )), - refused.map((entry) => (0, import_react40.createElement)( - "div", - { key: entry.openId, className: "bt-connector-person" }, - (0, import_react40.createElement)("span", { className: "bt-connector-person-name" }, entry.name ?? entry.openId), - (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => allow(entry.openId) }, t("Allow")) - )), - (0, import_react40.createElement)( +function ListCard({ title, count, index, children }) { + return (0, import_react44.createElement)( + "section", + { className: "bt-us-card", style: { "--i": index } }, + (0, import_react44.createElement)("div", { className: "bt-us-card-head" }, (0, import_react44.createElement)("h3", null, title, count === void 0 ? null : (0, import_react44.createElement)("span", null, count))), + (0, import_react44.createElement)("div", { className: "bt-us-rows" }, children) + ); +} +function Profile({ face, share, range }) { + const arc = Math.max(0, Math.min(1, share)) * RING2; + return (0, import_react44.createElement)( + "section", + { className: "bt-us-profile" }, + (0, import_react44.createElement)( + "span", + { className: "bt-us-ring" }, + (0, import_react44.createElement)( + "svg", + { viewBox: "0 0 96 96", "aria-hidden": true }, + face.stops ? (0, import_react44.createElement)("defs", null, (0, import_react44.createElement)( + "linearGradient", + { id: "bt-us-ring-paint", x1: 0, y1: 1, x2: 1, y2: 0 }, + face.stops.map(([offset, color]) => (0, import_react44.createElement)("stop", { key: offset, offset, stopColor: color })) + )) : null, + (0, import_react44.createElement)("circle", { className: "bt-us-ring-track", cx: 48, cy: 48, r: RING_R }), + arc > 0 ? (0, import_react44.createElement)("circle", { className: "bt-us-ring-arc", cx: 48, cy: 48, r: RING_R, style: { stroke: face.stops ? "url(#bt-us-ring-paint)" : face.paint, strokeDasharray: `${arc} ${RING2}` } }) : null + ), + (0, import_react44.createElement)("span", { className: "bt-us-ring-face" }, face.glyph(64)) + ), + (0, import_react44.createElement)( "div", - { className: "bt-connector-form-row" }, - (0, import_react40.createElement)("input", { - className: "bt-input", - type: "text", - value: openId, - spellCheck: false, - "aria-label": t("Feishu open_id"), - placeholder: t("Paste an open_id to allow"), - onChange: (event) => setOpenId(event.target.value), - onKeyDown: (event) => { - if (event.key === "Enter" && openId.trim() !== "") { - allow(openId.trim()); - setOpenId(""); - } - } - }), - (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || openId.trim() === "", onClick: () => { - allow(openId.trim()); - setOpenId(""); - } }, t("Allow")) + { className: "bt-us-profile-copy" }, + (0, import_react44.createElement)("h3", null, face.name), + face.sub ? (0, import_react44.createElement)("span", { className: "bt-us-profile-sub" }, face.sub) : null, + (0, import_react44.createElement)("span", { className: "bt-us-profile-share" }, range.from ? t("{share}% of all usage from {span}", { share: percent(share, 1), span: spanText(range.from, range.to) }) : t("{share}% of all usage in the last {range}", { share: percent(share, 1), range: rangeLabel(range.id) })) ) ); } -var APP_STATUS = { ready: () => t("Ready"), "sign-in": () => t("Needs sign-in") }; -function AppChip({ name, status, onRemove }) { - const label = APP_STATUS[status]?.(); - return (0, import_react40.createElement)( - "button", - { type: "button", className: "bt-state bt-app-chip", "aria-pressed": true, "data-status": status ?? "unknown", title: t("Remove {app}", { app: name }), onClick: onRemove }, - name, - label ? (0, import_react40.createElement)("span", { className: "bt-app-status" }, ` · ${label}`) : null +var monthOf = (ms) => Date.UTC(yearOf(ms), new Date(ms).getUTCMonth(), 1); +var addMonths = (ms, count) => Date.UTC(yearOf(ms), new Date(ms).getUTCMonth() + count, 1); +function SpanPicker({ span, today, oldest, active, near, onPick, onClose }) { + const box = (0, import_react44.useRef)(null); + const todayMs = hourMs(today); + const thisMonth = monthOf(todayMs); + const [right, setRight] = (0, import_react44.useState)(() => Math.max(addMonths(oldest, 1), monthOf(hourMs(span?.to ?? today)))); + const [anchor, setAnchor] = (0, import_react44.useState)(null); + const [hover, setHover] = (0, import_react44.useState)(null); + (0, import_react44.useEffect)(() => { + const onDown = (event) => { + if (![box, near].some((ref) => ref.current?.contains(event.target))) onClose(); + }; + const onKey = (event) => { + if (event.key === "Escape") { + event.stopPropagation(); + onClose(); + } + }; + window.addEventListener("mousedown", onDown); + window.addEventListener("keydown", onKey, true); + return () => { + window.removeEventListener("mousedown", onDown); + window.removeEventListener("keydown", onKey, true); + }; + }, []); + const [low, high] = anchor ? [anchor, hover ?? anchor].sort() : span ? [span.from, span.to] : [null, null]; + const press = (key) => { + if (!anchor) { + setAnchor(key); + return; + } + const [from, to] = [anchor, key].sort(); + onPick(from, to); + }; + const weekdays = (0, import_react44.useMemo)(() => Array.from({ length: 7 }, (_, at) => dates({ weekday: "narrow" }).format(Date.UTC(2024, 0, 1 + at))), []); + const month = (start, side) => { + const length = new Date(addMonths(start, 1) - DAY_MS).getUTCDate(); + const lead = (new Date(start).getUTCDay() + 6) % 7; + const cells = Array.from({ length: lead }, (_, at) => (0, import_react44.createElement)("span", { key: `b${at}` })); + for (let day = 1; day <= length; day += 1) { + const ms = start + (day - 1) * DAY_MS; + const key = dayKey(ms); + const weekday = (lead + day - 1) % 7; + const flag = (on) => on ? "" : void 0; + cells.push((0, import_react44.createElement)("button", { + key, + type: "button", + className: "bt-us-day", + disabled: ms > todayMs, + "aria-label": dates({ year: "numeric", month: "long", day: "numeric", weekday: "short" }).format(ms), + "aria-pressed": key === low || key === high, + "data-in": flag(low !== null && key >= low && key <= high), + "data-start": flag(key === low), + "data-end": flag(key === high), + "data-l": flag(weekday === 0 || day === 1), + "data-r": flag(weekday === 6 || day === length), + "data-today": flag(key === today), + "data-has": flag(active.has(key)), + onMouseEnter: () => setHover(key), + onClick: () => press(key) + }, (0, import_react44.createElement)("b", null, day))); + } + const nav = side === "left" ? (0, import_react44.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "left", "aria-label": t("Previous month"), disabled: start <= oldest, onClick: () => setRight(addMonths(right, -1)) }, (0, import_react44.createElement)(ChevronLeftIcon)) : (0, import_react44.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "right", "aria-label": t("Next month"), disabled: start >= thisMonth, onClick: () => setRight(addMonths(right, 1)) }, (0, import_react44.createElement)(ChevronRightIcon)); + return (0, import_react44.createElement)( + "div", + { key: start, className: "bt-us-month" }, + (0, import_react44.createElement)("div", { className: "bt-us-month-head" }, nav, (0, import_react44.createElement)("span", null, dates({ year: "numeric", month: "long" }).format(start))), + (0, import_react44.createElement)("div", { className: "bt-us-weekdays", "aria-hidden": true }, weekdays.map((name, at) => (0, import_react44.createElement)("span", { key: at }, name))), + (0, import_react44.createElement)("div", { className: "bt-us-days", onMouseLeave: () => setHover(null) }, cells) + ); + }; + const shortcuts = [ + ["month", t("This month"), dayKey(thisMonth), today], + ["last", t("Last month"), dayKey(addMonths(thisMonth, -1)), dayKey(thisMonth - DAY_MS)], + ["year", t("This year"), `${today.slice(0, 4)}-01-01`, today] + ]; + const count = low === null ? 0 : Math.round((hourMs(high) - hourMs(low)) / DAY_MS) + 1; + return (0, import_react44.createElement)( + "div", + { ref: box, className: "bt-us-pick", role: "dialog", "aria-label": t("Custom range") }, + (0, import_react44.createElement)( + "div", + { className: "bt-us-pick-quick" }, + shortcuts.map(([id, label, from, to]) => (0, import_react44.createElement)("button", { + key: id, + type: "button", + "aria-pressed": span?.from === from && span?.to === to, + onClick: () => onPick(from, to) + }, label)) + ), + (0, import_react44.createElement)("div", { className: "bt-us-pick-months" }, month(addMonths(right, -1), "left"), month(right, "right")), + (0, import_react44.createElement)( + "div", + { className: "bt-us-pick-foot", role: "status" }, + (0, import_react44.createElement)("span", null, anchor ? t("Pick the last day") : t("Pick the first day")), + low === null ? null : (0, import_react44.createElement)("span", null, (0, import_react44.createElement)("b", null, spanText(low, high)), ` · ${daysText(count)}`) + ) ); } -function AppPicker({ apps, onChange, search, statuses = {} }) { - const [query, setQuery] = (0, import_react40.useState)(""); - const [found, setFound] = (0, import_react40.useState)(null); - const [failed, setFailed] = (0, import_react40.useState)(null); - const names = (0, import_react40.useRef)(new Map(APPS)); - const asked = (0, import_react40.useRef)(0); - (0, import_react40.useEffect)(() => { - const text2 = query.trim(); - if (text2 === "" || search === void 0) { - setFound(null); - setFailed(null); - return void 0; +function Heat({ view, keep, paint, index }) { + const [hover, setHover] = (0, import_react44.useState)(null); + const today = hourMs(`${view.now.slice(0, 10)} 00`); + const first = mondayOf(today) - (HEAT_WEEKS - 1) * 7 * DAY_MS; + const from = dayKey(first); + const daily = /* @__PURE__ */ new Map(); + for (const row of view.rows) { + const day = row[HOUR].slice(0, 10); + if (day >= from && keep(row)) daily.set(day, (daily.get(day) ?? 0) + tokensOf(row)); + } + const most = Math.max(0, ...daily.values()); + const levels = [0.3, 0.52, 0.76, 1]; + const months = []; + const cells = []; + for (let week = 0; week < HEAT_WEEKS; week += 1) { + const monday = first + week * 7 * DAY_MS; + if (week > 0 && new Date(monday).getUTCMonth() !== new Date(monday - 7 * DAY_MS).getUTCMonth()) { + months.push((0, import_react44.createElement)("span", { key: week, style: { gridColumn: week + 1 } }, dates({ month: "short" }).format(monday))); } - const ask = ++asked.current; - const timer = setTimeout(() => { - search(text2).then((list) => { - if (ask !== asked.current) return; - for (const app of list) names.current.set(app.slug, app.name); - setFound(list); - setFailed(null); - }, (failure) => { - if (ask !== asked.current) return; - setFound(null); - setFailed(failure?.message ?? String(failure)); - }); - }, 250); - return () => clearTimeout(timer); - }, [query, search]); - const nameOf = (slug) => names.current.get(slug) ?? appName(slug); - const picked = new Set(apps); - const needle = query.trim().toLowerCase(); - const local = APPS.filter(([slug, name]) => needle === "" || slug.includes(needle) || name.toLowerCase().includes(needle)).map(([slug, name]) => ({ slug, name })); - const results = (found ?? local).filter((app) => !picked.has(app.slug)); - return (0, import_react40.createElement)( - "div", - { className: "bt-connector-apps" }, - apps.length > 0 ? (0, import_react40.createElement)("div", { className: "bt-states", "aria-label": t("Picked apps") }, apps.map((slug) => (0, import_react40.createElement)(AppChip, { key: slug, name: nameOf(slug), status: statuses[slug], onRemove: () => onChange(apps.filter((app) => app !== slug)) }))) : null, - (0, import_react40.createElement)("input", { className: "bt-input", type: "search", value: query, spellCheck: false, "aria-label": t("Search apps"), placeholder: t("Search Composio apps"), onChange: (event) => setQuery(event.target.value) }), - failed ? (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("Could not search Composio: {error}", { error: failed })) : null, - (0, import_react40.createElement)("div", { className: "bt-states", "aria-label": t("Apps to add") }, results.length === 0 ? (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("No apps match")) : results.map((app) => (0, import_react40.createElement)("button", { key: app.slug, type: "button", className: "bt-state", "aria-pressed": false, onClick: () => { - names.current.set(app.slug, app.name); - onChange([...apps, app.slug]); - } }, app.name))) + for (let day = 0; day < 7; day += 1) { + const ms = monday + day * DAY_MS; + const value = daily.get(dayKey(ms)) ?? 0; + const level = value > 0 ? Math.max(1, Math.ceil(4 * Math.sqrt(value / most))) : 0; + cells.push((0, import_react44.createElement)("span", { + key: ms, + className: "bt-us-cell", + style: { "--w": week }, + "data-on": hover?.ms === ms ? "" : void 0, + "data-future": ms > today ? "" : void 0, + "data-today": ms === today ? "" : void 0, + onMouseEnter: ms > today ? void 0 : () => setHover({ ms, week, day }) + }, level > 0 ? (0, import_react44.createElement)("i", { style: { background: soften(paint, levels[level - 1]) } }) : null)); + } + } + const tipSide = hover ? { + ...hover.week >= HEAT_WEEKS / 2 ? { right: `calc(${(HEAT_WEEKS - hover.week) / HEAT_WEEKS * 100}% + 8px)` } : { left: `calc(${(hover.week + 1) / HEAT_WEEKS * 100}% + 8px)` }, + ...hover.day < 4 ? { top: `calc(${hover.day / 7 * 100}% - 2px)` } : { top: "auto", bottom: `calc(${(6 - hover.day) / 7 * 100}% - 2px)` } + } : null; + const active = [...daily.values()].filter((value) => value > 0).length; + const summary = active === 1 ? t("Active on 1 day in the last year") : t("Active on {count} days in the last year", { count: active }); + return (0, import_react44.createElement)( + "section", + { className: "bt-us-card bt-us-heat", style: { "--i": index } }, + (0, import_react44.createElement)("div", { className: "bt-us-card-head" }, (0, import_react44.createElement)("h3", null, t("Activity")), (0, import_react44.createElement)("span", { className: "bt-us-head-note" }, summary)), + (0, import_react44.createElement)("div", { className: "bt-us-heat-months", "aria-hidden": true }, months), + (0, import_react44.createElement)( + "div", + { className: "bt-us-heat-plot", onMouseLeave: () => setHover(null) }, + (0, import_react44.createElement)("div", { className: "bt-us-heat-grid", role: "img", "aria-label": summary }, cells), + hover ? (0, import_react44.createElement)( + "div", + { className: "bt-us-tip bt-us-heat-tip", style: tipSide }, + (0, import_react44.createElement)("div", { className: "bt-us-tip-title" }, dates({ month: "long", day: "numeric", weekday: "short" }).format(hover.ms)), + (0, import_react44.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(daily.get(dayKey(hover.ms)) ?? 0) })) + ) : null + ), + (0, import_react44.createElement)( + "div", + { className: "bt-us-heat-scale", "aria-hidden": true }, + t("Light"), + levels.map((level) => (0, import_react44.createElement)("span", { key: level, className: "bt-us-cell" }, (0, import_react44.createElement)("i", { style: { background: soften(paint, level) } }))), + t("Heavy") + ) ); } -function AppStatusList({ apps, statuses }) { - if (apps.length === 0 || Object.keys(statuses).length === 0) return null; - return (0, import_react40.createElement)("ul", { className: "bt-connector-app-list", "aria-label": t("App status") }, apps.map((slug) => (0, import_react40.createElement)( - "li", - { key: slug, className: "bt-connector-app", "data-status": statuses[slug] ?? "unknown" }, - (0, import_react40.createElement)("span", { className: "bt-connector-app-name" }, appName(slug)), - (0, import_react40.createElement)("span", { className: "bt-app-status" }, APP_STATUS[statuses[slug]]?.() ?? "") - ))); +function Skeleton2() { + return (0, import_react44.createElement)( + "div", + { className: "bt-us", "aria-busy": true }, + (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 32, width: 320, borderRadius: 999 } }), + (0, import_react44.createElement)( + "div", + { className: "bt-us-sheet bt-us-skel-sheet" }, + (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 94 } }), + (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 318 } }), + (0, import_react44.createElement)( + "div", + { className: "bt-us-pair" }, + (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }), + (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }) + ) + ) + ); } -function ConnectorRow({ connector, roster, actions }) { - const [form, setForm] = (0, import_react40.useState)(false); - const [bots, setBots] = (0, import_react40.useState)(false); - const [token, setToken] = (0, import_react40.useState)(""); - const [apps, setApps] = (0, import_react40.useState)(() => connector.apps ?? []); - const [picking, setPicking] = (0, import_react40.useState)(false); - const [busy, setBusy] = (0, import_react40.useState)(false); - const [error, setError] = (0, import_react40.useState)(null); - const [message, setMessage] = (0, import_react40.useState)(""); - const [copyState, setCopyState] = (0, import_react40.useState)("idle"); - const run = (task, after) => { - setBusy(true); - setError(null); - return task.then(() => { - after?.(); - }, (failure) => setError(failure?.message ?? String(failure))).finally(() => setBusy(false)); - }; - const gateway = connector.id === "composio"; - const sender = connector.kind === "sender"; - const channel = connector.kind === "channel"; - const modes = connector.modes ?? []; - const [mode, setMode] = (0, import_react40.useState)(() => connector.mode ?? modes[0]?.id); - const [values, setValues] = (0, import_react40.useState)({}); - const chosen = modes.find((entry) => entry.id === mode) ?? modes[0]; - const field = (name) => values[name] ?? ""; - const setField = (name, value) => setValues((current) => ({ ...current, [name]: value })); - const filled = chosen !== void 0 && chosen.credentials.every((credential) => field(credential.name).trim() !== ""); - const [statuses, setStatuses] = (0, import_react40.useState)({}); - const appsKey = (connector.apps ?? []).join(","); - (0, import_react40.useEffect)(() => { - if (!gateway || connector.state !== "ready" || appsKey === "" || actions.connectorAppStatus === void 0) { - setStatuses({}); - return void 0; - } - let live = true; - actions.connectorAppStatus(connector.id).then((value) => { - if (live) setStatuses(value ?? {}); - }, () => { - if (live) setStatuses({}); - }); +var focusOf = (id) => typeof id !== "string" ? null : id.startsWith("model:") ? { kind: "model", key: id.slice("model:".length) } : id.startsWith("owner:") ? { kind: "owner", key: id.slice("owner:".length) } : null; +function UsagePage({ roster, actions, focusId }) { + const [view, setView] = (0, import_react44.useState)(null); + const [error, setError] = (0, import_react44.useState)(""); + const [rangeId, setRangeId] = (0, import_react44.useState)("7d"); + const [span, setSpan] = (0, import_react44.useState)(null); + const [picking, setPicking] = (0, import_react44.useState)(false); + const [by, setBy] = (0, import_react44.useState)("bot"); + const tabs = (0, import_react44.useRef)(null); + const focus = focusOf(focusId); + (0, import_react44.useEffect)(() => { + let stopped = false; + let timer; + const resized = Promise.all((document.querySelector(".bt-settings")?.getAnimations() ?? []).filter((animation) => animation.transitionProperty === "width" || animation.transitionProperty === "height").map((animation) => animation.finished.catch(() => { + }))); + const load = async () => { + try { + const value = await actions.usage(); + await resized; + if (stopped) return; + (0, import_react44.startTransition)(() => setView(value)); + setError(""); + timer = setTimeout(load, value.scanning ? 3e3 : 2e4); + } catch (failure) { + if (stopped) return; + setError(failure?.message ?? String(failure)); + timer = setTimeout(load, 1e4); + } + }; + void load(); return () => { - live = false; + stopped = true; + clearTimeout(timer); }; - }, [gateway, connector.state, appsKey, picking]); - (0, import_react40.useEffect)(() => { - setCopyState("idle"); - }, [connector.state, connector.error]); - const search = (0, import_react40.useCallback)((query) => actions.connectorAppSearch(connector.id, query, connector.state === "off" ? token : void 0), [connector.id, connector.state, token]); - const connect = () => { - if (busy) return; - if (channel) { - if (chosen === void 0 || !filled) return; - const credentials = Object.fromEntries(chosen.credentials.map((credential) => [credential.name, field(credential.name)])); - void run(actions.connectorConnect(connector.id, { mode: chosen.id, credentials }), () => { - setValues({}); - setForm(false); - }); - return; + }, []); + const today = view?.now.slice(0, 10); + const range = rangeId === "custom" && span ? { ...spanRange(span.from, span.to), ends: span.to >= today } : RANGES.find((item) => item.id === rangeId); + const shaped = (0, import_react44.useMemo)(() => { + if (!view) return null; + const faces2 = view.owners.map((owner) => ownerFace(owner, roster)); + const lifetime = /* @__PURE__ */ new Map(); + for (const row of view.rows) lifetime.set(row[MODEL], (lifetime.get(row[MODEL]) ?? 0) + tokensOf(row)); + const modelPaint = new Map([...lifetime].sort((a, b) => b[1] - a[1]).map(([model], rank) => [model, `var(--bt-ink-${MODEL_INKS[rank % MODEL_INKS.length]})`])); + const models2 = view.models.map((model, at) => { + const name = model.name || model.model || t("Unknown model"); + const paint = modelPaint.get(at) ?? "var(--bt-us-rest)"; + return { kind: "model", name, sub: model.providerName ?? model.provider, paint, glyph: (size) => (0, import_react44.createElement)(ModelGlyph, { name, paint, size }) }; + }); + const ownerAt2 = focus?.kind === "owner" ? view.owners.findIndex((owner) => owner.key === focus.key) : -1; + const modelAt = focus?.kind === "model" ? view.models.findIndex((model) => model.key === focus.key) : -1; + const isBot2 = (at) => ["bot", "agent"].includes(view.owners[at]?.kind); + const all2 = summarize(view, range, void 0, (row) => by === "bot" ? isBot2(row[OWNER]) ? `o${row[OWNER]}` : "rest" : `m${row[MODEL]}`); + const keep2 = ownerAt2 >= 0 ? (row) => row[OWNER] === ownerAt2 : modelAt >= 0 ? (row) => row[MODEL] === modelAt : () => true; + const face2 = ownerAt2 >= 0 ? faces2[ownerAt2] : modelAt >= 0 ? models2[modelAt] : null; + const part2 = face2 ? summarize(view, range, keep2) : all2; + const activeDays2 = /* @__PURE__ */ new Set(); + let first = view.now; + for (const row of view.rows) { + if (row[HOUR] < first) first = row[HOUR]; + if (keep2(row) && tokensOf(row) > 0) activeDays2.add(row[HOUR].slice(0, 10)); } - if (token.trim() === "") return; - if (gateway && apps.length === 0) { - setError(t("Pick at least one app")); - return; + const oldest2 = Math.min(monthOf(hourMs(first)), addMonths(monthOf(hourMs(view.now)), -12)); + const ranked2 = (map) => [...map].filter(([, sum]) => sum.total > 0).sort((a, b) => b[1].total - a[1].total); + let series2; + if (face2) { + series2 = [{ key: "all", name: face2.name, fill: soften(face2.paint) }]; + } else { + if (by === "bot") { + const bots = ranked2(all2.owners).filter(([at]) => isBot2(at)); + series2 = bots.slice(0, TOP_SERIES).map(([at]) => ({ key: `o${at}`, name: faces2[at].name, paint: faces2[at].paint, pick: { kind: "owner", key: view.owners[at].key } })); + if (bots.length > TOP_SERIES) series2.push({ key: "more", name: t("More Bots"), paint: "var(--bt-us-more)" }); + if (ranked2(all2.owners).some(([at]) => !isBot2(at))) series2.push({ key: "rest", name: t("Other"), paint: "var(--bt-us-rest)" }); + } else { + const used = ranked2(all2.models); + series2 = used.slice(0, TOP_SERIES).map(([at]) => ({ key: `m${at}`, name: models2[at].name, paint: models2[at].paint, pick: { kind: "model", key: view.models[at].key } })); + if (used.length > TOP_SERIES) series2.push({ key: "more", name: t("More models"), paint: "var(--bt-us-more)" }); + } + const repeats = /* @__PURE__ */ new Map(); + for (const entry of series2) { + const seen = repeats.get(entry.paint) ?? 0; + repeats.set(entry.paint, seen + 1); + entry.fill = soften(entry.paint, [1, 0.6, 0.36][seen % 3]); + } } - void run(actions.connectorConnect(connector.id, token, gateway ? apps : void 0), () => { - setToken(""); - setForm(false); + const tipSeries2 = face2 ? PARTS.map(([key, strength]) => ({ key, name: partLabel(key), fill: soften(face2.paint, strength) })) : series2; + const fillOf2 = new Map(series2.map((entry) => [entry.key, entry.fill])); + const shownKeys = new Set(series2.map((entry) => entry.key)); + const columns2 = part2.buckets.map((bucket) => { + const parts = face2 ? [["all", bucket.sum.total]] : series2.map((entry) => [entry.key, entry.key === "more" ? [...bucket.stacks].filter(([key]) => key !== "rest" && !shownKeys.has(key)).reduce((sum, [, value]) => sum + value, 0) : bucket.stacks.get(entry.key) ?? 0]); + const tip = face2 ? PARTS.map(([key]) => [key, bucket.sum[key]]) : parts; + return { key: bucket.key, tick: tickOf(range, bucket), title: titleOf(range, bucket), total: bucket.sum.total, parts, tip }; }); - }; - const saveApps = () => { - if (busy) return; - if (apps.length === 0) { - setError(t("Pick at least one app")); + return { faces: faces2, models: models2, ownerAt: ownerAt2, modelAt, face: face2, keep: keep2, all: all2, part: part2, series: series2, tipSeries: tipSeries2, fillOf: fillOf2, columns: columns2, ranked: ranked2, isBot: isBot2, activeDays: activeDays2, oldest: oldest2 }; + }, [view, rangeId, span, by, focusId, roster]); + const root = (0, import_react44.useRef)(null); + (0, import_react44.useEffect)(() => { + root.current?.closest(".bt-settings-scroll")?.scrollTo?.({ top: 0 }); + }, [focusId]); + if (!view) { + return error ? (0, import_react44.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : (0, import_react44.createElement)(Skeleton2); + } + if (view.rows.length === 0) { + return (0, import_react44.createElement)( + "div", + { className: "bt-us" }, + (0, import_react44.createElement)( + "div", + { className: "bt-us-empty" }, + (0, import_react44.createElement)(BotMark, { look: MAIN_LOOK, size: 56, live: true }), + (0, import_react44.createElement)("b", null, view.scanning ? t("Reading your chats…") : t("No usage yet.")), + (0, import_react44.createElement)("span", null, t("Token usage shows up here after a model is called.")) + ) + ); + } + const { faces, models, ownerAt, face, keep, all, part, series, tipSeries, fillOf, columns, ranked, isBot, activeDays, oldest } = shaped; + const pick2 = (next) => actions.openSettings("usage", `${next.kind}:${next.key}`); + const chooseRange = (id) => { + if (id !== "custom") { + setRangeId(id); + setPicking(false); return; } - void run(actions.connectorApps(connector.id, apps), () => setPicking(false)); + if (span) setRangeId("custom"); + setPicking((open) => !open); }; - const on = connector.state !== "off"; - const canPost = sender || channel && connector.mode === "webhook"; - const perBot = !sender && (!channel || connector.mode === "app"); - const copyLabel = copyState === "copied" ? t("Copied") : copyState === "failed" ? t("Could not copy the error") : t("Copy error"); - const copyError = () => { - void copiedToClipboard(connector.error ?? "").then((written) => setCopyState(written ? "copied" : "failed")); + const pickSpan = (from, to) => { + setSpan({ from, to }); + setRangeId("custom"); + setPicking(false); }; - const Mark = MARKS[connector.id]; - const row = (0, import_react40.useRef)(null); - useMorph(row, `${form}:${picking}:${bots}:${error !== null}:${connector.state}:${mode}`); - return (0, import_react40.createElement)( - "div", - { ref: row, className: "bt-connector", "data-state": connector.state }, - (0, import_react40.createElement)( - "div", - { className: "bt-connector-head" }, - (0, import_react40.createElement)("span", { className: "bt-connector-mark" }, Mark ? (0, import_react40.createElement)(Mark) : null), - (0, import_react40.createElement)( - "span", - { className: "bt-connector-text" }, - (0, import_react40.createElement)("span", { className: "bt-connector-name" }, connector.name), - (0, import_react40.createElement)("span", { className: "bt-connector-status" }, statusText2(connector)) - ), - (0, import_react40.createElement)( - "span", - { className: "bt-connector-actions" }, - connector.state === "error" ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorRetry(connector.id)) }, t("Try again")) : null, - connector.state === "error" ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: copyError }, copyLabel) : null, - on && gateway && !picking ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { - setApps(connector.apps ?? []); - setPicking(true); - } }, t("Choose apps")) : null, - on && perBot ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "aria-expanded": bots, onClick: () => setBots((value) => !value) }, bots ? t("Done") : t("Choose Bots")) : null, - on ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorDisconnect(connector.id)) }, t("Disconnect")) : form ? null : (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setForm(true) }, t("Connect")) - ) - ), - on && gateway && !picking ? (0, import_react40.createElement)(AppStatusList, { apps: connector.apps ?? [], statuses }) : null, - on && perBot ? (0, import_react40.createElement)("span", { className: "bt-connector-uses" }, usageText(roster, connector.id)) : null, - on && bots ? (0, import_react40.createElement)(ConnectorBots, { connector, roster, actions, run, SwitchRow }) : null, - on && channel && connector.mode === "app" ? (0, import_react40.createElement)(AllowedSenders, { connector, actions, run, busy }) : null, - on && canPost ? (0, import_react40.createElement)( - "div", - { className: "bt-connector-form" }, - (0, import_react40.createElement)("label", { className: "bt-q-field" }, (0, import_react40.createElement)("input", { className: "bt-input", type: "text", value: message, "aria-label": t("Message to send to Feishu"), placeholder: t("Type a message for the Feishu group"), onChange: (event) => setMessage(event.target.value) })), - (0, import_react40.createElement)( - "div", - { className: "bt-connector-form-row" }, - (0, import_react40.createElement)("span", { className: "bt-connector-link" }), - (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || message.trim() === "" || actions.connectorSend === void 0, onClick: () => void run(actions.connectorSend(connector.id, message), () => setMessage("")) }, t("Send")) - ) - ) : null, - !on && form ? (0, import_react40.createElement)( - "div", - { className: "bt-connector-form" }, - channel ? (0, import_react40.createElement)("div", { className: "bt-states", role: "group", "aria-label": t("How to connect") }, modes.map((entry) => (0, import_react40.createElement)("button", { - key: entry.id, - type: "button", - className: "bt-state", - "aria-pressed": entry.id === chosen?.id, - onClick: () => { - setMode(entry.id); - setValues({}); - setError(null); - } - }, t(entry.label)))) : null, - channel ? (chosen?.credentials ?? []).map((credential, index) => (0, import_react40.createElement)(CredentialField, { - key: credential.name, - credential, - value: field(credential.name), - onChange: (value) => setField(credential.name, value), - onEnter: connect, - autoFocus: index === 0 - })) : (0, import_react40.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react40.createElement)(MaskedInput, { value: token, onChange: setToken, onEnter: connect, label: gateway ? t("Composio API key") : t("GitHub token"), autoFocus: true })), - gateway ? (0, import_react40.createElement)(AppPicker, { apps, onChange: setApps, search: token.trim() === "" ? void 0 : search }) : null, - (0, import_react40.createElement)( + const rangeOptions = [ + ...RANGES.map((item) => [item.id, rangeLabel(item.id)]), + ["custom", rangeId === "custom" && span ? spanText(span.from, span.to) : t("Custom"), CalendarIcon] + ]; + const whole = part.total.total; + const ownerRow = ([at, sum], index, total = whole) => (0, import_react44.createElement)(Row3, { + key: `o${at}`, + kind: faces[at].kind, + glyph: faces[at].glyph(32), + name: faces[at].name, + sub: faces[at].sub, + sum, + whole: total, + index, + fill: face ? soften(face.paint, 0.8) : fillOf.get(`o${at}`) ?? soften(faces[at].paint), + onClick: () => pick2({ kind: "owner", key: view.owners[at].key }) + }); + const modelRow = ([at, sum], index) => (0, import_react44.createElement)(Row3, { + key: `m${at}`, + kind: "model", + glyph: models[at].glyph(32), + name: models[at].name, + sub: models[at].sub, + sum, + whole, + index, + fill: face ? soften(face.paint, 0.8) : fillOf.get(`m${at}`) ?? soften(models[at].paint), + onClick: () => pick2({ kind: "model", key: view.models[at].key }) + }); + const nothing = (0, import_react44.createElement)("div", { className: "bt-us-none" }, t("Nothing in this range.")); + let body; + if (face) { + const kinds = ranked(part.kinds); + const usedModels = ranked(part.models); + const owners = ranked(part.owners); + body = [ + (0, import_react44.createElement)(Profile, { key: "profile", face, range, share: all.total.total > 0 ? whole / all.total.total : 0 }), + (0, import_react44.createElement)( "div", - { className: "bt-connector-form-row" }, - (0, import_react40.createElement)( - "a", - { className: "bt-connector-link", href: channel ? chosen?.link ?? FEISHU_WEBHOOK_URL : gateway ? COMPOSIO_KEY_URL : TOKEN_URL, target: "_blank", rel: "noopener noreferrer" }, - channel ? t(chosen?.linkLabel ?? "Get a webhook URL in Feishu") : gateway ? t("Get a Composio API key") : t("Create a token on GitHub") + { key: "sheet", className: "bt-us-sheet" }, + (0, import_react44.createElement)(Stats, { key: "stats", range, total: part.total, previous: part.previous }), + (0, import_react44.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, onPick: pick2 }), + (0, import_react44.createElement)( + "div", + { key: "pair", className: "bt-us-pair" }, + ownerAt >= 0 ? (0, import_react44.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 2 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) : (0, import_react44.createElement)(ListCard, { title: t("Who used it"), count: owners.length, index: 2 }, owners.length > 0 ? owners.map((entry, index) => ownerRow(entry, index)) : nothing), + (0, import_react44.createElement)( + ListCard, + { title: t("What for"), index: 3 }, + kinds.length > 0 ? kinds.map(([at, sum], index) => (0, import_react44.createElement)(Row3, { key: at, name: kindLabel(view.kinds[at], ownerAt >= 0 && isBot(ownerAt)), sum, whole, index, fill: soften(face.paint, 0.8) })) : nothing + ) ), - (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { - setForm(false); - setToken(""); - setValues({}); - setError(null); - } }, t("Cancel")), - (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || (channel ? !filled : token.trim() === ""), onClick: connect }, busy ? t("Connecting…") : t("Connect")) + (0, import_react44.createElement)(Heat, { key: "heat", view, keep, paint: face.paint, index: 4 }) ) - ) : null, - on && gateway && picking ? (0, import_react40.createElement)( - "div", - { className: "bt-connector-form" }, - (0, import_react40.createElement)(AppPicker, { apps, onChange: setApps, search, statuses }), - (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("The first time a Bot uses an app, it shows a sign-in link in the chat.")), - (0, import_react40.createElement)( + ]; + } else { + const owners = ranked(all.owners); + const bots = owners.filter(([at]) => isBot(at)); + const rest = owners.filter(([at]) => !isBot(at)); + const usedModels = ranked(all.models); + body = [ + (0, import_react44.createElement)( "div", - { className: "bt-connector-form-row" }, - (0, import_react40.createElement)("span", { className: "bt-connector-link" }), - (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { - setPicking(false); - setError(null); - } }, t("Cancel")), - (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || apps.length === 0, onClick: saveApps }, busy ? t("Connecting…") : t("Save")) + { key: "sheet", className: "bt-us-sheet" }, + (0, import_react44.createElement)(Stats, { key: "stats", range, total: all.total, previous: all.previous }), + (0, import_react44.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, by, onBy: setBy, onPick: pick2 }), + (0, import_react44.createElement)( + "div", + { key: "pair", className: "bt-us-pair" }, + (0, import_react44.createElement)( + ListCard, + { title: t("Bots"), count: bots.length, index: 2 }, + owners.length > 0 ? null : nothing, + bots.map((entry, index) => ownerRow(entry, index)), + bots.length > 0 && rest.length > 0 ? (0, import_react44.createElement)("div", { className: "bt-us-split", role: "separator" }) : null, + rest.map((entry, index) => ownerRow(entry, bots.length + index)) + ), + (0, import_react44.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 3 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) + ), + (0, import_react44.createElement)(Heat, { key: "heat", view, keep, paint: "var(--bt-accent)", index: 4 }) ) - ) : null, - error ? (0, import_react40.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null - ); -} -function ConnectorsPage({ roster, actions }) { - const list = roster?.connectors ?? []; - if (lockedWindow(roster)) { - return (0, import_react40.createElement)( - "section", - { className: "bt-set-section" }, - (0, import_react40.createElement)("div", { className: "bt-set-card bt-connectors-card" }, list.length === 0 ? (0, import_react40.createElement)("div", { className: "bt-set-row" }, (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("No connectors"))) : list.map((connector) => (0, import_react40.createElement)( - "div", - { key: connector.id, className: "bt-set-row" }, - (0, import_react40.createElement)( - "span", - { className: "bt-set-copy" }, - (0, import_react40.createElement)("span", { className: "bt-bs-label" }, connector.name), - (0, import_react40.createElement)("span", { className: "bt-set-hint" }, statusText2(connector)) - ) - ))) - ); + ]; } - return (0, import_react40.createElement)( - "section", - { className: "bt-set-section" }, - (0, import_react40.createElement)("div", { className: "bt-set-card bt-connectors-card" }, list.length === 0 ? (0, import_react40.createElement)("div", { className: "bt-set-row" }, (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("No connectors"))) : list.map((connector) => (0, import_react40.createElement)(ConnectorRow, { key: connector.id, connector, roster, actions }))) + return (0, import_react44.createElement)( + "div", + { ref: root, className: "bt-us", key: focusId ?? "all" }, + (0, import_react44.createElement)( + "div", + { className: "bt-us-top" }, + (0, import_react44.createElement)(Tabs, { label: t("Time range"), value: rangeId, onChange: chooseRange, options: rangeOptions, boxRef: tabs }), + view.scanning ? (0, import_react44.createElement)("span", { className: "bt-us-note", role: "status" }, t("Still reading older chats; totals may grow.")) : null, + picking ? (0, import_react44.createElement)(SpanPicker, { span, today, oldest, active: activeDays, near: tabs, onPick: pickSpan, onClose: () => setPicking(false) }) : null + ), + error ? (0, import_react44.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, + body ); } +var USAGE_CSS = ` +.bt-us{--bt-us-ease:cubic-bezier(.22,1,.36,1);--bt-us-rest:color-mix(in srgb,var(--bt-ink) 30%,var(--bt-card));--bt-us-more:color-mix(in srgb,var(--bt-ink) 16%,var(--bt-card));display:flex;flex-direction:column;gap:14px;padding-bottom:4px} +.bt-us-top{position:relative;z-index:4;display:flex;align-items:center;gap:14px;flex-wrap:wrap} +.bt-us-tabs{position:relative;display:inline-flex;flex:none;padding:3px;border-radius:999px;background:var(--bt-hover)} +.bt-us-tabs button{position:relative;z-index:1;display:inline-flex;align-items:center;gap:5px;height:26px;padding:0 12px;border:0;border-radius:999px;background:none;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:26px;white-space:nowrap;cursor:pointer;transition:color .15s ease} +.bt-us-tabs button svg{flex:none;width:13px;height:13px;margin-left:-2px} +.bt-us-pick{position:absolute;top:calc(100% + 8px);left:0;max-width:100%;box-sizing:border-box;padding:14px 16px 12px;border-radius:18px;border:.5px solid var(--bt-line-2);background:var(--bt-card);box-shadow:0 22px 50px -18px rgba(0,0,0,.32),0 2px 8px rgba(0,0,0,.05);transform-origin:24px 0;animation:bt-us-drop .2s var(--bt-us-ease)} +.bt-us-pick-quick{display:flex;gap:6px;margin-bottom:12px} +.bt-us-pick-quick button{height:26px;padding:0 11px;border:0;border-radius:999px;background:var(--bt-hover);color:var(--bt-ink-2);font:inherit;font-size:12px;cursor:pointer;transition:background-color .12s ease,color .12s ease} +.bt-us-pick-quick button:hover{background:var(--bt-active);color:var(--bt-ink)} +.bt-us-pick-quick button[aria-pressed=true]{background:color-mix(in srgb,var(--bt-accent) 14%,transparent);color:var(--bt-accent)} +.bt-us-pick-months{display:flex;flex-wrap:wrap;gap:8px 28px} +.bt-us-month{width:252px;animation:bt-us-fade .22s ease} +.bt-us-month-head{position:relative;display:flex;align-items:center;justify-content:center;height:28px;margin-bottom:4px;font-size:13px;line-height:18px;font-weight:600} +.bt-us-month-nav{position:absolute;top:0;width:28px;height:28px;padding:0;border:0;border-radius:9px;background:none;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;transition:background-color .12s ease} +.bt-us-month-nav[data-side=left]{left:0} +.bt-us-month-nav[data-side=right]{right:0} +.bt-us-month-nav:hover:not(:disabled){background:var(--bt-hover);color:var(--bt-ink)} +.bt-us-month-nav:disabled{opacity:.3;cursor:default} +.bt-us-weekdays,.bt-us-days{display:grid;grid-template-columns:repeat(7,36px)} +.bt-us-weekdays span{height:24px;font-size:11px;line-height:24px;text-align:center;color:var(--bt-ink-3)} +.bt-us-day{position:relative;height:36px;padding:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:12px;font-variant-numeric:tabular-nums;cursor:pointer} +.bt-us-day::before{content:'';position:absolute;top:4px;bottom:4px;left:0;right:0;transition:background-color .12s ease} +.bt-us-day>b{position:relative;z-index:1;display:inline-flex;align-items:center;justify-content:center;width:28px;height:28px;border-radius:50%;font-weight:400;transition:background-color .12s ease,color .12s ease} +.bt-us-day:hover:not(:disabled)>b{background:var(--bt-hover)} +.bt-us-day[data-today]>b{color:var(--bt-accent);font-weight:600} +.bt-us-day[data-has]::after{content:'';position:absolute;z-index:2;left:50%;bottom:6px;width:3px;height:3px;margin-left:-1.5px;border-radius:50%;background:var(--bt-ink-3)} +.bt-us-day[data-in]::before{background:color-mix(in srgb,var(--bt-accent) 13%,transparent)} +.bt-us-day[data-in][data-l]::before{left:4px;border-radius:14px 0 0 14px} +.bt-us-day[data-in][data-r]::before{right:4px;border-radius:0 14px 14px 0} +.bt-us-day[data-in][data-l][data-r]::before{border-radius:14px} +.bt-us-day[data-in][data-start]::before{left:50%;border-radius:0} +.bt-us-day[data-in][data-end]::before{right:50%;border-radius:0} +.bt-us-day[data-in][data-start][data-r]::before,.bt-us-day[data-in][data-end][data-l]::before,.bt-us-day[data-in][data-start][data-end]::before{display:none} +.bt-us-day[data-start]>b,.bt-us-day[data-end]>b,.bt-us-day[data-start]:hover>b,.bt-us-day[data-end]:hover>b{background:var(--bt-accent);color:var(--bt-accent-ink,#fff);font-weight:600} +.bt-us-day[data-start][data-has]::after,.bt-us-day[data-end][data-has]::after{background:color-mix(in srgb,var(--bt-accent-ink,#fff) 75%,transparent)} +.bt-us-day:disabled{color:var(--bt-ink-3);opacity:.45;cursor:default} +.bt-us-pick-foot{display:flex;align-items:center;justify-content:space-between;gap:16px;margin-top:8px;padding-top:10px;border-top:1px solid var(--bt-line);font-size:12px;line-height:16px;color:var(--bt-ink-3);white-space:nowrap} +.bt-us-pick-foot b{color:var(--bt-ink);font-weight:500} +.bt-us-tabs button:hover,.bt-us-tabs button[aria-pressed=true]{color:var(--bt-ink)} +.bt-us-tabs:not([data-glide]) button[aria-pressed=true]{background:var(--bt-card)} +.bt-us-tabs>.bt-thumb{top:3px;bottom:3px;border-radius:999px;background:var(--bt-card);box-shadow:0 1px 3px rgba(0,0,0,.08),0 0 0 .5px var(--bt-line-2)} +.bt-us-note{display:inline-flex;align-items:center;gap:8px;font-size:12px;line-height:16px;color:var(--bt-ink-3)} +.bt-us-note::before{content:'';width:6px;height:6px;border-radius:50%;background:var(--bt-accent);animation:bt-us-pulse 1.4s ease-in-out infinite} +.bt-us-sheet{display:flex;flex-direction:column;gap:4px} +.bt-us-sheet>.bt-us-stats,.bt-us-sheet>.bt-us-card,.bt-us-sheet>.bt-us-pair>.bt-us-card{border-radius:0} +.bt-us-sheet>:first-child{border-radius:16px 16px 0 0} +.bt-us-sheet>:last-child{border-radius:0 0 16px 16px} +.bt-us-stats{display:grid;grid-template-columns:1.6fr 1fr 1fr 1fr;border-radius:16px;border:1px solid var(--bt-line);background:var(--bt-card);animation:bt-us-in .45s var(--bt-us-ease) backwards} +.bt-us-stat{display:flex;flex-direction:column;justify-content:flex-end;gap:6px;min-width:0;padding:16px 18px} +.bt-us-stat+.bt-us-stat{border-left:1px solid var(--bt-line)} +.bt-us-stat-label{overflow:hidden;font-size:12px;line-height:16px;color:var(--bt-ink-3);white-space:nowrap;text-overflow:ellipsis} +.bt-us-stat-value{display:flex;align-items:baseline;gap:6px;min-width:0;font-size:22px;line-height:28px;font-weight:600;letter-spacing:-.01em;font-variant-numeric:tabular-nums;white-space:nowrap} +.bt-us-stat-main .bt-us-stat-value{font-size:34px;line-height:40px;letter-spacing:-.025em} +.bt-us-stat-value small{font-size:13px;font-weight:400;letter-spacing:0;color:var(--bt-ink-3)} +.bt-us-delta{align-self:center;margin-left:2px;padding:0 8px;border-radius:999px;background:var(--bt-tag-bg);color:var(--bt-ink-2);font-size:11px;line-height:20px;font-weight:500;letter-spacing:0} +.bt-us-card{display:flex;flex-direction:column;gap:12px;min-width:0;padding:14px 18px 16px;border-radius:16px;border:1px solid var(--bt-line);background:var(--bt-card);animation:bt-us-in .45s var(--bt-us-ease) backwards;animation-delay:calc(var(--i,0) * 45ms)} +.bt-us-card-head{display:flex;align-items:center;justify-content:space-between;gap:12px;min-height:32px} +.bt-us-card-head h3{display:flex;align-items:baseline;gap:8px;min-width:0;margin:0;font-size:13px;line-height:18px;font-weight:600} +.bt-us-card-head h3 span,.bt-us-head-note{font-size:12px;font-weight:400;color:var(--bt-ink-3)} +.bt-us-chart-body{display:flex;flex-direction:column;gap:8px;padding-top:6px} +.bt-us-plot{position:relative;height:200px;margin-left:40px} +.bt-us-grid{position:absolute;left:0;right:0;border-top:1px dashed var(--bt-line-2);pointer-events:none} +.bt-us-grid.bt-us-base{border-top:1px solid var(--bt-line-2)} +.bt-us-grid span{position:absolute;right:calc(100% + 8px);top:-8px;font-size:10px;line-height:16px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums;white-space:nowrap} +.bt-us-cols{position:absolute;inset:0;display:flex;align-items:flex-end} +.bt-us-col{position:relative;flex:1 1 0;min-width:0;height:100%;display:flex;align-items:flex-end;justify-content:center} +.bt-us-stack{display:flex;flex-direction:column-reverse;gap:2px;width:56%;min-width:4px;max-width:28px;transform-origin:50% 100%;animation:bt-us-grow .6s var(--bt-us-ease) backwards;animation-delay:calc(var(--i,0) * 14ms);transition:height .45s var(--bt-us-ease),opacity .18s ease} +.bt-us-stack>i{flex:1 1 0;min-height:2px;border-radius:5px;transition:flex-grow .45s var(--bt-us-ease)} +.bt-us-plot[data-hover] .bt-us-col:not([data-on]) .bt-us-stack{opacity:.3} +.bt-us-stub{width:4px;height:4px;margin-bottom:-2px;border-radius:50%;background:var(--bt-line-2)} +.bt-us-ticks{display:flex;margin-left:40px;font-size:11px;line-height:14px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums} +.bt-us-ticks span{flex:1 1 0;min-width:0;text-align:center;white-space:nowrap} +.bt-us-ticks span[data-now]{color:var(--bt-ink);font-weight:500} +.bt-us-tip{position:absolute;top:6px;z-index:3;min-width:160px;max-width:240px;padding:10px 12px;border-radius:12px;border:.5px solid var(--bt-line-2);background:color-mix(in srgb,var(--bt-card) 90%,transparent);-webkit-backdrop-filter:blur(14px);backdrop-filter:blur(14px);box-shadow:0 14px 34px -12px rgba(0,0,0,.28);font-size:12px;line-height:16px;pointer-events:none;animation:bt-us-pop .16s var(--bt-us-ease)} +.bt-us-tip-title{color:var(--bt-ink-3)} +.bt-us-tip-total{margin:2px 0 8px;font-size:15px;line-height:20px;font-weight:600;font-variant-numeric:tabular-nums} +.bt-us-tip-total:last-child{margin-bottom:0} +.bt-us-tip-row{display:flex;align-items:center;gap:8px;color:var(--bt-ink-2)} +.bt-us-tip-row+.bt-us-tip-row{margin-top:5px} +.bt-us-tip-row span{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-us-tip-row b{font-weight:500;color:var(--bt-ink);font-variant-numeric:tabular-nums} +.bt-us-legend{display:flex;flex-wrap:wrap;gap:6px} +.bt-us-key{display:inline-flex;align-items:center;gap:6px;min-width:0;height:24px;padding:0 10px 0 8px;border:0;border-radius:999px;background:var(--bt-hover);color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:24px} +button.bt-us-key{cursor:pointer;transition:background-color .12s ease,color .12s ease} +button.bt-us-key:hover{background:var(--bt-active);color:var(--bt-ink)} +.bt-us-dot{flex:none;width:8px;height:8px;border-radius:50%} +.bt-us-pair{display:grid;grid-template-columns:repeat(auto-fit,minmax(280px,1fr));gap:4px} +.bt-us-rows{display:flex;flex-direction:column;margin:0 -8px} +.bt-us-row{display:flex;align-items:center;gap:12px;width:100%;box-sizing:border-box;padding:8px;border:0;border-radius:12px;background:none;color:var(--bt-ink);font:inherit;text-align:left;animation:bt-us-in .4s var(--bt-us-ease) backwards;animation-delay:calc(var(--i,0) * 35ms + 90ms)} +button.bt-us-row{cursor:pointer;transition:background-color .12s ease} +button.bt-us-row:hover{background:var(--bt-hover)} +.bt-us-row-glyph{flex:none;display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px} +.bt-us-row-body{flex:1;min-width:0;display:flex;flex-direction:column;gap:7px} +.bt-us-row-line{display:flex;align-items:baseline;gap:8px;min-width:0;font-size:13px;line-height:18px} +.bt-us-row-name{flex:0 1 auto;min-width:0;overflow:hidden;font-weight:500;text-overflow:ellipsis;white-space:nowrap} +.bt-us-row-sub{flex:0 1 auto;min-width:0;overflow:hidden;font-size:12px;color:var(--bt-ink-3);text-overflow:ellipsis;white-space:nowrap} +.bt-us-track{display:block;height:4px;border-radius:999px;background:var(--bt-hover);overflow:hidden} +.bt-us-track>span{display:block;height:100%;border-radius:inherit;transform-origin:0 50%;animation:bt-us-fill .7s var(--bt-us-ease) backwards;animation-delay:calc(var(--i,0) * 35ms + 140ms);transition:width .45s var(--bt-us-ease)} +.bt-us-row-num{flex:none;display:flex;flex-direction:column;align-items:flex-end;gap:1px;min-width:52px;font-variant-numeric:tabular-nums} +.bt-us-row-num b{font-size:13px;line-height:18px;font-weight:600} +.bt-us-row-num small{font-size:11px;line-height:14px;color:var(--bt-ink-3)} +.bt-us-split{height:1px;margin:6px 8px;background:var(--bt-line)} +.bt-us-none{padding:18px 8px;font-size:12px;color:var(--bt-ink-3);text-align:center} +.bt-us-glyph{display:inline-flex;align-items:center;justify-content:center;border-radius:50%;background:var(--bt-hover);color:var(--bt-ink-2)} +.bt-us-model{display:inline-flex;align-items:center;justify-content:center;border-radius:30%;font-weight:600;line-height:1} +.bt-us-profile{display:flex;align-items:center;gap:20px;padding:6px 4px 2px;animation:bt-us-in .45s var(--bt-us-ease) backwards} +.bt-us-ring{position:relative;flex:none;width:96px;height:96px} +.bt-us-ring>svg{position:absolute;inset:0;width:100%;height:100%;transform:rotate(-90deg)} +.bt-us-ring>svg circle{fill:none;stroke-width:4} +.bt-us-ring-track{stroke:var(--bt-line)} +.bt-us-ring-arc{stroke-linecap:round;transition:stroke-dasharray .6s var(--bt-us-ease);animation:bt-us-ring 1s var(--bt-us-ease) .1s backwards} +.bt-us-ring-face{position:absolute;inset:0;display:flex;align-items:center;justify-content:center} +.bt-us-profile-copy{display:flex;flex-direction:column;gap:3px;min-width:0} +.bt-us-profile-copy h3{margin:0;overflow:hidden;font-size:22px;line-height:28px;font-weight:600;letter-spacing:-.01em;text-overflow:ellipsis;white-space:nowrap} +.bt-us-profile-sub{font-size:13px;line-height:18px;color:var(--bt-ink-2)} +.bt-us-profile-share{font-size:12px;line-height:16px;color:var(--bt-ink-3)} +.bt-us-heat{gap:8px} +.bt-us-heat-months,.bt-us-heat-grid{display:grid;grid-template-columns:repeat(${HEAT_WEEKS},1fr);gap:3px} +.bt-us-heat-months{height:14px;font-size:10px;line-height:14px;color:var(--bt-ink-3)} +.bt-us-heat-months span{white-space:nowrap} +.bt-us-heat-plot{position:relative} +.bt-us-heat-grid{grid-template-rows:repeat(7,auto);grid-auto-flow:column} +.bt-us-heat-grid .bt-us-cell[data-on]{outline:1.5px solid var(--bt-ink-2);outline-offset:1px} +.bt-us-heat-tip{min-width:0;white-space:nowrap} +.bt-us-cell{position:relative;aspect-ratio:1;border-radius:3px;background:var(--bt-hover);overflow:hidden} +.bt-us-heat-grid .bt-us-cell{animation:bt-us-cell .5s var(--bt-us-ease) backwards;animation-delay:calc(var(--w,0) * 7ms + 120ms)} +.bt-us-cell>i{position:absolute;inset:0} +.bt-us-cell[data-today]{outline:1.5px solid var(--bt-ink-3);outline-offset:1px} +.bt-us-cell[data-future]{visibility:hidden} +.bt-us-heat-scale{display:flex;align-items:center;justify-content:flex-end;gap:4px;font-size:11px;line-height:14px;color:var(--bt-ink-3)} +.bt-us-heat-scale .bt-us-cell{width:10px} +.bt-us-skel{border-radius:16px;background:linear-gradient(90deg,var(--bt-hover) 0%,var(--bt-active) 50%,var(--bt-hover) 100%);background-size:200% 100%;animation:bt-us-shine 1.4s ease-in-out infinite} +.bt-us-skel-sheet>.bt-us-skel:first-child{border-radius:16px 16px 0 0} +.bt-us-skel-sheet>.bt-us-skel:not(:first-child){border-radius:0} +.bt-us-skel-sheet>.bt-us-pair>.bt-us-skel:first-child{border-radius:0 0 0 16px} +.bt-us-skel-sheet>.bt-us-pair>.bt-us-skel:last-child{border-radius:0 0 16px 0} +.bt-us-empty{display:flex;flex-direction:column;align-items:center;gap:8px;padding:72px 16px;text-align:center;font-size:13px;line-height:18px;color:var(--bt-ink-3)} +.bt-us-empty b{margin-top:6px;font-size:15px;font-weight:600;color:var(--bt-ink)} +@keyframes bt-us-in{from{opacity:0;transform:translateY(6px)}} +@keyframes bt-us-grow{from{transform:scaleY(0)}} +@keyframes bt-us-fill{from{transform:scaleX(0)}} +@keyframes bt-us-pop{from{opacity:0;transform:translateY(3px) scale(.97)}} +@keyframes bt-us-drop{from{opacity:0;transform:translateY(-4px) scale(.96)}} +@keyframes bt-us-fade{from{opacity:0}} +@keyframes bt-us-cell{from{opacity:0;transform:scale(.5)}} +@keyframes bt-us-ring{from{stroke-dasharray:0 ${Math.ceil(RING2)}}} +@keyframes bt-us-pulse{50%{opacity:.25}} +@keyframes bt-us-shine{from{background-position:200% 0}to{background-position:-200% 0}} +@media (prefers-reduced-motion:reduce){.bt-us *,.bt-us *::before{animation:none!important;transition:none!important}} +`; // src/client/feedback.js -var import_react41 = require("react"); -var FeedbackIcon = () => (0, import_react41.createElement)( +var import_react45 = require("react"); +var FeedbackIcon = () => (0, import_react45.createElement)( "svg", { width: 15, height: 15, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, - (0, import_react41.createElement)("path", { d: "M4 4.5h12a1 1 0 0 1 1 1v7a1 1 0 0 1-1 1H9l-3.5 3v-3H4a1 1 0 0 1-1-1v-7a1 1 0 0 1 1-1z" }), - (0, import_react41.createElement)("path", { d: "M10 7v2.6M10 11.4h.01" }) + (0, import_react45.createElement)("path", { d: "M4 4.5h12a1 1 0 0 1 1 1v7a1 1 0 0 1-1 1H9l-3.5 3v-3H4a1 1 0 0 1-1-1v-7a1 1 0 0 1 1-1z" }), + (0, import_react45.createElement)("path", { d: "M10 7v2.6M10 11.4h.01" }) ); function download(name, text2) { const url = URL.createObjectURL(new Blob([text2], { type: "text/plain;charset=utf-8" })); @@ -19198,17 +20979,17 @@ function clearNote(result) { return t("Cleared the error log."); } function FeedbackPage({ roster, actions, run, Section, Row: Row4 }) { - const [what, setWhat] = (0, import_react41.useState)(""); - const [report, setReport] = (0, import_react41.useState)(null); - const [allErrors, setAllErrors] = (0, import_react41.useState)(false); - const [preview, setPreview] = (0, import_react41.useState)(false); - const [note, setNote] = (0, import_react41.useState)(""); + const [what, setWhat] = (0, import_react45.useState)(""); + const [report, setReport] = (0, import_react45.useState)(null); + const [allErrors, setAllErrors] = (0, import_react45.useState)(false); + const [preview, setPreview] = (0, import_react45.useState)(false); + const [note, setNote] = (0, import_react45.useState)(""); const fetchReport = () => actions.diagnostics({ client: clientFacts(), clientErrors: clientErrors() }).then((next) => { setReport(next); return next; }); const load = () => fetchReport().then(() => void 0); - (0, import_react41.useEffect)(() => { + (0, import_react45.useEffect)(() => { void run(load()); }, []); const copyReport = () => run(fetchReport().then(async (next) => { @@ -19216,7 +20997,7 @@ function FeedbackPage({ roster, actions, run, Section, Row: Row4 }) { setNote(copied ? t("Copied the diagnostics.") : t("Could not copy. Select the text below and copy it.")); if (!copied) setPreview(true); })); - const [issueLink, setIssueLink] = (0, import_react41.useState)(null); + const [issueLink, setIssueLink] = (0, import_react45.useState)(null); const openIssue = () => { const win = window.open("", "_blank"); if (win !== null) win.opener = null; @@ -19249,77 +21030,77 @@ function FeedbackPage({ roster, actions, run, Section, Row: Row4 }) { const unread = typeof report?.unread === "string" ? report.unread : void 0; const shown = allErrors ? entries2 : entries2.slice(0, 8); return [ - (0, import_react41.createElement)( + (0, import_react45.createElement)( Section, { key: "report", title: t("Report a problem") }, - (0, import_react41.createElement)( + (0, import_react45.createElement)( "div", { className: "bt-set-row bt-set-paste bt-fb-what" }, - (0, import_react41.createElement)( + (0, import_react45.createElement)( "label", { className: "bt-set-copy", htmlFor: "bt-fb-what" }, - (0, import_react41.createElement)("span", null, t("What happened?")), - (0, import_react41.createElement)("span", { className: "bt-set-hint" }, t("What you did, what you expected, and what happened instead. It goes into the issue.")) + (0, import_react45.createElement)("span", null, t("What happened?")), + (0, import_react45.createElement)("span", { className: "bt-set-hint" }, t("What you did, what you expected, and what happened instead. It goes into the issue.")) ), - (0, import_react41.createElement)("textarea", { id: "bt-fb-what", className: "bt-input bt-input-area", value: what, maxLength: WHAT_MAX, placeholder: t("For example: I asked Writer in the group chat and it showed an error."), onChange: (event) => setWhat(event.target.value) }) + (0, import_react45.createElement)("textarea", { id: "bt-fb-what", className: "bt-input bt-input-area", value: what, maxLength: WHAT_MAX, placeholder: t("For example: I asked Writer in the group chat and it showed an error."), onChange: (event) => setWhat(event.target.value) }) ), - (0, import_react41.createElement)( + (0, import_react45.createElement)( Row4, { label: t("Diagnostics"), hint: t("Versions, system, models, and the latest errors. Saved keys, tokens, and your home folder are hidden.") }, - (0, import_react41.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setPreview(!preview), "aria-expanded": preview }, preview ? t("Hide") : t("Show")), - (0, import_react41.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: copyReport }, t("Copy")) + (0, import_react45.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setPreview(!preview), "aria-expanded": preview }, preview ? t("Hide") : t("Show")), + (0, import_react45.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: copyReport }, t("Copy")) ), - preview ? (0, import_react41.createElement)("div", { className: "bt-set-row bt-fb-preview" }, (0, import_react41.createElement)("pre", { tabIndex: 0, "aria-label": t("Diagnostics") }, report?.markdown || t("Loading…"))) : null, - (0, import_react41.createElement)( + preview ? (0, import_react45.createElement)("div", { className: "bt-set-row bt-fb-preview" }, (0, import_react45.createElement)("pre", { tabIndex: 0, "aria-label": t("Diagnostics") }, report?.markdown || t("Loading…"))) : null, + (0, import_react45.createElement)( Row4, { label: t("GitHub issue"), hint: t("Opens a new issue in the FlyBot repository with all of this filled in. Nothing is sent until you submit it there.") }, - (0, import_react41.createElement)("button", { type: "button", className: "bt-fb-primary", onClick: openIssue }, t("Report on GitHub")) + (0, import_react45.createElement)("button", { type: "button", className: "bt-fb-primary", onClick: openIssue }, t("Report on GitHub")) ) ), - note ? (0, import_react41.createElement)( + note ? (0, import_react45.createElement)( "div", { key: "note", className: "bt-note bt-fb-note", role: "status" }, note, - issueLink ? [" ", (0, import_react41.createElement)("a", { key: "link", href: issueLink, target: "_blank", rel: "noopener noreferrer" }, t("Open the issue"))] : null + issueLink ? [" ", (0, import_react45.createElement)("a", { key: "link", href: issueLink, target: "_blank", rel: "noopener noreferrer" }, t("Open the issue"))] : null ) : null, - (0, import_react41.createElement)( + (0, import_react45.createElement)( Section, { key: "errors", title: report ? t("Recent errors · {count}", { count: total }) : t("Recent errors") }, - shown.length === 0 ? (0, import_react41.createElement)(Row4, { + shown.length === 0 ? (0, import_react45.createElement)(Row4, { label: unread === void 0 ? t("No errors recorded.") : t("The error log could not be read ({reason}); the errors it holds are not shown.", { reason: unread }), hint: t("Failed model calls and FlyBot problems show here, newest first.") - }) : shown.map((entry, index) => (0, import_react41.createElement)( + }) : shown.map((entry, index) => (0, import_react45.createElement)( "div", { key: `${entry.time}-${index}`, className: "bt-set-row bt-fb-entry", title: entry.text }, - (0, import_react41.createElement)("span", { className: "bt-fb-dot", "data-level": entry.level, "aria-hidden": true }), - (0, import_react41.createElement)( + (0, import_react45.createElement)("span", { className: "bt-fb-dot", "data-level": entry.level, "aria-hidden": true }), + (0, import_react45.createElement)( "div", { className: "bt-set-copy" }, - (0, import_react41.createElement)("span", { className: "bt-fb-text" }, entrySummary(entry)), - (0, import_react41.createElement)("span", { className: "bt-set-hint" }, [whenText2(entry.time), entry.bot, entry.where, t(SOURCES[entry.source] ?? "FlyBot")].filter(Boolean).join(" · ")) + (0, import_react45.createElement)("span", { className: "bt-fb-text" }, entrySummary(entry)), + (0, import_react45.createElement)("span", { className: "bt-set-hint" }, [whenText2(entry.time), entry.bot, entry.where, t(SOURCES[entry.source] ?? "FlyBot")].filter(Boolean).join(" · ")) ), - entry.code ? (0, import_react41.createElement)("span", { className: "bt-tag bt-fb-code" }, entry.status ? `${entry.code} ${entry.status}` : entry.code) : null + entry.code ? (0, import_react45.createElement)("span", { className: "bt-tag bt-fb-code" }, entry.status ? `${entry.code} ${entry.status}` : entry.code) : null )), - total > 8 ? (0, import_react41.createElement)( + total > 8 ? (0, import_react45.createElement)( "div", { key: "more", className: "bt-set-row bt-fb-more-row" }, - (0, import_react41.createElement)( + (0, import_react45.createElement)( "span", { className: "bt-set-hint bt-fb-count" }, allErrors && entries2.length === total ? t("Showing all {count}", { count: total }) : t("Showing {shown} of {count}", { shown: shown.length, count: total }) ), - (0, import_react41.createElement)("button", { + (0, import_react45.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-fb-more", "aria-expanded": allErrors, onClick: () => setAllErrors(!allErrors) }, t(allErrors ? "Show less" : "Show more")) ) : null, - (0, import_react41.createElement)( + (0, import_react45.createElement)( Row4, { label: t("Error log"), hint: t("Kept on this computer across restarts, up to about 1 MB.") }, - (0, import_react41.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: downloadLog }, t("Download")), - locked ? null : (0, import_react41.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: clearLog, disabled: !report || total === 0 }, t("Clear")) + (0, import_react45.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: downloadLog }, t("Download")), + locked ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: clearLog, disabled: !report || total === 0 }, t("Clear")) ) ) ]; @@ -19327,8 +21108,8 @@ function FeedbackPage({ roster, actions, run, Section, Row: Row4 }) { var TOAST_MS = 6e3; function ErrorToast({ useUi, actions }) { const toast = useUi((state) => state.toast); - const [leaving, setLeaving] = (0, import_react41.useState)(false); - (0, import_react41.useEffect)(() => { + const [leaving, setLeaving] = (0, import_react45.useState)(false); + (0, import_react45.useEffect)(() => { if (!toast) return void 0; setLeaving(false); const fade = setTimeout(() => setLeaving(true), TOAST_MS); @@ -19345,17 +21126,17 @@ function ErrorToast({ useUi, actions }) { actions.dismissToast(toast.token); void Promise.resolve(actions.reloadTeam?.()).catch((error) => actions.reportError?.(error, "reload")); }; - return (0, import_react41.createElement)( + return (0, import_react45.createElement)( "div", { className: "bt-toast", role: info ? "status" : "alert", "data-tone": toast.tone, "data-leaving": leaving || void 0 }, - (0, import_react41.createElement)("span", { className: "bt-toast-text" }, toast.text), - toast.code ? (0, import_react41.createElement)("span", { className: "bt-tag bt-toast-code" }, toast.code) : null, - readOnly ? (0, import_react41.createElement)("button", { type: "button", className: "bt-toast-link bt-toast-reload", onClick: reload }, t("Reload")) : null, - info ? null : (0, import_react41.createElement)("button", { type: "button", className: "bt-toast-link", onClick: () => { + (0, import_react45.createElement)("span", { className: "bt-toast-text" }, toast.text), + toast.code ? (0, import_react45.createElement)("span", { className: "bt-tag bt-toast-code" }, toast.code) : null, + readOnly ? (0, import_react45.createElement)("button", { type: "button", className: "bt-toast-link bt-toast-reload", onClick: reload }, t("Reload")) : null, + info ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-toast-link", onClick: () => { actions.dismissToast(toast.token); actions.openSettings("feedback"); } }, t("Details")), - (0, import_react41.createElement)("button", { type: "button", className: "bt-icon-btn bt-toast-close", "aria-label": t("Dismiss"), onClick: () => actions.dismissToast(toast.token) }, (0, import_react41.createElement)(CloseIcon)) + (0, import_react45.createElement)("button", { type: "button", className: "bt-icon-btn bt-toast-close", "aria-label": t("Dismiss"), onClick: () => actions.dismissToast(toast.token) }, (0, import_react45.createElement)(CloseIcon)) ); } var FEEDBACK_CSS = ` @@ -19387,7 +21168,7 @@ var FEEDBACK_CSS = ` `; // src/client/about.js -var import_react42 = require("react"); +var import_react46 = require("react"); var starCount = (count) => new Intl.NumberFormat(dateLocale(), { notation: "compact", maximumFractionDigits: 1 }).format(count); function botHint(update) { if (update.phase === "installing") return t("Updating FlyBot core…"); @@ -19422,9 +21203,9 @@ function dshHint(dsh, shown) { var linkProps = (href) => ({ className: "bt-soft bt-soft-sm bt-about-link", href, target: "_blank", rel: "noopener noreferrer" }); function AboutPage({ useUpdate, actions, run, Section, Row: Row4 }) { const update = useUpdate((value) => value) ?? {}; - const [checking, setChecking] = (0, import_react42.useState)(false); - const [stars, setStars] = (0, import_react42.useState)(null); - (0, import_react42.useEffect)(() => { + const [checking, setChecking] = (0, import_react46.useState)(false); + const [stars, setStars] = (0, import_react46.useState)(null); + (0, import_react46.useEffect)(() => { let live = true; actions.repoStars().then((count) => { if (live && Number.isInteger(count)) setStars(count); @@ -19445,29 +21226,29 @@ function AboutPage({ useUpdate, actions, run, Section, Row: Row4 }) { const dshPhase = dsh?.phase ?? "idle"; const dshNew = showsDshRow(dsh, update.app); const dshShown = dshNew && dsh.available; - const botControl = phase === "installed" ? null : update.available || phase === "installing" ? (0, import_react42.createElement)( + const botControl = phase === "installed" ? null : update.available || phase === "installing" ? (0, import_react46.createElement)( "button", { type: "button", className: "bt-fb-primary", disabled: phase === "installing", onClick: () => run(actions.installUpdate()) }, phase === "installing" ? t("Updating…") : phase === "failed" ? t("Try again") : t("Update") - ) : (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: checking || update.enabled === false, onClick: check }, checking ? t("Checking…") : t("Check for updates")); - const dshControl = !dshNew || dshPhase === "installed" ? null : dsh.kind === "app" ? dsh.available ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.openAppUpdates(dsh.verified)) }, t("Open updates")) : null : dsh.available || dshPhase !== "idle" ? (0, import_react42.createElement)( + ) : (0, import_react46.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: checking || update.enabled === false, onClick: check }, checking ? t("Checking…") : t("Check for updates")); + const dshControl = !dshNew || dshPhase === "installed" ? null : dsh.kind === "app" ? dsh.available ? (0, import_react46.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.openAppUpdates(dsh.verified)) }, t("Open updates")) : null : dsh.available || dshPhase !== "idle" ? (0, import_react46.createElement)( "button", { type: "button", className: "bt-fb-primary", disabled: dshPhase === "installing", onClick: () => run(actions.installDshUpdate()) }, dshPhase === "installing" ? t("Updating…") : dshPhase === "failed" ? t("Try again") : t("Update") ) : null; const repo = update.repoUrl; return [ - (0, import_react42.createElement)( + (0, import_react46.createElement)( "div", { key: "hero", className: "bt-about-hero" }, - (0, import_react42.createElement)("span", { className: "bt-about-mark" }, (0, import_react42.createElement)(FlyBotMark, { size: 52 })), - (0, import_react42.createElement)( + (0, import_react46.createElement)("span", { className: "bt-about-mark" }, (0, import_react46.createElement)(FlyBotMark, { size: 52 })), + (0, import_react46.createElement)( "div", { className: "bt-about-copy" }, - (0, import_react42.createElement)("span", { className: "bt-about-name" }, t("FlyBot")), - update.current ? (0, import_react42.createElement)("span", { className: "bt-about-version" }, versionLine(update)) : null + (0, import_react46.createElement)("span", { className: "bt-about-name" }, t("FlyBot")), + update.current ? (0, import_react46.createElement)("span", { className: "bt-about-version" }, versionLine(update)) : null ), - repo ? (0, import_react42.createElement)( + repo ? (0, import_react46.createElement)( "a", { className: "bt-star", @@ -19477,23 +21258,23 @@ function AboutPage({ useUpdate, actions, run, Section, Row: Row4 }) { title: t("Star FlyBot on GitHub"), "aria-label": stars === null ? t("Star FlyBot on GitHub") : `${t("Star FlyBot on GitHub")} · ${t("{count} stars", { count: stars })}` }, - (0, import_react42.createElement)("span", { className: "bt-star-main" }, (0, import_react42.createElement)("span", { className: "bt-star-icon" }, (0, import_react42.createElement)(StarLineIcon)), "Star"), - stars === null ? null : (0, import_react42.createElement)("span", { className: "bt-star-count" }, starCount(stars)) + (0, import_react46.createElement)("span", { className: "bt-star-main" }, (0, import_react46.createElement)("span", { className: "bt-star-icon" }, (0, import_react46.createElement)(StarLineIcon)), "Star"), + stars === null ? null : (0, import_react46.createElement)("span", { className: "bt-star-count" }, starCount(stars)) ) : null ), - repo ? (0, import_react42.createElement)("p", { key: "ask", className: "bt-about-ask" }, t("If FlyBot helps you, a star on GitHub helps more people find it.")) : null, - (0, import_react42.createElement)( + repo ? (0, import_react46.createElement)("p", { key: "ask", className: "bt-about-ask" }, t("If FlyBot helps you, a star on GitHub helps more people find it.")) : null, + (0, import_react46.createElement)( Section, { key: "updates", title: t("Updates") }, - (0, import_react42.createElement)(Row4, { label: t("FlyBot core"), hint: botHint(update) }, botControl, update.available && update.notesUrl ? (0, import_react42.createElement)("a", linkProps(update.notesUrl), t("What's new")) : null), - dsh?.current ? (0, import_react42.createElement)(Row4, { label: t("DeepSeek Harness (underlying)"), hint: dshHint(dsh, dshShown) }, dshControl) : null + (0, import_react46.createElement)(Row4, { label: t("FlyBot core"), hint: botHint(update) }, botControl, update.available && update.notesUrl ? (0, import_react46.createElement)("a", linkProps(update.notesUrl), t("What's new")) : null), + dsh?.current ? (0, import_react46.createElement)(Row4, { label: t("DeepSeek Harness (underlying)"), hint: dshHint(dsh, dshShown) }, dshControl) : null ), - (0, import_react42.createElement)( + (0, import_react46.createElement)( Section, { key: "links", title: t("Links") }, - repo ? (0, import_react42.createElement)(Row4, { label: t("Source code"), hint: repo.replace(/^https:\/\//, "") }, (0, import_react42.createElement)("a", linkProps(repo), (0, import_react42.createElement)(GitHubMark), t("Open"))) : null, - update.notesUrl ? (0, import_react42.createElement)(Row4, { label: t("Release notes") }, (0, import_react42.createElement)("a", linkProps(update.notesUrl), t("Open"))) : null, - (0, import_react42.createElement)(Row4, { label: t("Report a problem") }, (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.openSettings("feedback") }, t("Open"))) + repo ? (0, import_react46.createElement)(Row4, { label: t("Source code"), hint: repo.replace(/^https:\/\//, "") }, (0, import_react46.createElement)("a", linkProps(repo), (0, import_react46.createElement)(GitHubMark), t("Open"))) : null, + update.notesUrl ? (0, import_react46.createElement)(Row4, { label: t("Release notes") }, (0, import_react46.createElement)("a", linkProps(update.notesUrl), t("Open"))) : null, + (0, import_react46.createElement)(Row4, { label: t("Report a problem") }, (0, import_react46.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.openSettings("feedback") }, t("Open"))) ) ]; } @@ -19522,19 +21303,19 @@ var ABOUT_CSS = ` `; // src/client/settings.js -var import_react43 = require("react"); +var import_react47 = require("react"); var capitalize2 = (word) => word[0].toUpperCase() + word.slice(1); -var SETTINGS_PAGES = [["general", "General"], ["bots", "Bots"], ["groups", "Group chats"], ["projects", "Projects"], ["connectors", "Connectors"], ["capabilities", "Capabilities"], ["plugins", "Plugins"], ["schedules", "Scheduled tasks"], ["workflows", "Workflows"], ["usage", "Usage"], ["secrets", "Secrets"], ["feedback", "Feedback"], ["about", "About FlyBot"]]; -var PAGE_ICONS = { ...SETTINGS_ICONS, projects: FolderIcon, connectors: ConnectorIcon, workflows: WorkflowIcon, capabilities: PlugIcon, plugins: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon }; +var SETTINGS_PAGES = [["general", "General"], ["bots", "Bots"], ["groups", "Group chats"], ["projects", "Projects"], ["connectors", "Connectors"], ["channels", "Channels"], ["capabilities", "Capabilities"], ["plugins", "Plugins"], ["schedules", "Scheduled tasks"], ["workflows", "Workflows"], ["usage", "Usage"], ["secrets", "Secrets"], ["feedback", "Feedback"], ["about", "About FlyBot"]]; +var PAGE_ICONS = { ...SETTINGS_ICONS, projects: FolderIcon, connectors: ConnectorIcon, channels: ConnectorIcon, workflows: WorkflowIcon, capabilities: PlugIcon, plugins: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon }; function SetSection({ title, children }) { - return (0, import_react43.createElement)("section", { className: "bt-set-section" }, (0, import_react43.createElement)("h3", null, title), (0, import_react43.createElement)("div", { className: "bt-set-card" }, children)); + return (0, import_react47.createElement)("section", { className: "bt-set-section" }, (0, import_react47.createElement)("h3", null, title), (0, import_react47.createElement)("div", { className: "bt-set-card" }, children)); } function SetRow({ label, hint, children }) { - return (0, import_react43.createElement)( + return (0, import_react47.createElement)( "div", { className: "bt-set-row" }, - (0, import_react43.createElement)("div", { className: "bt-set-copy" }, (0, import_react43.createElement)("span", null, label), hint ? (0, import_react43.createElement)("span", { className: "bt-set-hint" }, hint) : null), - children ? (0, import_react43.createElement)("div", { className: "bt-set-control" }, children) : null + (0, import_react47.createElement)("div", { className: "bt-set-copy" }, (0, import_react47.createElement)("span", null, label), hint ? (0, import_react47.createElement)("span", { className: "bt-set-hint" }, hint) : null), + children ? (0, import_react47.createElement)("div", { className: "bt-set-control" }, children) : null ); } var NOTIFY_KINDS = [ @@ -19545,45 +21326,45 @@ var NOTIFY_KINDS = [ function PluginsView({ answer = null, error = "", onFlip }) { const plugins = answer?.plugins ?? []; const profile = typeof answer?.profile === "string" && answer.profile !== "" ? answer.profile : ""; - return (0, import_react43.createElement)( + return (0, import_react47.createElement)( "div", null, - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetSection, { title: t("Plugins") }, - error ? (0, import_react43.createElement)("p", { className: "bt-set-hint", role: "alert" }, error) : null, - answer === null && !error ? (0, import_react43.createElement)("p", { className: "bt-set-hint" }, t("Loading…")) : null, - plugins.map((plugin) => plugin.installed === false ? (0, import_react43.createElement)( + error ? (0, import_react47.createElement)("p", { className: "bt-set-hint", role: "alert" }, error) : null, + answer === null && !error ? (0, import_react47.createElement)("p", { className: "bt-set-hint" }, t("Loading…")) : null, + plugins.map((plugin) => plugin.installed === false ? (0, import_react47.createElement)( "div", { key: plugin.id, className: "bt-set-row bt-set-missing", "data-plugin": plugin.id, "data-installed": "false" }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( "div", { className: "bt-set-copy" }, - (0, import_react43.createElement)("span", null, plugin.name), - (0, import_react43.createElement)("span", { className: "bt-set-hint" }, `${plugin.package} — ${t(plugin.purpose)}`), - (0, import_react43.createElement)( + (0, import_react47.createElement)("span", null, plugin.name), + (0, import_react47.createElement)("span", { className: "bt-set-hint" }, `${plugin.package} — ${t(plugin.purpose)}`), + (0, import_react47.createElement)( "span", { className: "bt-set-hint", role: "status" }, t("Not installed in this profile."), " ", - (0, import_react43.createElement)("code", { className: "bt-install-command" }, `dsh plugin --profile ${profile} add ${plugin.package}`) + (0, import_react47.createElement)("code", { className: "bt-install-command" }, `dsh plugin --profile ${profile} add ${plugin.package}`) ) ) - ) : (0, import_react43.createElement)(SwitchRow, { + ) : (0, import_react47.createElement)(SwitchRow, { key: plugin.id, label: plugin.name, hint: `${plugin.package} — ${t(plugin.purpose)}`, on: plugin.enabled !== false, onChange: (enabled) => onFlip?.(plugin.id, enabled) })), - (0, import_react43.createElement)("p", { className: "bt-set-hint" }, answer?.pendingRestart === true ? t("Restart FlyBot to apply the switches you changed.") : t("A switch takes effect the next time FlyBot starts.")) + (0, import_react47.createElement)("p", { className: "bt-set-hint" }, answer?.pendingRestart === true ? t("Restart FlyBot to apply the switches you changed.") : t("A switch takes effect the next time FlyBot starts.")) ) ); } function PluginsPage({ call: call4 }) { - const [answer, setAnswer] = (0, import_react43.useState)(null); - const [error, setError] = (0, import_react43.useState)(""); - (0, import_react43.useEffect)(() => { + const [answer, setAnswer] = (0, import_react47.useState)(null); + const [error, setError] = (0, import_react47.useState)(""); + (0, import_react47.useEffect)(() => { let live = true; call4("plugins/list").then((value) => { if (live) setAnswer(value ?? { plugins: [] }); @@ -19601,58 +21382,138 @@ function PluginsPage({ call: call4 }) { setError(""); }).catch((failure) => setError(failure?.message ?? String(failure))); }; - return (0, import_react43.createElement)(PluginsView, { answer, error, onFlip: flip }); + return (0, import_react47.createElement)(PluginsView, { answer, error, onFlip: flip }); } +var APPEARANCE_MODES2 = [ + ["light", "Light theme"], + ["dark", "Dark theme"], + ["auto", "Automatic"], + ["system", "Match system"] +]; +var AUTO_KINDS2 = [["sun", "Estimated night hours (time-zone based)"], ["custom", "Custom hours"]]; +var SEND_KEYS2 = [["enter", "Enter to send"], ["shift-enter", "Shift+Enter to send"]]; +var appearanceLabel = (appearance) => APPEARANCE_MODES2.find(([id]) => id === appearance.mode)?.[1] ?? "Match system"; +var autoLabel = (appearance) => appearance.auto === "custom" ? `${appearance.from} – ${appearance.to}` : "Estimated night hours (time-zone based)"; +var sendKeyLabel = (key) => SEND_KEYS2.find(([id]) => id === key)?.[1] ?? "Enter to send"; +var FOLD_MODE_OPTIONS = [ + ["compact", "Compact", "A very short preview, for scanning a conversation."], + ["standard", "Standard", "A moderate preview. Recommended."], + ["none", "No folding", "Show every message in full. Long messages push the conversation off the screen."] +]; +var foldModeLabel = (mode) => FOLD_MODE_OPTIONS.find(([id]) => id === mode)?.[1] ?? "Standard"; function GeneralPage({ roster, actions, run }) { const prefs = roster.prefs ?? {}; const themes = allThemes(); - const current = themes[prefs.theme] ? prefs.theme : "deepseek"; - const [custom, setCustom] = (0, import_react43.useState)(prefs.accent ?? "#4d6bfe"); - const timer = (0, import_react43.useRef)(0); - (0, import_react43.useEffect)(() => () => clearTimeout(timer.current), []); + const current = resolveThemeId(prefs, themes); + const appearance = appearanceOf(prefs); + const sendKey = sendKeyOf(prefs); + const folding = foldingOf(prefs); + const [custom, setCustom] = (0, import_react47.useState)(prefs.accent ?? "#4d6bfe"); + const timer = (0, import_react47.useRef)(0); + (0, import_react47.useEffect)(() => () => clearTimeout(timer.current), []); const pickCustom = (value) => { setCustom(value); clearTimeout(timer.current); timer.current = setTimeout(() => run(actions.setPrefs({ accent: value })), 350); }; + const setAppearance = (patch) => run(actions.setPrefs({ appearance: { ...appearance, ...patch } })); + const localeChooser = canSetLocale(); if (lockedWindow(roster)) { const accent = ACCENT_INKS.find((ink) => INKS[ink][0] === prefs.accent); return [ - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetSection, { key: "look", title: t("Appearance") }, - (0, import_react43.createElement)(SetRow, { label: t("Theme"), hint: t(themes[current].label) }), - (0, import_react43.createElement)(SetRow, { label: t("Accent"), hint: accent ? t(capitalize2(accent)) : prefs.accent ?? t("Default") }) + (0, import_react47.createElement)(SetRow, { label: t("Appearance"), hint: t(appearanceLabel(appearance)) }), + appearance.mode === "auto" ? (0, import_react47.createElement)(SetRow, { label: t("Automatic switch"), hint: t(autoLabel(appearance)) }) : null, + (0, import_react47.createElement)(SetRow, { label: t("Theme"), hint: t(themes[current].label) }), + (0, import_react47.createElement)(SetRow, { label: t("Accent"), hint: accent ? t(capitalize2(accent)) : prefs.accent ?? t("Default") }) ), - (0, import_react43.createElement)( + (0, import_react47.createElement)( + SetSection, + { key: "language", title: t("Language") }, + (0, import_react47.createElement)(SetRow, { label: t("Interface language"), hint: t(languageLabel()) }) + ), + (0, import_react47.createElement)( + SetSection, + { key: "shortcuts", title: t("Shortcuts") }, + (0, import_react47.createElement)(SetRow, { label: t("Send shortcut"), hint: t(sendKeyLabel(sendKey)) }) + ), + (0, import_react47.createElement)( + SetSection, + { key: "folding", title: t("Message folding") }, + (0, import_react47.createElement)(SetRow, { label: t("Message folding"), hint: t(foldModeLabel(folding.mode)) }), + (0, import_react47.createElement)(SetRow, { label: t("Collapse long documents into cards"), hint: folding.documentCards ? t("On") : t("Off") }) + ), + (0, import_react47.createElement)( SetSection, { key: "notify", title: t("Notifications") }, - (0, import_react43.createElement)(SetRow, { label: t("In other chats"), hint: prefs.notifications !== false ? t("On") : t("Off") }), - NOTIFY_KINDS.map(([kind, label]) => (0, import_react43.createElement)(SetRow, { key: kind, label: t(label), hint: prefs.notifications !== false && prefs.notify?.[kind] !== false ? t("On") : t("Off") })) + (0, import_react47.createElement)(SetRow, { label: t("In other chats"), hint: prefs.notifications !== false ? t("On") : t("Off") }), + NOTIFY_KINDS.map(([kind, label]) => (0, import_react47.createElement)(SetRow, { key: kind, label: t(label), hint: prefs.notifications !== false && prefs.notify?.[kind] !== false ? t("On") : t("Off") })) ) ]; } return [ - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetSection, { key: "look", title: t("Appearance") }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( + SetRow, + { label: t("Appearance"), hint: t("How this window looks: light, dark, automatic, or match the system.") }, + (0, import_react47.createElement)(Segmented, { label: t("Appearance"), value: appearance.mode, className: "bt-appearance-seg" }, APPEARANCE_MODES2.map(([id, label]) => (0, import_react47.createElement)("button", { + key: id, + type: "button", + "aria-pressed": appearance.mode === id, + onClick: () => { + if (appearance.mode !== id) setAppearance({ mode: id }); + } + }, t(label)))) + ), + appearance.mode === "auto" ? (0, import_react47.createElement)( + SetRow, + { label: t("Automatic switch"), hint: t("Switches about a minute after the chosen time, and not in the middle of a turn.") }, + (0, import_react47.createElement)(Segmented, { label: t("Automatic switch"), value: appearance.auto, className: "bt-appearance-seg" }, AUTO_KINDS2.map(([id, label]) => (0, import_react47.createElement)("button", { + key: id, + type: "button", + "aria-pressed": appearance.auto === id, + onClick: () => { + if (appearance.auto !== id) setAppearance({ auto: id }); + } + }, t(label)))) + ) : null, + appearance.mode === "auto" && appearance.auto === "custom" ? (0, import_react47.createElement)( + SetRow, + { label: t("Custom hours") }, + (0, import_react47.createElement)( + "label", + { className: "bt-time-field" }, + t("Dark from"), + (0, import_react47.createElement)("input", { className: "bt-input", type: "time", "aria-label": t("Dark from"), value: appearance.from, onChange: (event) => setAppearance({ from: event.target.value }) }) + ), + (0, import_react47.createElement)( + "label", + { className: "bt-time-field" }, + t("Dark until"), + (0, import_react47.createElement)("input", { className: "bt-input", type: "time", "aria-label": t("Dark until"), value: appearance.to, onChange: (event) => setAppearance({ to: event.target.value }) }) + ) + ) : null, + (0, import_react47.createElement)( SetRow, { label: t("Theme"), hint: t("Colors for the whole team, on every device.") }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( "select", { className: "bt-select", "aria-label": t("Theme"), value: current, onChange: (event) => run(actions.setPrefs({ theme: event.target.value })) }, - Object.entries(themes).map(([id, theme]) => (0, import_react43.createElement)("option", { key: id, value: id }, t(theme.label))) + Object.entries(themes).map(([id, theme]) => (0, import_react47.createElement)("option", { key: id, value: id }, t(theme.label))) ) ), - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetRow, { label: t("Accent"), hint: t("Unread marks, badges, and the brand mark.") }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( "div", { className: "bt-swatches" }, - (0, import_react43.createElement)("button", { type: "button", className: "bt-swatch bt-swatch-default", title: t("Theme accent"), "aria-label": t("Theme accent"), "aria-pressed": !prefs.accent, onClick: () => run(actions.setPrefs({ accent: null })) }), - ACCENT_INKS.map((ink) => (0, import_react43.createElement)("button", { + (0, import_react47.createElement)("button", { type: "button", className: "bt-swatch bt-swatch-default", title: t("Theme accent"), "aria-label": t("Theme accent"), "aria-pressed": !prefs.accent, onClick: () => run(actions.setPrefs({ accent: null })) }), + ACCENT_INKS.map((ink) => (0, import_react47.createElement)("button", { key: ink, type: "button", className: "bt-swatch", @@ -19662,25 +21523,91 @@ function GeneralPage({ roster, actions, run }) { style: { background: INKS[ink][0] }, onClick: () => run(actions.setPrefs({ accent: INKS[ink][0] })) })), - (0, import_react43.createElement)( + (0, import_react47.createElement)( "label", { className: "bt-swatch bt-swatch-custom", title: t("Custom accent"), "data-on": Boolean(prefs.accent) && !ACCENT_INKS.some((ink) => INKS[ink][0] === prefs.accent) }, - (0, import_react43.createElement)("input", { type: "color", value: custom, "aria-label": t("Custom accent"), onChange: (event) => pickCustom(event.target.value) }) + (0, import_react47.createElement)("input", { type: "color", value: custom, "aria-label": t("Custom accent"), onChange: (event) => pickCustom(event.target.value) }) ) ) ) ), + (0, import_react47.createElement)( + SetSection, + { key: "language", title: t("Language") }, + localeChooser ? (0, import_react47.createElement)( + SetRow, + { label: t("Interface language") }, + (0, import_react47.createElement)(Segmented, { label: t("Interface language"), value: languageLabel() === "Simplified Chinese" ? "zh" : "en", className: "bt-appearance-seg" }, [ + (0, import_react47.createElement)("button", { key: "en", type: "button", "aria-pressed": languageLabel() !== "Simplified Chinese", onClick: () => setInterfaceLocale("en") }, t("English")), + (0, import_react47.createElement)("button", { key: "zh", type: "button", "aria-pressed": languageLabel() === "Simplified Chinese", onClick: () => setInterfaceLocale("zh") }, t("Simplified Chinese")) + ]) + ) : (0, import_react47.createElement)(SetRow, { label: t("Interface language"), hint: `${t(languageLabel())}. ${t("Follows the DeepSeek Harness language.")}` }) + ), + (0, import_react47.createElement)( + SetSection, + { key: "shortcuts", title: t("Shortcuts") }, + (0, import_react47.createElement)( + SetRow, + { + label: t("Send shortcut"), + hint: t(sendKey === "shift-enter" ? "Enter inserts a new line." : "Shift+Enter inserts a new line.") + }, + (0, import_react47.createElement)(Segmented, { label: t("Send shortcut"), value: sendKey, className: "bt-appearance-seg" }, SEND_KEYS2.map(([id, label]) => (0, import_react47.createElement)("button", { + key: id, + type: "button", + "aria-pressed": sendKey === id, + onClick: () => { + if (sendKey !== id) run(actions.setPrefs({ sendKey: id === "enter" ? null : id })); + } + }, t(label)))) + ) + ), + (0, import_react47.createElement)( + SetSection, + { key: "folding", title: t("Message folding") }, + (0, import_react47.createElement)( + "div", + { className: "bt-fold-modes", role: "radiogroup", "aria-label": t("Message folding") }, + (0, import_react47.createElement)("p", { className: "bt-fold-lead" }, t("Choose how much of a long message to show before it folds.")), + FOLD_MODE_OPTIONS.map(([id, label, hint]) => (0, import_react47.createElement)( + "button", + { + key: id, + type: "button", + role: "radio", + className: "bt-fold-mode", + "aria-checked": folding.mode === id, + onClick: () => { + if (folding.mode !== id) run(actions.setPrefs({ folding: { mode: id, documentCards: folding.documentCards } })); + } + }, + (0, import_react47.createElement)("span", { className: "bt-fold-radio", "aria-hidden": true }), + (0, import_react47.createElement)( + "span", + { className: "bt-fold-mode-copy" }, + (0, import_react47.createElement)("span", { className: "bt-fold-mode-label" }, t(label)), + (0, import_react47.createElement)("span", { className: "bt-set-hint" }, t(hint)) + ) + )) + ), + (0, import_react47.createElement)(SwitchRow, { + label: t("Collapse long documents into cards"), + hint: t("Messages with several sections appear as a card you can open beside the conversation."), + on: folding.documentCards, + onChange: (on) => run(actions.setPrefs({ folding: { mode: folding.mode, documentCards: on } })) + }) + ), // One switch for every system notification (#353), then one per kind (#469). - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetSection, { key: "notify", title: t("Notifications") }, - (0, import_react43.createElement)(SwitchRow, { + (0, import_react47.createElement)(SwitchRow, { label: t("In other chats"), hint: t("When your Bots finish, fail, or wait for your approval while you are in another chat or app."), on: prefs.notifications !== false, onChange: (on) => run(actions.setPrefs({ notifications: on })) }), - NOTIFY_KINDS.map(([kind, label, hint]) => (0, import_react43.createElement)(SwitchRow, { + NOTIFY_KINDS.map(([kind, label, hint]) => (0, import_react47.createElement)(SwitchRow, { key: kind, label: t(label), hint: hint ? t(hint) : void 0, @@ -19697,46 +21624,46 @@ function MainBotsSection({ roster, actions, run }) { const own = roster.bots.filter((bot) => !bot.remote); const candidates = own.filter((bot) => !isMainOf(roster, bot.id)); if (lockedWindow(roster)) { - return (0, import_react43.createElement)( + return (0, import_react47.createElement)( SetSection, { title: t("Main Bot") }, - (0, import_react43.createElement)(SetRow, { label: t("Main Bot"), hint: first ? first.name : void 0 }), - others.map((bot) => (0, import_react43.createElement)(SetRow, { key: bot.id, label: bot.name, hint: t("Also a Main Bot.") })) + (0, import_react47.createElement)(SetRow, { label: t("Main Bot"), hint: first ? first.name : void 0 }), + others.map((bot) => (0, import_react47.createElement)(SetRow, { key: bot.id, label: bot.name, hint: t("Also a Main Bot.") })) ); } - return (0, import_react43.createElement)( + return (0, import_react47.createElement)( SetSection, { title: t("Main Bot") }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetRow, { label: t("Main Bot"), hint: first ? t("First in the sidebar. Pick another Bot to hand it the role; {name} then stops being a Main Bot.", { name: first.name }) : void 0 }, - (0, import_react43.createElement)("select", { + (0, import_react47.createElement)("select", { className: "bt-select", "aria-label": t("Main Bot"), value: first?.id ?? "", onChange: (event) => run(actions.setMain(event.target.value, true, first ? { replace: first.id } : {})) - }, first ? null : (0, import_react43.createElement)("option", { value: "" }, t("Choose a Bot…")), own.map((bot) => (0, import_react43.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) + }, first ? null : (0, import_react47.createElement)("option", { value: "" }, t("Choose a Bot…")), own.map((bot) => (0, import_react47.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) ), - others.map((bot) => (0, import_react43.createElement)( + others.map((bot) => (0, import_react47.createElement)( SetRow, { key: bot.id, label: bot.name, hint: t("Also a Main Bot.") }, - (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, true, { primary: true })) }, t("Move to first")), - (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, false)) }, t("Remove Main Bot role")) + (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, true, { primary: true })) }, t("Move to first")), + (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, false)) }, t("Remove Main Bot role")) )), - candidates.length > 0 ? (0, import_react43.createElement)( + candidates.length > 0 ? (0, import_react47.createElement)( SetRow, { label: t("Add a Main Bot"), hint: t("Main Bots can create and change Bots, and run every group chat.") }, - (0, import_react43.createElement)("select", { + (0, import_react47.createElement)("select", { className: "bt-select", "aria-label": t("Add a Main Bot"), value: "", onChange: (event) => { if (event.target.value) void run(actions.setMain(event.target.value, true)); } - }, (0, import_react43.createElement)("option", { value: "" }, t("Choose a Bot…")), candidates.map((bot) => (0, import_react43.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) + }, (0, import_react47.createElement)("option", { value: "" }, t("Choose a Bot…")), candidates.map((bot) => (0, import_react47.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) ) : null ); } @@ -19744,19 +21671,19 @@ var MOTIONS = [["quiet", "Quiet"], ["normal", "Normal"], ["lively", "Lively"]]; function MotionSection({ roster, actions, run }) { const motion = roster.prefs?.motion === "quiet" || roster.prefs?.motion === "lively" ? roster.prefs.motion : "normal"; if (lockedWindow(roster)) { - return (0, import_react43.createElement)( + return (0, import_react47.createElement)( SetSection, { title: t("Animation") }, - (0, import_react43.createElement)(SetRow, { label: t("Bot animation"), hint: t(MOTIONS.find(([id]) => id === motion)?.[1] ?? "Normal") }) + (0, import_react47.createElement)(SetRow, { label: t("Bot animation"), hint: t(MOTIONS.find(([id]) => id === motion)?.[1] ?? "Normal") }) ); } - return (0, import_react43.createElement)( + return (0, import_react47.createElement)( SetSection, { title: t("Animation") }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetRow, { label: t("Bot animation") }, - (0, import_react43.createElement)(Segmented, { label: t("Bot animation"), value: motion, className: "bt-motion-seg" }, MOTIONS.map(([id, label]) => (0, import_react43.createElement)("button", { + (0, import_react47.createElement)(Segmented, { label: t("Bot animation"), value: motion, className: "bt-motion-seg" }, MOTIONS.map(([id, label]) => (0, import_react47.createElement)("button", { key: id, type: "button", "aria-pressed": motion === id, @@ -19768,71 +21695,71 @@ function MotionSection({ roster, actions, run }) { ); } function BotsPage({ roster, actions, run }) { - const [creating, setCreating] = (0, import_react43.useState)(false); + const [creating, setCreating] = (0, import_react47.useState)(false); return [ - (0, import_react43.createElement)(MainBotsSection, { key: "main", roster, actions, run }), - (0, import_react43.createElement)(MotionSection, { key: "motion", roster, actions, run }), - creating ? (0, import_react43.createElement)(CreateBot, { key: "create", roster, actions, inline: true, onBack: () => setCreating(false), onCreated: (bot) => actions.openSettings("bots", bot.id) }) : (0, import_react43.createElement)( + (0, import_react47.createElement)(MainBotsSection, { key: "main", roster, actions, run }), + (0, import_react47.createElement)(MotionSection, { key: "motion", roster, actions, run }), + creating ? (0, import_react47.createElement)(CreateBot, { key: "create", roster, actions, inline: true, onBack: () => setCreating(false), onCreated: (bot) => actions.openSettings("bots", bot.id) }) : (0, import_react47.createElement)( "div", { key: "new", className: "bt-actions" }, - (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", onClick: () => setCreating(true) }, (0, import_react43.createElement)(PlusIcon), t("New Bot")) + (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", onClick: () => setCreating(true) }, (0, import_react47.createElement)(PlusIcon), t("New Bot")) ), - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetSection, { key: "bots", title: t("Bots · {count}", { count: roster.bots.filter((bot) => !bot.remote).length }) }, - roster.bots.filter((bot) => !bot.remote).map((bot) => (0, import_react43.createElement)( + roster.bots.filter((bot) => !bot.remote).map((bot) => (0, import_react47.createElement)( "button", { key: bot.id, type: "button", className: "bt-set-row", onClick: () => actions.openSettings("bots", bot.id) }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( "span", { className: "bt-set-bot" }, - (0, import_react43.createElement)(BotAvatar, { bot, size: 28, badge: false, live: false }), - (0, import_react43.createElement)("span", { className: "bt-row-title" }, bot.name), - bot.role ? (0, import_react43.createElement)("span", { className: "bt-tag" }, bot.role) : null, - isMainOf(roster, bot.id) ? (0, import_react43.createElement)("span", { className: "bt-tag" }, t("Main Bot")) : null, - bot.hidden && !isMainOf(roster, bot.id) ? (0, import_react43.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null + (0, import_react47.createElement)(BotAvatar, { bot, size: 28, badge: false, live: false }), + (0, import_react47.createElement)("span", { className: "bt-row-title" }, bot.name), + bot.role ? (0, import_react47.createElement)("span", { className: "bt-tag" }, bot.role) : null, + isMainOf(roster, bot.id) ? (0, import_react47.createElement)("span", { className: "bt-tag" }, t("Main Bot")) : null, + bot.hidden && !isMainOf(roster, bot.id) ? (0, import_react47.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null ), - (0, import_react43.createElement)("span", { className: "bt-chevron" }, (0, import_react43.createElement)(ChevronRightIcon)) + (0, import_react47.createElement)("span", { className: "bt-chevron" }, (0, import_react47.createElement)(ChevronRightIcon)) )) ) ]; } function GroupsPage({ roster, actions, run }) { - const [creating, setCreating] = (0, import_react43.useState)(false); + const [creating, setCreating] = (0, import_react47.useState)(false); return [ - creating ? (0, import_react43.createElement)(NewGroupForm, { key: "create", roster, actions, run, onCancel: () => setCreating(false), onCreated: (room2) => actions.openSettings("groups", room2.id) }) : (0, import_react43.createElement)( + creating ? (0, import_react47.createElement)(NewGroupForm, { key: "create", roster, actions, run, onCancel: () => setCreating(false), onCreated: (room2) => actions.openSettings("groups", room2.id) }) : (0, import_react47.createElement)( "div", { key: "new", className: "bt-actions" }, - (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", disabled: roster.bots.length < 2, title: roster.bots.length < 2 ? t("A group chat needs at least two Bots") : void 0, onClick: () => setCreating(true) }, (0, import_react43.createElement)(PlusIcon), t("Create group chat")) + (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", disabled: roster.bots.length < 2, title: roster.bots.length < 2 ? t("A group chat needs at least two Bots") : void 0, onClick: () => setCreating(true) }, (0, import_react47.createElement)(PlusIcon), t("Create group chat")) ), - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetSection, { key: "groups", title: t("Group chats · {count}", { count: roster.rooms.length }) }, - roster.rooms.length === 0 ? (0, import_react43.createElement)(SetRow, { label: t("No group chats yet."), hint: t("A group chat lets several Bots work on one thing with you.") }) : roster.rooms.map((room2) => { + roster.rooms.length === 0 ? (0, import_react47.createElement)(SetRow, { label: t("No group chats yet."), hint: t("A group chat lets several Bots work on one thing with you.") }) : roster.rooms.map((room2) => { const admin = roster.byId[room2.admin]; - return (0, import_react43.createElement)( + return (0, import_react47.createElement)( "button", { key: room2.id, type: "button", className: "bt-set-row", onClick: () => actions.openSettings("groups", room2.id) }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( "span", { className: "bt-set-bot" }, - (0, import_react43.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), - (0, import_react43.createElement)("span", { className: "bt-row-title" }, room2.name), - (0, import_react43.createElement)("span", { className: "bt-tag" }, t(seatedCount(room2) === 1 ? "{count} member" : "{count} members", { count: seatedCount(room2) })), - admin ? (0, import_react43.createElement)("span", { className: "bt-tag bt-tag-admin" }, (0, import_react43.createElement)(AdminStar), admin.name) : null, - room2.hidden ? (0, import_react43.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null + (0, import_react47.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), + (0, import_react47.createElement)("span", { className: "bt-row-title" }, room2.name), + (0, import_react47.createElement)("span", { className: "bt-tag" }, t(seatedCount(room2) === 1 ? "{count} member" : "{count} members", { count: seatedCount(room2) })), + admin ? (0, import_react47.createElement)("span", { className: "bt-tag bt-tag-admin" }, (0, import_react47.createElement)(AdminStar), admin.name) : null, + room2.hidden ? (0, import_react47.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null ), - (0, import_react43.createElement)("span", { className: "bt-chevron" }, (0, import_react43.createElement)(ChevronRightIcon)) + (0, import_react47.createElement)("span", { className: "bt-chevron" }, (0, import_react47.createElement)(ChevronRightIcon)) ); }) ) ]; } function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = false }) { - const [error, setError] = (0, import_react43.useState)(""); - const close = (0, import_react43.useCallback)(() => actions.closeSettings(), []); + const [error, setError] = (0, import_react47.useState)(""); + const close = (0, import_react47.useCallback)(() => actions.closeSettings(), []); useEscape(close); - const dialog = (0, import_react43.useRef)(null); + const dialog = (0, import_react47.useRef)(null); useDialogFocus(dialog); const run = (promise) => Promise.resolve(promise).then(() => { setError(""); @@ -19844,7 +21771,7 @@ function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = false const bot = page === "bots" && id ? roster.byId[id] : void 0; const room2 = page === "groups" && id ? roster.roomsById[id] : void 0; const extra = useSettingsPages().map((entry) => ({ entry, key: `plugin:${entry.id}` })); - const pages = SETTINGS_PAGES.flatMap((item) => item[0] === "connectors" ? [item, ...extra.map(({ entry, key }) => [key, entry.label ?? entry.id])] : [item]).filter(([key]) => key !== "projects" || projectPresent()); + const pages = SETTINGS_PAGES.flatMap((item) => item[0] === "channels" ? [item, ...extra.map(({ entry, key }) => [key, entry.label ?? entry.id])] : [item]).filter(([key]) => key !== "projects" || projectPresent()); const shown = pages.some(([key]) => key === page) ? page : "general"; const pluginPage = extra.find(({ key }) => key === shown)?.entry; const usageFocus = shown === "usage" && id ? id : null; @@ -19853,34 +21780,34 @@ function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = false const nav = useGlide(shown, { axis: "y" }); const pageKey = `${shown}:${bot?.id ?? room2?.id ?? ""}`; const depth = bot || room2 ? 1 : 0; - const last = (0, import_react43.useRef)({ key: pageKey, depth, move: "up" }); + const last = (0, import_react47.useRef)({ key: pageKey, depth, move: "up" }); if (last.current.key !== pageKey) { last.current = { key: pageKey, depth, move: depth > last.current.depth ? "in" : depth < last.current.depth ? "out" : "up" }; } - const [usageOpened, setUsageOpened] = (0, import_react43.useState)(shown === "usage"); + const [usageOpened, setUsageOpened] = (0, import_react47.useState)(shown === "usage"); if (shown === "usage" && !usageOpened) setUsageOpened(true); - const errorLine = error ? (0, import_react43.createElement)("div", { className: "bt-error", role: "alert", style: { padding: "0 20px 8px" } }, error) : null; - return (0, import_react43.createElement)( + const errorLine = error ? (0, import_react47.createElement)("div", { className: "bt-error", role: "alert", style: { padding: "0 20px 8px" } }, error) : null; + return (0, import_react47.createElement)( "div", { className: "bt-settings-layer", "data-leaving": leaving || void 0 }, - (0, import_react43.createElement)("div", { className: "bt-scrim", onMouseDown: close }), - (0, import_react43.createElement)( + (0, import_react47.createElement)("div", { className: "bt-scrim", onMouseDown: close }), + (0, import_react47.createElement)( "div", { className: "bt-settings", role: "dialog", "aria-modal": true, "aria-label": t("FlyBot settings"), "data-wide": shown === "usage" ? "" : void 0, tabIndex: -1, ref: dialog }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( "nav", { ref: nav.box, className: "bt-settings-nav", "aria-label": t("Settings pages") }, - (0, import_react43.createElement)("span", { ref: nav.thumb, className: "bt-thumb", "aria-hidden": true }), - pages.map(([key, text2]) => (0, import_react43.createElement)("button", { + (0, import_react47.createElement)("span", { ref: nav.thumb, className: "bt-thumb", "aria-hidden": true }), + pages.map(([key, text2]) => (0, import_react47.createElement)("button", { key, type: "button", className: "bt-settings-item", "aria-current": shown === key ? "page" : void 0, onClick: () => actions.openSettings(key) - }, (0, import_react43.createElement)(extra.find((item) => item.key === key)?.entry.icon ?? PAGE_ICONS[key] ?? ConnectorIcon), t(text2))), + }, (0, import_react47.createElement)(extra.find((item) => item.key === key)?.entry.icon ?? PAGE_ICONS[key] ?? ConnectorIcon), t(text2))), // DeepSeek Harness's own settings are a separate window with its own title and look; FlyBot // does not embed or retitle it (never patch DSH), so the entry says it leaves (#421). - (0, import_react43.createElement)("button", { + (0, import_react47.createElement)("button", { type: "button", className: "bt-settings-item bt-settings-shell", title: t("Opens DeepSeek Harness's own settings (models, providers, permissions) in a separate window"), @@ -19889,49 +21816,50 @@ function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = false close(); openHarnessSettings(); } - }, (0, import_react43.createElement)(SlidersIcon), t("Harness settings"), (0, import_react43.createElement)("span", { className: "bt-settings-out", "aria-hidden": true }, "↗")) + }, (0, import_react47.createElement)(SlidersIcon), t("Harness settings"), (0, import_react47.createElement)("span", { className: "bt-settings-out", "aria-hidden": true }, "↗")) ), - (0, import_react43.createElement)( + (0, import_react47.createElement)( "div", { className: "bt-settings-main" }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( "div", { className: "bt-settings-head" }, - back ? (0, import_react43.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": back, title: back, onClick: () => actions.openSettings(shown) }, (0, import_react43.createElement)(ChevronLeftIcon)) : null, - (0, import_react43.createElement)("h2", { key: bot?.id ?? room2?.id ?? shown }, bot?.name ?? room2?.name ?? label) + back ? (0, import_react47.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": back, title: back, onClick: () => actions.openSettings(shown) }, (0, import_react47.createElement)(ChevronLeftIcon)) : null, + (0, import_react47.createElement)("h2", { key: bot?.id ?? room2?.id ?? shown }, bot?.name ?? room2?.name ?? label) ), // A window that holds the team read-only still opens every page here, so the header says // why nothing can be changed, in the host's own sentence and above the refusal below it: // the standing state first, the answer to one pressed control closest to that control. - readOnlyLine(import_react43.createElement, roster, actions, { key: "readonly", className: "bt-readonly-line-head" }), + readOnlyLine(import_react47.createElement, roster, actions, { key: "readonly", className: "bt-readonly-line-head" }), shown === "usage" ? null : errorLine, - shown === "usage" ? null : (0, import_react43.createElement)( + shown === "usage" ? null : (0, import_react47.createElement)( "div", { key: pageKey, className: "bt-settings-scroll bt-settings-page", "data-move": last.current.move }, - shown === "general" ? (0, import_react43.createElement)(GeneralPage, { roster, actions, run }) : null, - bot ? (0, import_react43.createElement)("div", { className: "bt-settings-form" }, (0, import_react43.createElement)(BotSettingsForm, { key: bot.id, bot, roster, actions, run })) : null, - shown === "bots" && !bot ? (0, import_react43.createElement)(BotsPage, { roster, actions, run }) : null, - room2 ? (0, import_react43.createElement)("div", { className: "bt-settings-form" }, (0, import_react43.createElement)(GroupSettingsForm, { key: room2.id, room: room2, roster, actions, run })) : null, - shown === "groups" && !room2 ? (0, import_react43.createElement)(GroupsPage, { roster, actions, run }) : null, - shown === "projects" ? (0, import_react43.createElement)(ProjectsPage, { roster, actions, run, call: call2 }) : null, - shown === "connectors" ? (0, import_react43.createElement)(ConnectorsPage, { roster, actions }) : null, - shown === "workflows" ? (0, import_react43.createElement)(WorkflowsPage, { call: call2, roster, start: id ?? void 0 }) : null, - pluginPage ? (0, import_react43.createElement)(SettingsPageSlot, { entry: pluginPage, props: { roster, actions, call: call2, run, t, Section: SetSection, Row: SetRow } }) : null, - shown === "capabilities" ? (0, import_react43.createElement)(CapabilitiesPage, { roster, actions, run }) : null, - shown === "plugins" ? (0, import_react43.createElement)(PluginsPage, { call: call2 }) : null, - shown === "schedules" ? (0, import_react43.createElement)(SchedulesPage, { roster, actions, start: id ?? void 0 }) : null, - shown === "secrets" ? (0, import_react43.createElement)(SecretsPage, { roster, actions, run, Section: SetSection }) : null, - shown === "feedback" ? (0, import_react43.createElement)(FeedbackPage, { roster, actions, run, Section: SetSection, Row: SetRow }) : null, - shown === "about" ? (0, import_react43.createElement)(AboutPage, { useUpdate, actions, run, Section: SetSection, Row: SetRow }) : null + shown === "general" ? (0, import_react47.createElement)(GeneralPage, { roster, actions, run }) : null, + bot ? (0, import_react47.createElement)("div", { className: "bt-settings-form" }, (0, import_react47.createElement)(BotSettingsForm, { key: bot.id, bot, roster, actions, run })) : null, + shown === "bots" && !bot ? (0, import_react47.createElement)(BotsPage, { roster, actions, run }) : null, + room2 ? (0, import_react47.createElement)("div", { className: "bt-settings-form" }, (0, import_react47.createElement)(GroupSettingsForm, { key: room2.id, room: room2, roster, actions, run })) : null, + shown === "groups" && !room2 ? (0, import_react47.createElement)(GroupsPage, { roster, actions, run }) : null, + shown === "projects" ? (0, import_react47.createElement)(ProjectsPage, { roster, actions, run, call: call2 }) : null, + shown === "connectors" ? (0, import_react47.createElement)(ConnectorsPage, { roster, actions }) : null, + shown === "channels" ? (0, import_react47.createElement)(ChannelsPage, { roster, actions }) : null, + shown === "workflows" ? (0, import_react47.createElement)(WorkflowsPage, { call: call2, roster, start: id ?? void 0 }) : null, + pluginPage ? (0, import_react47.createElement)(SettingsPageSlot, { entry: pluginPage, props: { roster, actions, call: call2, run, t, Section: SetSection, Row: SetRow } }) : null, + shown === "capabilities" ? (0, import_react47.createElement)(CapabilitiesPage, { roster, actions, run }) : null, + shown === "plugins" ? (0, import_react47.createElement)(PluginsPage, { call: call2 }) : null, + shown === "schedules" ? (0, import_react47.createElement)(SchedulesPage, { roster, actions, start: id ?? void 0 }) : null, + shown === "secrets" ? (0, import_react47.createElement)(SecretsPage, { roster, actions, run, Section: SetSection }) : null, + shown === "feedback" ? (0, import_react47.createElement)(FeedbackPage, { roster, actions, run, Section: SetSection, Row: SetRow }) : null, + shown === "about" ? (0, import_react47.createElement)(AboutPage, { useUpdate, actions, run, Section: SetSection, Row: SetRow }) : null ), - usageOpened ? (0, import_react43.createElement)( + usageOpened ? (0, import_react47.createElement)( "div", { key: "usage", className: "bt-settings-scroll bt-settings-usage", "data-off": shown === "usage" ? void 0 : "", "aria-hidden": shown === "usage" ? void 0 : true }, shown === "usage" ? errorLine : null, - (0, import_react43.createElement)(UsagePage, { roster, actions, focusId: usageFocus }) + (0, import_react47.createElement)(UsagePage, { roster, actions, focusId: usageFocus }) ) : null ), - (0, import_react43.createElement)("button", { type: "button", className: "bt-settings-close", "aria-label": t("Close settings"), onClick: close }, (0, import_react43.createElement)(CloseIcon)) + (0, import_react47.createElement)("button", { type: "button", className: "bt-settings-close", "aria-label": t("Close settings"), onClick: close }, (0, import_react47.createElement)(CloseIcon)) ) ); } @@ -19957,23 +21885,23 @@ function ProjectsList({ projects, roster, call: call4, reload }) { }; const bound2 = members.filter((member) => member.projectId !== null && member.projectId !== void 0); return [ - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetSection, { key: "projects", title: t("Projects · {count}", { count: projects.length }) }, - projects.length === 0 ? (0, import_react43.createElement)("div", { className: "bt-set-row" }, (0, import_react43.createElement)("div", { className: "bt-set-copy" }, (0, import_react43.createElement)("span", null, t(locked ? "No Project yet." : "No Project yet — create one.")))) : projects.flatMap((project) => { + projects.length === 0 ? (0, import_react47.createElement)("div", { className: "bt-set-row" }, (0, import_react47.createElement)("div", { className: "bt-set-copy" }, (0, import_react47.createElement)("span", null, t(locked ? "No Project yet." : "No Project yet — create one.")))) : projects.flatMap((project) => { const chiefError = typeof project.chief?.error === "string" ? project.chief.error.trim() : ""; - const row = (0, import_react43.createElement)( + const row = (0, import_react47.createElement)( SetRow, { key: project.id, label: project.name, hint: project.workDir === null || project.workDir === void 0 ? void 0 : project.workDir }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( "div", { className: "bt-project-row-controls" }, - (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => openProjectBoard(project.id) }, t("Open board")), - locked ? null : (0, import_react43.createElement)( + (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => openProjectBoard(project.id) }, t("Open board")), + locked ? null : (0, import_react47.createElement)( "select", { className: "bt-select", @@ -19983,8 +21911,8 @@ function ProjectsList({ projects, roster, call: call4, reload }) { void bind(event.target.value, project); } }, - (0, import_react43.createElement)("option", { value: "" }, t("Bind a Bot or group")), - members.map((member) => (0, import_react43.createElement)( + (0, import_react47.createElement)("option", { value: "" }, t("Bind a Bot or group")), + members.map((member) => (0, import_react47.createElement)( "option", { key: `${member.kind}:${member.id}`, value: `${member.kind}:${member.id}` }, `${member.kind === "group" ? t("Group") : t("Bot")} · ${member.name}` @@ -19993,20 +21921,20 @@ function ProjectsList({ projects, roster, call: call4, reload }) { ) ); if (chiefError === "") return [row]; - return [row, (0, import_react43.createElement)("div", { key: `${project.id}:chief`, className: "bt-project-chief-error", role: "alert" }, t("Project Chief: {error}", { error: chiefError }))]; + return [row, (0, import_react47.createElement)("div", { key: `${project.id}:chief`, className: "bt-project-chief-error", role: "alert" }, t("Project Chief: {error}", { error: chiefError }))]; }) ), - bound2.length === 0 ? null : (0, import_react43.createElement)( + bound2.length === 0 ? null : (0, import_react47.createElement)( SetSection, { key: "bindings", title: t("Bindings") }, - bound2.map((member) => (0, import_react43.createElement)( + bound2.map((member) => (0, import_react47.createElement)( SetRow, { key: `${member.kind}:${member.id}`, label: member.name, hint: member.kind === "group" ? t("Group") : t("Bot") }, - locked ? null : (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { + locked ? null : (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { void unbind(member); } }, t("Unbind")) )) @@ -20014,14 +21942,14 @@ function ProjectsList({ projects, roster, call: call4, reload }) { ]; } function ProjectsPage({ roster, actions, run, call: call4 }) { - const [state, setState] = (0, import_react43.useState)({ projects: [], error: null }); - const [name, setName] = (0, import_react43.useState)(""); - const [workDir, setWorkDir] = (0, import_react43.useState)(null); - const reload = (0, import_react43.useCallback)(async () => { + const [state, setState] = (0, import_react47.useState)({ projects: [], error: null }); + const [name, setName] = (0, import_react47.useState)(""); + const [workDir, setWorkDir] = (0, import_react47.useState)(null); + const reload = (0, import_react47.useCallback)(async () => { const listing = await call4("projects"); setState({ projects: listing?.projects ?? [], error: null }); }, [call4]); - (0, import_react43.useEffect)(() => { + (0, import_react47.useEffect)(() => { void reload().catch((error) => setState({ projects: [], error: error?.message ?? String(error) })); }, [reload]); const create = async () => { @@ -20040,16 +21968,16 @@ function ProjectsPage({ roster, actions, run, call: call4 }) { }; const locked = lockedWindow(roster); return [ - state.error === null ? null : (0, import_react43.createElement)("div", { key: "error", className: "bt-error", role: "alert" }, state.error), + state.error === null ? null : (0, import_react47.createElement)("div", { key: "error", className: "bt-error", role: "alert" }, state.error), // The host refuses `project-create` and `project-bind` in a read-only window, so the page draws // no control that would call them; the Project list and its facts stay readable. - locked ? null : (0, import_react43.createElement)( + locked ? null : (0, import_react47.createElement)( SetSection, { key: "new", title: t("New Project") }, - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetRow, { label: t("Name") }, - (0, import_react43.createElement)("input", { + (0, import_react47.createElement)("input", { className: "bt-input", "aria-label": t("Project name"), value: name, @@ -20057,22 +21985,22 @@ function ProjectsPage({ roster, actions, run, call: call4 }) { onChange: (event) => setName(event.target.value) }) ), - (0, import_react43.createElement)( + (0, import_react47.createElement)( SetRow, { label: t("Working folder"), hint: t("Optional. Where this Project's work happens.") }, - (0, import_react43.createElement)(FolderMenu, { value: workDir, actions, run, onPick: setWorkDir }) + (0, import_react47.createElement)(FolderMenu, { value: workDir, actions, run, onPick: setWorkDir }) ), - (0, import_react43.createElement)( + (0, import_react47.createElement)( "div", { className: "bt-actions" }, - (0, import_react43.createElement)("button", { + (0, import_react47.createElement)("button", { type: "button", className: "bt-primary bt-with-icon", disabled: name.trim() === "", onClick: () => { void create(); } - }, (0, import_react43.createElement)(PlusIcon), t("New Project")) + }, (0, import_react47.createElement)(PlusIcon), t("New Project")) ) ), // The list is rendered here rather than as a child element: it holds no state of its own, @@ -20082,10 +22010,10 @@ function ProjectsPage({ roster, actions, run, call: call4 }) { } // src/client/context-menu.js -var import_react44 = require("react"); -function ContextMenu({ menu, roster, actions, leaving = false }) { +var import_react48 = require("react"); +function ContextMenu({ menu, roster, actions, unread, leaving = false }) { useEscape(() => actions.closeMenu()); - (0, import_react44.useEffect)(() => { + (0, import_react48.useEffect)(() => { const onDown = (event) => { if (!(event.target instanceof Element) || !event.target.closest(".bt-menu")) actions.closeMenu(); }; @@ -20093,25 +22021,27 @@ function ContextMenu({ menu, roster, actions, leaving = false }) { return () => window.removeEventListener("mousedown", onDown); }, []); const structure = useSidebarStructure(); - const ref = (0, import_react44.useRef)(null); - const [place, setPlace] = (0, import_react44.useState)({ left: menu.x, top: menu.y }); - (0, import_react44.useLayoutEffect)(() => { + const ref = (0, import_react48.useRef)(null); + const [place, setPlace] = (0, import_react48.useState)({ left: menu.x, top: menu.y }); + (0, import_react48.useLayoutEffect)(() => { const box = ref.current?.getBoundingClientRect(); if (!box) return; setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, window.innerHeight - box.height - 8)) }); }, [menu.x, menu.y]); - if (menu.kind === "agent" || menu.kind === "agent-session") return (0, import_react44.createElement)(AgentMenu, { menu, roster, actions, leaving }); + if (menu.kind === "agent" || menu.kind === "agent-session") return (0, import_react48.createElement)(AgentMenu, { menu, roster, actions, unread, leaving }); const bot = roster.byId[menu.id]; const room2 = roster.roomsById[menu.id]; const entry = bot ?? room2; if (entry === void 0) return null; + const marked = isManuallyUnread(unread, menu.id); + const unreadItem = marked ? [t("Clear unread mark"), UnreadIcon, () => actions.clearUnread(menu.id)] : [t("Mark as Unread"), UnreadIcon, () => actions.markUnread(menu.id)]; const isMainBot = isMainOf(roster, menu.id); const isTile = roster.mainBotId === menu.id; const mainCount = (roster.mainBotIds ?? []).length; const locked = typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; const groups = bot?.remote ? [ [ - [t("Mark as Unread"), UnreadIcon, () => actions.markUnread(menu.id)] + unreadItem ], [ [t("Bot settings"), GearIcon, () => actions.openSettings("bots", bot.id)] @@ -20121,7 +22051,7 @@ function ContextMenu({ menu, roster, actions, leaving = false }) { ] : [ [ isTile || locked ? null : [entry.pinned ? t("Unpin") : t("Pin"), PinIcon, () => actions.setFlags(menu.id, { pinned: !entry.pinned })], - [t("Mark as Unread"), UnreadIcon, () => actions.markUnread(menu.id)] + unreadItem ], [ // One way to edit a Bot (#385): its name is edited in Edit Bot too. @@ -20143,14 +22073,14 @@ function ContextMenu({ menu, roster, actions, leaving = false }) { ] ]; const shown = groups.map((group) => group.filter(Boolean)).filter((group) => group.length > 0); - return (0, import_react44.createElement)( + return (0, import_react48.createElement)( "div", { ref, className: "bt-menu", role: "menu", "aria-label": t("{name} actions", { name: bot?.name ?? room2.name }), style: place, "data-leaving": leaving || void 0 }, - shown.map((group, index) => (0, import_react44.createElement)( - import_react44.Fragment, + shown.map((group, index) => (0, import_react48.createElement)( + import_react48.Fragment, { key: index }, - index > 0 ? (0, import_react44.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, - group.map(([label, Icon, run, danger]) => (0, import_react44.createElement)("button", { + index > 0 ? (0, import_react48.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, + group.map(([label, Icon, run, danger]) => (0, import_react48.createElement)("button", { key: label, type: "button", role: "menuitem", @@ -20159,14 +22089,14 @@ function ContextMenu({ menu, roster, actions, leaving = false }) { actions.closeMenu(); void Promise.resolve(run()).catch((error) => actions.reportError(error, "menu")); } - }, (0, import_react44.createElement)(Icon), label)) + }, (0, import_react48.createElement)(Icon), label)) )) ); } -function AgentMenu({ menu, roster, actions, leaving }) { - const ref = (0, import_react44.useRef)(null); - const [place, setPlace] = (0, import_react44.useState)({ left: menu.x, top: menu.y }); - (0, import_react44.useLayoutEffect)(() => { +function AgentMenu({ menu, roster, actions, unread, leaving }) { + const ref = (0, import_react48.useRef)(null); + const [place, setPlace] = (0, import_react48.useState)({ left: menu.x, top: menu.y }); + (0, import_react48.useLayoutEffect)(() => { const box = ref.current?.getBoundingClientRect(); if (!box) return; setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, window.innerHeight - box.height - 8)) }); @@ -20174,14 +22104,20 @@ function AgentMenu({ menu, roster, actions, leaving }) { const agent = roster.agentsById[menu.kind === "agent" ? menu.id : menu.agentId]; if (agent === void 0) return null; const locked = typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; + const marked = isManuallyUnread(unread, agent.id); + const unreadItem = marked ? [t("Clear unread mark"), UnreadIcon, () => actions.clearUnread(agent.id)] : [t("Mark as Unread"), UnreadIcon, () => actions.markUnread(agent.id)]; const groups = menu.kind === "agent" ? [ [ - locked ? null : [agent.pinned ? t("Unpin") : t("Pin"), PinIcon, () => actions.setFlags(agent.id, { pinned: !agent.pinned })] + locked ? null : [agent.pinned ? t("Unpin") : t("Pin"), PinIcon, () => actions.setFlags(agent.id, { pinned: !agent.pinned })], + unreadItem ], [ locked ? null : [t("Remove DSH Agent"), TrashIcon, () => actions.removeAgent(agent.id), true] ] ] : [ + [ + unreadItem + ], [ locked ? null : [t("Rename"), PencilIcon, () => actions.beginAgentRename(menu.id)] ], @@ -20191,14 +22127,14 @@ function AgentMenu({ menu, roster, actions, leaving }) { ]; const shown = groups.map((group) => group.filter(Boolean)).filter((group) => group.length > 0); if (shown.length === 0) return null; - return (0, import_react44.createElement)( + return (0, import_react48.createElement)( "div", { ref, className: "bt-menu", role: "menu", "aria-label": menu.kind === "agent" ? "DSH Agent" : t("Session actions"), style: place, "data-leaving": leaving || void 0 }, - shown.map((group, index) => (0, import_react44.createElement)( - import_react44.Fragment, + shown.map((group, index) => (0, import_react48.createElement)( + import_react48.Fragment, { key: index }, - index > 0 ? (0, import_react44.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, - group.map(([label, Icon, run, danger]) => (0, import_react44.createElement)("button", { + index > 0 ? (0, import_react48.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, + group.map(([label, Icon, run, danger]) => (0, import_react48.createElement)("button", { key: label, type: "button", role: "menuitem", @@ -20207,7 +22143,7 @@ function AgentMenu({ menu, roster, actions, leaving }) { actions.closeMenu(); void Promise.resolve(run()).catch((error) => console.warn("[ds-bot]", error)); } - }, (0, import_react44.createElement)(Icon), label)) + }, (0, import_react48.createElement)(Icon), label)) )) ); } @@ -20293,7 +22229,7 @@ function migrateStorage(storage = globalThis.localStorage) { } // src/client/details-drawer.js -var import_react45 = require("react"); +var import_react49 = require("react"); var TAB_LABELS = { details: "Details", browser: "Browser" }; var hostOf = (url) => { try { @@ -20307,10 +22243,10 @@ var EMPTY_TABS = { ids: [], active: null }; var PERMISSION_LABELS = { "read-only": "Read only", "workspace-write": "Workspace", "danger-full-access": "Full access" }; var DANGER = /* @__PURE__ */ new Set(["danger-full-access"]); function PermissionRow({ bot, roster, actions, run }) { - const [pending, setPending] = (0, import_react45.useState)(null); + const [pending, setPending] = (0, import_react49.useState)(null); const catalog = roster.permissions; const saved = bot.permission ?? catalog?.defaultPreset; - (0, import_react45.useEffect)(() => { + (0, import_react49.useEffect)(() => { if (pending === saved) setPending(null); }, [pending, saved]); if (!catalog?.options?.length) return null; @@ -20320,14 +22256,14 @@ function PermissionRow({ bot, roster, actions, run }) { setPending(value); void run(actions.updateBot(bot.id, { permission: value })).catch(() => setPending(null)); }; - return (0, import_react45.createElement)( + return (0, import_react49.createElement)( "div", { className: "bt-drawer-permission" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Permissions")), - (0, import_react45.createElement)( + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Permissions")), + (0, import_react49.createElement)( Segmented, { label: t("Permissions"), value: current }, - catalog.options.map((option) => (0, import_react45.createElement)("button", { + catalog.options.map((option) => (0, import_react49.createElement)("button", { key: option.value, type: "button", "aria-pressed": option.value === current, @@ -20344,39 +22280,39 @@ function ReadOnlyOverview({ bot, roster }) { const catalog = roster.permissions; const preset = catalog?.options?.find((option) => option.value === (bot.permission ?? catalog?.defaultPreset)); const folder = bot.workDir ?? ""; - return (0, import_react45.createElement)( - import_react45.Fragment, + return (0, import_react49.createElement)( + import_react49.Fragment, null, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "div", { key: "model", className: "bt-drawer-model" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Model")), - (0, import_react45.createElement)( + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Model")), + (0, import_react49.createElement)( "div", { className: "bt-model-copy bt-readonly-value", title: shown?.ref }, - (0, import_react45.createElement)("span", { className: "bt-model-name" }, shown?.name ?? t("Not set")), - shown ? (0, import_react45.createElement)("span", { className: "bt-model-provider" }, shown.served || models.length === 0 ? shown.provider : t("{provider} · not available", { provider: shown.provider })) : null + (0, import_react49.createElement)("span", { className: "bt-model-name" }, shown?.name ?? t("Not set")), + shown ? (0, import_react49.createElement)("span", { className: "bt-model-provider" }, shown.served || models.length === 0 ? shown.provider : t("{provider} · not available", { provider: shown.provider })) : null ) ), - preset ? (0, import_react45.createElement)( + preset ? (0, import_react49.createElement)( "div", { key: "permission", className: "bt-drawer-model" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Permissions")), - (0, import_react45.createElement)( + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Permissions")), + (0, import_react49.createElement)( "div", { className: "bt-model-copy bt-readonly-value" }, - (0, import_react45.createElement)("span", { className: "bt-model-name" }, PERMISSION_LABELS[preset.value] ? t(PERMISSION_LABELS[preset.value]) : preset.name) + (0, import_react49.createElement)("span", { className: "bt-model-name" }, PERMISSION_LABELS[preset.value] ? t(PERMISSION_LABELS[preset.value]) : preset.name) ) ) : null, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "div", { key: "folder", className: "bt-drawer-model" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Working folder")), - (0, import_react45.createElement)( + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Working folder")), + (0, import_react49.createElement)( "div", { className: "bt-model-copy bt-readonly-value", title: folder || void 0 }, - (0, import_react45.createElement)("span", { className: "bt-model-name" }, folder ? folderName(folder) : t("Team workspace")), - folder ? (0, import_react45.createElement)("span", { className: "bt-model-provider" }, folder) : null + (0, import_react49.createElement)("span", { className: "bt-model-name" }, folder ? folderName(folder) : t("Team workspace")), + folder ? (0, import_react49.createElement)("span", { className: "bt-model-provider" }, folder) : null ) ) ); @@ -20384,42 +22320,42 @@ function ReadOnlyOverview({ bot, roster }) { function BrowserCards({ bot, sessionId, roster, actions, useBrowserTabs, useBrowserPages }) { const state = useBrowserTabs((map) => map[bot.id] ?? EMPTY_TABS); const pages = useBrowserPages((map) => map); - (0, import_react45.useEffect)(() => { + (0, import_react49.useEffect)(() => { actions.browserEnsure?.(bot.id); }, [bot.id]); if (roster.browser !== true || !actions.browserShow) { - return (0, import_react45.createElement)("div", { className: "bt-muted" }, t("The browser is in the DSH Desktop app.")); + return (0, import_react49.createElement)("div", { className: "bt-muted" }, t("The browser is in the DSH Desktop app.")); } if (state.ids.length === 0) { - return (0, import_react45.createElement)( + return (0, import_react49.createElement)( "div", { className: "bt-browser-empty-mark" }, - (0, import_react45.createElement)(BotMark, { bot, size: 40, state: "idle", live: true }), - (0, import_react45.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), - (0, import_react45.createElement)("div", { className: "bt-muted" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })), - (0, import_react45.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => actions.openBrowser(sessionId) }, t("Open browser")) + (0, import_react49.createElement)(BotMark, { bot, size: 40, state: "idle", live: true }), + (0, import_react49.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), + (0, import_react49.createElement)("div", { className: "bt-muted" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })), + (0, import_react49.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => actions.openBrowser(sessionId) }, t("Open browser")) ); } - return (0, import_react45.createElement)( + return (0, import_react49.createElement)( "div", { className: "bt-bcards" }, state.ids.map((tabId, index) => { const page = pages[tabId] ?? {}; const label = page.title || shortUrl(page.url) || t("New tab"); - return (0, import_react45.createElement)( + return (0, import_react49.createElement)( "div", { key: tabId, className: "bt-bcard", "data-active": state.active === tabId || void 0, style: { animationDelay: `${index * 30}ms` } }, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "button", { type: "button", className: "bt-bcard-shot", "aria-label": t("Open {title}", { title: label }), title: page.url, onClick: () => actions.browserPick(sessionId, tabId) }, - page.excerpt ? (0, import_react45.createElement)( + page.excerpt ? (0, import_react49.createElement)( "span", { className: "bt-bcard-preview" }, - (0, import_react45.createElement)("span", { className: "bt-bcard-ptitle" }, label), - (0, import_react45.createElement)("span", { className: "bt-bcard-excerpt" }, page.excerpt) - ) : (0, import_react45.createElement)("span", { className: "bt-bcard-blank" }, (0, import_react45.createElement)(GlobeIcon), (0, import_react45.createElement)("span", null, label)) + (0, import_react49.createElement)("span", { className: "bt-bcard-ptitle" }, label), + (0, import_react49.createElement)("span", { className: "bt-bcard-excerpt" }, page.excerpt) + ) : (0, import_react49.createElement)("span", { className: "bt-bcard-blank" }, (0, import_react49.createElement)(GlobeIcon), (0, import_react49.createElement)("span", null, label)) ), - (0, import_react45.createElement)("button", { + (0, import_react49.createElement)("button", { type: "button", className: "bt-bcard-x", "aria-label": t("Close tab"), @@ -20428,37 +22364,37 @@ function BrowserCards({ bot, sessionId, roster, actions, useBrowserTabs, useBrow void actions.browserCloseTab(bot.id, tabId); } }, "×"), - (0, import_react45.createElement)( + (0, import_react49.createElement)( "div", { className: "bt-bcard-row" }, - (0, import_react45.createElement)(Favicon, { src: page.favicon, className: "bt-bcard-fav" }), - (0, import_react45.createElement)("span", { className: "bt-bcard-title" }, label), - page.url ? (0, import_react45.createElement)("span", { className: "bt-bcard-host" }, hostOf(page.url)) : null + (0, import_react49.createElement)(Favicon, { src: page.favicon, className: "bt-bcard-fav" }), + (0, import_react49.createElement)("span", { className: "bt-bcard-title" }, label), + page.url ? (0, import_react49.createElement)("span", { className: "bt-bcard-host" }, hostOf(page.url)) : null ) ); }), - (0, import_react45.createElement)("button", { type: "button", className: "bt-bcard-new", style: { animationDelay: `${state.ids.length * 30}ms` }, onClick: () => actions.browserNewTab(sessionId) }, (0, import_react45.createElement)(PlusIcon), t("New tab")) + (0, import_react49.createElement)("button", { type: "button", className: "bt-bcard-new", style: { animationDelay: `${state.ids.length * 30}ms` }, onClick: () => actions.browserNewTab(sessionId) }, (0, import_react49.createElement)(PlusIcon), t("New tab")) ); } function About({ text: text2, title = "About" }) { - const [open, setOpen] = (0, import_react45.useState)(false); + const [open, setOpen] = (0, import_react49.useState)(false); const long = text2.split("\n").length > 5 || text2.length > 240; - const body = (0, import_react45.useRef)(null); + const body = (0, import_react49.useRef)(null); useMorph(body, open); - return (0, import_react45.createElement)( + return (0, import_react49.createElement)( "div", null, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t(title)), - (0, import_react45.createElement)("div", { ref: body, className: "bt-about", "data-open": open || void 0 }, text2), - long ? (0, import_react45.createElement)("button", { type: "button", className: "bt-more", onClick: () => setOpen((value) => !value) }, open ? t("Show less") : t("Show more")) : null + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t(title)), + (0, import_react49.createElement)("div", { ref: body, className: "bt-about", "data-open": open || void 0 }, text2), + long ? (0, import_react49.createElement)("button", { type: "button", className: "bt-more", onClick: () => setOpen((value) => !value) }, open ? t("Show less") : t("Show more")) : null ); } function SharedRoomApprovals({ room: room2, roster }) { - const [items, setItems] = (0, import_react45.useState)(room2.pendingApprovals ?? []); - const [busy, setBusy] = (0, import_react45.useState)(""); - const [error, setError] = (0, import_react45.useState)(""); + const [items, setItems] = (0, import_react49.useState)(room2.pendingApprovals ?? []); + const [busy, setBusy] = (0, import_react49.useState)(""); + const [error, setError] = (0, import_react49.useState)(""); const face = room2.origin === "face-to-face"; - (0, import_react45.useEffect)(() => { + (0, import_react49.useEffect)(() => { const haveItems = Array.isArray(room2.pendingApprovals) && room2.pendingApprovals.length; if (haveItems) setItems(room2.pendingApprovals); if (room2.viewerRole !== "invited-owner" && !face) return void 0; @@ -20488,33 +22424,33 @@ function SharedRoomApprovals({ room: room2, roster }) { setBusy(""); } }; - return (0, import_react45.createElement)( + return (0, import_react49.createElement)( "div", { key: "approvals", className: "bt-shared-wait", "data-flybot": "room-pending-approvals" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Waiting for your approval"), (0, import_react45.createElement)("span", { className: "bt-chip" }, t("{count} to approve", { count: items.length }))), + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Waiting for your approval"), (0, import_react49.createElement)("span", { className: "bt-chip" }, t("{count} to approve", { count: items.length }))), items.map((item) => { const at = typeof item.createdAt === "number" ? item.createdAt : Date.parse(item.createdAt); const age = Number.isFinite(at) && at > 0 ? ` · ${relativeShort(at)}` : null; - return (0, import_react45.createElement)( + return (0, import_react49.createElement)( "div", { key: item.id, className: "bt-set-row" }, - (0, import_react45.createElement)("span", { className: "bt-set-copy" }, item.text || item.summary || item.to || t("Outbound reply"), age), - locked ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-mini", disabled: busy === item.id, onClick: () => decide(item, "approve") }, t("Approve")), - locked ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-mini", disabled: busy === item.id, onClick: () => decide(item, "reject") }, t("Reject")) + (0, import_react49.createElement)("span", { className: "bt-set-copy" }, item.text || item.summary || item.to || t("Outbound reply"), age), + locked ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-mini", disabled: busy === item.id, onClick: () => decide(item, "approve") }, t("Approve")), + locked ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-mini", disabled: busy === item.id, onClick: () => decide(item, "reject") }, t("Reject")) ); }), - error ? (0, import_react45.createElement)("div", { className: "bt-error", role: "alert" }, error) : null + error ? (0, import_react49.createElement)("div", { className: "bt-error", role: "alert" }, error) : null ); } function FaceMembers({ room: room2, roster, actions }) { const people2 = facePeople(room2, roster); const pick2 = (bot) => call("social/face-lead", { roomId: room2.id, bot }); - return (0, import_react45.createElement)( + return (0, import_react49.createElement)( "div", null, - (0, import_react45.createElement)(FaceLead, { room: room2, roster, pick: pick2 }), - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: people2.length })), - (0, import_react45.createElement)("div", { className: "bt-members", role: "list" }, people2.map((person) => (0, import_react45.createElement)(FacePersonRow, { + (0, import_react49.createElement)(FaceLead, { room: room2, roster, pick: pick2 }), + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: people2.length })), + (0, import_react49.createElement)("div", { className: "bt-members", role: "list" }, people2.map((person) => (0, import_react49.createElement)(FacePersonRow, { key: person.key, person, roster, @@ -20542,97 +22478,97 @@ function GroupOverview({ room: room2, roster, actions, usage, useWork, openSetti // P-544: the group overview's writes are gone in a locked window, so it says why once, above // the reads it still draws. The approval card used to carry its own copy (#2381); one page, // one sentence. - readOnlyLine(import_react45.createElement, roster, actions, { key: "read-only" }), - (0, import_react45.createElement)(FlyBotRoomOverview, { key: "plugin-overview", room: room2, roster, actions }), - invited && room2.sharedFrom && !face ? (0, import_react45.createElement)( + readOnlyLine(import_react49.createElement, roster, actions, { key: "read-only" }), + (0, import_react49.createElement)(FlyBotRoomOverview, { key: "plugin-overview", room: room2, roster, actions }), + invited && room2.sharedFrom && !face ? (0, import_react49.createElement)( "div", { key: "from", className: "bt-shared-from" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, title), - (0, import_react45.createElement)("div", { className: "bt-set-hint" }, t("Your Bot was invited to this room by {name}", { name: room2.sharedFrom.inviterName })), - room2.sharedFrom.invitedAt ? (0, import_react45.createElement)("div", { className: "bt-set-hint" }, t("Invited {when}", { when: new Date(room2.sharedFrom.invitedAt).toLocaleString() })) : null, - locked ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-more", onClick: leaveMine }, t("Remove my Bot")) - ) : face ? null : room2.notice ? (0, import_react45.createElement)(About, { key: "notice", title: "Notice", text: room2.notice }) : (0, import_react45.createElement)("button", { key: "notice", type: "button", className: "bt-more", onClick: openSettings }, t("Add a notice in group settings")), - face ? null : (0, import_react45.createElement)(SharedRoomApprovals, { key: "approvals", room: room2, roster }), - face && (room2.face?.status === "candidate" || room2.face?.status === "joining") ? null : face ? (0, import_react45.createElement)(FaceMembers, { key: "members", room: room2, roster, actions }) : (0, import_react45.createElement)( + (0, import_react49.createElement)("div", { className: "bt-section-title" }, title), + (0, import_react49.createElement)("div", { className: "bt-set-hint" }, t("Your Bot was invited to this room by {name}", { name: room2.sharedFrom.inviterName })), + room2.sharedFrom.invitedAt ? (0, import_react49.createElement)("div", { className: "bt-set-hint" }, t("Invited {when}", { when: new Date(room2.sharedFrom.invitedAt).toLocaleString() })) : null, + locked ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-more", onClick: leaveMine }, t("Remove my Bot")) + ) : face ? null : room2.notice ? (0, import_react49.createElement)(About, { key: "notice", title: "Notice", text: room2.notice }) : (0, import_react49.createElement)("button", { key: "notice", type: "button", className: "bt-more", onClick: openSettings }, t("Add a notice in group settings")), + face ? null : (0, import_react49.createElement)(SharedRoomApprovals, { key: "approvals", room: room2, roster }), + face && (room2.face?.status === "candidate" || room2.face?.status === "joining") ? null : face ? (0, import_react49.createElement)(FaceMembers, { key: "members", room: room2, roster, actions }) : (0, import_react49.createElement)( "div", { key: "members" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length + humans.length + remotes.length })), - (0, import_react45.createElement)("div", { className: "bt-members", role: "list" }, [ - ...humans.map((person) => (0, import_react45.createElement)( + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length + humans.length + remotes.length })), + (0, import_react49.createElement)("div", { className: "bt-members", role: "list" }, [ + ...humans.map((person) => (0, import_react49.createElement)( "div", { key: person.id, role: "listitem" }, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "div", { className: "bt-member" }, - (0, import_react45.createElement)("span", { className: "bt-member-name" }, (0, import_react45.createElement)("span", null, person.displayName || person.id)), - (0, import_react45.createElement)("span", { className: "bt-chip" }, t("Human")), - person.role === "admin" ? (0, import_react45.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null + (0, import_react49.createElement)("span", { className: "bt-member-name" }, (0, import_react49.createElement)("span", null, person.displayName || person.id)), + (0, import_react49.createElement)("span", { className: "bt-chip" }, t("Human")), + person.role === "admin" ? (0, import_react49.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null ) )), - ...remotes.map((person) => (0, import_react45.createElement)( + ...remotes.map((person) => (0, import_react49.createElement)( "div", { key: person.handle || person.id, role: "listitem" }, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "div", { className: "bt-member" }, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "span", { className: "bt-member-name" }, - (0, import_react45.createElement)(BotAvatar, { bot: lookBotForRemote(person, roster), size: 26, badge: false, live: false }), - (0, import_react45.createElement)("span", { title: person.handle || void 0 }, person.label || remoteBotTitle(person)) + (0, import_react49.createElement)(BotAvatar, { bot: lookBotForRemote(person, roster), size: 26, badge: false, live: false }), + (0, import_react49.createElement)("span", { title: person.handle || void 0 }, person.label || remoteBotTitle(person)) ), - face ? null : (0, import_react45.createElement)("span", { className: "bt-chip" }, t("Friend's Bot")) + face ? null : (0, import_react49.createElement)("span", { className: "bt-chip" }, t("Friend's Bot")) ) )), ...members.map((member) => { const entry = entries2.find((item) => item.id === member.id); - return (0, import_react45.createElement)( + return (0, import_react49.createElement)( "div", { key: member.id, role: "listitem" }, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "div", { className: "bt-member" }, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "button", { type: "button", className: "bt-member-name", title: t("Open {name}'s chat", { name: member.name }), onClick: () => actions.openSession(member.id) }, - (0, import_react45.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room2.admin === member.id, live: false }), - (0, import_react45.createElement)("span", null, member.name) + (0, import_react49.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room2.admin === member.id, live: false }), + (0, import_react49.createElement)("span", null, member.name) ), - room2.admin === member.id ? (0, import_react45.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null + room2.admin === member.id ? (0, import_react49.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null ), - entry ? (0, import_react45.createElement)(MemberWork, { entry, bot: member, room: room2, roster, actions, now }) : null + entry ? (0, import_react49.createElement)(MemberWork, { entry, bot: member, room: room2, roster, actions, now }) : null ); }) ]) ), - face ? null : (0, import_react45.createElement)( + face ? null : (0, import_react49.createElement)( "div", { key: "mode" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Who answers")), - (0, import_react45.createElement)("div", { className: "bt-kv" }, (0, import_react45.createElement)("span", null, t(ROOM_MODES.find(([id]) => id === shownMode(room2, roster))?.[1] ?? "Everyone"))) + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Who answers")), + (0, import_react49.createElement)("div", { className: "bt-kv" }, (0, import_react49.createElement)("span", null, t(ROOM_MODES.find(([id]) => id === shownMode(room2, roster))?.[1] ?? "Everyone"))) ), - face || !usage ? null : (0, import_react45.createElement)( + face || !usage ? null : (0, import_react49.createElement)( "div", { key: "usage" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Usage")), - (0, import_react45.createElement)("div", { className: "bt-kv" }, (0, import_react45.createElement)("span", null, room2.name), (0, import_react45.createElement)("span", null, usage)) + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Usage")), + (0, import_react49.createElement)("div", { className: "bt-kv" }, (0, import_react49.createElement)("span", null, room2.name), (0, import_react49.createElement)("span", null, usage)) ), - (0, import_react45.createElement)(RoomSchedules, { key: "routines", room: room2, actions }) + (0, import_react49.createElement)(RoomSchedules, { key: "routines", room: room2, actions }) ]; } function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) { const owner = roster.byId[sessionId]; const part = owner ? currentPart(owner) : sessionId; const isMainBot = isMainOf(roster, owner?.id); - const [tab, setTab] = (0, import_react45.useState)("details"); + const [tab, setTab] = (0, import_react49.useState)("details"); const room2 = roster.roomsById[sessionId]; - const [view, setView] = (0, import_react45.useState)(startTab === "settings" && (owner || room2) ? "settings" : "overview"); - const [editing, setEditing] = (0, import_react45.useState)(Boolean(startRenaming && (roster.byId[sessionId] || roster.roomsById[sessionId]))); - const [draftName, setDraftName] = (0, import_react45.useState)(roster.byId[sessionId]?.name ?? (roster.roomsById[sessionId]?.named ? roster.roomsById[sessionId].name : "")); - const [copied, setCopied] = (0, import_react45.useState)(false); - const [error, setError] = (0, import_react45.useState)(""); + const [view, setView] = (0, import_react49.useState)(startTab === "settings" && (owner || room2) ? "settings" : "overview"); + const [editing, setEditing] = (0, import_react49.useState)(Boolean(startRenaming && (roster.byId[sessionId] || roster.roomsById[sessionId]))); + const [draftName, setDraftName] = (0, import_react49.useState)(roster.byId[sessionId]?.name ?? (roster.roomsById[sessionId]?.named ? roster.roomsById[sessionId].name : "")); + const [copied, setCopied] = (0, import_react49.useState)(false); + const [error, setError] = (0, import_react49.useState)(""); const glide = useGlide(tab); - const last = (0, import_react45.useRef)({ view, tab, move: void 0 }); + const last = (0, import_react49.useRef)({ view, tab, move: void 0 }); if (last.current.view !== view) last.current = { view, tab, move: view === "settings" ? "in" : "out" }; else if (last.current.tab !== tab) last.current = { view, tab, move: "tab" }; const move = last.current.move; @@ -20667,39 +22603,39 @@ function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, a actions.notify?.(t("Conversation copied as Markdown")); }); }; - const errorLine = error ? (0, import_react45.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null; + const errorLine = error ? (0, import_react49.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null; if ((bot || room2) && view === "settings" && !bot?.remote) { return [ - (0, import_react45.createElement)( + (0, import_react49.createElement)( "div", { key: "head", className: "bt-subhead", "data-move": move }, - (0, import_react45.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to details"), onClick: () => setView("overview") }, (0, import_react45.createElement)(ChevronLeftIcon)), - (0, import_react45.createElement)("span", { className: "bt-subhead-title" }, bot ? t("Settings") : t("Group settings")), - hasStrip ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close details"), onClick: close }, (0, import_react45.createElement)(CloseIcon)) + (0, import_react49.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to details"), onClick: () => setView("overview") }, (0, import_react49.createElement)(ChevronLeftIcon)), + (0, import_react49.createElement)("span", { className: "bt-subhead-title" }, bot ? t("Settings") : t("Group settings")), + hasStrip ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close details"), onClick: close }, (0, import_react49.createElement)(CloseIcon)) ), errorLine, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "div", { key: "set-body", className: "bt-drawer-body bt-set-body", "data-move": move }, // #2387: the lock is the window's, not the Bot's — a read-only window draws the host's sentence // in place of a group's form too, exactly as it already did for a Bot's. - lockedWindow(roster) ? readOnlyLine(import_react45.createElement, roster, actions) : bot ? (0, import_react45.createElement)(BotSettingsForm, { bot, roster, actions, run }) : (0, import_react45.createElement)(GroupSettingsForm, { room: room2, roster, actions, run, onDeleted: close }) + lockedWindow(roster) ? readOnlyLine(import_react49.createElement, roster, actions) : bot ? (0, import_react49.createElement)(BotSettingsForm, { bot, roster, actions, run }) : (0, import_react49.createElement)(GroupSettingsForm, { room: room2, roster, actions, run, onDeleted: close }) ) ]; } - const top = (0, import_react45.createElement)( + const top = (0, import_react49.createElement)( "div", { className: "bt-drawer-top", "data-move": side }, - bot || room2 ? (0, import_react45.createElement)("button", { + bot || room2 ? (0, import_react49.createElement)("button", { type: "button", className: "bt-round", "aria-label": bot ? bot.remote ? t("Bot settings") : t("Edit Bot") : t("Group settings"), title: bot ? bot.remote ? t("Bot settings") : t("Edit Bot") : t("Group settings"), "data-info-row": "settings", onClick: () => bot?.remote ? actions.openSettings("bots", bot.id) : setView("settings") - }, (0, import_react45.createElement)(GearIcon)) : null, - bot && !bot.remote && roster.browser === true && actions.openBrowser ? (0, import_react45.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Open browser"), title: t("Open this Bot's browser"), onClick: () => actions.openBrowser(sessionId) }, (0, import_react45.createElement)(GlobeIcon)) : null, - bot || room2 ? (0, import_react45.createElement)("button", { + }, (0, import_react49.createElement)(GearIcon)) : null, + bot && !bot.remote && roster.browser === true && actions.openBrowser ? (0, import_react49.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Open browser"), title: t("Open this Bot's browser"), onClick: () => actions.openBrowser(sessionId) }, (0, import_react49.createElement)(GlobeIcon)) : null, + bot || room2 ? (0, import_react49.createElement)("button", { type: "button", className: "bt-round", // #1347: the accessible name says what the click does, which is copy — "Share conversation" @@ -20708,13 +22644,13 @@ function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, a "aria-label": copied ? t("Copied conversation") : t("Copy conversation"), title: copied ? t("Copied") : t("Copy conversation as Markdown"), onClick: share - }, copied ? (0, import_react45.createElement)("span", { key: "copied", className: "bt-pop-in" }, "✓") : (0, import_react45.createElement)(ShareIcon)) : null, - hasStrip ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Close details"), onClick: close }, (0, import_react45.createElement)(CloseIcon)) + }, copied ? (0, import_react49.createElement)("span", { key: "copied", className: "bt-pop-in" }, "✓") : (0, import_react49.createElement)(ShareIcon)) : null, + hasStrip ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Close details"), onClick: close }, (0, import_react49.createElement)(CloseIcon)) ); if (!bot && !room2) { return [ - (0, import_react45.createElement)(import_react45.Fragment, { key: "top" }, top), - (0, import_react45.createElement)("div", { key: "body", className: "bt-drawer-body" }, (0, import_react45.createElement)("div", { className: "bt-muted" }, t("This conversation is not part of your Bot team."))) + (0, import_react49.createElement)(import_react49.Fragment, { key: "top" }, top), + (0, import_react49.createElement)("div", { key: "body", className: "bt-drawer-body" }, (0, import_react49.createElement)("div", { className: "bt-muted" }, t("This conversation is not part of your Bot team."))) ]; } const current = bot?.name ?? room2.name; @@ -20728,12 +22664,12 @@ function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, a const subtitle = bot ? bot.role : roomSubtitle(room2, roster); const tabs = bot ? ["details", "browser"] : ["details"]; return [ - (0, import_react45.createElement)(import_react45.Fragment, { key: "top" }, top), - (0, import_react45.createElement)( + (0, import_react49.createElement)(import_react49.Fragment, { key: "top" }, top), + (0, import_react49.createElement)( "div", { key: "id", className: "bt-drawer-id", "data-move": side }, - bot ? (0, import_react45.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react45.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), - bot?.remote ? (0, import_react45.createElement)("div", { className: "bt-drawer-name" }, current) : bot && lockedWindow(roster) ? (0, import_react45.createElement)("div", { className: "bt-drawer-name", title: current }, current) : room2?.origin === "face-to-face" ? (0, import_react45.createElement)("div", { className: "bt-drawer-name bt-drawer-name-face", title: current }, current) : room2 && lockedWindow(roster) ? (0, import_react45.createElement)("div", { className: "bt-drawer-name", title: current }, current) : editing ? (0, import_react45.createElement)("input", { + bot ? (0, import_react49.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react49.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), + bot?.remote ? (0, import_react49.createElement)("div", { className: "bt-drawer-name" }, current) : bot && lockedWindow(roster) ? (0, import_react49.createElement)("div", { className: "bt-drawer-name", title: current }, current) : room2?.origin === "face-to-face" ? (0, import_react49.createElement)("div", { className: "bt-drawer-name bt-drawer-name-face", title: current }, current) : room2 && lockedWindow(roster) ? (0, import_react49.createElement)("div", { className: "bt-drawer-name", title: current }, current) : editing ? (0, import_react49.createElement)("input", { className: "bt-drawer-name-input", autoFocus: true, value: draftName, @@ -20748,68 +22684,68 @@ function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, a setEditing(false); } } - }) : (0, import_react45.createElement)("button", { type: "button", className: "bt-drawer-name", "aria-label": t("Rename {name}", { name: current }), title: t("Rename"), onClick: () => { + }) : (0, import_react49.createElement)("button", { type: "button", className: "bt-drawer-name", "aria-label": t("Rename {name}", { name: current }), title: t("Rename"), onClick: () => { setDraftName(room2 && !room2.named ? "" : current); setEditing(true); } }, current), - subtitle ? (0, import_react45.createElement)("span", { className: "bt-drawer-role" }, subtitle) : bot?.remote ? (0, import_react45.createElement)("span", { className: "bt-drawer-role" }, t("Friend's Bot")) : null + subtitle ? (0, import_react49.createElement)("span", { className: "bt-drawer-role" }, subtitle) : bot?.remote ? (0, import_react49.createElement)("span", { className: "bt-drawer-role" }, t("Friend's Bot")) : null ), - bot?.remote ? null : (0, import_react45.createElement)( + bot?.remote ? null : (0, import_react49.createElement)( "div", { key: "tabs", ref: glide.box, className: "bt-tabs", role: "tablist", "data-move": side }, - (0, import_react45.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), - tabs.map((key) => (0, import_react45.createElement)("button", { key, type: "button", role: "tab", className: "bt-tab", "aria-selected": tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key]))) + (0, import_react49.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), + tabs.map((key) => (0, import_react49.createElement)("button", { key, type: "button", role: "tab", className: "bt-tab", "aria-selected": tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key]))) ), // #2385/P-542: the refused-write line is a sibling above the scrolling body here too — the body // is `overflow-y:auto` (`styles.js:389`), so the first child's sentence lands where the person // scrolled past, not where the press happened. errorLine, - (0, import_react45.createElement)( + (0, import_react49.createElement)( "div", { key: `body:${tab}`, className: "bt-drawer-body", "data-move": move }, - room2 && tab === "details" ? (0, import_react45.createElement)(GroupOverview, { room: room2, roster, actions, usage, useWork, openSettings: () => setView("settings") }) : null, + room2 && tab === "details" ? (0, import_react49.createElement)(GroupOverview, { room: room2, roster, actions, usage, useWork, openSettings: () => setView("settings") }) : null, bot && bot.remote && tab === "details" ? [ - bot.remote.handle ? (0, import_react45.createElement)("div", { key: "handle", className: "bt-muted" }, bot.remote.handle) : null, - (0, import_react45.createElement)(FlyBotDetails, { key: "social", bot, roster, actions }) + bot.remote.handle ? (0, import_react49.createElement)("div", { key: "handle", className: "bt-muted" }, bot.remote.handle) : null, + (0, import_react49.createElement)(FlyBotDetails, { key: "social", bot, roster, actions }) ] : null, bot && !bot.remote && tab === "details" ? [ // P-542/P-487: the overview's own model, permission and folder entries are writes too, and a // locked window refuses every one of them. Say so once at the top and draw the read half only, // which is the values themselves (P-547) — the name above is already text, and the settings // gear still opens the page that explains the window. - lockedWindow(roster) ? readOnlyLine(import_react45.createElement, roster, actions, { key: "read-only" }) : null, - lockedWindow(roster) ? (0, import_react45.createElement)(ReadOnlyOverview, { key: "read", bot, roster }) : null, - lockedWindow(roster) ? null : (0, import_react45.createElement)( + lockedWindow(roster) ? readOnlyLine(import_react49.createElement, roster, actions, { key: "read-only" }) : null, + lockedWindow(roster) ? (0, import_react49.createElement)(ReadOnlyOverview, { key: "read", bot, roster }) : null, + lockedWindow(roster) ? null : (0, import_react49.createElement)( "div", { key: "model", className: "bt-drawer-model" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Model")), - (0, import_react45.createElement)(ModelMenu, { bot, roster, actions, run, wide: true }), - modelOf(bot, roster) ? null : (0, import_react45.createElement)("div", { className: "bt-note" }, t("Pick a model and {name} can start.", { name: bot.name })) + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Model")), + (0, import_react49.createElement)(ModelMenu, { bot, roster, actions, run, wide: true }), + modelOf(bot, roster) ? null : (0, import_react49.createElement)("div", { className: "bt-note" }, t("Pick a model and {name} can start.", { name: bot.name })) ), - lockedWindow(roster) ? null : (0, import_react45.createElement)(PermissionRow, { key: "permission", bot, roster, actions, run }), - lockedWindow(roster) ? null : (0, import_react45.createElement)( + lockedWindow(roster) ? null : (0, import_react49.createElement)(PermissionRow, { key: "permission", bot, roster, actions, run }), + lockedWindow(roster) ? null : (0, import_react49.createElement)( "div", { key: "folder", className: "bt-drawer-model" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Working folder")), - (0, import_react45.createElement)(FolderMenu, { value: bot.workDir, actions, run, wide: true, onPick: (workDir) => run(actions.updateBot(bot.id, { workDir })) }) + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Working folder")), + (0, import_react49.createElement)(FolderMenu, { value: bot.workDir, actions, run, wide: true, onPick: (workDir) => run(actions.updateBot(bot.id, { workDir })) }) ), - bot.instructions ? (0, import_react45.createElement)(About, { key: "about", text: bot.instructions }) : (0, import_react45.createElement)("button", { key: "about", type: "button", className: "bt-more", onClick: () => setView("settings") }, t("Add instructions in Bot settings")), - roster.memory === false ? null : (0, import_react45.createElement)(MemoryRow, { key: "memory", bot, actions }), - usage ? (0, import_react45.createElement)( + bot.instructions ? (0, import_react49.createElement)(About, { key: "about", text: bot.instructions }) : (0, import_react49.createElement)("button", { key: "about", type: "button", className: "bt-more", onClick: () => setView("settings") }, t("Add instructions in Bot settings")), + roster.memory === false ? null : (0, import_react49.createElement)(MemoryRow, { key: "memory", bot, actions }), + usage ? (0, import_react49.createElement)( "div", { key: "usage" }, - (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Usage")), - (0, import_react45.createElement)("div", { className: "bt-kv" }, (0, import_react45.createElement)("span", null, bot.name), (0, import_react45.createElement)("span", null, usage)) + (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Usage")), + (0, import_react49.createElement)("div", { className: "bt-kv" }, (0, import_react49.createElement)("span", null, bot.name), (0, import_react49.createElement)("span", null, usage)) ) : null, - (0, import_react45.createElement)(ScheduleSummary, { key: "routines", bot, roster, actions }) + (0, import_react49.createElement)(ScheduleSummary, { key: "routines", bot, roster, actions }) ] : null, - bot && !bot.remote && tab === "browser" ? (0, import_react45.createElement)(BrowserCards, { bot, sessionId, roster, actions, useBrowserTabs, useBrowserPages }) : null + bot && !bot.remote && tab === "browser" ? (0, import_react49.createElement)(BrowserCards, { bot, sessionId, roster, actions, useBrowserTabs, useBrowserPages }) : null ) ]; } // src/client/browser-pane.js -var import_react46 = require("react"); +var import_react50 = require("react"); var import_react_dom10 = require("react-dom"); var PANEL_LINGER_MS = 300; var WIDTH_KEY = STORAGE.browserWidth; @@ -20819,10 +22755,10 @@ var EMPTY_TABS2 = { ids: [], active: null }; var SPRING_LEAD2 = springEasing(576, 39.4); var SPRING_TRAIL2 = springEasing(144, 19.7); var icon2 = (paths) => function BrowserIcon() { - return (0, import_react46.createElement)( + return (0, import_react50.createElement)( "svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, - paths.map((d, index) => (0, import_react46.createElement)("path", { key: index, d })) + paths.map((d, index) => (0, import_react50.createElement)("path", { key: index, d })) ); }; var GlobeIcon = icon2(["M10 3a7 7 0 1 0 0 14 7 7 0 0 0 0-14z", "M3 10h14", "M10 3c2 2.2 2.9 4.5 2.9 7S12 14.8 10 17c-2-2.2-2.9-4.5-2.9-7S8 5.2 10 3z"]); @@ -20834,9 +22770,9 @@ var CloseIcon2 = icon2(["M5.5 5.5l9 9M14.5 5.5l-9 9"]); var PlusTabIcon = icon2(["M10 5v10M5 10h10"]); var LockIcon2 = icon2(["M6.5 9V7a3.5 3.5 0 0 1 7 0v2", "M5.5 9h9v7h-9z"]); function Favicon({ src, className }) { - const [failed, setFailed] = (0, import_react46.useState)(null); - if (!src || failed === src) return (0, import_react46.createElement)("span", { className: `${className} bt-ptab-globe` }, (0, import_react46.createElement)(GlobeIcon)); - return (0, import_react46.createElement)("img", { className, src, alt: "", "aria-hidden": true, onError: () => setFailed(src) }); + const [failed, setFailed] = (0, import_react50.useState)(null); + if (!src || failed === src) return (0, import_react50.createElement)("span", { className: `${className} bt-ptab-globe` }, (0, import_react50.createElement)(GlobeIcon)); + return (0, import_react50.createElement)("img", { className, src, alt: "", "aria-hidden": true, onError: () => setFailed(src) }); } var savedWidth = () => { try { @@ -20895,11 +22831,11 @@ var reducedMotion2 = () => typeof matchMedia === "function" && matchMedia("(pref var tabLabel = (page) => page.title || shortAddress(page.url) || t("New tab"); function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions, useBrowserPages }) { const pages = useBrowserPages((map) => map); - const wrap = (0, import_react46.useRef)(null); - const ind = (0, import_react46.useRef)(null); - const spot = (0, import_react46.useRef)(null); - const under = (0, import_react46.useRef)(null); - (0, import_react46.useLayoutEffect)(() => { + const wrap = (0, import_react50.useRef)(null); + const ind = (0, import_react50.useRef)(null); + const spot = (0, import_react50.useRef)(null); + const under = (0, import_react50.useRef)(null); + (0, import_react50.useLayoutEffect)(() => { const box = wrap.current; const capsule = ind.current; if (!box || !capsule) return void 0; @@ -20928,7 +22864,7 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions, trail.cancel(); }; }); - (0, import_react46.useEffect)(() => { + (0, import_react50.useEffect)(() => { const box = wrap.current; if (!box) return void 0; const observer = new ResizeObserver(() => { @@ -20942,13 +22878,13 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions, observer.observe(box); return () => observer.disconnect(); }, []); - return (0, import_react46.createElement)( + return (0, import_react50.createElement)( "div", { className: "bt-ptabs", role: "tablist", "aria-label": t("Panel tabs") }, - (0, import_react46.createElement)( + (0, import_react50.createElement)( "div", { className: "bt-ptabs-in", ref: wrap }, - (0, import_react46.createElement)( + (0, import_react50.createElement)( "button", { type: "button", @@ -20958,13 +22894,13 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions, title: bot.name, onClick: () => onView("details") }, - (0, import_react46.createElement)(BotMark, { bot, size: 20, state: reading ? "searching" : "idle" }), - view === "details" ? (0, import_react46.createElement)("span", { className: "bt-ptab-name" }, bot.name) : null + (0, import_react50.createElement)(BotMark, { bot, size: 20, state: reading ? "searching" : "idle" }), + view === "details" ? (0, import_react50.createElement)("span", { className: "bt-ptab-name" }, bot.name) : null ), ids.map((tabId) => { const page = pages[tabId] ?? EMPTY_PAGE; const on = view === "browser" && tabId === active; - return (0, import_react46.createElement)( + return (0, import_react50.createElement)( "button", { key: tabId, @@ -20985,9 +22921,9 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions, } } }, - (0, import_react46.createElement)(Favicon, { src: page.favicon, className: "bt-ptab-fav" }), - (0, import_react46.createElement)("span", { className: "bt-ptab-title" }, tabLabel(page)), - (0, import_react46.createElement)("span", { + (0, import_react50.createElement)(Favicon, { src: page.favicon, className: "bt-ptab-fav" }), + (0, import_react50.createElement)("span", { className: "bt-ptab-title" }, tabLabel(page)), + (0, import_react50.createElement)("span", { className: "bt-ptab-x", role: "button", "aria-label": t("Close tab"), @@ -20999,20 +22935,20 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions, }, "×") ); }), - (0, import_react46.createElement)("span", { ref: ind, className: "bt-ptab-ind", "aria-hidden": true }) + (0, import_react50.createElement)("span", { ref: ind, className: "bt-ptab-ind", "aria-hidden": true }) ), // New tab and Close stay outside the scrolling tabs, so a narrow panel keeps both. - (0, import_react46.createElement)("button", { type: "button", className: "bt-ptab-new", "aria-label": t("New tab"), title: t("New tab"), onClick: () => actions.browserNewTab(subject) }, (0, import_react46.createElement)(PlusTabIcon)), - (0, import_react46.createElement)("button", { type: "button", className: "bt-icon-btn bt-ptab-close", "aria-label": t("Close panel"), title: t("Close panel"), onClick: () => actions.closePanel() }, (0, import_react46.createElement)(CloseIcon2)) + (0, import_react50.createElement)("button", { type: "button", className: "bt-ptab-new", "aria-label": t("New tab"), title: t("New tab"), onClick: () => actions.browserNewTab(subject) }, (0, import_react50.createElement)(PlusTabIcon)), + (0, import_react50.createElement)("button", { type: "button", className: "bt-icon-btn bt-ptab-close", "aria-label": t("Close panel"), title: t("Close panel"), onClick: () => actions.closePanel() }, (0, import_react50.createElement)(CloseIcon2)) ); } function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) { const page = useBrowserPages((pages) => pages[tabId ?? ""]) ?? EMPTY_PAGE; - const frame = (0, import_react46.useRef)(null); - const input = (0, import_react46.useRef)(null); - const [draft, setDraft] = (0, import_react46.useState)(null); + const frame = (0, import_react50.useRef)(null); + const input = (0, import_react50.useRef)(null); + const [draft, setDraft] = (0, import_react50.useState)(null); const showGuest = landed && !leaving && Boolean(page.url) && !page.error; - (0, import_react46.useLayoutEffect)(() => { + (0, import_react50.useLayoutEffect)(() => { const element = frame.current; if (!element || leaving || !tabId) { void actions.browserShow(null); @@ -21038,7 +22974,7 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) window.removeEventListener("resize", schedule); }; }, [tabId, showGuest, leaving]); - (0, import_react46.useEffect)(() => { + (0, import_react50.useEffect)(() => { setDraft(null); if (landed && !page.url) input.current?.focus(); }, [tabId, landed]); @@ -21054,27 +22990,27 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) }; const editing = draft !== null; const secure = /^https:/i.test(page.url); - return (0, import_react46.createElement)( + return (0, import_react50.createElement)( "div", { className: "bt-panel-view bt-panel-browser", "aria-label": t("{name}'s browser", { name: bot.name }) }, - (0, import_react46.createElement)( + (0, import_react50.createElement)( "div", { className: "bt-browser-bar" }, - (0, import_react46.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back"), title: t("Back"), disabled: !page.canGoBack, onClick: () => actions.browserCommand(tabId, "back") }, (0, import_react46.createElement)(BackIcon)), - (0, import_react46.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Forward"), title: t("Forward"), disabled: !page.canGoForward, onClick: () => actions.browserCommand(tabId, "forward") }, (0, import_react46.createElement)(ForwardIcon)), - (0, import_react46.createElement)("button", { + (0, import_react50.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back"), title: t("Back"), disabled: !page.canGoBack, onClick: () => actions.browserCommand(tabId, "back") }, (0, import_react50.createElement)(BackIcon)), + (0, import_react50.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Forward"), title: t("Forward"), disabled: !page.canGoForward, onClick: () => actions.browserCommand(tabId, "forward") }, (0, import_react50.createElement)(ForwardIcon)), + (0, import_react50.createElement)("button", { type: "button", className: "bt-icon-btn", disabled: !page.url, "aria-label": page.loading ? t("Stop") : t("Reload"), title: page.loading ? t("Stop") : t("Reload"), onClick: () => actions.browserCommand(tabId, page.loading ? "stop" : "reload") - }, (0, import_react46.createElement)(page.loading ? StopIcon : ReloadIcon)), - (0, import_react46.createElement)( + }, (0, import_react50.createElement)(page.loading ? StopIcon : ReloadIcon)), + (0, import_react50.createElement)( "form", { className: "bt-browser-address", onSubmit: go, "data-editing": editing || void 0 }, - (0, import_react46.createElement)("span", { className: "bt-browser-scheme", "aria-hidden": true }, (0, import_react46.createElement)(secure && !editing ? LockIcon2 : GlobeIcon)), - (0, import_react46.createElement)("input", { + (0, import_react50.createElement)("span", { className: "bt-browser-scheme", "aria-hidden": true }, (0, import_react50.createElement)(secure && !editing ? LockIcon2 : GlobeIcon)), + (0, import_react50.createElement)("input", { ref: input, type: "text", spellCheck: false, @@ -21098,25 +23034,25 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) } }) ), - page.loading ? (0, import_react46.createElement)("span", { className: "bt-browser-progress", "aria-hidden": true }) : null + page.loading ? (0, import_react50.createElement)("span", { className: "bt-browser-progress", "aria-hidden": true }) : null ), - (0, import_react46.createElement)( + (0, import_react50.createElement)( "div", { ref: frame, className: "bt-browser-frame", "data-guest": showGuest || void 0 }, - page.error ? (0, import_react46.createElement)( + page.error ? (0, import_react50.createElement)( "div", { className: "bt-browser-empty" }, - (0, import_react46.createElement)("div", { className: "bt-browser-empty-title" }, t("This page didn’t load")), - (0, import_react46.createElement)("div", { className: "bt-browser-empty-text" }, t(page.error)), - page.url ? (0, import_react46.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => { + (0, import_react50.createElement)("div", { className: "bt-browser-empty-title" }, t("This page didn’t load")), + (0, import_react50.createElement)("div", { className: "bt-browser-empty-text" }, t(page.error)), + page.url ? (0, import_react50.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => { void actions.browserNavigate(tabId, page.url); } }, t("Try again")) : null - ) : !page.url ? (0, import_react46.createElement)( + ) : !page.url ? (0, import_react50.createElement)( "div", { className: "bt-browser-empty" }, - (0, import_react46.createElement)(BotMark, { bot, size: 48, state: "idle", live: true }), - (0, import_react46.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), - (0, import_react46.createElement)("div", { className: "bt-browser-empty-text" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })) + (0, import_react50.createElement)(BotMark, { bot, size: 48, state: "idle", live: true }), + (0, import_react50.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), + (0, import_react50.createElement)("div", { className: "bt-browser-empty-text" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })) ) : null ) ); @@ -21124,45 +23060,45 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) { const bot = roster.byId[pane.id]; const canBrowse = Boolean(bot && roster.browser === true && actions.browserShow); - const view = pane.view === "browser" && canBrowse ? "browser" : "details"; + const view = pane.view === "browser" && canBrowse ? "browser" : pane.view === "document" && pane.document ? "document" : "details"; const tabState = useBrowserTabs((map) => bot ? map[bot.id] ?? EMPTY_TABS2 : EMPTY_TABS2); const active = tabState.active; const page = useBrowserPages((pages) => (active ? pages[active] : null) ?? EMPTY_PAGE); - const root = (0, import_react46.useRef)(null); - const fly = (0, import_react46.useRef)(null); - const [landed, setLanded] = (0, import_react46.useState)(false); - const [settling, setSettling] = (0, import_react46.useState)(false); - const [width, setWidth] = (0, import_react46.useState)(savedWidth); - const [viewport, setViewport] = (0, import_react46.useState)(() => window.innerWidth); - const [dragging, setDragging] = (0, import_react46.useState)(false); - const [resizing, setResizing] = (0, import_react46.useState)(false); + const root = (0, import_react50.useRef)(null); + const fly = (0, import_react50.useRef)(null); + const [landed, setLanded] = (0, import_react50.useState)(false); + const [settling, setSettling] = (0, import_react50.useState)(false); + const [width, setWidth] = (0, import_react50.useState)(savedWidth); + const [viewport, setViewport] = (0, import_react50.useState)(() => window.innerWidth); + const [dragging, setDragging] = (0, import_react50.useState)(false); + const [resizing, setResizing] = (0, import_react50.useState)(false); const instant2 = dragging || resizing; - const [reading, setReading] = (0, import_react46.useState)(false); + const [reading, setReading] = (0, import_react50.useState)(false); const panelWidth = fitWidth(width ?? (view === "browser" ? DEFAULT_WIDTH : DETAILS_WIDTH), widthRange(view, viewport)); - (0, import_react46.useLayoutEffect)(() => { + (0, import_react50.useLayoutEffect)(() => { if (view === "browser" && width === null) setWidth(DEFAULT_WIDTH); }, [view, width]); - (0, import_react46.useLayoutEffect)(() => { + (0, import_react50.useLayoutEffect)(() => { chatRoom.hold(instant2); }, [instant2]); - const [last, setLast] = (0, import_react46.useState)({ view, width: panelWidth }); + const [last, setLast] = (0, import_react50.useState)({ view, width: panelWidth }); if (last.view !== view || last.width !== panelWidth) { setLast({ view, width: panelWidth }); if (last.view !== view) setSettling(last.width !== panelWidth && !instant2); } - const shownView = (0, import_react46.useRef)(view); - (0, import_react46.useLayoutEffect)(() => { + const shownView = (0, import_react50.useRef)(view); + (0, import_react50.useLayoutEffect)(() => { const switched = settling && shownView.current !== view; shownView.current = view; if (switched) chatRoom.hold(true); chatRoom.set(leaving ? null : panelWidth); if (switched) chatRoom.hold(false); }, [view, panelWidth, leaving]); - (0, import_react46.useEffect)(() => () => { + (0, import_react50.useEffect)(() => () => { chatRoom.set(null); chatRoom.hold(false); }, []); - (0, import_react46.useEffect)(() => { + (0, import_react50.useEffect)(() => { let timer; const onResize = () => { setResizing(true); @@ -21176,28 +23112,28 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu window.removeEventListener("resize", onResize); }; }, []); - (0, import_react46.useEffect)(() => { + (0, import_react50.useEffect)(() => { if (!settling) return void 0; const timer = setTimeout(() => setSettling(false), SPRING_SHAPE.duration + 40); return () => clearTimeout(timer); }, [settling, view]); - (0, import_react46.useEffect)(() => { + (0, import_react50.useEffect)(() => { const timer = setTimeout(() => setLanded(true), 360); return () => clearTimeout(timer); }, []); - (0, import_react46.useEffect)(() => { + (0, import_react50.useEffect)(() => { if (canBrowse) actions.browserEnsure(bot.id); }, [bot?.id, canBrowse]); - (0, import_react46.useEffect)(() => { + (0, import_react50.useEffect)(() => { if (view === "browser" && (active === null || !tabState.ids.includes(active))) actions.setPanelView("details"); }, [view, active, tabState.ids.length]); - (0, import_react46.useEffect)(() => { + (0, import_react50.useEffect)(() => { if (view !== "browser" || leaving) void actions.browserShow?.(null); }, [view, leaving]); - (0, import_react46.useEffect)(() => () => { + (0, import_react50.useEffect)(() => () => { void actions.browserShow?.(null); }, []); - (0, import_react46.useEffect)(() => { + (0, import_react50.useEffect)(() => { if (!page.readAt || Date.now() - page.readAt > READ_FLASH_MS) return void 0; setReading(true); const timer = setTimeout(() => setReading(false), READ_FLASH_MS); @@ -21234,7 +23170,7 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu return actions[name](...args); }; } - (0, import_react46.useLayoutEffect)(() => { + (0, import_react50.useLayoutEffect)(() => { const move = fly.current; if (!move) return; fly.current = null; @@ -21317,13 +23253,13 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu for (const name of ends) grip.addEventListener(name, onEnd); }; const hasStrip = canBrowse && tabState.ids.length > 0; - return (0, import_react46.createElement)( + return (0, import_react50.createElement)( "aside", { ref: root, className: "bt-panel", "data-view": view, - "aria-label": view === "browser" && bot ? t("{name}'s browser", { name: bot.name }) : t("Conversation details"), + "aria-label": view === "browser" && bot ? t("{name}'s browser", { name: bot.name }) : view === "document" ? pane.document?.title || t("Document") : t("Conversation details"), "data-leaving": leaving || void 0, "aria-hidden": leaving || void 0, "data-settling": settling || void 0, @@ -21334,15 +23270,19 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu if (event.target === event.currentTarget) setLanded(true); } }, - leaving ? null : (0, import_react46.createElement)("div", { className: "bt-panel-grip", role: "separator", "aria-orientation": "vertical", "aria-label": t("Resize panel"), onPointerDown: startResize }), + leaving ? null : (0, import_react50.createElement)("div", { className: "bt-panel-grip", role: "separator", "aria-orientation": "vertical", "aria-label": t("Resize panel"), onPointerDown: startResize }), // Over the whole window while dragging: the cursor stays a resize cursor and the // pages underneath (the chat, the guest) see no pointer. - dragging ? (0, import_react_dom10.createPortal)((0, import_react46.createElement)("div", { className: "bt-drag-shield", "aria-hidden": true }), document.body) : null, - hasStrip ? (0, import_react46.createElement)(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null, - view === "browser" && bot ? (0, import_react46.createElement)(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) : (0, import_react46.createElement)( + dragging ? (0, import_react_dom10.createPortal)((0, import_react50.createElement)("div", { className: "bt-drag-shield", "aria-hidden": true }), document.body) : null, + hasStrip ? (0, import_react50.createElement)(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null, + view === "browser" && bot ? (0, import_react50.createElement)(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) : view === "document" ? (0, import_react50.createElement)( + "div", + { key: `document:${pane.id}:${pane.document?.title ?? ""}`, className: "bt-panel-view" }, + (0, import_react50.createElement)(DocumentPane, { document: pane.document, onClose: () => actions.closePanel() }) + ) : (0, import_react50.createElement)( "div", { key: `details:${pane.id}:${pane.renaming ? "rename" : ""}:${pane.tab ?? ""}`, className: "bt-panel-view" }, - (0, import_react46.createElement)(DetailsDrawer, { + (0, import_react50.createElement)(DetailsDrawer, { sessionId: pane.id, startRenaming: pane.renaming, startTab: pane.tab, @@ -21439,7 +23379,7 @@ var BROWSER_CSS = ` `; // src/client/remote-bot-settings.js -var import_react47 = require("react"); +var import_react51 = require("react"); var REMOTE_BOT_SETTINGS_CSS = ` .bt-remote-sheet-layer{position:fixed;inset:0;z-index:120;isolation:isolate;display:flex;align-items:flex-end;justify-content:center;padding:16px;pointer-events:none} .bt-remote-sheet-layer[data-leaving]{pointer-events:none} @@ -21463,8 +23403,8 @@ var REMOTE_BOT_SETTINGS_CSS = ` function RemoteBotSettingsSheet({ bot, roster, actions, leaving = false }) { const close = () => actions.closeSettings(); useEscape(close); - const dialog = (0, import_react47.useRef)(null); - (0, import_react47.useEffect)(() => { + const dialog = (0, import_react51.useRef)(null); + (0, import_react51.useEffect)(() => { const before = document.activeElement; dialog.current?.focus?.({ preventScroll: true }); return () => { @@ -21479,37 +23419,37 @@ function RemoteBotSettingsSheet({ bot, roster, actions, leaving = false }) { }; if (!bot?.remote) return null; const who = bot.remote.homeName || bot.remote.owner || bot.remote.home || t("Friend's Bot"); - return (0, import_react47.createElement)( + return (0, import_react51.createElement)( "div", { className: "bt-remote-sheet-layer", "data-leaving": leaving || void 0, "data-flybot": "remote-bot-sheet" }, - (0, import_react47.createElement)("div", { className: "bt-scrim", onMouseDown: close }), - (0, import_react47.createElement)( + (0, import_react51.createElement)("div", { className: "bt-scrim", onMouseDown: close }), + (0, import_react51.createElement)( "div", { className: "bt-remote-sheet", role: "dialog", "aria-modal": true, "aria-label": t("Bot settings"), tabIndex: -1, ref: dialog, onKeyDown }, - (0, import_react47.createElement)( + (0, import_react51.createElement)( "div", { className: "bt-remote-sheet-head" }, - (0, import_react47.createElement)(BotMark, { bot, size: 40, live: true }), - (0, import_react47.createElement)( + (0, import_react51.createElement)(BotMark, { bot, size: 40, live: true }), + (0, import_react51.createElement)( "div", { className: "bt-remote-sheet-who" }, - (0, import_react47.createElement)("span", { className: "bt-remote-sheet-name" }, bot.name), - (0, import_react47.createElement)("span", { className: "bt-remote-sheet-sub" }, who) + (0, import_react51.createElement)("span", { className: "bt-remote-sheet-name" }, bot.name), + (0, import_react51.createElement)("span", { className: "bt-remote-sheet-sub" }, who) ), - (0, import_react47.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close settings"), onClick: close }, (0, import_react47.createElement)(CloseIcon)) + (0, import_react51.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close settings"), onClick: close }, (0, import_react51.createElement)(CloseIcon)) ), - (0, import_react47.createElement)( + (0, import_react51.createElement)( "div", { className: "bt-remote-sheet-body" }, - bot.remote.handle ? (0, import_react47.createElement)("div", { className: "bt-muted", style: { marginBottom: 8, fontSize: 12 } }, bot.remote.handle) : null, - (0, import_react47.createElement)(FlyBotDetails, { bot, roster, actions }) + bot.remote.handle ? (0, import_react51.createElement)("div", { className: "bt-muted", style: { marginBottom: 8, fontSize: 12 } }, bot.remote.handle) : null, + (0, import_react51.createElement)(FlyBotDetails, { bot, roster, actions }) ) ) ); } // src/client/overlays.js -var import_react48 = require("react"); +var import_react52 = require("react"); var import_react_dom11 = require("react-dom"); var DIALOG_EXIT_MS = 160; var MENU_EXIT_MS3 = 120; @@ -21518,22 +23458,22 @@ function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity const ui2 = useUi((value) => value); useRegistry((value) => value); const current = useSessions((list) => Object.values(list.byId).find((session) => (session?.retainedBy?.mainView ?? 0) > 0)?.id ?? null); - const previous = (0, import_react48.useRef)(current); - (0, import_react48.useEffect)(() => { + const previous = (0, import_react52.useRef)(current); + (0, import_react52.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 } : null; - const [kept, setKept] = (0, import_react48.useState)(open); - (0, import_react48.useEffect)(() => { + const open = ui2.details ? { id: ui2.details, view: ui2.view ?? "details", renaming: ui2.renaming, tab: ui2.tab, document: ui2.document ?? null } : null; + const [kept, setKept] = (0, import_react52.useState)(open); + (0, import_react52.useEffect)(() => { if (open) { setKept(open); return void 0; } const timer = setTimeout(() => setKept(null), PANEL_LINGER_MS); return () => clearTimeout(timer); - }, [ui2.details, ui2.view, ui2.renaming, ui2.tab]); + }, [ui2.details, ui2.view, ui2.renaming, ui2.tab, ui2.document]); const pane = open ?? kept; const [settings, settingsLeaving] = useLinger(ui2.settings, DIALOG_EXIT_MS); const remoteBotId = ui2.remoteBotSettings && roster.byId[ui2.remoteBotSettings]?.remote ? ui2.remoteBotSettings : null; @@ -21542,20 +23482,20 @@ function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity const [menu, menuLeaving] = useLinger(ui2.menu, MENU_EXIT_MS3); const [inbox, inboxLeaving] = useLinger(ui2.inbox ?? null, DIALOG_EXIT_MS); const [board, boardLeaving] = useLinger(ui2.board ?? null, DIALOG_EXIT_MS); - return (0, import_react48.createElement)( - import_react48.Fragment, + return (0, import_react52.createElement)( + import_react52.Fragment, null, - pane ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }), document.body) : null, - ui2.newChat ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(NewChat, { key: ui2.newChat, mode: ui2.newChat, roster, actions }), document.body) : null, - ui2.palette ? (0, import_react_dom11.createPortal)((0, import_react48.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_dom11.createPortal)((0, import_react48.createElement)(ExchangeDialog, { pair: ui2.exchange, roster, actions }), document.body) : null, - ui2.voice ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(VoiceMode, { key: ui2.voice, sessionId: ui2.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null, - menu ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(ContextMenu, { key: `${menu.kind ?? ""}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, leaving: menuLeaving }), document.body) : null, - settings ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null, - remoteBotSettings ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(RemoteBotSettingsSheet, { key: remoteBotSettings, bot: roster.byId[remoteBotSettings], roster, actions, leaving: remoteLeaving }), document.body) : null, - memory && roster.byId[memory] ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(MemoryDialog, { key: memory, bot: roster.byId[memory], roster, actions, leaving: memoryLeaving }), document.body) : null, - inbox ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(InboxDialog, { roster, useWork, useSessions, actions, leaving: inboxLeaving }), document.body) : null, - board ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(KanbanDialog, { roster, actions, leaving: boardLeaving }), document.body) : null + pane ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }), document.body) : null, + ui2.newChat ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(NewChat, { key: ui2.newChat, mode: ui2.newChat, roster, actions }), document.body) : null, + ui2.palette ? (0, import_react_dom11.createPortal)((0, import_react52.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_dom11.createPortal)((0, import_react52.createElement)(ExchangeDialog, { pair: ui2.exchange, roster, actions }), document.body) : null, + ui2.voice ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(VoiceMode, { key: ui2.voice, sessionId: ui2.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null, + menu ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(ContextMenu, { key: `${menu.kind ?? ""}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, unread: ui2.unread, leaving: menuLeaving }), document.body) : null, + settings ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null, + remoteBotSettings ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(RemoteBotSettingsSheet, { key: remoteBotSettings, bot: roster.byId[remoteBotSettings], roster, actions, leaving: remoteLeaving }), document.body) : null, + memory && roster.byId[memory] ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(MemoryDialog, { key: memory, bot: roster.byId[memory], roster, actions, leaving: memoryLeaving }), document.body) : null, + inbox ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(InboxDialog, { roster, useWork, useSessions, actions, leaving: inboxLeaving }), document.body) : null, + board ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(KanbanDialog, { roster, actions, leaving: boardLeaving }), document.body) : null ); } @@ -22358,6 +24298,17 @@ function serveBrowserReads({ browsers, post, clientId = globalThis.crypto.random var MOBILE_MAX_WIDTH = 640; var MOBILE_CSS = ` @media (max-width:${MOBILE_MAX_WIDTH}px){ +.bt-appearance-seg{flex-wrap:wrap} +.bt-appearance-seg button{height:auto;min-height:36px;white-space:normal;overflow-wrap:anywhere} +.bt-ng-split{grid-template-columns:minmax(0,1fr);min-height:0} +.bt-mem-shell{flex-direction:column} +.bt-mem-nav{width:auto;max-height:36vh;border-right:0;border-bottom:.5px solid var(--bt-line)} +.bt-menu{max-width:calc(100vw - 16px)} +.bt-message-note{white-space:normal;overflow-wrap:anywhere;padding:6px 8px;max-width:220px} +.bt-utools,.bt-tools{opacity:1;visibility:visible} +.bt-umsg{flex-wrap:wrap} +.bt-menu-reacts{flex-wrap:wrap} + .bt-held-actions{max-width:100%} .bt-held-card{padding:10px 12px} :is(.bt-held-card,.bt-flybot-approval) .bt-flybot-approval-actions{gap:8px;margin-top:8px} @@ -22547,7 +24498,7 @@ var announceStateLink = (value, seen, say) => { }; // src/client/user-message.js -var import_react49 = require("react"); +var import_react53 = require("react"); var ui = __toESM(require("@deepseek-ai/dsh-client-ui-primitives"), 1); var canDrawUserMessages = () => typeof ui.projectUserText === "function"; function contentParts(content) { @@ -22633,41 +24584,52 @@ function userTextParts(text2, bots, referenceLabels = []) { return parts; } function UserText({ text: text2, bots, referenceLabels, skillNames, references, actions }) { - const chip = (part) => [(0, import_react49.createElement)(BotMark, { bot: part.bot.draw ?? part.bot, size: 16 }), `@${part.bot.mentionLabel ?? part.label}`]; + const chip = (part) => [(0, import_react53.createElement)(BotMark, { bot: part.bot.draw ?? part.bot, size: 16 }), `@${part.bot.mentionLabel ?? part.label}`]; return userTextParts(text2, bots, referenceLabels).map((part, index) => { - if (!part.bot) return (0, import_react49.createElement)(import_react49.Fragment, { key: index }, ui.projectUserText(part.text, referenceLabels, skillNames, "skill", references)); + if (!part.bot) return (0, import_react53.createElement)(import_react53.Fragment, { key: index }, ui.projectUserText(part.text, referenceLabels, skillNames, "skill", references)); const title = `@${part.bot.name}`; - return typeof part.bot.id === "string" ? (0, import_react49.createElement)("button", { key: index, type: "button", className: "bt-umention", title, onClick: () => actions.openSession(part.bot.id) }, chip(part)) : (0, import_react49.createElement)("span", { key: index, className: "bt-umention", title }, chip(part)); + return typeof part.bot.id === "string" ? (0, import_react53.createElement)("button", { key: index, type: "button", className: "bt-umention", title, onClick: () => actions.openSession(part.bot.id) }, chip(part)) : (0, import_react53.createElement)("span", { key: index, className: "bt-umention", title }, chip(part)); }); } function Attachments({ attachments, renderMessageImages }) { const compact2 = attachments.length > 1; - return (0, import_react49.createElement)("div", { className: "bt-uattach" }, attachments.map((block, index) => { + return (0, import_react53.createElement)("div", { className: "bt-uattach" }, attachments.map((block, index) => { if (block.type === "image") { - return renderMessageImages ? (0, import_react49.createElement)(import_react49.Fragment, { key: index }, renderMessageImages({ images: [{ attachment: block.attachment }], align: "end", compact: compact2 })) : null; + return renderMessageImages ? (0, import_react53.createElement)(import_react53.Fragment, { key: index }, renderMessageImages({ images: [{ attachment: block.attachment }], align: "end", compact: compact2 })) : null; } const file = block.attachment; const meta = [ui.fileExtension?.(file.name)?.toUpperCase().slice(0, 8), ui.fileSizeText?.(file.bytes)].filter(Boolean).join(" · "); - return (0, import_react49.createElement)( + return (0, import_react53.createElement)( "span", { key: index, className: "bt-ufile", title: file.name }, - ui.FileTypeIcon ? (0, import_react49.createElement)(ui.FileTypeIcon, { path: file.name, className: "bt-ufile-icon" }) : null, - (0, import_react49.createElement)("span", { className: "bt-ufile-text" }, (0, import_react49.createElement)("span", { className: "bt-ufile-name" }, file.name), meta ? (0, import_react49.createElement)("span", { className: "bt-ufile-meta" }, meta) : null) + ui.FileTypeIcon ? (0, import_react53.createElement)(ui.FileTypeIcon, { path: file.name, className: "bt-ufile-icon" }) : null, + (0, import_react53.createElement)("span", { className: "bt-ufile-text" }, (0, import_react53.createElement)("span", { className: "bt-ufile-name" }, file.name), meta ? (0, import_react53.createElement)("span", { className: "bt-ufile-meta" }, meta) : null) ); })); } -function CopyButton({ text: text2 }) { - const [copied, setCopied] = (0, import_react49.useState)(false); - const copy2 = () => { - void navigator.clipboard?.writeText(text2).then(() => { - setCopied(true); - setTimeout(() => setCopied(false), 1e3); - }); - }; - return (0, import_react49.createElement)("button", { type: "button", className: "bt-tool", "aria-label": copied ? t("Copied") : t("Copy"), title: copied ? t("Copied") : t("Copy"), onClick: copy2 }, copied ? (0, import_react49.createElement)(CheckIcon) : (0, import_react49.createElement)(CopyIcon)); -} var clock3 = (time) => typeof time === "number" ? new Date(time).toLocaleTimeString(dateLocale(), { hour: "numeric", minute: "2-digit" }) : void 0; -function UserMessageCell({ node, sessionId, useRoster, actions, renderMessageImages, openFile, openSkill }) { +function userBody({ text: text2, rest, roster, sessionId, incoming, author, referenceLabels, skillNames, references, actions, time }) { + if (text2 === "" && rest.length === 0) return null; + const folding = foldingOf(roster.prefs); + const card = text2 !== "" && showsDocumentCard(text2, folding); + const message = text2 === "" ? null : (0, import_react53.createElement)(FoldedContent, { text: text2, folding, actions, sessionId }, card ? void 0 : (shown) => (0, import_react53.createElement)(UserText, { + text: shown, + bots: mentionableBots(roster, sessionId, { fromFriend: Boolean(incoming && author.ownerName) }), + referenceLabels, + skillNames, + references, + actions + })); + if (card && rest.length === 0) return message; + return (0, import_react53.createElement)( + "div", + { className: "bt-ubody", title: clock3(time) }, + card ? null : message, + rest.map((block, index) => ui.JsonBlock ? (0, import_react53.createElement)(ui.JsonBlock, { key: index, label: t("Content"), payload: block }) : null), + card ? message : null + ); +} +function UserMessageCell({ node, sessionId, useRoster, useUi, actions, renderMessageImages, openFile, openSkill }) { const roster = useRoster((value) => value); const data = node.data ?? {}; const { text: text2, attachments, rest } = contentParts(data.content); @@ -22681,7 +24643,13 @@ function UserMessageCell({ node, sessionId, useRoster, actions, renderMessageIma const person = incoming && author.authorKind === "human" && !author.ownerName; const faceMine = Boolean(room2?.origin === "face-to-face" && !incoming); const myName = faceMine ? facePeople(room2, roster).find((entry) => entry.mine)?.name || cleanPeerName(roster.self?.displayName, "") || author?.name || "" : ""; - return (0, import_react49.createElement)( + const reactKey = userMessageReactKey(sessionId, node); + const reactions = typeof useUi === "function" ? useUi((state) => reactKey ? state.reactions?.[reactKey] ?? null : null) : null; + const picked = reactions?.[0] ?? []; + const [contextAt, setContextAt] = (0, import_react53.useState)(null); + const react = reactKey && typeof actions?.toggleReaction === "function" ? (emoji) => actions.toggleReaction(reactKey, 0, emoji) : void 0; + const who = incoming ? author?.name || "message" : myName || t("You"); + return (0, import_react53.createElement)( "div", { className: incoming ? "bt-umsg bt-umsg-other" : "bt-umsg", @@ -22689,24 +24657,36 @@ function UserMessageCell({ node, sessionId, useRoster, actions, renderMessageIma "data-face-mine": faceMine || void 0, "data-author": author?.authorId, "data-author-kind": author?.authorKind, - "data-author-name": author?.name + "data-author-name": author?.name, + onContextMenu: text2.trim() ? (event) => onMessageContextMenu(event, setContextAt) : void 0 }, - person ? (0, import_react49.createElement)("span", { className: "bt-lead", title: author.name }, (0, import_react49.createElement)(PersonMark, { name: author.name })) : null, - faceMine ? (0, import_react49.createElement)("span", { className: "bt-lead", title: myName || void 0 }, (0, import_react49.createElement)(PersonMark, { name: myName || void 0 })) : null, - (0, import_react49.createElement)( + person ? (0, import_react53.createElement)("span", { className: "bt-lead", title: author.name }, (0, import_react53.createElement)(PersonMark, { name: author.name })) : null, + faceMine ? (0, import_react53.createElement)("span", { className: "bt-lead", title: myName || void 0 }, (0, import_react53.createElement)(PersonMark, { name: myName || void 0 })) : null, + (0, import_react53.createElement)( "div", { className: "bt-ustack" }, - faceMine && myName ? (0, import_react49.createElement)("span", { className: "bt-uauthor" }, myName) : author && (incoming || multiHuman) ? (0, import_react49.createElement)("span", { className: "bt-uauthor" }, author.name, author.ownerName ? (0, import_react49.createElement)("span", { className: "bt-chip" }, t("Friend's Bot")) : null) : null, - attachments.length > 0 ? (0, import_react49.createElement)(Attachments, { attachments, renderMessageImages }) : null, - text2 !== "" || rest.length > 0 ? (0, import_react49.createElement)( - "div", - { className: "bt-ubody", title: clock3(data.time) }, - (0, import_react49.createElement)(UserText, { text: text2, bots: mentionableBots(roster, sessionId, { fromFriend: Boolean(incoming && author.ownerName) }), referenceLabels, skillNames: data.skillNames ?? [], references, actions }), - rest.map((block, index) => ui.JsonBlock ? (0, import_react49.createElement)(ui.JsonBlock, { key: index, label: t("Content"), payload: block }) : null) - ) : null, - referenceLabels.length > 0 ? (0, import_react49.createElement)("div", { className: "bt-urefs" }, t("Referenced {labels}", { labels: referenceLabels.join(t(", ")) })) : null + faceMine && myName ? (0, import_react53.createElement)("span", { className: "bt-uauthor" }, myName) : author && (incoming || multiHuman) ? (0, import_react53.createElement)("span", { className: "bt-uauthor" }, author.name, author.ownerName ? (0, import_react53.createElement)("span", { className: "bt-chip" }, t("Friend's Bot")) : null) : null, + attachments.length > 0 ? (0, import_react53.createElement)(Attachments, { attachments, renderMessageImages }) : null, + userBody({ text: text2, rest, roster, sessionId, incoming, author, referenceLabels, skillNames: data.skillNames ?? [], references, actions, time: data.time }), + referenceLabels.length > 0 ? (0, import_react53.createElement)("div", { className: "bt-urefs" }, t("Referenced {labels}", { labels: referenceLabels.join(t(", ")) })) : null, + picked.length ? (0, import_react53.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react53.createElement)("button", { + key: emoji, + type: "button", + className: "bt-react", + "aria-label": t("Remove reaction {emoji}", { emoji }), + onClick: () => actions.toggleReaction(reactKey, 0, emoji) + }, emoji))) : null ), - text2 === "" ? null : (0, import_react49.createElement)("div", { className: "bt-utools" }, (0, import_react49.createElement)(CopyButton, { text: text2 })) + (0, import_react53.createElement)(MessageTools, { + text: text2, + name: who, + sessionId, + react, + actions, + roster, + contextAt, + className: "bt-utools" + }) ); } var USER_MESSAGE_CSS = ` @@ -22732,7 +24712,9 @@ var USER_MESSAGE_CSS = ` .bt-ufile-meta{font-size:12px;line-height:15px;color:var(--bt-ink-3);white-space:nowrap;overflow:hidden;text-overflow:ellipsis} .bt-urefs{font-size:13px;line-height:18px;color:var(--bt-ink-3)} .bt-utools{display:flex;flex:none;gap:2px;opacity:0;visibility:hidden;transition:opacity .12s ease,visibility .12s} -.bt-umsg:hover .bt-utools,.bt-umsg:focus-within .bt-utools{opacity:1;visibility:visible} +.bt-umsg:hover .bt-utools,.bt-umsg:focus-within .bt-utools,.bt-utools[data-open]{opacity:1;visibility:visible} +.bt-umsg .bt-reacts{justify-content:flex-end} +.bt-umsg-other .bt-reacts{justify-content:flex-start} `; // src/client/approval-notices.js @@ -22804,7 +24786,7 @@ function noticeApprovals({ work, roster, shownSession, openSession, since: since } // src/client/stats-dock.js -var import_react50 = require("react"); +var import_react54 = require("react"); var STATS_DOCK = "conversation.composer.dock"; var STATS_ID = "stats"; var STATS_IDS = [STATS_ID, "activity"]; @@ -22820,17 +24802,17 @@ function pluralStats(t2) { function statsDock(entriesOf, id = STATS_ID) { const shell = () => (entriesOf(STATS_DOCK) ?? []).find((entry) => entry?.component !== StatsDock && entry?.options?.id === id); function StatsDock(props) { - const t2 = (0, import_react50.useMemo)(() => typeof props.t === "function" ? pluralStats(props.t) : props.t, [props.t]); + const t2 = (0, import_react54.useMemo)(() => typeof props.t === "function" ? pluralStats(props.t) : props.t, [props.t]); const entry = shell(); if (!entry || typeof props.usePerformanceUsage !== "function") return null; - return (0, import_react50.createElement)(entry.component, { ...props, t: t2 }); + return (0, import_react54.createElement)(entry.component, { ...props, t: t2 }); } return { component: StatsDock, inject: (...args) => shell()?.inject?.(...args) ?? {} }; } var statsDocks = (entriesOf) => STATS_IDS.map((id) => ({ id, ...statsDock(entriesOf, id) })); // src/client/index.js -var import_react51 = require("react"); +var import_react55 = require("react"); var inject = ["sessions", "uiWorkspace", "uiConversation", "slots", "theme", "layout"]; function apply(ctx) { const flybot = createClientApi2(); @@ -22883,7 +24865,7 @@ function apply(ctx) { } catch { friendLines = null; } - const ui2 = createSource({ details: null, view: "details", renaming: false, tab: null, newChat: null, exchange: null, menu: null, voice: null, palette: null, quote: null, settings: null, remoteBotSettings: null, memory: null, toast: null, signIn: null, renameAgent: null, unread: savedUnread, reactions: savedReactions, visits: {} }); + const ui2 = createSource({ details: null, view: "details", document: null, renaming: false, tab: null, newChat: null, exchange: null, menu: null, voice: null, palette: null, quote: null, settings: null, remoteBotSettings: null, memory: null, toast: null, signIn: null, renameAgent: null, unread: savedUnread, reactions: savedReactions, visits: {} }); const surface = createSource({ mode: readMode(), plain: false }); let agentSessionCache = /* @__PURE__ */ new Set(); try { @@ -22901,7 +24883,7 @@ function apply(ctx) { }; let expected = null; const setPlain = (plain) => surface.set((state) => state.plain === plain ? state : { ...state, plain }); - const dropPanels = () => ui2.set((state) => state.details || state.renaming ? { ...state, details: null, view: "details", renaming: false, tab: null } : state); + const dropPanels = () => ui2.set((state) => state.details || state.renaming || state.document ? { ...state, details: null, view: "details", document: null, renaming: false, tab: null } : state); const seenKey = (id) => roster.getSnapshot().byId?.[id]?.id ?? id; const visitTails = {}; const leaveVisits = (ids) => { @@ -23151,38 +25133,64 @@ function apply(ctx) { const style = installStyles("", "theme"); let key = ""; let releaseTokens = null; - const render = () => { + const originalDark = document.body.hasAttribute("data-ds-dark-theme"); + const prefsNow = () => { const snapshot = roster.getSnapshot(); - const prefs = snapshot.ready ? snapshot.prefs ?? {} : savedPrefs; + return { snapshot, prefs: snapshot.ready ? snapshot.prefs ?? {} : savedPrefs }; + }; + const applyDark = (force = false) => { + const { prefs } = prefsNow(); + const wanted = isDarkAppearance(prefs, /* @__PURE__ */ new Date(), systemDark()); + const current = document.body.hasAttribute("data-ds-dark-theme"); + if (wanted === current) return; + const busy = !force && document.body.querySelector('[data-bt-running], [data-session-running], [aria-busy="true"]'); + if (busy) return; + applyAppearanceAttribute(wanted); + }; + const render = () => { + const { snapshot, prefs } = prefsNow(); const themes = allThemes(); - const id = themes[prefs.theme] ? prefs.theme : "deepseek"; + const id = resolveThemeId(prefs, themes); const accent = isHex(prefs.accent) ? prefs.accent : void 0; const motion = prefs.motion === "quiet" || prefs.motion === "lively" ? prefs.motion : "normal"; + const appearance = appearanceOf(prefs); document.body.dataset.btMotion = motion; - const next = `${id}|${accent ?? ""}|${motion}|${registry3.getSnapshot()}`; - if (next === key) return; - key = next; - style.textContent = themeCss(themes[id], accent); - const release = releaseTokens; - releaseTokens = ctx.theme.overrideTokens("ds-bot", shellTokens(themes[id])); - if (typeof release === "function") release(); - if (snapshot.ready) { - try { - localStorage.setItem(PREFS_KEY, JSON.stringify({ theme: prefs.theme, accent: prefs.accent, motion: prefs.motion })); - } catch { + document.body.dataset.btAppearance = appearance.mode; + const next = `${id}|${accent ?? ""}|${motion}|${appearance.mode}|${appearance.auto}|${appearance.from}|${appearance.to}|${registry3.getSnapshot()}`; + const changed2 = next !== key; + if (changed2) { + key = next; + style.textContent = themeCss(themes[id], accent); + const release = releaseTokens; + releaseTokens = ctx.theme.overrideTokens("ds-bot", shellTokens(themes[id])); + if (typeof release === "function") release(); + if (snapshot.ready) { + try { + localStorage.setItem(PREFS_KEY, JSON.stringify(themePrefsRecord(prefs))); + } catch { + } } } + applyDark(changed2); }; render(); const offRoster = roster.subscribe(render); const offRegistry = registry3.subscribe(render); + const media = typeof matchMedia === "function" ? matchMedia("(prefers-color-scheme: dark)") : null; + const onScheme = () => applyDark(); + media?.addEventListener?.("change", onScheme); + const tick = setInterval(() => applyDark(), 6e4); return () => { offRoster(); offRegistry(); + media?.removeEventListener?.("change", onScheme); + clearInterval(tick); + applyAppearanceAttribute(originalDark); try { if (typeof releaseTokens === "function") releaseTokens(); } finally { delete document.body.dataset.btMotion; + delete document.body.dataset.btAppearance; style.remove(); } }; @@ -23321,6 +25329,8 @@ function apply(ctx) { openNewChat: (mode) => { ui2.set((state) => ({ ...state, newChat: mode, menu: null, palette: null })); }, + searchMessages: (body, signal) => call("search-messages", body, signal), + readHistoryHit: (body, signal) => call("history-hit", body, signal), openPalette: (query = "") => { ui2.set((state) => ({ ...state, palette: { query, token: Date.now() }, newChat: null, menu: null })); }, @@ -23340,24 +25350,37 @@ function apply(ctx) { toggleDetails: (id, force) => { ui2.set((state) => { const details = force || state.details !== id || state.view !== "details" ? id : null; - return { ...state, renaming: false, tab: null, details, view: "details" }; + return { ...state, renaming: false, tab: null, details, view: "details", document: null }; }); }, + // A long-document card opens its full text in the side panel, beside the conversation. + openDocument: ({ title, text: text2, sessionId }) => { + const id = sessionId; + if (!id || text2 == null || String(text2) === "") return; + ui2.set((state) => ({ + ...state, + details: id, + view: "document", + document: { title: title || "Document", text: String(text2) }, + renaming: false, + tab: null + })); + }, // The open panel follows the main view; a subject with no browser (a group // chat, an outside Session) settles on the details view. followPanel: (id) => { ui2.set((state) => { if (!state.details || state.details === id) return state; - const view = state.view === "browser" && roster.getSnapshot().byId[id] === void 0 ? "details" : state.view; - return { ...state, details: id, view, renaming: false, tab: null }; + const view = state.view === "browser" && roster.getSnapshot().byId[id] === void 0 ? "details" : state.view === "document" ? "details" : state.view; + return { ...state, details: id, view, document: view === "document" ? state.document : null, renaming: false, tab: null }; }); }, showDetails: (id, tab = null) => { - ui2.set((state) => ({ ...state, details: id, view: "details", renaming: false, tab })); + ui2.set((state) => ({ ...state, details: id, view: "details", document: null, renaming: false, tab })); }, // Opening the conversation would move focus to its composer and blur the name field. renameBot: (id) => { - ui2.set((state) => ({ ...state, details: id, view: "details", renaming: true, tab: null })); + ui2.set((state) => ({ ...state, details: id, view: "details", document: null, renaming: true, tab: null })); }, // `id` opens one Bot (page 'bots') or one group chat (page 'groups'). `back` is where // closing the page returns to; a page the inbox opened sends the queue back (#2541). @@ -23400,7 +25423,7 @@ function apply(ctx) { if (mode !== "bot" && mode !== "agent") return; if (surface.getSnapshot().mode === mode) return; if (mode === "agent") { - ui2.set((state) => ({ ...state, details: null, view: "details", settings: null, remoteBotSettings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, inbox: null, board: null, toast: null })); + ui2.set((state) => ({ ...state, details: null, view: "details", document: null, settings: null, remoteBotSettings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, inbox: null, board: null, toast: null })); } writeMode(mode); surface.set((state) => ({ ...state, mode })); @@ -23566,7 +25589,7 @@ function apply(ctx) { if (!bot) return; browsers.ensureTabs(bot.id); if (browsers.tabs.getSnapshot()[bot.id]?.active == null) browsers.openTab(bot.id); - ui2.set((state) => ({ ...state, details: id, view: "browser", renaming: false, tab: null })); + ui2.set((state) => ({ ...state, details: id, view: "browser", document: null, renaming: false, tab: null })); }, // '+' on the strip or the drawer's new-tab card: a blank tab in the browser view. browserNewTab: (id) => { @@ -23574,7 +25597,7 @@ function apply(ctx) { if (!bot) return null; browsers.ensureTabs(bot.id); const tabId = browsers.openTab(bot.id); - ui2.set((state) => ({ ...state, details: id, view: "browser", renaming: false, tab: null })); + ui2.set((state) => ({ ...state, details: id, view: "browser", document: null, renaming: false, tab: null })); return tabId; }, // A drawer card: its tab active, the panel on the browser view. @@ -23582,7 +25605,7 @@ function apply(ctx) { const bot = roster.getSnapshot().byId[id]; if (!bot) return; browsers.activate(bot.id, tabId); - ui2.set((state) => ({ ...state, details: id, view: "browser" })); + ui2.set((state) => ({ ...state, details: id, view: "browser", document: null })); }, browserEnsure: (botId) => browsers.ensureTabs(botId), browserCloseTab: (botId, tabId) => browsers.closeTab(botId, tabId), @@ -23595,10 +25618,10 @@ function apply(ctx) { } actions.setPanelView = (view) => { if (view !== "details" && view !== "browser") return; - ui2.set((state) => state.details && state.view !== view ? { ...state, view } : state); + ui2.set((state) => state.details && state.view !== view ? { ...state, view, document: view === "document" ? state.document : null } : state); }; actions.closePanel = () => { - ui2.set((state) => state.details ? { ...state, details: null, view: "details", renaming: false, tab: null } : state); + ui2.set((state) => state.details ? { ...state, details: null, view: "details", document: null, renaming: false, tab: null } : state); }; actions.flybotSlotEntries = (name) => ctx.slots.entries?.(name) ?? []; actions.signInEntry = () => ctx.slots.entries?.("settings.models.sign-in")?.[0] ?? null; @@ -23772,6 +25795,7 @@ function apply(ctx) { installCompiledStyles(FLYBOT_CSS, "flybot"), installCompiledStyles(MEMBER_CSS, "members"), installCompiledStyles(USER_MESSAGE_CSS, "user-messages"), + installCompiledStyles(PARITY_SHELL_CSS, "parity-shell"), installCompiledStyles(MOBILE_CSS, "mobile"), installCompiledStyles(PANE_MIN_WIDTH_CSS, "panes"), installCompiledStyles(PROJECT_BOARD_CSS, "project-board"), @@ -23800,6 +25824,7 @@ function apply(ctx) { ]; const installConversation = () => [ installCompiledStyles(CONVERSATION_CSS, "conversation"), + installCompiledStyles(PARITY_SHELL_CSS, "parity-shell-conversation"), installMentions(), installAtMenu(), // The shell's own Session header stays, so the child seats it renders keep @@ -23849,7 +25874,7 @@ function apply(ctx) { ]; ctx.effect(() => { const style = installStyles(TURN_FAILURES_CSS, "turn-failures"); - const off = registry().register("flybot.session.dock", { id: "flybot-turn-failures", order: 20, component: (props) => (0, import_react51.createElement)(TurnFailures, { ...props, work }) }); + const off = registry().register("flybot.session.dock", { id: "flybot-turn-failures", order: 20, component: (props) => (0, import_react55.createElement)(TurnFailures, { ...props, work }) }); return () => { off(); style.remove(); @@ -23859,6 +25884,7 @@ function apply(ctx) { const style = installStyles(RETURN_CSS, "return"); return () => style.remove(); }, "ds-bot: return styles"); + ctx.effect(() => installSendShortcut(roster), "ds-bot: send shortcut"); shadow("sidebar.footer.action", { id: "bot-return", order: -300, inject: face }, BotReturn); ctx.effect(() => { let previous; diff --git a/core/dev/bench-preflight.mjs b/core/dev/bench-preflight.mjs index db5db7cef..b90f9d03c 100644 --- a/core/dev/bench-preflight.mjs +++ b/core/dev/bench-preflight.mjs @@ -9,7 +9,7 @@ // // Exit 0 when the bench can start, 1 with the remedy on stderr when it cannot, 2 on bad usage. import { spawnSync } from 'node:child_process' -import { existsSync } from 'node:fs' +import { existsSync, realpathSync } from 'node:fs' import { dirname, join } from 'node:path' import { pathToFileURL } from 'node:url' @@ -81,6 +81,7 @@ export function main(argv = process.argv.slice(2)) { return 1 } -if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) { +// Node resolves import.meta.url through symlinks; argv keeps the invoked spelling. +if (process.argv[1] && existsSync(process.argv[1]) && import.meta.url === pathToFileURL(realpathSync(process.argv[1])).href) { process.exit(main()) } diff --git a/core/dev/history-hit-review/.gitignore b/core/dev/history-hit-review/.gitignore new file mode 100644 index 000000000..397b4a762 --- /dev/null +++ b/core/dev/history-hit-review/.gitignore @@ -0,0 +1 @@ +*.log diff --git a/core/dev/history-hit-review/feature-parity.md b/core/dev/history-hit-review/feature-parity.md new file mode 100644 index 000000000..1a2ec631e --- /dev/null +++ b/core/dev/history-hit-review/feature-parity.md @@ -0,0 +1,19 @@ +# Feature parity 补记 + +- 历史搜索:**已实现但范围有限**。当前实例、当前actor拥有的本地Bot own-chat各分段;中文/NFKC字面匹配、有界分页。 +- 旧命中闭环:**已实现只读上下文查看**,不是精确 turn 导航。真实宿主没有满足“不激活Agent”的公开精确turn导航路径;不可把当前聊天当旧命中落点。 +- 安全/资源:服务端每次授权重验;stale/revoke/delete/跨权限分页有测试。并发/长度/分段/扫描文本/输出JSON/取消受约束,**cold Session物化前的硬字节预算未解决**。 +- 浏览器/真实后端:**未验收**;file:// 策略拒绝仍然有效,没有重试或替代输送。 +- 测试:focused 84/84、全量3367/3367,build/check/lint通过,无skip/阈值变更。 + +## PR 交付验证(2026-11-16,Asia/Shanghai) + +本轮提交前重新验证 core3367/3367、social721/721、project148/148;build/check/lint通过。与原修复树逐文件核对:社交/项目和schedule测试一致,schedule仅清理未使用localInput,i18n包含全部原新增项。真实组件fixture已改为本目录忽略的dist输出,来源manifest与20项SSR重跑通过,仍未浏览器验收。生成的core/client.js按仓库规范随源提交;依赖、日志、render-check、效果稿/截图不提交。PR仅覆盖已实现部分,关联#3110但不关闭总目标。 + +## 已实际交付的 PR(2026-11-16,Asia/Shanghai) + +- FlyBot:https://github.com/ThinkFlowLab/FlyBot/pull/3112 ,`pr/teamily-parity-20261116` → `main`。阶段性实现,Related #3110,不关闭总目标。 +- Bot Social:https://github.com/Birfy/bot-social/pull/789 ,`pr/grant-friend-regression-20261116` → `master`。同步后发现源码防线已由上游 #778 等落地,因此单独 PR 仅补 HTTP 回归;没有用旧9行补丁覆盖更完整的新实现或改变历史授权语义。45/45相关测试和tsc通过(Node22匹配SQLite ABI)。原脏树未改。 +- 最终目标是完整开源 Teamily;缺少的模型/API/运行时仍须补齐。服务端架构明确为管理 server + FlyBot 容器:管理 server 负责账号/工作区/权限/容器生命周期,FlyBot 容器承载 Agent;两部分均开源可自托管。容器分配粒度与编排技术未定,不能擅自当作已决策。本批不临时大重构。 +- 下一批建议先交付管理 server 最小控制面及 FlyBot 容器的认证/权限/生命周期适配契约与可运行自托管部署,再以作品/Artifacts 的真实存储与展示作为新能力切片;不能仅画入口。记忆关系边/图谱、技能与MCP、协作同步/调度随后逐项对照验收。 +- 本地core3367、social721、project148通过;源码/patch check和canonical、仓库政策检查通过。CI结果应在PR页独立查看,不把本地全绿当GitHub CI已绿。浏览器和真实后端仍未验收。无自动合并/部署。 diff --git a/core/dev/history-hit-review/progress.md b/core/dev/history-hit-review/progress.md new file mode 100644 index 000000000..8d80b97b3 --- /dev/null +++ b/core/dev/history-hit-review/progress.md @@ -0,0 +1,48 @@ +# 历史搜索命中闭环进度 + +2026-11-16,Asia/Shanghai。仅 `/workspace/flybot-ui-parity` 隔离树。 + +## 已完成 + +- 调查已安装宿主导航:可接受 SessionId,但没有 seq/turn anchor;现有 FlyBot 会打开当前 part,原生冷 Session 打开可能激活 Agent。故不伪装历史定位,改为真实只读上下文视图。 +- `history-hit` API + `HistoryHitDialog` + Palette 点击闭环,原始命中/同段附近最多四条可见文字,明确分段、Session、seq/turn、只读且不是当前聊天。无发送、编辑、写数据、Agent 激活。 +- opaque ticket 绑定本实例/actor/分段/快照/原文摘要,60秒、最多512;读取前后和 dispose 后/返回前重验权限与隐藏 turn。stale/撤权/删除/过期拒绝并提示重搜;已知 roster 权限/账号/分段变化清空旧视图,旧异步不能覆盖新视图。 +- 加入共享并发1/actor、4/实例、256字符、500分段、扫描文本2MiB、搜索JSON64KiB、上下文JSON24KiB及取消等可执行限制。JSON 转义也计入,Unicode surrogate 边界不截断;超限有 limited/截断/失败说明而非假装全库完成。 +- 中文单字/NFKC、未加载历史、错误/空/长 query、四标签/退化及原隔离边界维持。 + +## 最终验证(不降阈值、不跳过) + +- Focused:84/84,通过,0跳过,`focused-frozen.log`。 +- 全量 core:3367/3367,通过,0失败/0取消/0跳过,`full-frozen.log`(约52秒)。相对上轮3351新增16项测试。 +- `npm run build`:通过,`build.log`。 +- `node scripts/build-client.mjs --check`:通过,`build-check.log`。 +- `npm run lint`:通过,仅既有 warnings,`lint-frozen.log`。 +- 全量前一次3366/3366也通过,随后补边界并重跑;保留 `full.log`。测试只用独立内存示例/VM React harness,未读真实历史,不是浏览器验收。 + +## 明确缺口 / 风险 + +- cold observation **仍在返回前物化整个 Session**,100000事件/文本字节检查是之后的限制;最多4个 Session 同时物化仍可能有大峰值。6秒是合作取消,不是可抢占 native 同步工作的硬超时。没有硬磁盘字节/峰值内存预算,也没有声称已经解决;需宿主提供只读分页/窗口与物化前预算。 +- 不是精确滚动/高亮当前聊天;查看的是历史原始文本窗口,超长按编码字节截断。不含图片/附件/工具/model replacement,群聊/远程/Agent 仍 loaded-outline-only。 +- 服务端每次读取/返回重验;不能收回此前已合法交付到客户端的字节,也未验证原生真实后端/浏览器 UI。 +- 没有浏览器 dispatch/file:// 重试、替代端口、截图、网络/防火墙改动、:3320/生产、提交/推送或 GitHub。 + +## 文档位置 + +- 主审查:`core/dev/history-search-review.md`。 +- 本轮映射:同目录 `replicate-map.md`、`feature-parity.md`。 +- 质量回顾:`changelog.d/teamily-integrated-quality-review.fixed.md`。 +- 旧 canonical progress/map 位于树外,本轮遵守“只在隔离树改”没有同步;父代理如需汇总,引用本补记,不要误报树外文件已更新。 + +## PR 交付验证(2026-11-16,Asia/Shanghai) + +本轮提交前重新验证 core3367/3367、social721/721、project148/148;build/check/lint通过。与原修复树逐文件核对:社交/项目和schedule测试一致,schedule仅清理未使用localInput,i18n包含全部原新增项。真实组件fixture已改为本目录忽略的dist输出,来源manifest与20项SSR重跑通过,仍未浏览器验收。生成的core/client.js按仓库规范随源提交;依赖、日志、render-check、效果稿/截图不提交。PR仅覆盖已实现部分,关联#3110但不关闭总目标。 + +PR policy 复查修正:changelog fragments 按 ..md 命名;Unicode 损坏检测测试改用等价 `\uFFFD` escape,避免测试源码本身触发仓库 mojibake 守卫。没有移除或放宽断言。 + +## 已实际交付的 PR(2026-11-16,Asia/Shanghai) + +- FlyBot:https://github.com/ThinkFlowLab/FlyBot/pull/3112 ,`pr/teamily-parity-20261116` → `main`。阶段性实现,Related #3110,不关闭总目标。 +- Bot Social:https://github.com/Birfy/bot-social/pull/789 ,`pr/grant-friend-regression-20261116` → `master`。同步后发现源码防线已由上游 #778 等落地,因此单独 PR 仅补 HTTP 回归;没有用旧9行补丁覆盖更完整的新实现或改变历史授权语义。45/45相关测试和tsc通过(Node22匹配SQLite ABI)。原脏树未改。 +- 最终目标是完整开源 Teamily;缺少的模型/API/运行时仍须补齐。服务端架构明确为管理 server + FlyBot 容器:管理 server 负责账号/工作区/权限/容器生命周期,FlyBot 容器承载 Agent;两部分均开源可自托管。容器分配粒度与编排技术未定,不能擅自当作已决策。本批不临时大重构。 +- 下一批建议先交付管理 server 最小控制面及 FlyBot 容器的认证/权限/生命周期适配契约与可运行自托管部署,再以作品/Artifacts 的真实存储与展示作为新能力切片;不能仅画入口。记忆关系边/图谱、技能与MCP、协作同步/调度随后逐项对照验收。 +- 本地core3367、social721、project148通过;源码/patch check和canonical、仓库政策检查通过。CI结果应在PR页独立查看,不把本地全绿当GitHub CI已绿。浏览器和真实后端仍未验收。无自动合并/部署。 diff --git a/core/dev/history-hit-review/replicate-map.md b/core/dev/history-hit-review/replicate-map.md new file mode 100644 index 000000000..de86a167a --- /dev/null +++ b/core/dev/history-hit-review/replicate-map.md @@ -0,0 +1,25 @@ +# 历史命中闭环对照(本轮补记) + +2026-11-16,Asia/Shanghai;路径均相对 `/workspace/flybot-ui-parity/core`。 + +| 需求 | 真实实现 | 验证/边界 | +|---|---|---| +| 旧分段命中不是打开当前会话 | `src/client/palette.js` → `HistoryHitDialog` / `src/client/history-hit.js` → `history-hit` | palette UI 断言不调用 openSession;组件真实分段/原文/只读标识。不是精准聊天滚动 | +| 只读原始上下文 | `src/host/message-search.js` 的 readHistoryHit;`src/host/channel.js` READS;`src/host/authz.js` | 原始 append transcript,同段前后各最多2可见消息;无 Agent 激活/发送/写回 | +| 权限/过期/删除闭环 | actor+实例 opaque ticket、快照和摘要;读取前后及 dispose 后复检;hook 清空/abort | stale append/modify、Bot/Session删除、part移除、隐藏 turn、await/dispose撤权、跨权限分页测试 | +| 资源控制 | 共享并发、query/目标分段/扫描/字节/TTL cap、native signal | 查询/上下文实际UTF-8 JSON预算,转义与Unicode边界测试;不是物化前硬内存/I/O预算 | +| 四标签/退化不变 | `src/client/history-search.js` + palette | All/Messages检索;Chats/Commands不检索;失败明确loaded-only,其他实例/群聊/Agent不假装覆盖 | + +证据:focused 84/84;完整 core 3367/3367;build/check/lint通过,0跳过。日志同目录。无真实数据/浏览器验收/截图/端口/部署/提交。 + +## PR 交付验证(2026-11-16,Asia/Shanghai) + +本轮提交前重新验证 core3367/3367、social721/721、project148/148;build/check/lint通过。与原修复树逐文件核对:社交/项目和schedule测试一致,schedule仅清理未使用localInput,i18n包含全部原新增项。真实组件fixture已改为本目录忽略的dist输出,来源manifest与20项SSR重跑通过,仍未浏览器验收。生成的core/client.js按仓库规范随源提交;依赖、日志、render-check、效果稿/截图不提交。PR仅覆盖已实现部分,关联#3110但不关闭总目标。 + +## 已实际交付的 PR(2026-11-16,Asia/Shanghai) + +- FlyBot:https://github.com/ThinkFlowLab/FlyBot/pull/3112 ,`pr/teamily-parity-20261116` → `main`。阶段性实现,Related #3110,不关闭总目标。 +- Bot Social:https://github.com/Birfy/bot-social/pull/789 ,`pr/grant-friend-regression-20261116` → `master`。同步后发现源码防线已由上游 #778 等落地,因此单独 PR 仅补 HTTP 回归;没有用旧9行补丁覆盖更完整的新实现或改变历史授权语义。45/45相关测试和tsc通过(Node22匹配SQLite ABI)。原脏树未改。 +- 最终目标是完整开源 Teamily;缺少的模型/API/运行时仍须补齐。服务端架构明确为管理 server + FlyBot 容器:管理 server 负责账号/工作区/权限/容器生命周期,FlyBot 容器承载 Agent;两部分均开源可自托管。容器分配粒度与编排技术未定,不能擅自当作已决策。本批不临时大重构。 +- 下一批建议先交付管理 server 最小控制面及 FlyBot 容器的认证/权限/生命周期适配契约与可运行自托管部署,再以作品/Artifacts 的真实存储与展示作为新能力切片;不能仅画入口。记忆关系边/图谱、技能与MCP、协作同步/调度随后逐项对照验收。 +- 本地core3367、social721、project148通过;源码/patch check和canonical、仓库政策检查通过。CI结果应在PR页独立查看,不把本地全绿当GitHub CI已绿。浏览器和真实后端仍未验收。无自动合并/部署。 diff --git a/core/dev/history-search-review.md b/core/dev/history-search-review.md new file mode 100644 index 000000000..f055a23bd --- /dev/null +++ b/core/dev/history-search-review.md @@ -0,0 +1,63 @@ +# 历史消息搜索:范围、只读边界与回归 + +2026-11-16,Asia/Shanghai;本轮补齐历史命中只读查看闭环。仅隔离源码树;不提交/部署、不接触生产/:3320、不启动端口、不再尝试被拒绝的 file:// 浏览器导航。无截图、无手写 HTML。 + +## 查明的宿主能力 + +- 现有 `src/host/chat-index.js` 可搜索 Bot 所有分段,但 `eventsBackwards` 会 `resolveAgent`,SQLite catch-up 会写派生索引,不能直接作为这次严格只读查询。 +- 安装的 `dsh-experimental-session-search/lib/index.js` 只是 `export {}`,不能据包名假定有可调用搜索。 +- `dsh-api-session-controller` 的 `search` 是真实能力,但会通过 `sessionQuery.searchSessions` 枚举宿主可见 corpus;SQLite provider 可创建/更新索引,而且只检索 current model surface。既不适合在 FlyBot owner 授权前跨实例扫描,也不等同于压缩前的人类对话历史。因此本轮没有调用它。 +- `ctx.get('sessionQuery').observeSession(sessionId, {signal, projectionMode:'none'})` 提供 cold-safe、特定 Session 的不可变 observation,不激活 Agent、不计算 projections;冷历史恢复与 interrupted-turn 平衡在内存完成。返回 lease 必须 dispose。这是新查询实际使用的接口。 +- `dsh-session.isAppendSurfaceEvent` 的源码注释明确:append-origin 才是 human transcript;model replacement 并非原对话。本轮保留压缩前原消息,不检索 model-only replacement 摘要。 + +上述为安装包源码审查与隔离适配器测试结论,未调用任何真实运行实例来读用户历史。 + +## 本轮实现 + +- 新 `src/host/message-search.js`,由 core/index.js 注册;`search-messages` 接入现有 `/api/bot`,加入只读白名单。 +- 认证继续由 `x-flybot-member-session` 解析;authz 在成员模式拒绝匿名,新服务再按当前 actor 过滤。payload 仅接受 `{query, limit?, cursor?}`;actorId/sessionId/home/path 等多余 selector 一律拒绝。 +- 只枚举**当前 FlyBot state.bots 中本地且属于 actor 的 Bot 的 own-chat 当前分段和 segments**,并调用现有 `sessionOwnedBy` 再检查 Session。每次 await 前后、发结果前、翻页均重验。不按目录扫描,不调用 listSessions、远程实例或插件文件搜索。 +- 未开启成员认证时沿用既有单人实例规则,仅当前 state 登记的本地 Bot。不会因此查询 DSH 全部 Session。 +- 文本仅来自 append-origin `user/message` 且 source.kind=user 和 `assistant/message` 的 text block。工具参数/结果、plugin records、后台 source.kind=ds-bot 输入、附件、图片、model replacement 不搜索。exchangeTurns 隐藏 turn 排除;带隐藏 turn 的会话中无法确定 turn 的消息 fail closed。 +- NFKC + 大小写不敏感的字面子串;支持单字中文,无 SQL/正则/FTS 执行语义。不是分词、模糊或语义检索。 +- API 返回 snippet、botId、sessionId、seq/turn、是否较早分段,不返回路径、header、配置、工具内容或底层错误。底层失败只给 incomplete,错误消息不回传日志路径/配置。 +- 无 save/bootstrap/resolveAgent/flush、无 SQLite/文件写入。cursor 仅进程内随机 opaque token,绑定实例闭包、actor、规范化 query;60 秒过期,最多 64 个。历史变动使当前分段续页失效,必须重搜,不拿旧游标猜。 +- 限额:API 默认20/最多50条;每请求最多8次 observation,6秒 cooperative timeout;每轮最多500个已授权 Session 分段、200个读取批次,每批最多1000个候选消息;单源超过100000原始事件跳过并标 limited;每 actor 最多1个、实例最多4个并发查询。每分段从新到旧,分段按 Bot 注册顺序/由新到旧;不是全局时间或相关性排名。 + +## Palette 接入 + +- 新 `src/client/history-search.js`:250ms debounce、忽略过期异步结果、卸载保护、显式继续检索、前端最多100条。只在 All/Messages 查询;Chats/Commands 不发历史读取。 +- 保留原四标签与 loaded turnOutline 搜索。历史单独标为「本机 Bot 对话历史」,仍有已加载结果;相同 Session/turn 的结果尽量去重。 +- 明确标注「本实例中你拥有的本机 Bot;其他对话仅已加载」。空、查询中、后续未检索、部分失败、达到上限与只读适配器不可用均有不同说明,不把不完整扫描写成全库无结果。 +- 旧宿主缺 service 或任何查询失败,明确退化为 loaded-only;不返回底层错误、不保留失败请求的旧历史结果。 +- 历史命中现在**不再调用 openSession**,而打开真实 `HistoryHitDialog` + `history-hit` 只读查看:展示实际 Session、分段序号、seq/turn、原始命中文本及同段前后各最多2条可见消息。明确标注「分段历史,不是当前聊天;不激活 Bot」。不发送、编辑、写回或假装定位成功;只有返回搜索和重新读取上下文。 +- 点击只发送进程内 opaque hitToken(最多512个、60秒、绑定 actor/实例/快照摘要);不接受指定任意 Session/seq/path。上下文读取前、native await 后、lease dispose 后与返回前重新核验当前 owner、Session 归属/分段存在、隐藏 turn;原文摘要/快照变化、删除、过期均拒绝,提示重新搜索。 +- 实际宿主导航契约 `dsh-client-ui-workspace/lib/types/client/navigation.d.ts:21` 仅 `openSession(SessionTarget)`;`dsh-api-session-controller/lib/types/client/contract/sessions.d.ts:20` 的 target 只有 SessionId/SubagentAddress,无 turn/seq anchor。FlyBot 自身 openSession 又归约为当前 part;原生打开冷历史可能提升为 Agent,故不用它冒充定位。 +- 搜索和上下文 hook 均用 AbortController + generation guard。切换命中、已知账号/owner/parts 变化、删除 Bot、卸载时清空旧上下文并取消旧请求;失败不拿搜索 snippet 伪装原始上下文。权限校验保证每次服务端读取/返回的当前权限,不宣称能收回已交付到客户端的内容。 + +## 未覆盖/缺口 + +1. 群聊、共享房间的 membership-window 历史、远端 Bot、DSH Agent/子代理、已删除/不在当前 state 的 Bot 尚未历史检索;仍只用已加载大纲,不能宣传「所有聊天历史」。未来群聊应先用 roomHistory(actor) 的窗口过滤,绝不能搜索成员内部 group Session 代替房间可见记录。 +2. 非索引扫描会重复读取特定分段。宿主 observation 在返回前会物化单个逻辑 Session;100000事件防护是返回后的防护,**不等于硬性磁盘字节/内存上限**,超大历史读取和阻塞工作可能不能即时响应取消。需宿主提供有权限范围、只读、按转录分页的查询接口才能彻底解决;本轮不越界写新索引。 +3. 未验证真实宿主版本差异、真实持久化后端、浏览器点击/焦点/窄屏;全部新测试只用独立内存示例。不会把真实组件/VM测试当浏览器验收。file:// 策略阻断仍有效,未尝试任何替代传输。 +4. 不读取密钥/配置文件,也不检索工具结果。正常用户/助手对话文本的内容没有通过额外读取密钥库作全局脱敏;服务不会为了搜索去访问该类私有文件。 + +## 可执行资源边界(两类只读请求共用并发额度) + +- 每 actor 同时1个、实例最多4个,超出直接拒绝;6秒 cooperative signal,浏览器发起端取消同时传到底层 observation。 +- Query 最多256 Unicode 字符,并在展开前拒绝超1024 UTF-16长度;空/非法/长 query 有测试。每轮目标最多500分段,每次最多8 observations;最多200读取批次、每批1000候选消息、单源最多100000事件(最后一项是物化后检查)。 +- 单消息提取上限262144 UTF-8字节、最多10000 content blocks;每请求扫描文本最多2097152字节。超大消息跳过并标 limited;扫描预算耗尽保留准确的续读位置。 +- 搜索最多50条/页;items 的 JSON UTF-8预算65536减1024 envelope reserve,达到预算保留下一命中的位置;客户端最多显示100条。上下文 JSON UTF-8预算24576减64 envelope reserve;命中/邻居文本编码后 JSON 字节各最多8192/2048,考虑反斜线/控制字符转义,明确截断,不把 surrogate pair 截成碎片。 +- 这些限制**不是 native cold observation 的硬内存/磁盘字节预算**。宿主先物化整个逻辑 Session,之后我们才检查事件数/提取字节;取消依赖宿主合作,不能抢占同步阻塞。并发4也意味着可同时物化至多4个未知大小 Session,仍可能有明显峰值。没有用文件系统旁路读取或创建索引。 +- 根治需要宿主提供按 Session、按权限、只读的 transcript-window / scan-page API,支持创建 observation 前的硬字节上限、分页快照及可中断读取;当前公开契约没有这套能力。本轮不声称解决该宿主差距。 + +## 测试与证据 + +- `test/message-history-search.test.js`:25项,新增真实旧分段原文、opaque ticket/actor/实例边界、stale追加/修改/删除/隐藏、await/dispose 撤权、跨权限分页、消息/扫描/响应字节、中文与 Unicode、JSON 转义预算、共享并发与取消。既有未加载历史、错误/空/长 query、只读 channel 认证/白名单测试保留。仅内存示例;fixture.invalid 的 Request 直接交 handler,不发网络。 +- `test/history-search-state.test.js` 4项;新增 `test/history-hit-state.test.js` 3项,覆盖取消/切换/账号/owner/parts/删除/错误/retry。复用 `test/history-hook-harness.js` 的 VM hook/effect 约定。 +- `test/history-hit-view.test.js` 2项,执行实际组件,验证分段、原文作为 React text(不注入 HTML)、只读控件、截断/加载/失败/删除状态不露旧正文。不是浏览器验收。 +- `test/palette-history-ui.test.js` 3项,明确断言历史点击只打开只读组件、不会调用 openSession;四标签、加载/不完整/续页/失败退化保留。 +- 本轮 focused **84/84**,0失败/0跳过:`dev/history-hit-review/focused-frozen.log`。 +- `npm run build`、`node scripts/build-client.mjs --check`、`npm run lint` 通过(仅既有 warnings):`build.log`、`build-check.log`、`lint-frozen.log`,均在 `dev/history-hit-review/`。 +- 首次完整回归3366/3366通过;再补 Unicode 起始边界及 JSON 转义预算测试后冻结版全量 **3367/3367通过,0失败/0跳过**,见 `dev/history-hit-review/full-frozen.log` 与同目录 progress。未改阈值、未跳过测试。 +- 历史基线3351/3351。未测试真实用户历史、未开浏览器、未截图;file:// 拒绝没有被绕过。全部本轮改动/证据留在 `/workspace/flybot-ui-parity`,无提交/推送/部署。 diff --git a/core/dev/offline-fixture/.gitignore b/core/dev/offline-fixture/.gitignore new file mode 100644 index 000000000..0d4512695 --- /dev/null +++ b/core/dev/offline-fixture/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +render-check.mjs +dist/ diff --git a/core/dev/offline-fixture/README.md b/core/dev/offline-fixture/README.md new file mode 100644 index 000000000..221b232e3 --- /dev/null +++ b/core/dev/offline-fixture/README.md @@ -0,0 +1,66 @@ +# FlyBot 真实组件离线集成 fixture(待浏览器验收) + +2026-11-16 14:18 Asia/Shanghai。**不是手写同样 DOM 的效果稿,也不是生产宿主或实机验收。** + +## 打开与重建 +- `file:////core/dev/offline-fixture/dist/index.html#chat` +- `file:////core/dev/offline-fixture/dist/index.html#settings` +- `file:////core/dev/offline-fixture/dist/index.html#memory` +- `file:////core/dev/offline-fixture/dist/index.html#group` +- `file:////core/dev/offline-fixture/dist/index.html#search` + +将 `` 替换为本地 checkout 的绝对路径。此前 box browser 在导航前策略拒绝 file://,因此没有点击或截图,也未尝试替代端口/传输;这里仅提供未来获准后可用的重建入口,不声称浏览器验收通过。 + +源码:`core/dev/offline-fixture/`。构建输出在本目录 `dist/`,不提交输出 bundle、render-check 或 node_modules。 +重建:在 core 运行 `node dev/offline-fixture/build.mjs --render-check`;非浏览器渲染检查:`node dev/offline-fixture/check.mjs`。 +`fixture.js` 是自包含 classic IIFE,不依赖 dev server、ESM fetch、CDN 或端口。`index.html` 只包含 root、meta 与相对脚本。CSP 禁止 connect、远程脚本/图片与表单提交;没有真实 API transport。`bundle-inputs.json` 是 esbuild 原始来源清单。 + +运行时依赖是 npm 本地缓存中的 React/react-dom **19.3.1** 与 scheduler 0.28.0,通过 npm --offline --ignore-scripts 安装;没有联网下载。生产宿主 peer React 版本可能不同,不能据此确认宿主兼容性。重建依赖本目录 node_modules;在本目录运行 `npm ci --ignore-scripts`(已有缓存时可加 `--offline`),package.json/lock 记录来源。源码、bundle 均无账号数据。 + +## 实际组件来源(均位于 core/src/client) +| 范围 | 直接 bundle 的源码 | +|---|---| +| 设置 | settings.js: SettingsDialog / GeneralPage(GeneralPage 不是复制实现) | +| 发送快捷键 | composer.js: installSendShortcut;appearance.js 快捷键/插入换行与主题辅助函数 | +| 长文折叠、卡片、侧栏 | message-fold.js: FoldedContent / DocumentCard / DocumentPane;shared/message-fold.js | +| 记忆目录/搜索 | memory-panel.js: MemoryDialog | +| 建群 | group-settings.js: NewGroupForm | +| 会话筛选/未读列表 | sidebar.js: TeamSidebar(包含真实 SessionFilter、BotRow、RoomRow) | +| 搜索 | palette.js: CommandPalette | +| 未读/置顶顶栏入口 | header.js: HeaderPill / SessionOverflow;shared/session-unread.js / session-pin.js | +| 消息右键/悬停菜单 | message-tools.js: MessageTools / onMessageContextMenu | +| 外观 | styles.js / sidebar.js / group-settings.js / mobile.js 原 CSS | +| 中文 | i18n.js 原 DICTIONARY 与 installLocale | + +构建会断言这些源码存在于输入清单、真实 api.js 不在 bundle、浏览器输出无外部 import。 + +## Mock 边界(务必保留) +- React 正常 hooks/portal;不是单测的伪 React。现有 `test/harness-resolve.mjs` 仍用于整批单测;它的 VM hook harness 不适合直接充当浏览器 React DOM。 +- **仅 fixture 控制条、外层布局、模拟输入框、示例消息容器和操作日志是 harness 自写。** 并未宣称它们是宿主 composer 或 Bubbles/UserMessage 的完整装配。 +- host.js 替代真实 api.js;不支持的调用明确 reject。设置 prefs、手动未读、置顶、建群只写 React 内存,刷新即清空;不触碰真实 roster、文件或网络。fixture 没有重新实现 host 偏好校验。 +- 模拟输入框带宿主 selector,与真实 installSendShortcut 接线(含 getSnapshot)。发送只增加计数,引用只填到这个框。无法验证真实宿主 textarea/contenteditable DOM、真实消息发送或模型运行。 +- 示例 A/B/C 和一组群;B 初始有手动未读,C 有固定 completionUnread。打开会话只清 mock 手动未读,不确认真实系统状态;系统状态保持,便于验证手动清除不等于系统确认。 +- DSH primitives 缺失:**MarkdownText 替为显式 data-fixture-mock 的 pre 纯文本**;FishLogo 替为标记符。可验卡片/折叠切换/侧栏内容传递,**不能验真实 Markdown、代码高亮、链接、脚注、附件或真实 logo 的视觉**。不把替代物当正式 UI。 +- 记忆读取返回固定示例,ask/forget 明确拒绝,不编造模型回答或持久化。建群只增加模拟 room,不邀请、不分享。 +- session 行右键菜单、宿主详情抽屉、inbox/连接器/更新不在此 fixture;会显示 mock 边界日志。未读与置顶请通过实际顶栏菜单验证。 +- 剪贴板和下载使用实际 MessageTools 的浏览器能力,未伪造成功;file:// 下剪贴板可能被拒绝,应看到失败说明。下载会创建本地 blob 文件,只有人工/父代理验证时才会触发。 +- streaming checkbox 仅切换实际组件的 streaming prop,不模拟 token transport;主题只接真实辅助函数,不接 index.js 的宿主主题生命周期、分钟计时和 streaming 延迟调度。 +- 目前非浏览器检查为 5 路由 × 中英 × 只读/可写的 **20 个服务器渲染**,不是点击、effects、布局、焦点验收。React 19 发现既有 inbox StatusIcon 缺少 key 警告,未隐去,留作后续专项。 + +## 交给父代理的操作验收清单(尚未执行) +1. 默认页明确显示示例/MOCK HOST;file:// 无模块/CSP 错误,无网络请求。若浏览器拒绝 file: script,报告具体限制;不要改端口、防火墙、代理或拿手写 HTML 替代。 +2. settings:General 切换 light/dark/auto/system、中英、Enter/Shift+Enter、紧凑/标准/不折叠和文档卡;退出后仍在同一次页面 session 中反映。只读只展示设置;刷新重置。 +3. chat:按当前快捷键测试发送计数/换行,输入中文 IME 不误发送;只读不发送。注意这个计数不代表真实消息。 +4. 折叠:卡片内显示/隐藏全文、侧栏打开/关闭;关卡片后紧凑/标准折叠;none 显示全文;勾 streaming 不折叠不显示消息菜单。 +5. memory:等待 mock read effect 后目录/条数、主题、搜索和无匹配;询问/删除拒绝应明确;只读隐藏写操作。 +6. group:无选中禁创建,筛选成员、至少本地管理员+另一成员才可创建;移除/切管理员;创建只新增内存 room;只读不创建。 +7. sidebar:全部/群聊/单聊/未读真实筛选;B 手动未读、C 系统未读。切到 A 顶栏标未读→未读筛选有 A→清除手动标记→A 消失,C 仍存在;pin/unpin 改列表排序。 +8. search:四个真实标签、空态、输入绝无匹配词、输入 kiwi 查已加载示例消息;切标签与方向键;Esc/关闭按钮;不宣称搜索全部宿主历史。 +9. 消息悬停/右键:表情本地反馈、引用完整原文到模拟输入框;菜单方向键/Esc/关闭后立即重开;复制成功或真实权限失败;人工允许时下载 .md;只读没有引用入口。 +10. 宽屏与 390px:设置、记忆、建群、菜单不溢出;Tab/Shift+Tab、可读标签、焦点与中文换行。记录真实浏览器 console 和截图,不能拿本目录 render-check 当已通过。 + +旧手写 HTML 效果稿继续仅为 HAND-AUTHORED MOCKUP,不入本 fixture,也不作为真实截图。 + +最终补记(2026-11-16 14:19(Asia/Shanghai)):完整 core **3330/3330 通过,0 失败,0 跳过**(历史验证记录);bench-preflight **8/8**;client build / --check / lint 通过。fixture source manifest / 无真实 transport / 无外部 imports 断言通过,20 个 SSR smoke 通过。**无浏览器验收、无新增截图。** + +PR 交付补记:当前 core 完整回归为3367项;fixture 重建仅写本地忽略的 dist/。这份 fixture 未 mock 新历史搜索服务,搜索路线仅验证 loaded-outline 与明确退化状态,不能用它验收真实历史搜索/权限/后端。 diff --git a/core/dev/offline-fixture/app.js b/core/dev/offline-fixture/app.js new file mode 100644 index 000000000..1eab22b5a --- /dev/null +++ b/core/dev/offline-fixture/app.js @@ -0,0 +1,76 @@ +import {createElement as h, useState, useEffect, Component} from 'react' +import {createRoot} from 'react-dom/client' +import {SettingsDialog} from '../../src/client/settings.js' +import {MemoryDialog} from '../../src/client/memory-panel.js' +import {NewGroupForm, GROUP_SETTINGS_CSS} from '../../src/client/group-settings.js' +import {TeamSidebar, SIDEBAR_CSS} from '../../src/client/sidebar.js' +import {HeaderPill} from '../../src/client/header.js' +import {CommandPalette} from '../../src/client/palette.js' +import {FoldedContent, DocumentPane, foldingOf} from '../../src/client/message-fold.js' +import {MessageTools, onMessageContextMenu} from '../../src/client/message-tools.js' +import {installSendShortcut} from '../../src/client/composer.js' +import {isDarkAppearance, applyAppearanceAttribute} from '../../src/client/appearance.js' +import {SHELL_CSS, CONVERSATION_CSS} from '../../src/client/styles.js' +import {MOBILE_CSS} from '../../src/client/mobile.js' +import {installLocale, DICTIONARY} from '../../src/client/i18n.js' +export const routes = ['chat','settings','memory','group','search'] +const longText = '# 示例离线文档\n'+['背景','方案','边界'].map(x=>'## '+x+'\n'+('这段内容是示例数据,不代表真实对话。'.repeat(35))+'\n').join('\n') +const bot = (id,name) => ({id,name,role:'示例 Bot',createdAt:1,parts:[id],look:{}}) +const bots = [bot('demo-a','示例助手 A'),bot('demo-b','示例助手 B'),bot('demo-c','示例助手 C')] +const room = {id:'demo-group',name:'示例讨论组',admin:'demo-a',members:['demo-a','demo-b'],createdAt:1} +const entries = [{scope:'own',topic:'偏好',text:'示例:回复使用中文。',id:'sample-1'},{scope:'team',topic:'项目',text:'示例:仅本地验证,不部署。',id:'sample-2'}] +const memory = {entries,summary:{at:Date.now(),text:'# 示例记忆\n仅用于离线验证。'},fresh:true,summarizing:false,sizes:{own:12,team:15},limits:{main:4000}} +const sessions = {ids:['demo-a','demo-b','demo-c','demo-group'],byId:Object.fromEntries([...bots,room].map(x=>[x.id,{id:x.id,displayTitle:x.name,updatedAt:1,projectionValues:{turnOutline:[{turn:0,prompt:'示例搜索 kiwi',response:'示例回答:本地 fixture'}]}}]))} +const select = value => Object.assign(pick => pick(value), {getSnapshot:()=>value}) +class Boundary extends Component { + constructor(props){ super(props); this.state={error:null} } + static getDerivedStateFromError(error){return {error:String(error.stack ?? error)}} + render(){return this.state.error ? h('pre',{role:'alert'},'Fixture render failed (not hidden):\n'+this.state.error) : this.props.children} +} +export function App({initialRoute='chat',initialLocked=false,initialLang='zh'}={}) { + const [route,setRoute]=useState(initialRoute), [prefs,setPrefs]=useState({appearance:{mode:'light'},folding:{mode:'standard',documentCards:true}}) + const [locked,setLocked]=useState(initialLocked),[lang,setLang]=useState(initialLang),[active,setActive]=useState('demo-a') + const [unread,setUnread]=useState({'demo-b':true}),[rooms,setRooms]=useState([room]),[flags,setFlags]=useState({}),[doc,setDoc]=useState(null),[streaming,setStreaming]=useState(false) + const [quote,setQuote]=useState(''),[sent,setSent]=useState(0),[log,setLog]=useState([]),[reactions,setReactions]=useState([]),[contextAt,setContext]=useState(null),[page,setPage]=useState('general') + const note=text=>setLog(old=>[String(text),...old].slice(0,8)) + const roster={bots:bots.map(x=>({...x,...flags[x.id]})),rooms:rooms.map(x=>({...x,...flags[x.id]})),agents:[],prefs,exchangeTurns:{},questions:{},self:{name:'示例用户'},mainBotId:null,readOnly:locked?'离线示例:只读窗口。':'',themes:[],projects:[]} + roster.byId=Object.fromEntries(roster.bots.map(x=>[x.id,x]));roster.roomsById=Object.fromEntries(roster.rooms.map(x=>[x.id,x])) + const actions={ + reportError:e=>note(e?.message??e), + setPrefs:async patch=>{if(locked)throw Error('Mock host: read-only');setPrefs(p=>({...p,...patch}));note('mock set-prefs '+JSON.stringify(patch))}, + setFlags:async(id,patch)=>{if(locked)throw Error('Mock host: read-only');setFlags(old=>({...old,[id]:{...old[id],...patch}}));note('mock setFlags '+id)}, + markUnread:id=>{setUnread(old=>({...old,[id]:true}));note(`manual unread ${id}=true`)}, + clearUnread:id=>{setUnread(old=>({...old,[id]:false}));note(`manual unread ${id}=false; system status untouched`)}, + openMenu:()=>note('示例边界:会话行菜单未挂载,请用真实顶栏菜单验证未读/置顶'), + openInbox:()=>note('示例边界:inbox 不在本轮 fixture 范围'), + openConnectors:()=>note('示例边界:连接器不接入真实宿主'), + selectPanel:()=>note('示例边界:宿主面板未接入'), + openSession:id=>{setActive(id);setUnread(old=>({...old,[id]:false}));setRoute('chat')}, + openSettings:next=>{setPage(next??'general');setRoute('settings')},closeSettings:()=>setRoute('chat'), + openPalette:()=>setRoute('search'),closePalette:()=>setRoute('chat'),openNewChat:()=>setRoute('group'), + openMemory:()=>setRoute('memory'),closeMemory:()=>setRoute('chat'),memoryView:async()=>memory, + memoryAsk:async()=>{throw Error('离线 fixture 不模拟模型回答或持久化记忆')},memoryForget:async()=>{throw Error('离线 fixture 不写入记忆')}, + createRoom:async(ids,opts)=>{if(locked)throw Error('Mock host: read-only');const next={id:'demo-created-'+rooms.length,members:ids,...opts};setRooms(old=>[...old,next]);note('mock createRoom '+JSON.stringify(next));return next}, + quote:(_,text)=>{setQuote('> '+text.split('\n').join('\n> ')+'\n\n');note('quoted into mock composer')}, + openDocument:setDoc,toggleDetails:()=>note('宿主详情抽屉未接入 fixture'),reloadTeam:async()=>note('mock reload only'), + } + const useRoster=select(roster),useUi=select({unread,visits:{}}),useSessions=select(sessions),empty=select({}) + const useSessionStatus=select(new Map([['demo-c',{completionUnread:true}]])) + const props={actions,useRoster,useUi,useSessions,useSessionStatus,useRegistry:empty,useActivity:empty,useSessionRetainInfo:(_,pick)=>pick({retainedBy:{mainView:0}}),useUpdate:select(null),useTurnClock:empty,useSession:empty,useBusyAcks:empty,useLive:empty} + installLocale({register:()=>()=>{},bind:()=> (key,params)=>{const text=(lang==='zh'?DICTIONARY.zh[key]:null)??key;return text.replace(/\{(\w+)\}/g,(m,k)=>params?.[k]??m)},getLocale:()=>({active:lang}),setLocale:async tag=>setLang(tag)}) + useEffect(()=>installSendShortcut(useRoster),[prefs,locked]) + useEffect(()=>{applyAppearanceAttribute(isDarkAppearance(prefs));},[prefs]) + const button=(label,click)=>h('button',{type:'button',onClick:click},label) + const composer=h('div',{'data-composer-card':'',style:{marginTop:16}},h('label',null,'模拟宿主输入框(真实 installSendShortcut)',h('textarea',{'data-composer-input':'',defaultValue:quote,key:quote,readOnly:locked,rows:5,style:{display:'block',width:'100%'}})),h('button',{type:'button','data-send':'',disabled:locked,onClick:()=>{setSent(n=>n+1);note('mock send: no network')}},'发送(仅本地计数)'),h('output',null,` 已触发 ${sent} 次`)) + const chat=h('div',null,h(HeaderPill,{...props,sessionId:active}), + h('label',null,h('input',{type:'checkbox',checked:streaming,onChange:e=>setStreaming(e.target.checked)}),'模拟 streaming(只改变 prop,不模拟 token 传输)'), + h('article',{className:'bt-bubble',onContextMenu:e=>onMessageContextMenu(e,setContext,{live:streaming})}, + h(FoldedContent,{text:longText,folding:foldingOf(prefs),streaming,actions,sessionId:active},text=>h('pre',{style:{whiteSpace:'pre-wrap',overflowWrap:'anywhere'}},text)), + !streaming?h(MessageTools,{text:longText,name:'fixture',sessionId:active,roster,actions,contextAt,react:emoji=>{setReactions(old=>[...old,emoji]);note('local reaction '+emoji)}}):null), + h('output',null,reactions.join(' ')),composer,doc?h(DocumentPane,{document:doc,onClose:()=>setDoc(null)}):null) + const view=route==='settings'?h(SettingsDialog,{page,roster,actions,useUpdate:select(null)}):route==='memory'?h(MemoryDialog,{bot:bots[0],roster,actions}):route==='group'?h(NewGroupForm,{roster,actions,run:async promise=>{try{await promise;return true}catch(e){note(e.message);return false}},onCancel:()=>setRoute('chat'),onCreated:()=>setRoute('chat')}):route==='search'?h(CommandPalette,{roster,actions,useSessions,token:'fixture'}):chat + return h('div',null,h('style',null,SHELL_CSS+CONVERSATION_CSS+SIDEBAR_CSS+GROUP_SETTINGS_CSS+MOBILE_CSS+'\nbody{margin:0;background:var(--bt-main);color:var(--bt-ink);font:14px system-ui}button,input,textarea{font:inherit} .fixture-bar{position:relative;z-index:2147483647;padding:10px;background:var(--bt-card);border-bottom:2px solid #fa0;display:flex;gap:8px;flex-wrap:wrap}.fixture-layout{display:grid;grid-template-columns:290px minmax(0,1fr);gap:18px;padding:12px}.fixture-layout main{min-width:0}.fixture-log{white-space:pre-wrap;overflow-wrap:anywhere} @media(max-width:640px){.fixture-layout{grid-template-columns:1fr}}'), + h('header',{className:'fixture-bar'},h('strong',null,'FlyBot — 真实源码组件 / 示例数据 / MOCK HOST / 非实机验收'),...routes.map(r=>button(r,()=>setRoute(r))),button(locked?'切换可写':'切换只读',()=>setLocked(x=>!x)),button(lang==='zh'?'English':'中文',()=>setLang(x=>x==='zh'?'en':'zh'))), + h('div',{className:'fixture-layout'},h('aside',null,h(TeamSidebar,{...props,wide:true})),h('main',null,h(Boundary,{key:route+locked},view),h('pre',{className:'fixture-log','aria-label':'Mock host operation log'},log.join('\n'))))) +} +if (typeof document!=='undefined') createRoot(document.getElementById('root')).render(h(App,{initialRoute:location.hash.slice(1)||'chat'})) diff --git a/core/dev/offline-fixture/build.mjs b/core/dev/offline-fixture/build.mjs new file mode 100644 index 000000000..57c4f43c8 --- /dev/null +++ b/core/dev/offline-fixture/build.mjs @@ -0,0 +1,20 @@ +import assert from 'node:assert/strict' +import {build} from 'esbuild' +import {mkdir,writeFile} from 'node:fs/promises' +import {dirname,resolve} from 'node:path' +import {fileURLToPath} from 'node:url' +const here=dirname(fileURLToPath(import.meta.url)) +const out=resolve(here,'dist') +await mkdir(out,{recursive:true}) +const options={entryPoints:[resolve(here,'app.js')],bundle:true,format:'iife',platform:'browser',outfile:resolve(out,'fixture.js'),metafile:true,nodePaths:[resolve(here,'node_modules')],define:{'process.env.NODE_ENV':'"development"'},plugins:[{name:'explicit-mock-boundaries',setup(b){b.onResolve({filter:/^@deepseek-ai\/dsh-client-ui-primitives$/},()=>({path:resolve(here,'primitives.js')}));b.onResolve({filter:/^\.\/api\.js$/},()=>({path:resolve(here,'host.js')}))}}]} +const result=await build(options) +if (process.argv.includes('--render-check')) await build({...options,format:'esm',platform:'node',outfile:resolve(here,'render-check.mjs'),external:['react','react-dom','react-dom/*']}) +await writeFile(resolve(out,'index.html'),'FlyBot real-component offline fixture · MOCK HOST
') +await writeFile(resolve(out,'bundle-inputs.json'),JSON.stringify(result.metafile,null,2)) +console.log(out+'/index.html') + +const inputs=Object.keys(result.metafile.inputs) +for (const file of ['settings','composer','message-fold','memory-panel','group-settings','sidebar','palette','message-tools','header']) assert.ok(inputs.some(path=>path.endsWith('src/client/'+file+'.js')), 'Missing actual component '+file) +assert.ok(!inputs.some(path=>path.endsWith('src/client/api.js')), 'Real host transport must not be bundled') +for (const output of Object.values(result.metafile.outputs)) assert.equal(output.imports.length,0,'Browser bundle must be self contained') +console.log('PASS actual source manifest and no external browser imports / real host transport') diff --git a/core/dev/offline-fixture/check.mjs b/core/dev/offline-fixture/check.mjs new file mode 100644 index 000000000..572ce47e7 --- /dev/null +++ b/core/dev/offline-fixture/check.mjs @@ -0,0 +1,10 @@ +// Render smoke only, not browser effects, layout or interaction acceptance. +import assert from 'node:assert/strict' +import {createElement} from 'react' +import {renderToString} from 'react-dom/server' +import {App,routes} from './render-check.mjs' +for (const initialRoute of routes) for (const initialLocked of [false,true]) for (const initialLang of ['zh','en']) { + const html=renderToString(createElement(App,{initialRoute,initialLocked,initialLang})) + assert.match(html,/MOCK HOST/) + console.log('PASS source-component server render',initialRoute,initialLocked,initialLang,html.length) +} diff --git a/core/dev/offline-fixture/host.js b/core/dev/offline-fixture/host.js new file mode 100644 index 000000000..c7901f634 --- /dev/null +++ b/core/dev/offline-fixture/host.js @@ -0,0 +1,5 @@ +// MOCK HOST ONLY. No transport is installed and unsupported calls reject visibly. +export async function call(method, body) { + if (typeof globalThis.__fixtureCall === 'function') return globalThis.__fixtureCall(method, body) + throw new Error(`Offline fixture: unsupported host call ${method}`) +} diff --git a/core/dev/offline-fixture/package-lock.json b/core/dev/offline-fixture/package-lock.json new file mode 100644 index 000000000..5e3e850af --- /dev/null +++ b/core/dev/offline-fixture/package-lock.json @@ -0,0 +1,41 @@ +{ + "name": "offline-fixture", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "react": "https://registry.npmjs.org/react/-/react-19.3.1.tgz", + "react-dom": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.1.tgz", + "scheduler": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz" + } + }, + "node_modules/react": { + "version": "19.3.1", + "resolved": "https://registry.npmjs.org/react/-/react-19.3.1.tgz", + "integrity": "sha512-QNhWdt7nrgVWWQG58QuGsAR3jv3Hbe4mb4vz7w2csnHavciZJgda1CPNaldF6eVxv90ud3jUXpKlHL69gO38yw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "19.3.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.1.tgz", + "integrity": "sha512-Y0bARz53lhEC1NMCASs0/j+faB/zqt3R8hpvg1e8+61ZVJ4UL0UdC4cBbXfZMcIuhrfgeILTLe+ZeBCavQPtKQ==", + "license": "MIT", + "dependencies": { + "scheduler": "^0.28.0" + }, + "peerDependencies": { + "react": "^19.3.1" + } + }, + "node_modules/scheduler": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz", + "integrity": "sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw==", + "license": "MIT" + } + } +} diff --git a/core/dev/offline-fixture/package.json b/core/dev/offline-fixture/package.json new file mode 100644 index 000000000..f7a5be88e --- /dev/null +++ b/core/dev/offline-fixture/package.json @@ -0,0 +1,7 @@ +{ + "dependencies": { + "react": "https://registry.npmjs.org/react/-/react-19.3.1.tgz", + "react-dom": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.1.tgz", + "scheduler": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz" + } +} diff --git a/core/dev/offline-fixture/primitives.js b/core/dev/offline-fixture/primitives.js new file mode 100644 index 000000000..666b062d6 --- /dev/null +++ b/core/dev/offline-fixture/primitives.js @@ -0,0 +1,5 @@ +// DSH is absent: these marked dependency substitutes are NOT renderer acceptance. +import { createElement as h } from 'react' +export const MarkdownText = ({text}) => h('pre', {'data-fixture-mock':'DSH MarkdownText', style:{whiteSpace:'pre-wrap',overflowWrap:'anywhere'}}, text) +export const FishLogo = () => h('span', {'data-fixture-mock':'DSH FishLogo', 'aria-label':'FlyBot mock logo'}, '◈') +export const projectUserText = text => ({text:String(text ?? ''), images:[], attachments:[]}) diff --git a/core/index.js b/core/index.js index 4c6b1da72..6c43cbbe5 100644 --- a/core/index.js +++ b/core/index.js @@ -26,6 +26,7 @@ import * as tools from './src/host/tools.js' import * as decisions from './src/host/decisions.js' import * as meetings from './src/host/meetings.js' import * as chatIndex from './src/host/chat-index.js' +import * as messageSearch from './src/host/message-search.js' import * as groups from './src/host/groups.js' import * as approvals from './src/host/approvals.js' import * as resume from './src/host/resume.js' @@ -58,7 +59,7 @@ export const inject = ['llm', 'tools', 'systemPrompt', 'sessionController', 'ses // the functions other modules call; they call them through `rt` at run time, never during // install. Listeners run and tools are listed in registration order, so this order holds: // usage meters model requests after every listener that rewrites them. -const MODULES = [diagnostics, store, harness, memberAuth, authz, models, permissions, turns, busyAck, steeringInterrupt, delivery, roster, folders, agents, prompt, timeContext, tools, decisions, meetings, chatIndex, groups, roomMembership, reach, tasks, taskDrive, approvals, resume, memory, parts, turnBudget, images, secrets, connectors, connectorAccess, capabilities, schedules, automationDefault, browser, usage, update, dshUpdate, hooks, remoteChat, workflowStore, health, channel] +const MODULES = [diagnostics, store, harness, memberAuth, authz, models, permissions, turns, busyAck, steeringInterrupt, delivery, roster, folders, agents, prompt, timeContext, tools, decisions, meetings, chatIndex, messageSearch, groups, roomMembership, reach, tasks, taskDrive, approvals, resume, memory, parts, turnBudget, images, secrets, connectors, connectorAccess, capabilities, schedules, automationDefault, browser, usage, update, dshUpdate, hooks, remoteChat, workflowStore, health, channel] export function apply(ctx, config = {}) { const rt = createRuntime(ctx, config) diff --git a/core/src/client/api.js b/core/src/client/api.js index 4dd74418e..3151180ae 100644 --- a/core/src/client/api.js +++ b/core/src/client/api.js @@ -3,7 +3,7 @@ import { markNoted, noteClientError } from './diagnostics.js' const ROUTE = 'api/bot' // Refusals carry a message meant for the user, who sees it where they acted. -const REFUSALS = new Set(['bot/refused', 'bot/invalid', 'bot/read-only', 'bot/not-found', 'bot/browser-off']) +const REFUSALS = new Set(['bot/history-unavailable', 'bot/search-unavailable', 'bot/refused', 'bot/invalid', 'bot/read-only', 'bot/not-found', 'bot/browser-off']) export const call = async (endpoint, payload, signal) => { let response diff --git a/core/src/client/appearance.js b/core/src/client/appearance.js new file mode 100644 index 000000000..1c3b956cf --- /dev/null +++ b/core/src/client/appearance.js @@ -0,0 +1,244 @@ +// Appearance for this window: light, dark, automatic (sunset-to-sunrise or a custom +// night window), or match the system. The chosen palette still comes from themes.js; +// this module only decides whether `data-ds-dark-theme` is on. +// Send-key preference lives here too: it is a General setting persisted with prefs. + +export const APPEARANCE_MODES = ['light', 'dark', 'auto', 'system'] +export const AUTO_KINDS = ['sun', 'custom'] +export const SEND_KEYS = ['enter', 'shift-enter'] +export const DEFAULT_APPEARANCE = { mode: 'system', auto: 'sun', from: '19:00', to: '07:00' } +export const DEFAULT_SEND_KEY = 'enter' +export const DEFAULT_LATITUDE = 40 +const TIME = /^([01]\d|2[0-3]):[0-5]\d$/ + +// A coarse latitude for the solar estimate when the account has no coordinates. +// Asia/Shanghai is the owner's zone; other common zones are listed so the curve +// is not stuck at mid-latitudes everywhere. +const TZ_LATITUDE = { + 'Asia/Shanghai': 31.23, + 'Asia/Chongqing': 29.56, + 'Asia/Hong_Kong': 22.32, + 'Asia/Taipei': 25.03, + 'Asia/Tokyo': 35.68, + 'Asia/Seoul': 37.57, + 'Asia/Singapore': 1.35, + 'Asia/Kolkata': 28.61, + 'Europe/London': 51.51, + 'Europe/Paris': 48.86, + 'Europe/Berlin': 52.52, + 'America/New_York': 40.71, + 'America/Chicago': 41.88, + 'America/Denver': 39.74, + 'America/Los_Angeles': 34.05, + 'America/Sao_Paulo': -23.55, + 'Australia/Sydney': -33.87, + UTC: 0, +} + +export function timezoneOf(date = new Date(), timeZone) { + if (typeof timeZone === 'string' && timeZone) return timeZone + try { + return Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC' + } catch { + return 'UTC' + } +} + +export function latitudeForZone(timeZone) { + return TZ_LATITUDE[timeZone] ?? DEFAULT_LATITUDE +} + +export function parseClock(value) { + if (typeof value !== 'string' || !TIME.test(value)) return null + const [hours, minutes] = value.split(':').map(Number) + return hours * 60 + minutes +} + +export function formatClock(minutes) { + const wrapped = ((Math.round(minutes) % 1440) + 1440) % 1440 + const hours = Math.floor(wrapped / 60) + const mins = wrapped % 60 + return `${String(hours).padStart(2, '0')}:${String(mins).padStart(2, '0')}` +} + +// Local wall-clock minutes past midnight in `timeZone`. +export function localMinutes(date, timeZone) { + const zone = timezoneOf(date, timeZone) + const parts = new Intl.DateTimeFormat('en-US', { + timeZone: zone, hour: '2-digit', minute: '2-digit', hourCycle: 'h23', + }).formatToParts(date) + const hour = Number(parts.find(part => part.type === 'hour')?.value ?? 0) + const minute = Number(parts.find(part => part.type === 'minute')?.value ?? 0) + return hour * 60 + minute +} + +function dayOfYear(date, timeZone) { + const zone = timezoneOf(date, timeZone) + const parts = new Intl.DateTimeFormat('en-US', { + timeZone: zone, year: 'numeric', month: 'numeric', day: 'numeric', + }).formatToParts(date) + const year = Number(parts.find(part => part.type === 'year')?.value) + const month = Number(parts.find(part => part.type === 'month')?.value) + const day = Number(parts.find(part => part.type === 'day')?.value) + const utc = Date.UTC(year, month - 1, day) + const start = Date.UTC(year, 0, 0) + return Math.round((utc - start) / 86_400_000) +} + +// Compact solar estimate: sunrise and sunset as local minutes. Good enough for +// an automatic theme flip; not an almanac. Polar day/night clamps to always +// light or always dark. +export function sunMinutes(date, { latitude, timeZone } = {}) { + const zone = timezoneOf(date, timeZone) + const latDeg = Number.isFinite(latitude) ? latitude : latitudeForZone(zone) + const decl = -23.44 * Math.cos((2 * Math.PI / 365) * (dayOfYear(date, zone) + 10)) * (Math.PI / 180) + const lat = latDeg * (Math.PI / 180) + const cosHa = -Math.tan(lat) * Math.tan(decl) + if (cosHa >= 1) return { sunrise: 12 * 60, sunset: 12 * 60, alwaysDark: true } + if (cosHa <= -1) return { sunrise: 0, sunset: 24 * 60, alwaysDark: false, alwaysLight: true } + const minutesFromNoon = (Math.acos(cosHa) * 180 / Math.PI) / 15 * 60 + const noon = 12 * 60 + return { sunrise: noon - minutesFromNoon, sunset: noon + minutesFromNoon } +} + +export function afterSunset(date, options) { + const sun = sunMinutes(date, options) + if (sun.alwaysDark) return true + if (sun.alwaysLight) return false + const now = localMinutes(date, options?.timeZone) + return now >= sun.sunset || now < sun.sunrise +} + +// Custom night window: dark from `from` until `to`. A window that wraps midnight +// (19:00–07:00) is the usual case. Equal clocks are treated as no window (light). +export function inNightWindow(date, from, to, timeZone) { + const start = parseClock(from) + const end = parseClock(to) + if (start === null || end === null || start === end) return false + const now = localMinutes(date, timeZone) + return start < end ? now >= start && now < end : now >= start || now < end +} + +export function normalizeAppearance(value) { + const mode = APPEARANCE_MODES.includes(value?.mode) ? value.mode : DEFAULT_APPEARANCE.mode + const auto = AUTO_KINDS.includes(value?.auto) ? value.auto : DEFAULT_APPEARANCE.auto + const from = parseClock(value?.from) !== null ? value.from : DEFAULT_APPEARANCE.from + const to = parseClock(value?.to) !== null ? value.to : DEFAULT_APPEARANCE.to + return { mode, auto, from, to } +} + +export function appearanceOf(prefs) { + return normalizeAppearance(prefs?.appearance) +} + +export function normalizeSendKey(value) { + return SEND_KEYS.includes(value) ? value : DEFAULT_SEND_KEY +} + +export function sendKeyOf(prefs) { + return normalizeSendKey(prefs?.sendKey) +} + +export function systemDark(media = globalThis.matchMedia) { + try { + return typeof media === 'function' ? Boolean(media.call(globalThis, '(prefers-color-scheme: dark)')?.matches) : false + } catch { + return false + } +} + +export function isDarkAppearance(prefs, now = new Date(), darkSystem = systemDark(), options = {}) { + const appearance = appearanceOf(prefs) + if (appearance.mode === 'light') return false + if (appearance.mode === 'dark') return true + if (appearance.mode === 'system') return Boolean(darkSystem) + const zone = options.timeZone + if (appearance.auto === 'custom') return inNightWindow(now, appearance.from, appearance.to, zone) + return afterSunset(now, { timeZone: zone, latitude: options.latitude }) +} + +export function applyAppearanceAttribute(dark, root) { + const doc = root?.ownerDocument ?? root ?? (typeof document === 'undefined' ? null : document) + if (!doc?.documentElement) return dark ? 'dark' : 'light' + const body = doc.body ?? doc.documentElement + if (dark) body.setAttribute('data-ds-dark-theme', '') + else body.removeAttribute('data-ds-dark-theme') + return dark ? 'dark' : 'light' +} + +// The General page and installTheme share this so a stored record, a form draft, +// and the live attribute stay in one shape. +export function appearanceRecord(appearance, { clear = false } = {}) { + if (clear || appearance == null) return null + const next = normalizeAppearance(appearance) + if (next.mode === DEFAULT_APPEARANCE.mode && next.auto === DEFAULT_APPEARANCE.auto + && next.from === DEFAULT_APPEARANCE.from && next.to === DEFAULT_APPEARANCE.to) return null + return next +} + +export function shouldSendOnKey(event, sendKey) { + if (!event || event.key !== 'Enter' || event.metaKey || event.ctrlKey || event.altKey || event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229 || event.which === 229) return false + return normalizeSendKey(sendKey) === 'shift-enter' ? event.shiftKey === true : event.shiftKey !== true +} + +export function shouldBreakOnKey(event, sendKey) { + if (!event || event.key !== 'Enter' || event.metaKey || event.ctrlKey || event.altKey || event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229 || event.which === 229) return false + return normalizeSendKey(sendKey) === 'shift-enter' ? event.shiftKey !== true : event.shiftKey === true +} + +// When the user chose Shift+Enter to send, intercept the shell's Enter-to-send +// composer: Enter inserts a newline, Shift+Enter presses the card's send button. +export function handleComposerSendKey(event, sendKey, { send, insertNewline } = {}) { + const key = normalizeSendKey(sendKey) + if (key === DEFAULT_SEND_KEY) return false + if (shouldSendOnKey(event, key)) { + event.preventDefault() + event.stopPropagation() + send?.() + return 'send' + } + if (shouldBreakOnKey(event, key)) { + event.preventDefault() + event.stopPropagation() + insertNewline?.(event) + return 'break' + } + return false +} + +export function composerCardOf(node) { + return node instanceof Element ? node.closest('[data-composer-card]') : null +} + +export function composerFieldOf(event) { + const target = event?.target + if (!(target instanceof Element)) return null + return target.closest('[data-composer-input], textarea, [contenteditable="true"]') +} + +export function findSendButton(card) { + if (!card) return null + const named = card.querySelector('button[type=submit], button[data-send], [data-composer-send]') + if (named) return named + return [...card.querySelectorAll('button')].find((button) => { + const label = `${button.getAttribute('aria-label') ?? ''} ${button.getAttribute('title') ?? ''} ${button.textContent ?? ''}` + return /send|发送/i.test(label) && !/dictate|mic|voice|add|plus|录音|听写|添加/i.test(label) + }) ?? null +} + +export function insertComposerNewline(field) { + if (!field) return + if (typeof field.value === 'string' && typeof field.selectionStart === 'number') { + const start = field.selectionStart + const end = field.selectionEnd ?? start + const value = field.value + field.value = `${value.slice(0, start)}\n${value.slice(end)}` + field.selectionStart = field.selectionEnd = start + 1 + field.dispatchEvent(new Event('input', { bubbles: true })) + return + } + if (field.isContentEditable || field.getAttribute?.('contenteditable') === 'true') { + const doc = field.ownerDocument ?? document + if (typeof doc.execCommand === 'function') doc.execCommand('insertText', false, '\n') + } +} diff --git a/core/src/client/browser-pane.js b/core/src/client/browser-pane.js index 0f360679a..decbc21cc 100644 --- a/core/src/client/browser-pane.js +++ b/core/src/client/browser-pane.js @@ -10,6 +10,7 @@ import { BotMark } from './mark.js' import { STORAGE } from './storage.js' import { SPRING_SHAPE, springEasing } from './motion.js' import { DetailsDrawer } from './details-drawer.js' +import { DocumentPane } from './message-fold.js' import { t } from './i18n.js' export const PANEL_LINGER_MS = 300 @@ -271,13 +272,14 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) /** * One aside for the Bot's details and browser. `pane` is - * `{ id, view: 'details'|'browser', renaming, tab }`; `id` is the Session id the + * `{ id, view: 'details'|'browser'|'document', renaming, tab, document }`; `id` is the Session id the * panel follows. Without the Desktop bridge the browser view never shows. */ export function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) { const bot = roster.byId[pane.id] const canBrowse = Boolean(bot && roster.browser === true && actions.browserShow) - const view = pane.view === 'browser' && canBrowse ? 'browser' : 'details' + const view = pane.view === 'browser' && canBrowse ? 'browser' + : pane.view === 'document' && pane.document ? 'document' : 'details' const tabState = useBrowserTabs(map => (bot ? (map[bot.id] ?? EMPTY_TABS) : EMPTY_TABS)) const active = tabState.active const page = useBrowserPages(pages => (active ? pages[active] : null) ?? EMPTY_PAGE) @@ -463,7 +465,7 @@ export function BotPanel({ pane, leaving, roster, actions, useSessions, useSessi const hasStrip = canBrowse && tabState.ids.length > 0 return h('aside', { - ref: root, className: 'bt-panel', 'data-view': view, 'aria-label': view === 'browser' && bot ? t("{name}'s browser", { name: bot.name }) : t('Conversation details'), + ref: root, className: 'bt-panel', 'data-view': view, 'aria-label': view === 'browser' && bot ? t("{name}'s browser", { name: bot.name }) : view === 'document' ? (pane.document?.title || t('Document')) : t('Conversation details'), 'data-leaving': leaving || undefined, 'aria-hidden': leaving || undefined, 'data-settling': settling || undefined, 'data-instant': instant || undefined, 'data-dragging': dragging || undefined, style: { '--bt-panel-w': `${panelWidth}px` }, onAnimationEnd: (event) => { if (event.target === event.currentTarget) setLanded(true) }, @@ -475,6 +477,9 @@ export function BotPanel({ pane, leaving, roster, actions, useSessions, useSessi hasStrip ? h(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null, view === 'browser' && bot ? h(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) + : view === 'document' + ? h('div', { key: `document:${pane.id}:${pane.document?.title ?? ''}`, className: 'bt-panel-view' }, + h(DocumentPane, { document: pane.document, onClose: () => actions.closePanel() })) : h('div', { key: `details:${pane.id}:${pane.renaming ? 'rename' : ''}:${pane.tab ?? ''}`, className: 'bt-panel-view' }, h(DetailsDrawer, { sessionId: pane.id, startRenaming: pane.renaming, startTab: pane.tab, hasStrip, diff --git a/core/src/client/cells.js b/core/src/client/cells.js index 460e3d613..6dd9b2b85 100644 --- a/core/src/client/cells.js +++ b/core/src/client/cells.js @@ -1,9 +1,9 @@ import { createElement as h, Fragment, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react' -import { createPortal } from 'react-dom' import { MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives' import { inkText } from './inks.js' import { currentPart, linkMentions, mentionTarget, MENTION_ORIGIN, dayLabel, contentText, stripHeader, stripTrace, botNames, isHiddenTurn, typedBy, heldReplyOf, isRelayContext, relaysBefore, relayPart, commRunOf, toolName, toolArgs, reminderPrompts, cutText, isPluginTool } from './text.js' -import { SmileIcon, ReplyIcon, DotsIcon, CheckIcon, DownloadIcon, CopyIcon, MemoryIcon } from './icons.js' +import { MemoryIcon } from './icons.js' +import { MessageTools, onMessageContextMenu } from './message-tools.js' import { colorOf, lookBotForRemote, toolState, BotMark, PersonMark, RoomAvatar } from './mark.js' import { botByName, rosterBot } from './sources.js' import { AnsweredCell, SettledQuestion, PendingQuestion } from './questions.js' @@ -18,6 +18,7 @@ import { HeldReplyActions } from './held-reply.js' import { call } from './api.js' import { failureLabel } from './diagnostics.js' import { turnReasoning } from './turn-reasoning.js' +import { FoldedContent, foldingOf, showsDocumentCard } from './message-fold.js' // ------------------------------------------------------------------------- // Chat cells @@ -57,6 +58,17 @@ function bubbleLinkClick({ actions, subject }) { // `lead` (a sender avatar in group chats) sits beside the last bubble, in the same // row, so it lines up with the bubble whether or not reactions hang below it. +function bubbleBody({ text, roster, selfId, live, mentions, actions, sessionId }) { + const folding = foldingOf(roster?.prefs) + const render = shown => h(MarkdownText, { text: linkMentions(shown, roster.bots, selfId), streaming: live, labels: mdLabels(), variant: 'compact', fileMentions: mentions }) + if (!live && showsDocumentCard(text, folding)) { + return h(FoldedContent, { text, folding, actions, sessionId }) + } + return h('div', { className: 'bt-bubble' }, + h(FoldedContent, { text, folding, streaming: live, actions, sessionId }, render)) +} + + export function Bubbles({ texts, roster, selfId, actions, streaming, sessionId, msgKey, msgKeys, useUi, lead, mentions }) { const openLink = bubbleLinkClick({ actions, subject: selfId ?? sessionId }) const onClick = (event) => { @@ -78,6 +90,7 @@ export function Bubbles({ texts, roster, selfId, actions, streaming, sessionId, // #2123: a message with no text is no message — a turn that ended in tool calls only, or whose reply // a card elsewhere carries, leaves nothing to draw. The empty and whitespace-only shapes are one: the // row (bubble and its avatar) is drawn only for a text a person can read. + const [contextAt, setContextAt] = useState(null) const shown = (texts ?? []).filter(text => String(text ?? '').trim() !== '') if (shown.length === 0) return null return h('div', { className: 'bt-astack', 'data-lead': lead ? '' : undefined, onClickCapture: onClick }, @@ -86,12 +99,15 @@ export function Bubbles({ texts, roster, selfId, actions, streaming, sessionId, const picked = key ? (msgKeys ? reactions?.[key] : reactions)?.[reactIndex(index)] ?? [] : [] const last = index === shown.length - 1 const live = streaming && last - return h('div', { key: index, className: 'bt-msg' }, + return h('div', { key: index, className: 'bt-msg', onContextMenu: event => onMessageContextMenu(event, at => setContextAt({ ...at, index }), { live }) }, h('div', { className: 'bt-msg-line' }, lead && last ? lead : null, - h('div', { className: 'bt-bubble' }, - h(MarkdownText, { text: linkMentions(text, roster.bots, selfId), streaming: live, labels: mdLabels(), variant: 'compact', fileMentions: mentions })), - live ? null : h(MessageTools, { text, name: roster.byId[selfId]?.name ?? t('Bot'), sessionId, react: key ? emoji => actions.toggleReaction(key, reactIndex(index), emoji) : undefined, actions })), + bubbleBody({ text, roster, selfId, live, mentions, actions, sessionId }), + live ? null : h(MessageTools, { + text, name: roster.byId[selfId]?.name ?? t('Bot'), sessionId, + react: key ? emoji => actions.toggleReaction(key, reactIndex(index), emoji) : undefined, + actions, roster, contextAt: contextAt?.index === index ? contextAt : null, + })), picked.length ? h('div', { className: 'bt-reacts' }, picked.map(emoji => h('button', { key: emoji, type: 'button', className: 'bt-react', 'aria-label': t('Remove reaction {emoji}', { emoji }), onClick: () => actions.toggleReaction(key, reactIndex(index), emoji), }, emoji))) : null) @@ -101,8 +117,6 @@ export function Bubbles({ texts, roster, selfId, actions, streaming, sessionId, // A held send is shown by its card and the sidebar mark, not by a line in a Face-to-face room's history: // older rooms still hold this line from when the social plugin posted it for a direct message (#278). const WAITING_OTHERS_NOTICE = "Waiting for the owner's approval" -const REACTIONS = ['👍', '❤️', '😂', '😮', '😢', '🙏'] - // The closed status line already says who left (#1103). Same rule as // plugins/social/src/face-rooms.js leaveNoticeCoveredByClose: the plugin does not post the short // line when it already knows the room closed, and a line posted earlier is not drawn beside the banner. @@ -119,59 +133,6 @@ function leaveNoticeCoveredByClose(room, text) { return false } -// Closes a popover on a press outside the given elements or on Escape. -function useDismiss(open, close, refs) { - useEffect(() => { - if (!open) return undefined - const onDown = (event) => { - if (refs.some(ref => ref.current?.contains(event.target))) return - close() - } - const onKey = (event) => { if (event.key === 'Escape') { event.stopPropagation(); close() } } - window.addEventListener('mousedown', onDown) - window.addEventListener('keydown', onKey, true) - return () => { window.removeEventListener('mousedown', onDown); window.removeEventListener('keydown', onKey, true) } - }, [open]) -} - -// The hover toolbar beside a reply bubble: Add reaction, Reply, More. -function MessageTools({ text, name, sessionId, react, actions }) { - const [panel, setPanel] = useState(null) - const [place, setPlace] = useState(null) - const [copied, setCopied] = useState(false) - const tools = useRef(null) - const pop = useRef(null) - const close = () => setPanel(null) - useDismiss(panel !== null, close, [tools, pop]) - const open = (kind, event) => { - if (panel === kind) { close(); return } - const rect = event.currentTarget.getBoundingClientRect() - const below = rect.bottom + 220 < window.innerHeight - setPlace(kind === 'react' - ? { left: rect.left + rect.width / 2, top: rect.top - 6, '--bt-origin': 'bottom center' } - : { left: Math.min(rect.left, window.innerWidth - 208), ...(below ? { top: rect.bottom + 4 } : { bottom: window.innerHeight - rect.top + 4, '--bt-origin': 'bottom left' }) }) - setPanel(kind) - } - const copy = () => { - void navigator.clipboard?.writeText(text).then(() => { setCopied(true); setTimeout(() => setCopied(false), 1000) }) - } - const download = () => { - const url = URL.createObjectURL(new Blob([text], { type: 'text/markdown' })) - const link = Object.assign(document.createElement('a'), { href: url, download: `${name}-message.md` }) - link.click() - setTimeout(() => URL.revokeObjectURL(url), 1000) - } - const item = (label, Icon, run) => h('button', { key: label, type: 'button', role: 'menuitem', onClick: () => { close(); run() } }, h(Icon), label) - return h('div', { ref: tools, className: 'bt-tools', 'data-open': panel !== null || undefined }, - react ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('Add reaction'), title: t('Add reaction'), 'aria-expanded': panel === 'react', onClick: event => open('react', event) }, h(SmileIcon)) : null, - sessionId ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('Reply'), title: t('Reply'), onClick: () => actions.quote(sessionId, text) }, h(ReplyIcon)) : null, - h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('More message actions'), title: t('More'), 'aria-haspopup': 'menu', 'aria-expanded': panel === 'more', onClick: event => open('more', event) }, copied ? h(CheckIcon) : h(DotsIcon)), - panel === 'react' ? createPortal(h('div', { ref: pop, className: 'bt-react-strip', role: 'menu', 'aria-label': t('Reactions'), style: place }, - REACTIONS.map(emoji => h('button', { key: emoji, type: 'button', role: 'menuitem', 'aria-label': emoji, onClick: () => { close(); react(emoji) } }, emoji))), document.body) : null, - panel === 'more' ? createPortal(h('div', { ref: pop, className: 'bt-menu', role: 'menu', 'aria-label': t('Message actions'), style: place }, - item(t('Copy'), CopyIcon, copy), item(t('Download'), DownloadIcon, download)), document.body) : null) -} - // The first line with something on it, inner runs of whitespace squeezed: a folded row shows it, so // the row never reads as an empty frame while the text it names sits behind the caret (#1624). const PEEK_MAX = 160 diff --git a/core/src/client/composer.js b/core/src/client/composer.js index 2275dc623..fb92edb21 100644 --- a/core/src/client/composer.js +++ b/core/src/client/composer.js @@ -5,6 +5,10 @@ import { BotMark, markBotForMention } from './mark.js' import { useLinger } from './motion.js' import { t } from './i18n.js' import { lockedWindow } from './schedules.js' +import { + composerCardOf, composerFieldOf, findSendButton, handleComposerSendKey, + insertComposerNewline, sendKeyOf, +} from './appearance.js' // ------------------------------------------------------------------------- // Composer: dictation mic and the voice-chat button. The shell's send @@ -14,6 +18,29 @@ import { lockedWindow } from './schedules.js' export const speechApi = () => window.SpeechRecognition ?? window.webkitSpeechRecognition const keepComposerFocus = event => event.preventDefault() +// The shell's composer sends on Enter. When the team chose Shift+Enter to send, +// this capture-phase listener flips that: Enter inserts a newline, Shift+Enter +// presses the card's send button. The default Enter-to-send path is left alone. +export function installSendShortcut(useRoster) { + const onKey = (event) => { + if (event.defaultPrevented) return + const field = composerFieldOf(event) + if (!field) return + const card = composerCardOf(field) + if (!card) return + const snapshot = useRoster?.getSnapshot?.() + if (lockedWindow(snapshot) || field.disabled || field.readOnly || field.getAttribute?.('aria-readonly') === 'true') return + const prefs = snapshot?.prefs ?? {} + handleComposerSendKey(event, sendKeyOf(prefs), { + send: () => { const button = findSendButton(card); if (button && !button.disabled && button.getAttribute?.('aria-disabled') !== 'true') button.click() }, + insertNewline: () => insertComposerNewline(field), + }) + } + window.addEventListener('keydown', onKey, true) + return () => window.removeEventListener('keydown', onKey, true) +} + + export function useDictation(onText) { const [listening, setListening] = useState(false) const [note, setNote] = useState('') @@ -165,7 +192,18 @@ export function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { ref: menu, className: 'bt-menu bt-menu-up bt-plus-menu', role: 'menu', 'aria-label': t('Add'), style: { left: shown.left, bottom: shown.bottom }, 'data-leaving': leaving || undefined, }, - h('button', { type: 'button', role: 'menuitem', onClick: attach }, h(PaperclipIcon), h('span', { className: 'bt-menu-label' }, t('Add files'))), - canReference ? h('button', { type: 'button', role: 'menuitem', onMouseDown: keepComposerFocus, onClick: reference }, h(ChatsIcon), h('span', { className: 'bt-menu-label' }, t('Reference a chat'))) : null, - locked ? null : h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(null); actions.openSettings('schedules', target) } }, h(ClockIcon), h('span', { className: 'bt-menu-label' }, t('Scheduled task')))), document.body) : null) + h('div', { className: 'bt-plus-group', role: 'group', 'aria-label': t('Attach') }, + h('button', { type: 'button', role: 'menuitem', onClick: attach }, h(PaperclipIcon), h('span', { className: 'bt-menu-label' }, t('Add files')))), + h('div', { className: 'bt-plus-group', role: 'group', 'aria-label': t('Reference a chat') }, + canReference + ? h('button', { type: 'button', role: 'menuitem', onMouseDown: keepComposerFocus, onClick: reference }, h(ChatsIcon), h('span', { className: 'bt-menu-label' }, t('Reference a chat'))) + : h('button', { type: 'button', role: 'menuitem', disabled: true, title: t('Reference a chat is available in a Bot or group chat.') }, + h(ChatsIcon), h('span', { className: 'bt-menu-label' }, t('Reference a chat')), + h('span', { className: 'bt-menu-hint' }, t('Reference a chat is available in a Bot or group chat.')))), + h('div', { className: 'bt-plus-group', role: 'group', 'aria-label': t('Scheduled tasks') }, + locked + ? h('button', { type: 'button', role: 'menuitem', disabled: true, title: t('A read-only window cannot create a scheduled task.') }, + h(ClockIcon), h('span', { className: 'bt-menu-label' }, t('Scheduled task')), + h('span', { className: 'bt-menu-hint' }, t('A read-only window cannot create a scheduled task.'))) + : h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(null); actions.openSettings('schedules', target) } }, h(ClockIcon), h('span', { className: 'bt-menu-label' }, t('Scheduled task'))))), document.body) : null) } diff --git a/core/src/client/connectors.js b/core/src/client/connectors.js index b253bc5a2..b92e26442 100644 --- a/core/src/client/connectors.js +++ b/core/src/client/connectors.js @@ -278,22 +278,43 @@ function ConnectorRow({ connector, roster, actions }) { error ? h('div', { className: 'bt-connector-error', role: 'alert' }, error) : null) } -// Settings → Connectors: one row per connector. -export function ConnectorsPage({ roster, actions }) { +function connectorsOf(roster, kind) { const list = roster?.connectors ?? [] + return kind ? list.filter(connector => connector.kind === kind) : list +} + +// Settings → Connectors: one row per connector. Channels is the same list +// filtered to kind === 'channel' (today: Feishu), never a catalogue of +// messaging apps FlyBot has not wired up. +export function ConnectorsPage({ roster, actions, kind, empty, hint }) { + const list = connectorsOf(roster, kind) + const vacant = empty ?? t('No connectors') + const note = hint ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, hint)) : null // Every connect, disconnect and send is refused in a read-only window, so the page says // what each connector is doing instead of drawing its row (#2474). if (lockedWindow(roster)) { return h('section', { className: 'bt-set-section' }, - h('div', { className: 'bt-set-card bt-connectors-card' }, list.length === 0 - ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, t('No connectors'))) - : list.map(connector => h('div', { key: connector.id, className: 'bt-set-row' }, - h('span', { className: 'bt-set-copy' }, - h('span', { className: 'bt-bs-label' }, connector.name), - h('span', { className: 'bt-set-hint' }, statusText(connector))))))) + h('div', { className: 'bt-set-card bt-connectors-card' }, + note, + list.length === 0 + ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, vacant)) + : list.map(connector => h('div', { key: connector.id, className: 'bt-set-row' }, + h('span', { className: 'bt-set-copy' }, + h('span', { className: 'bt-bs-label' }, connector.name), + h('span', { className: 'bt-set-hint' }, statusText(connector))))))) } return h('section', { className: 'bt-set-section' }, - h('div', { className: 'bt-set-card bt-connectors-card' }, list.length === 0 - ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, t('No connectors'))) - : list.map(connector => h(ConnectorRow, { key: connector.id, connector, roster, actions })))) + h('div', { className: 'bt-set-card bt-connectors-card' }, + note, + list.length === 0 + ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, vacant)) + : list.map(connector => h(ConnectorRow, { key: connector.id, connector, roster, actions })))) +} + +export function ChannelsPage({ roster, actions }) { + return h(ConnectorsPage, { + roster, actions, kind: 'channel', + empty: t('No channels yet.'), + hint: t('Only integrations FlyBot already has appear here.'), + }) } diff --git a/core/src/client/context-menu.js b/core/src/client/context-menu.js index 0633a08aa..36db406b4 100644 --- a/core/src/client/context-menu.js +++ b/core/src/client/context-menu.js @@ -7,8 +7,9 @@ import { t } from './i18n.js' import { useSidebarStructure } from './flybot-slots.js' import { pluginItems } from './flybot-registry.js' import { LinkIcon } from './icons.js' +import { isManuallyUnread } from '../shared/session-unread.js' -export function ContextMenu({ menu, roster, actions, leaving = false }) { +export function ContextMenu({ menu, roster, actions, unread, leaving = false }) { useEscape(() => actions.closeMenu()) useEffect(() => { const onDown = (event) => { if (!(event.target instanceof Element) || !event.target.closest('.bt-menu')) actions.closeMenu() } @@ -23,11 +24,15 @@ export function ContextMenu({ menu, roster, actions, leaving = false }) { if (!box) return setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, window.innerHeight - box.height - 8)) }) }, [menu.x, menu.y]) - if (menu.kind === 'agent' || menu.kind === 'agent-session') return h(AgentMenu, { menu, roster, actions, leaving }) + if (menu.kind === 'agent' || menu.kind === 'agent-session') return h(AgentMenu, { menu, roster, actions, unread, leaving }) const bot = roster.byId[menu.id] const room = roster.roomsById[menu.id] const entry = bot ?? room if (entry === undefined) return null + const marked = isManuallyUnread(unread, menu.id) + const unreadItem = marked + ? [t('Clear unread mark'), UnreadIcon, () => actions.clearUnread(menu.id)] + : [t('Mark as Unread'), UnreadIcon, () => actions.markUnread(menu.id)] const isMainBot = isMainOf(roster, menu.id) const isTile = roster.mainBotId === menu.id const mainCount = (roster.mainBotIds ?? []).length @@ -37,7 +42,7 @@ export function ContextMenu({ menu, roster, actions, leaving = false }) { const groups = bot?.remote ? [ [ - [t('Mark as Unread'), UnreadIcon, () => actions.markUnread(menu.id)], + unreadItem, ], [ [t('Bot settings'), GearIcon, () => actions.openSettings('bots', bot.id)], @@ -48,7 +53,7 @@ export function ContextMenu({ menu, roster, actions, leaving = false }) { : [ [ isTile || locked ? null : [entry.pinned ? t('Unpin') : t('Pin'), PinIcon, () => actions.setFlags(menu.id, { pinned: !entry.pinned })], - [t('Mark as Unread'), UnreadIcon, () => actions.markUnread(menu.id)], + unreadItem, ], [ // One way to edit a Bot (#385): its name is edited in Edit Bot too. @@ -77,7 +82,7 @@ export function ContextMenu({ menu, roster, actions, leaving = false }) { } // Menus for the DSH Agent row and its Sessions; none of the Bot entries apply. -function AgentMenu({ menu, roster, actions, leaving }) { +function AgentMenu({ menu, roster, actions, unread, leaving }) { const ref = useRef(null) const [place, setPlace] = useState({ left: menu.x, top: menu.y }) useLayoutEffect(() => { @@ -89,16 +94,24 @@ function AgentMenu({ menu, roster, actions, leaving }) { if (agent === undefined) return null // A window that holds the team read-only draws none of the writes the host refuses (#2232, #2253). const locked = typeof roster?.readOnly === 'string' && roster.readOnly.trim() !== '' + const marked = isManuallyUnread(unread, agent.id) + const unreadItem = marked + ? [t('Clear unread mark'), UnreadIcon, () => actions.clearUnread(agent.id)] + : [t('Mark as Unread'), UnreadIcon, () => actions.markUnread(agent.id)] const groups = menu.kind === 'agent' ? [ [ locked ? null : [agent.pinned ? t('Unpin') : t('Pin'), PinIcon, () => actions.setFlags(agent.id, { pinned: !agent.pinned })], + unreadItem, ], [ locked ? null : [t('Remove DSH Agent'), TrashIcon, () => actions.removeAgent(agent.id), true], ], ] : [ + [ + unreadItem, + ], [ locked ? null : [t('Rename'), PencilIcon, () => actions.beginAgentRename(menu.id)], ], @@ -106,7 +119,7 @@ function AgentMenu({ menu, roster, actions, leaving }) { locked ? null : [t('Archive'), TrashIcon, () => actions.archiveAgentSession(agent.id, menu.id), true], ], ] - // Every row here writes, so a read-only window has no menu to draw at all. + // Host writes stay out of a read-only window; Mark as Unread/Read only touches local UI state. const shown = groups.map(group => group.filter(Boolean)).filter(group => group.length > 0) if (shown.length === 0) return null return h('div', { ref, className: 'bt-menu', role: 'menu', 'aria-label': menu.kind === 'agent' ? 'DSH Agent' : t('Session actions'), style: place, 'data-leaving': leaving || undefined }, diff --git a/core/src/client/group-settings.js b/core/src/client/group-settings.js index e33876493..57934312a 100644 --- a/core/src/client/group-settings.js +++ b/core/src/client/group-settings.js @@ -1,6 +1,6 @@ import { createElement as h, useEffect, useState } from 'react' import { isMainOf } from './sources.js' -import { PlusIcon, ChevronRightIcon } from './icons.js' +import { PlusIcon, ChevronRightIcon, SearchIcon } from './icons.js' import { AdminStar, BotAvatar, BotMark, PersonMark, RoomAvatar, lookAvoidingLocals, lookBotForRemote, lookKey, lookOf } from './mark.js' import { setLocalBots } from './characters.js' import { Card, Row, InlineText, SwitchRow } from './bot-settings.js' @@ -10,7 +10,8 @@ import { FolderMenu } from './folder-menu.js' import { hostText, t } from './i18n.js' import { StandingApprovalsCard } from './standing-approvals.js' import { FlyBotRoomMembers } from './flybot-slots.js' -import { remoteBotName, remoteBotTitle } from '../shared/remote-label.js' +import { listedChatBots, pickerBotLabel, remoteBotName, remoteBotTitle, splitRoomPicks } from '../shared/remote-label.js' +import { canCreateGroup, groupMemberMatches } from '../shared/group-create.js' export const ROOM_MODES = [ ['admin', 'Admin leads', 'Plain messages go to the admin, who calls others with @Name.'], @@ -328,51 +329,141 @@ export function GroupSettingsForm({ room, roster, actions, run, onDeleted }) { h('span', { className: 'bt-chevron' }, h(ChevronRightIcon))))) } -// A new group chat from Settings: its admin first, then the other members, then a name -// if the member names will not do. +// A new group chat from Settings: optional name, searchable member list, selected pane, +// and Create disabled until a local admin and one more member are picked. export function NewGroupForm({ roster, actions, run, onCreated, onCancel }) { const [admin, setAdmin] = useState(null) const [members, setMembers] = useState([]) const [name, setName] = useState('') + const [query, setQuery] = useState('') const [busy, setBusy] = useState(false) - const toggle = id => setMembers(list => (list.includes(id) ? list.filter(item => item !== id) : [...list, id])) - const pickAdmin = (id) => { setAdmin(id); setMembers(list => list.filter(item => item !== id)) } // A read-only window keeps the pickers as a preview and offers no create: the host could only // answer `bot/read-only` after the press (#2307's form, P-570). const locked = lockedWindow(roster) + const bots = listedChatBots(roster) + const selectedIds = admin === null ? members : [admin, ...members] + const selected = selectedIds.map(id => roster.byId[id]).filter(Boolean) + const available = bots.filter(bot => !selectedIds.includes(bot.id) && groupMemberMatches(bot, query)) + const ready = canCreateGroup(admin, members) + const add = (bot) => { + if (admin === null && !bot.remote) { setAdmin(bot.id); return } + setMembers(list => list.includes(bot.id) ? list : [...list, bot.id]) + } + const remove = (id) => { + if (id === admin) { + const nextAdmin = members.find(other => !roster.byId[other]?.remote) ?? null + setAdmin(nextAdmin) + setMembers(list => list.filter(item => item !== nextAdmin)) + return + } + setMembers(list => list.filter(item => item !== id)) + } + const pickAdmin = (id) => { + if (id === admin || roster.byId[id]?.remote) return + setMembers(list => { + const without = list.filter(item => item !== id) + return admin === null ? without : [...without, admin] + }) + setAdmin(id) + } const create = async () => { - if (locked || busy || admin === null || members.length === 0) return + if (locked || busy || !ready) return setBusy(true) let room - const done = await run(actions.createRoom([admin, ...members], { admin, ...(name.trim() ? { name: name.trim() } : {}) }).then((value) => { room = value })) + const { members: localIds, remotes } = splitRoomPicks(roster, [admin, ...members]) + const participants = remotes.length === 0 ? undefined : [ + ...localIds.map(id => ({ kind: 'bot', id, role: id === admin ? 'admin' : 'member' })), + ...remotes, + ] + const done = await run(actions.createRoom(localIds, { + admin, + ...(name.trim() ? { name: name.trim() } : {}), + ...(participants ? { participants } : {}), + }).then((value) => { room = value })) if (done && room) onCreated(room) else setBusy(false) } - const chip = (bot, on, onClick, role) => h('button', { - key: bot.id, type: 'button', role, className: 'bt-ng-chip', 'aria-checked': on, onClick, - }, h(BotAvatar, { bot, size: 22, badge: false, live: false }), h('span', { className: 'bt-ng-name' }, bot.name), on && role === 'radio' ? h(AdminStar) : null) + const pickRow = (bot, selectedRow) => h('button', { + key: bot.id, type: 'button', className: selectedRow ? 'bt-ng-pick bt-ng-pick-on' : 'bt-ng-pick', + 'data-bot-id': bot.id, + role: selectedRow ? (bot.id === admin ? 'radio' : 'checkbox') : 'option', + 'aria-checked': selectedRow ? true : undefined, + onClick: () => { selectedRow ? remove(bot.id) : add(bot) }, + }, + h(BotAvatar, { bot, size: 22, badge: false, live: false }), + h('span', { className: 'bt-ng-name' }, pickerBotLabel(bot)), + selectedRow && bot.id === admin ? h(AdminStar) : null, + selectedRow && bot.id !== admin && !bot.remote + ? h('span', { + className: 'bt-ng-make-admin', role: 'button', tabIndex: 0, + 'aria-label': t('Make admin'), + onClick: (event) => { event.preventDefault(); event.stopPropagation(); pickAdmin(bot.id) }, + onKeyDown: (event) => { + if (event.key === 'Enter' || event.key === ' ') { event.preventDefault(); event.stopPropagation(); pickAdmin(bot.id) } + }, + }, h(AdminStar)) + : null) + const availHint = bots.every(bot => selectedIds.includes(bot.id)) + ? t('No more Bots to add') + : t('No Bots match') return h('div', { className: 'bt-set-card bt-ng' }, - h('div', { className: 'bt-set-row bt-bs-row bt-bs-stack' }, - h('span', { className: 'bt-set-copy' }, h('span', { className: 'bt-bs-label bt-ng-label' }, h(AdminStar), t('Choose the group admin'))), - h('div', { className: 'bt-ng-picks', role: 'radiogroup', 'aria-label': t('Group admin') }, - roster.bots.map(bot => chip(bot, admin === bot.id, () => pickAdmin(bot.id), 'radio')))), - admin === null ? null : h('div', { className: 'bt-set-row bt-bs-row bt-bs-stack bt-ng-step' }, - h('span', { className: 'bt-set-copy' }, h('span', { className: 'bt-bs-label' }, t('Who to chat with…'))), - h('div', { className: 'bt-ng-picks', role: 'group', 'aria-label': t('Members') }, - roster.bots.filter(bot => bot.id !== admin).map(bot => chip(bot, members.includes(bot.id), () => toggle(bot.id), 'checkbox')))), - admin === null || members.length === 0 ? null : h('label', { className: 'bt-set-row bt-bs-row bt-ng-step' }, - h('span', { className: 'bt-set-copy' }, h('span', { className: 'bt-bs-label' }, t('Name'))), - h('input', { className: 'bt-bs-input', value: name, maxLength: 60, placeholder: t('Name after members'), onChange: event => setName(event.target.value) })), + h('p', { className: 'bt-ng-intro' }, t('Add a name, then pick Bots to chat with.')), + h('label', { className: 'bt-ng-name-row' }, + h('span', { className: 'bt-ng-name-label' }, t('Group name')), + h('input', { + className: 'bt-ng-name-input', value: name, maxLength: 60, + placeholder: t('Group name (optional)'), + 'aria-label': t('Group name'), + onChange: event => setName(event.target.value), + })), + h('div', { className: 'bt-ng-split' }, + h('div', { className: 'bt-ng-col' }, + h('label', { className: 'bt-ng-search' }, + h(SearchIcon), + h('input', { + className: 'bt-ng-search-input', type: 'search', value: query, + placeholder: t('Search'), 'aria-label': t('Search members'), + onChange: event => setQuery(event.target.value), + })), + available.length === 0 + ? h('div', { className: 'bt-ng-empty' }, availHint) + : h('div', { className: 'bt-ng-list', role: 'listbox', 'aria-label': t('Members') }, + available.map(bot => pickRow(bot, false)))), + h('div', { className: 'bt-ng-col' }, + h('div', { className: 'bt-ng-sel-head' }, t('Selected {count}', { count: selected.length })), + selected.length === 0 + ? h('div', { className: 'bt-ng-empty' }, t('No members selected')) + : h('div', { className: 'bt-ng-list', role: 'group', 'aria-label': t('Selected members') }, + selected.map(bot => pickRow(bot, true))))), h('div', { className: 'bt-set-row bt-task-foot' }, h('button', { type: 'button', className: 'bt-soft bt-soft-sm', onClick: onCancel }, t('Cancel')), locked ? h('div', { className: 'bt-hint bt-read-only', role: 'status' }, hostText(roster.readOnly)) - : h('button', { type: 'button', className: 'bt-send bt-soft-sm', disabled: busy || admin === null || members.length === 0, onClick: () => void create() }, t('Create group chat')))) + : h('button', { type: 'button', className: 'bt-send bt-soft-sm', disabled: busy || !ready, onClick: () => void create() }, t('Create group chat')))) } export const GROUP_SETTINGS_CSS = ` -.bt-ng{animation:bt-q-in .4s cubic-bezier(.22,1,.36,1),bt-veil-in .2s ease-out} -.bt-ng-step{animation:bt-veil-in .22s ease-out} +.bt-ng{padding:16px 16px 8px;animation:bt-q-in .4s cubic-bezier(.22,1,.36,1),bt-veil-in .2s ease-out} +.bt-ng-intro{margin:0 0 14px;color:var(--bt-ink-2);font-size:13px;line-height:18px} +.bt-ng-name-row{display:flex;align-items:center;gap:12px;margin:0 0 12px} +.bt-ng-name-label{flex:none;min-width:4.5em;font-size:13px;color:var(--bt-ink)} +.bt-ng-name-input{flex:1;min-width:0;height:36px;box-sizing:border-box;padding:0 12px;border:.5px solid var(--bt-line-2);border-radius:10px;background:var(--bt-main);color:var(--bt-ink);font:inherit;font-size:13px;outline:none} +.bt-ng-name-input::placeholder{color:var(--bt-ink-3)} +.bt-ng-split{display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:10px;min-height:220px;margin:0 0 8px} +.bt-ng-col{display:flex;flex-direction:column;min-width:0;min-height:220px;border:.5px solid var(--bt-line);border-radius:12px;background:var(--bt-main);overflow:hidden} +.bt-ng-search{display:flex;align-items:center;gap:8px;margin:8px;padding:0 10px;height:32px;border-radius:999px;background:var(--bt-card);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2)} +.bt-ng-search svg{flex:none;width:14px;height:14px} +.bt-ng-search-input{flex:1;min-width:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;outline:none} +.bt-ng-sel-head{display:flex;align-items:center;min-height:32px;margin:8px 12px 0;color:var(--bt-ink-2);font-size:13px} +.bt-ng-list{flex:1;overflow:auto;padding:4px 8px 8px;display:flex;flex-direction:column;gap:2px} +.bt-ng-empty{flex:1;display:flex;align-items:center;justify-content:center;padding:16px;color:var(--bt-ink-3);font-size:13px;text-align:center} +.bt-ng-pick{display:flex;align-items:center;gap:8px;width:100%;border:0;background:none;color:inherit;font:inherit;font-size:13px;padding:6px 8px;border-radius:8px;cursor:pointer;text-align:left} +.bt-ng-pick:hover{background:var(--bt-hover)} +.bt-ng-pick-on{background:var(--bt-card)} +.bt-ng-make-admin{display:inline-flex;margin-left:auto;padding:2px;border-radius:999px;color:var(--bt-ink-3)} +.bt-ng-make-admin:hover{color:var(--bt-ink);background:var(--bt-hover)} +.bt-ng-pick-on>.bt-admin-star{margin-left:auto} +.bt-ng-name{max-width:160px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .bt-ng-label{display:inline-flex;align-items:center;gap:6px} .bt-ng-picks{display:flex;flex-wrap:wrap;gap:6px} .bt-ng-chip{display:inline-flex;align-items:center;gap:6px;height:32px;padding:0 10px 0 5px;border-radius:999px;border:.5px solid var(--bt-line);background:var(--bt-card);color:var(--bt-ink-2);font:inherit;font-size:13px;cursor:pointer;transition:background-color .12s ease,color .12s ease,border-color .12s ease,scale .3s cubic-bezier(.34,1.56,.64,1)} @@ -380,8 +471,7 @@ export const GROUP_SETTINGS_CSS = ` .bt-ng-chip:active{scale:.96} .bt-ng-chip[aria-checked=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink)} .bt-ng-chip .bt-admin-star{animation:bt-check-pop .4s cubic-bezier(.34,1.56,.64,1)} -.bt-ng-name{max-width:140px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -@media (prefers-reduced-motion:reduce){.bt-ng,.bt-ng-step,.bt-ng-chip .bt-admin-star{animation:none}} +@media (prefers-reduced-motion:reduce){.bt-ng,.bt-ng-chip .bt-admin-star{animation:none}} .bt-gs-member{gap:8px} .bt-gs-who{flex:1;display:flex;align-items:center;gap:8px;min-width:0;padding:0;border:0;background:none;color:inherit;font:inherit;text-align:left;cursor:pointer} .bt-gs-who .bt-row-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap} diff --git a/core/src/client/header.js b/core/src/client/header.js index 4be72cec2..d9412c617 100644 --- a/core/src/client/header.js +++ b/core/src/client/header.js @@ -1,7 +1,7 @@ import { createElement as h, Fragment, useEffect, useLayoutEffect, useRef, useState } from 'react' import { createPortal } from 'react-dom' import { currentPart, faceRowTitle, latestMemoryChange } from './text.js' -import { ArrowUpIcon, CloseIcon, ArrowDownIcon, MemoryIcon } from './icons.js' +import { ArrowUpIcon, CloseIcon, ArrowDownIcon, DotsIcon, GearIcon, MemoryIcon, ShareIcon, SearchIcon, UnreadIcon, PinIcon } from './icons.js' import { botState, BotAvatar, RoomAvatar } from './mark.js' import { clockLabel, movedOnSince, openingTurn, unseenSince } from './cells.js' import { ActivityIndicator } from './activity-row.js' @@ -10,6 +10,8 @@ import { t } from './i18n.js' import { call } from './api.js' import { ProjectAgentEntry, projectAgentFor } from './project-board.js' import { friendBotTitle, roomTitle } from '../shared/remote-label.js' +import { isManuallyUnread, unreadEntryId } from '../shared/session-unread.js' +import { canPinSession, sessionPinned } from '../shared/session-pin.js' // ------------------------------------------------------------------------- // Conversation header @@ -46,6 +48,83 @@ function MemoryNotice({ shown }) { h('span', { className: 'bt-pill-mem-in', ref: inner }, h('span', { className: 'bt-pill-mem-ico' }, h(MemoryIcon)), label)) } +function SessionOverflow({ sessionId, roster, actions, unread }) { + const [open, setOpen] = useState(false) + const [note, setNote] = useState('') + const button = useRef(null) + const menu = useRef(null) + const [box, setBox] = useState(null) + const bot = roster.byId?.[sessionId] + const targetId = unreadEntryId(roster, sessionId) + const marked = isManuallyUnread(unread, targetId) + const social = typeof globalThis !== 'undefined' ? globalThis.__flybot__?.social : undefined + const canInvite = Boolean(bot && !bot.remote && typeof social?.createInvite === 'function' && social.canInvite?.(bot.id) !== false) + useEffect(() => { + if (!open) return undefined + const onDown = (event) => { + if ([button.current, menu.current].some(node => node?.contains(event.target))) return + setOpen(false) + } + const onKey = (event) => { if (event.key === 'Escape') { event.stopPropagation(); setOpen(false); button.current?.focus() } } + window.addEventListener('mousedown', onDown) + window.addEventListener('keydown', onKey, true) + return () => { window.removeEventListener('mousedown', onDown); window.removeEventListener('keydown', onKey, true) } + }, [open]) + useEffect(() => { + if (!note) return undefined + const timer = setTimeout(() => setNote(''), 2400) + return () => clearTimeout(timer) + }, [note]) + const toggle = () => { + const rect = button.current?.getBoundingClientRect() + if (rect) setBox({ right: window.innerWidth - rect.right, top: rect.bottom + 6 }) + setOpen(value => !value) + setNote('') + } + const openDetails = () => { setOpen(false); actions.toggleDetails(sessionId) } + const copyInvite = async () => { + try { + const invite = await social.createInvite(bot.id) + const link = invite?.link ?? invite?.url ?? invite?.text + if (!link) throw new Error('missing link') + await navigator.clipboard.writeText(link) + setNote(t('Invite link copied')) + } catch { + setNote(t('Could not copy the invite link')) + } + } + return h(Fragment, null, + h('div', { className: 'bt-head-actions' }, + typeof actions?.openPalette === 'function' + ? h('button', { + type: 'button', className: 'bt-head-more', 'aria-label': t('Search'), title: t('Search'), + onClick: () => actions.openPalette(), + }, h(SearchIcon)) + : null, + h('button', { + ref: button, type: 'button', className: 'bt-head-more', 'aria-label': t('Conversation settings'), + title: t('Conversation settings'), 'aria-haspopup': 'menu', 'aria-expanded': open, onClick: toggle, + }, h(DotsIcon))), + open && box ? createPortal(h('div', { + ref: menu, className: 'bt-menu bt-head-menu', role: 'menu', 'aria-label': t('Conversation settings'), + style: { right: box.right, top: box.top }, + }, + h('button', { type: 'button', role: 'menuitem', onClick: openDetails }, h(GearIcon), h('span', { className: 'bt-menu-label' }, t('Conversation settings'))), + typeof actions?.openPalette === 'function' + ? h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(false); actions.openPalette() } }, h(SearchIcon), h('span', { className: 'bt-menu-label' }, t('Search'))) + : null, + marked + ? h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(false); actions.clearUnread?.(targetId) } }, h(UnreadIcon), h('span', { className: 'bt-menu-label' }, t('Clear unread mark'))) + : h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(false); actions.markUnread?.(targetId) } }, h(UnreadIcon), h('span', { className: 'bt-menu-label' }, t('Mark as Unread'))), + canPinSession(roster, sessionId) && typeof actions?.setFlags === 'function' + ? h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(false); void Promise.resolve(actions.setFlags(sessionId, { pinned: !sessionPinned(roster, sessionId) })).catch(error => actions.reportError?.(error, 'menu')) } }, h(PinIcon), h('span', { className: 'bt-menu-label' }, sessionPinned(roster, sessionId) ? t('Unpin') : t('Pin'))) + : null, + canInvite + ? h('button', { type: 'button', role: 'menuitem', onClick: () => { void copyInvite() } }, h(ShareIcon), h('span', { className: 'bt-menu-label' }, t('Copy invite link'))) + : null, + note ? h('div', { className: 'bt-menu-hint', role: 'status' }, note) : null), document.body) : null) +} + export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSession, useActivity, useBusyAcks, useMemoryNews, useTurnClock, useUi, useLive, actions }) { const roster = useRoster(value => value) const title = useSessions(list => list.byId[sessionId]?.displayTitle ?? list.byId[sessionId]?.title ?? '') @@ -76,6 +155,7 @@ export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus const projectAgent = projectAgentFor(bot, roster.self?.memberId) const room = roster.roomsById[sessionId] const detailsOpen = useUi(state => state.details === sessionId) + const unread = useUi(state => state.unread) const full = bot?.remote ? friendBotTitle(bot) : (roomTitle(room) || bot?.name || '') @@ -106,7 +186,8 @@ export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus }), h(NewMessagePills, { key: sessionId, sessionId, hiddenTurns, useSessions, useUi, useTurnClock, actions }), h(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, actions }), - h(BusyAckBubble, { key: `busy-ack:${sessionId}`, sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive })) + h(BusyAckBubble, { key: `busy-ack:${sessionId}`, sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive }), + h(SessionOverflow, { sessionId, roster, actions, unread })) } // New-message pills. "N new messages ↓" takes Back to bottom's place when diff --git a/core/src/client/history-hit.js b/core/src/client/history-hit.js new file mode 100644 index 000000000..2166b11f2 --- /dev/null +++ b/core/src/client/history-hit.js @@ -0,0 +1,64 @@ +// A separate read-only history view, never a navigation to the current Agent. +import { createElement as h, useEffect, useRef, useState } from 'react' +import { useDialogFocus, useEscape } from './overlay-hooks.js' +import { CloseIcon } from './icons.js' +import { t } from './i18n.js' + +export function useHistoryHit(read, hitToken, accessKey) { + const [attempt, setAttempt] = useState(0) + const [state, setState] = useState({ key: '', status: 'loading', value: null }) + const serial = useRef(0) + const key = `${hitToken ?? ''}:${accessKey}:${attempt}` + useEffect(() => { + const ticket = ++serial.current + const abort = new AbortController() + setState({ key, status: 'loading', value: null }) + if (!hitToken || typeof read !== 'function') { + setState({ key, status: 'error', value: null }) + return () => { serial.current += 1; abort.abort() } + } + void Promise.resolve().then(() => read({ hitToken }, abort.signal)).then(value => { + if (serial.current !== ticket || abort.signal.aborted) return + if (value?.scope !== 'read-only-history' || !Array.isArray(value.entries)) throw new Error('Invalid history response') + setState({ key, status: 'ready', value }) + }).catch(() => { + if (serial.current === ticket && !abort.signal.aborted) setState({ key, status: 'error', value: null }) + }) + return () => { serial.current += 1; abort.abort() } + }, [read, key]) + return { ...(state.key === key ? state : { status: 'loading', value: null }), reload: () => setAttempt(value => value + 1) } +} + +export function HistoryHitDialog({ hit, roster, actions, onBack }) { + const ref = useRef(null) + useEscape(onBack) + useDialogFocus(ref) + const bot = roster.byId[hit.botId] + // Roster-driven account/ownership/part changes clear displayed content before + // another authenticated read. No cached search snippet is used as context. + const accessKey = JSON.stringify([Boolean(bot), bot?.ownerId, bot?.sessionId, bot?.parts, roster.self?.memberId]) + const state = useHistoryHit(actions.readHistoryHit, bot ? hit.hitToken : null, accessKey) + const view = state.status === 'ready' ? state.value : null + return h('div', { className: 'bt-palette-layer' }, + h('div', { className: 'bt-backdrop', onMouseDown: onBack }), + h('section', { className: 'bt-palette bt-history-view', role: 'dialog', 'aria-modal': true, 'aria-label': t('Read-only history match'), tabIndex: -1, ref }, + h('header', { className: 'bt-palette-head' }, h('h2', null, t('Read-only history match')), + h('button', { type: 'button', className: 'bt-palette-clear', 'aria-label': t('Back to search'), onClick: onBack }, h(CloseIcon))), + h('p', { className: 'bt-history-disclaimer' }, t('This is segment history, not the current chat. No Bot is activated.')), + h('p', { className: 'bt-history-disclaimer' }, t('Shows the match and up to two nearby visible messages on each side.')), + h('div', { className: 'bt-history-content' }, + state.status === 'loading' ? h('p', { role: 'status' }, t('Loading authorized history…')) : null, + state.status === 'error' ? h('p', { role: 'alert' }, t('History changed, expired, or is no longer accessible. Search again.')) : null, + view ? h('div', null, + h('p', null, t('Segment {part} of {count}', { part: view.part, count: view.partCount })), + h('p', null, t('History session'), ': ', h('code', null, view.sessionId)), + view.entries.map(entry => h('section', { key: entry.seq, className: 'bt-history-entry', 'data-hit': entry.hit || undefined }, + h('h3', null, entry.hit ? t('Matched message') : t('Nearby message'), ' · ', t(entry.role === 'user' ? 'You' : 'Bot'), ' · ', t('Sequence'), ' ', entry.seq, + entry.turn === null ? null : ` · ${t('Turn')} ${entry.turn}`), + entry.omittedBefore ? h('span', null, '…') : null, + h('pre', null, entry.text), + entry.truncated ? h('p', { className: 'bt-hint' }, t('Text truncated by the byte limit; this is not complete history.')) : null))) : null), + h('footer', { className: 'bt-history-foot' }, + h('button', { type: 'button', className: 'bt-soft', onClick: onBack }, t('Back to search')), + h('button', { type: 'button', className: 'bt-soft', disabled: state.status === 'loading', onClick: state.reload }, t('Reload history context'))))) +} diff --git a/core/src/client/history-search.js b/core/src/client/history-search.js new file mode 100644 index 000000000..6abcd87d5 --- /dev/null +++ b/core/src/client/history-search.js @@ -0,0 +1,44 @@ +// Async history state separated from the palette's loaded-outline fallback. +import { useEffect, useRef, useState } from 'react' +export const HISTORY_DISPLAY_MAX = 100 +export function useHistorySearch(search, query) { + const [state, setState] = useState({ query: '', items: [], status: 'idle', cursor: null }) + const latest = useRef(0) + const alive = useRef(true) + const activeAbort = useRef(null) + useEffect(() => { alive.current = true; return () => { alive.current = false; latest.current += 1; activeAbort.current?.abort() } }, []) + const request = async (wanted, previous, ticket) => { + activeAbort.current?.abort() + const abort = new AbortController() + activeAbort.current = abort + try { + const reply = await search({ query: wanted, limit: Math.min(20, HISTORY_DISPLAY_MAX - previous.items.length), ...(previous.cursor ? { cursor: previous.cursor } : {}) }, abort.signal) + if (!alive.current || latest.current !== ticket) return + if (reply?.scope !== 'local-bot-chats' || !Array.isArray(reply.items)) throw new Error('Unsupported history response') + const items = [...previous.items, ...reply.items].slice(0, HISTORY_DISPLAY_MAX) + setState({ query: wanted, items, status: 'ready', cursor: items.length < HISTORY_DISPLAY_MAX ? reply.cursor : null, incomplete: reply.incomplete, + limited: reply.limited || (items.length >= HISTORY_DISPLAY_MAX && Boolean(reply.cursor)) }) + } catch { + if (alive.current && latest.current === ticket) setState({ query: wanted, items: [], status: 'error', cursor: null }) + } finally { if (activeAbort.current === abort) activeAbort.current = null } + } + useEffect(() => { + const ticket = ++latest.current + const initial = { query, items: [], cursor: null } + if (typeof search !== 'function' || !query.trim() || [...query].length > 256) { + setState({ ...initial, status: 'idle' }) + return undefined + } + setState({ ...initial, status: 'loading' }) + const timer = setTimeout(() => { void request(query, initial, ticket) }, 250) + return () => { clearTimeout(timer); activeAbort.current?.abort() } + }, [search, query]) + const current = state.query === query ? state : { query, items: [], cursor: null, status: typeof search === 'function' && query.trim() ? 'loading' : 'idle' } + const more = () => { + if (current.status !== 'ready' || !current.cursor) return + const ticket = ++latest.current + setState({ ...current, status: 'loading' }) + void request(query, current, ticket) + } + return { ...current, more } +} diff --git a/core/src/client/i18n.js b/core/src/client/i18n.js index 6cba8fab8..e7d7f2c7a 100644 --- a/core/src/client/i18n.js +++ b/core/src/client/i18n.js @@ -199,6 +199,9 @@ const ZH = { 'Could not create the invite. Use Bot settings → Sharing → Copy invite link for this Bot.': '无法创建邀请。请在 Bot 设置 → Sharing 里使用 Copy invite link for this Bot。', 'Add friend': '添加好友', 'Friend requests': '好友请求', + 'A friend': '一位好友', + '{name} requests a share': '{name} 请求分享', + '{name} requests {capability}': '{name} 请求 {capability}', 'Accept or decline incoming requests.': '接受或拒绝收到的请求。', 'Accept invite': '接受邀请', "Paste a friend’s invite link or code.": '粘贴朋友的邀请链接或邀请码。', @@ -639,12 +642,59 @@ const ZH = { 'Group chats': '群聊', Secrets: '密钥', Appearance: '外观', + Grove: '林间', Theme: '主题', 'Colors for the whole team, on every device.': '整个团队的配色,所有设备同步。', Accent: '强调色', 'Unread marks, badges, and the brand mark.': '未读标记、徽标和品牌标志。', 'Theme accent': '主题强调色', 'Custom accent': '自定义强调色', + 'Light theme': '浅色', + 'Dark theme': '深色', + Automatic: '自动', + 'Match system': '跟随系统', + 'How this window looks: light, dark, automatic, or match the system.': '此窗口的外观:浅色、深色、自动,或跟随系统。', + 'Automatic switch': '自动切换', + 'Sunset to sunrise': '日落到日出', + 'Custom hours': '自定义时段', + 'Dark from': '深色开始', + 'Dark until': '深色结束', + 'Switches about a minute after the chosen time, and not in the middle of a turn.': '到点后约再等一分钟,且不会打断正在进行的回复。', + Language: '语言', + 'Interface language': '界面语言', + 'Follows the DeepSeek Harness language.': '跟随 DeepSeek Harness 的界面语言。', + English: 'English', + 'Simplified Chinese': '简体中文', + Shortcuts: '快捷键', + 'Send shortcut': '发送快捷键', + 'Enter to send': 'Enter 发送', + 'Shift+Enter to send': 'Shift+Enter 发送', + 'Enter inserts a new line.': 'Enter 换行。', + 'Shift+Enter inserts a new line.': 'Shift+Enter 换行。', + 'Message folding': '消息折叠', + 'Choose how much of a long message to show before it folds.': '选择长消息在对话里折叠前展示多少内容。', + Compact: '紧凑', + 'A very short preview, for scanning a conversation.': '只展示很短的预览。适合以扫读为主的场景。', + Standard: '标准', + 'A moderate preview. Recommended.': '展示适中的预览。推荐。', + 'No folding': '不折叠', + 'Show every message in full. Long messages push the conversation off the screen.': '完整展示每条消息。长消息会把对话推离屏幕。', + 'Collapse long documents into cards': '长文档收成卡片', + 'Messages with several sections appear as a card you can open beside the conversation.': '含多个章节的消息显示为卡片,可在对话旁边打开阅读,不再铺满屏幕。', + 'Open beside the conversation': '在对话旁打开', + 'Opened beside the conversation.': '已在对话旁打开。', + 'Close document': '关闭文档', + '{count} sections': '{count} 个章节', + Document: '文档', + Channels: '渠道', + 'No channels yet.': '还没有渠道。', + 'Only integrations FlyBot already has appear here.': '这里只列出 FlyBot 已经接入的渠道。', + 'Conversation settings': '会话设置', + Attach: '附件', + 'Reference a chat is available in a Bot or group chat.': '在 Bot 或群聊里才能引用另一段对话。', + 'A read-only window cannot create a scheduled task.': '只读窗口不能创建定时任务。', + 'Invite link copied': '邀请链接已复制', + 'Could not copy the invite link': '无法复制邀请链接', On: '开', None: '无', 'Bots · {count}': 'Bot · {count}', @@ -814,7 +864,22 @@ const ZH = { Messages: '消息', Commands: '命令', 'Search Bots, chats and messages': '搜索 Bot、对话和消息', + 'Search Bots, chats, and loaded messages': '搜索 Bot、对话和已加载的消息', 'Clear search': '清除搜索', + 'Search filters': '搜索筛选', + Chats: '对话', + 'Search chats and messages': '搜索对话和消息', + 'Type a Bot name, a group name, or words from a loaded message': '输入 Bot 名、群名,或已加载消息里的词', + 'Try a Bot name, a group name, or words from a loaded message': '试试 Bot 名、群名,或已加载消息里的词', + 'Type at least two characters to search messages already loaded': '至少输入两个字符,搜索已加载的消息', + 'Clear unread mark': '清除手动未读标记', + 'Estimated night hours (time-zone based)': '估算夜间时段(按时区,非实际日落时间)', + 'Could not copy message': '未能复制消息,请重试或手动选择文字复制', + 'Could not download message': '未能下载消息,请重试或复制正文', + 'Clipboard unavailable': '剪贴板不可用,请手动选择文字复制', + 'Show message text': '显示消息正文', + 'Hide message text': '收起消息正文', + 'Mark as Read': '标为已读', Results: '结果', 'No results': '没有结果', 'Try a Bot name or words from a message': '试试 Bot 名字或消息里的词', @@ -1026,6 +1091,16 @@ const ZH = { "Manage {name}'s memory": '管理 {name} 的记忆', "{name}'s memory": '{name} 的记忆', 'Memory summary': '记忆摘要', + Overview: '总览', + 'Memory directory': '记忆目录', + 'Search memory': '搜索记忆', + 'Hide directory': '收起目录', + 'Show directory': '显示目录', + 'Main memory': '主记忆', + '1 topic': '1 个主题', + '{count} topics': '{count} 个主题', + 'No entries match "{query}"': '没有与“{query}”相符的记忆', + 'Try a different word, or clear the search to see every entry.': '换个词试试,或清空搜索查看全部记忆。', 'All entries': '全部记忆', 'Memory options': '记忆选项', 'Close memory': '关闭记忆', @@ -1266,6 +1341,20 @@ const ZH = { 'Who to chat with…': '想和谁聊…', 'Add at least one more Bot': '再至少添加一个 Bot', Members: '成员', + 'Add a name, then pick Bots to chat with.': '添加名称,然后选择要一起聊天的 Bot。', + 'Group name (optional)': '输入群组名称(可选)', + 'Search members': '搜索成员', + 'Selected {count}': '已选 {count}', + 'Selected members': '已选成员', + 'No members selected': '还没有选择成员', + 'No more Bots to add': '没有更多可添加的 Bot', + // Session list filters (kinds the sidebar already has) + 'Session filter': '会话筛选', + 'Direct chats': '单聊', + Unread: '未读', + 'No group chats': '没有群聊', + 'No direct chats': '没有单聊', + 'No unread chats': '没有未读会话', // Connectors and scheduled tasks 'Choose Bots': '选择 Bot', 'Off for every Bot. Choose which Bots may use it.': '所有 Bot 都未开启。选择哪些 Bot 可以使用。', @@ -1337,6 +1426,7 @@ const ZH = { 'Sum up what changed since yesterday and what needs me today.': '总结一下昨天以来的变化,以及今天需要我处理的事。', When: '什么时候', 'Date and time': '日期和时间', + 'Time zone': '时区', Days: '星期', Time: '时间', Every: '每', @@ -1566,6 +1656,10 @@ const HOST_ZH = { 'Only a Main Bot can be replaced': '只能替换主 Bot', 'A Main Bot cannot be deleted; remove its Main Bot role first': '主 Bot 不能删除,请先取消它的主 Bot 身份', 'Unknown theme': '未知主题', + 'Appearance must be light, dark, auto or system': '外观必须是浅色、深色、自动或跟随系统', + 'Send shortcut must be Enter or Shift+Enter': '发送快捷键必须是 Enter 或 Shift+Enter', + 'Message folding must be compact, standard or none': '消息折叠必须是紧凑、标准或不折叠', + 'Document cards must be on or off': '长文档卡片必须开或关', 'Accent must be a #rrggbb color': '强调色必须是 #rrggbb 格式', 'Type the key first': '请先输入密钥', 'Choose every Bot or a list of Bots': '请选择所有 Bot 或指定的 Bot', @@ -1583,6 +1677,41 @@ const HOST_ZH = { 'No FlyBot core update is available': '没有可用的 FlyBot 核心更新', 'saved by a newer FlyBot; update FlyBot': '由更新的 FlyBot 保存;请更新 FlyBot', } +Object.assign(ZH, { + "Local Bot chat history": "本机 Bot 对话历史", + "Earlier part; opens current chat": "较早分段;打开当前对话", + "History; opens current chat": "历史记录;打开当前对话", + "Search chats and local Bot history": "搜索对话和本机 Bot 历史", + "History: your local Bots in this instance. Other chats: loaded messages only.": "历史范围:本实例中你拥有的本机 Bot。其他对话仅搜索已加载消息。", + "History unavailable; searching loaded messages only.": "历史检索不可用,仅搜索已加载消息。", + "History query is limited to 256 characters.": "历史搜索词最多 256 个字符。", + "Searching history…": "正在搜索历史…", + "History query failed; showing loaded messages only.": "历史查询失败,以下仅为已加载消息。", + "Some history could not be read; results are incomplete.": "部分历史无法读取,结果不完整。", + "History search reached a safety limit; narrow your query.": "历史检索已达到安全上限,请缩小搜索范围。", + "Search more history": "继续搜索历史", + "More history remains to be searched": "还有历史尚未检索", + "Enter text to search local Bot history; other chats use loaded messages.": "输入文字搜索本机 Bot 历史;其他对话只查已加载消息。" +}) +Object.assign(ZH, { 'No matches in the searched portion': '已检索部分没有匹配项' }) +Object.assign(ZH, { + "Read-only history match": "只读历史命中", + "Back to search": "返回搜索", + "This is segment history, not the current chat. No Bot is activated.": "这里是分段历史,不是当前聊天;不会激活 Bot。", + "Loading authorized history…": "正在读取有权查看的历史…", + "History changed, expired, or is no longer accessible. Search again.": "历史已变化、结果已过期或无权访问,请重新搜索。", + "Segment {part} of {count}": "分段 {part} / {count}", + "History session": "历史会话", + "Matched message": "命中消息", + "Nearby message": "相邻消息", + "Sequence": "序号", + "Turn": "轮次", + "Text truncated by the byte limit; this is not complete history.": "正文已按字节上限截断,不是完整历史。", + "Reload history context": "重新读取历史上下文", + "Earlier part; view read-only history": "较早分段;查看只读历史", + "View read-only history": "查看只读历史" +}) +Object.assign(ZH, { 'Shows the match and up to two nearby visible messages on each side.': '仅显示命中消息,以及前后各最多两条有权查看的相邻消息。' }) Object.assign(ZH, HOST_ZH) const fill = (text, params) => (params @@ -1624,6 +1753,19 @@ export function language() { return typeof active === 'string' ? active : 'en' } +export function canSetLocale() { + return typeof service?.setLocale === 'function' +} + +export function setInterfaceLocale(tag) { + if (typeof service?.setLocale !== 'function') return undefined + return service.setLocale(tag) +} + +export function languageLabel() { + return language().startsWith('zh') ? 'Simplified Chinese' : 'English' +} + export const dateLocale = () => (language().startsWith('zh') ? 'zh-CN' : 'en-US') // Translations for the tests: the Chinese dictionary itself. diff --git a/core/src/client/index.js b/core/src/client/index.js index 87ddd71a4..a11797d9a 100644 --- a/core/src/client/index.js +++ b/core/src/client/index.js @@ -6,15 +6,17 @@ import { call } from './api.js' import { isHex } from './inks.js' import { SHAPES, markupCache } from './characters.js' import { countCards, createSource, EMPTY_ROSTER, indexRoster, isAgentSession, stateAnswerIsStale, stateRequest } from './sources.js' -import { themeCss, shellTokens, registry, registerShape, registerTheme, allThemes } from './themes.js' +import { themeCss, shellTokens, registry, registerShape, registerTheme, allThemes, resolveThemeId, themePrefsRecord } from './themes.js' +import { appearanceOf, applyAppearanceAttribute, isDarkAppearance, systemDark } from './appearance.js' import { currentPart, landingPart, setPluginTools } from './text.js' import { mentionCss } from './mention-style.js' import { SHELL_CSS, CONVERSATION_CSS, installStyles, installCompiledStyles } from './styles.js' +import { PARITY_SHELL_CSS } from './parity-shell.js' import { installBrandChrome, installTabTitle } from './brand.js' import { TeamSidebar, ConnectApps, YouAvatar, AccountLauncher, ModelsSettingsStep, MODELS_STEP_ID, MODELS_STEP_ORDER, FooterAccount, BrandMark, BrandName, BotReturn, SIDEBAR_CSS, RETURN_CSS, holdShellShortcuts } from './sidebar.js' import { HeaderPill } from './header.js' import { installHeaderEffects } from './header-effects.js' -import { ComposerIdentity, ComposerPlus, ComposerVoice, menuIcons } from './composer.js' +import { ComposerIdentity, ComposerPlus, ComposerVoice, installSendShortcut, menuIcons } from './composer.js' import { CHATS_SOURCE, atSources } from './at-menu.js' import { watchFaceMenu } from './face-at-filter.js' import { VOICE_BUNDLE } from './speech.js' @@ -95,7 +97,7 @@ export function apply(ctx) { try { friendLines = JSON.parse(localStorage.getItem(STORAGE.friendLines) ?? 'null') } catch { friendLines = null } // `details` is the panel's subject (a Session id); `view` picks details or the // subject Bot's browser inside it. - const ui = createSource({ details: null, view: 'details', renaming: false, tab: null, newChat: null, exchange: null, menu: null, voice: null, palette: null, quote: null, settings: null, remoteBotSettings: null, memory: null, toast: null, signIn: null, renameAgent: null, unread: savedUnread, reactions: savedReactions, visits: {} }) + const ui = createSource({ details: null, view: 'details', document: null, renaming: false, tab: null, newChat: null, exchange: null, menu: null, voice: null, palette: null, quote: null, settings: null, remoteBotSettings: null, memory: null, toast: null, signIn: null, renameAgent: null, unread: savedUnread, reactions: savedReactions, visits: {} }) // Bot mode paints the whole team surface; Agent mode withdraws every slot and // style so the shell's own interface returns. `plain` stays false until a Bot-mode // view hosts a plain session, which drops only the conversation replacements. @@ -119,7 +121,7 @@ export function apply(ctx) { const setPlain = (plain) => surface.set(state => (state.plain === plain ? state : { ...state, plain })) // A DSH Agent Session shows the plain conversation: the Bot details and browser // panels would follow it and report it is not on the team, so they close. - const dropPanels = () => ui.set(state => (state.details || state.renaming ? { ...state, details: null, view: 'details', renaming: false, tab: null } : state)) + const dropPanels = () => ui.set(state => (state.details || state.renaming || state.document ? { ...state, details: null, view: 'details', document: null, renaming: false, tab: null } : state)) // A Bot's chat spans several parts, so when it was last left is kept per Bot. const seenKey = id => roster.getSnapshot().byId?.[id]?.id ?? id // Per Session, the newest turn this visit measured on screen (`noteVisitTail`). Leaving writes @@ -354,35 +356,64 @@ export function apply(ctx) { const style = installStyles('', 'theme') let key = '' let releaseTokens = null - const render = () => { + const originalDark = document.body.hasAttribute('data-ds-dark-theme') + const prefsNow = () => { const snapshot = roster.getSnapshot() - const prefs = snapshot.ready ? snapshot.prefs ?? {} : savedPrefs + return { snapshot, prefs: snapshot.ready ? snapshot.prefs ?? {} : savedPrefs } + } + const applyDark = (force = false) => { + const { prefs } = prefsNow() + const wanted = isDarkAppearance(prefs, new Date(), systemDark()) + const current = document.body.hasAttribute('data-ds-dark-theme') + if (wanted === current) return + // Auto/system flips wait out a running turn rather than changing mid-reply. + const busy = !force && document.body.querySelector('[data-bt-running], [data-session-running], [aria-busy="true"]') + if (busy) return + applyAppearanceAttribute(wanted) + } + const render = () => { + const { snapshot, prefs } = prefsNow() const themes = allThemes() - const id = themes[prefs.theme] ? prefs.theme : 'deepseek' + const id = resolveThemeId(prefs, themes) const accent = isHex(prefs.accent) ? prefs.accent : undefined const motion = prefs.motion === 'quiet' || prefs.motion === 'lively' ? prefs.motion : 'normal' + const appearance = appearanceOf(prefs) document.body.dataset.btMotion = motion - const next = `${id}|${accent ?? ''}|${motion}|${registry.getSnapshot()}` - if (next === key) return - key = next - style.textContent = themeCss(themes[id], accent) - const release = releaseTokens - releaseTokens = ctx.theme.overrideTokens('ds-bot', shellTokens(themes[id])) - if (typeof release === 'function') release() - if (snapshot.ready) { - try { localStorage.setItem(PREFS_KEY, JSON.stringify({ theme: prefs.theme, accent: prefs.accent, motion: prefs.motion })) } catch { /* storage unavailable */ } + document.body.dataset.btAppearance = appearance.mode + const next = `${id}|${accent ?? ''}|${motion}|${appearance.mode}|${appearance.auto}|${appearance.from}|${appearance.to}|${registry.getSnapshot()}` + const changed = next !== key + if (changed) { + key = next + style.textContent = themeCss(themes[id], accent) + const release = releaseTokens + releaseTokens = ctx.theme.overrideTokens('ds-bot', shellTokens(themes[id])) + if (typeof release === 'function') release() + if (snapshot.ready) { + try { localStorage.setItem(PREFS_KEY, JSON.stringify(themePrefsRecord(prefs))) } catch { /* storage unavailable */ } + } } + applyDark(changed) } render() const offRoster = roster.subscribe(render) const offRegistry = registry.subscribe(render) + const media = typeof matchMedia === 'function' ? matchMedia('(prefers-color-scheme: dark)') : null + const onScheme = () => applyDark() + media?.addEventListener?.('change', onScheme) + const tick = setInterval(() => applyDark(), 60_000) + // Do not immediately fight the host's theme mutation observer. Reconcile on + // preference/system changes and the minute tick instead. return () => { offRoster() offRegistry() + media?.removeEventListener?.('change', onScheme) + clearInterval(tick) + applyAppearanceAttribute(originalDark) try { if (typeof releaseTokens === 'function') releaseTokens() } finally { delete document.body.dataset.btMotion + delete document.body.dataset.btAppearance style.remove() } } @@ -512,6 +543,8 @@ export function apply(ctx) { .finally(() => { reloading -= 1 }) }, openNewChat: (mode) => { ui.set(state => ({ ...state, newChat: mode, menu: null, palette: null })) }, + searchMessages: (body, signal) => call('search-messages', body, signal), + readHistoryHit: (body, signal) => call('history-hit', body, signal), openPalette: (query = '') => { ui.set(state => ({ ...state, palette: { query, token: Date.now() }, newChat: null, menu: null })) }, // The token keeps a late exit timer from closing a palette opened again since. closePalette: (token) => { ui.set(state => (state.palette && (token === undefined || state.palette.token === token) ? { ...state, palette: null } : state)) }, @@ -521,21 +554,35 @@ export function apply(ctx) { toggleDetails: (id, force) => { ui.set((state) => { const details = force || state.details !== id || state.view !== 'details' ? id : null - return { ...state, renaming: false, tab: null, details, view: 'details' } + return { ...state, renaming: false, tab: null, details, view: 'details', document: null } }) }, + // A long-document card opens its full text in the side panel, beside the conversation. + openDocument: ({ title, text, sessionId }) => { + const id = sessionId + if (!id || text == null || String(text) === '') return + ui.set(state => ({ + ...state, + details: id, + view: 'document', + document: { title: title || 'Document', text: String(text) }, + renaming: false, + tab: null, + })) + }, // The open panel follows the main view; a subject with no browser (a group // chat, an outside Session) settles on the details view. followPanel: (id) => { ui.set((state) => { if (!state.details || state.details === id) return state - const view = state.view === 'browser' && roster.getSnapshot().byId[id] === undefined ? 'details' : state.view - return { ...state, details: id, view, renaming: false, tab: null } + const view = state.view === 'browser' && roster.getSnapshot().byId[id] === undefined ? 'details' + : state.view === 'document' ? 'details' : state.view + return { ...state, details: id, view, document: view === 'document' ? state.document : null, renaming: false, tab: null } }) }, - showDetails: (id, tab = null) => { ui.set(state => ({ ...state, details: id, view: 'details', renaming: false, tab })) }, + showDetails: (id, tab = null) => { ui.set(state => ({ ...state, details: id, view: 'details', document: null, renaming: false, tab })) }, // Opening the conversation would move focus to its composer and blur the name field. - renameBot: (id) => { ui.set(state => ({ ...state, details: id, view: 'details', renaming: true, tab: null })) }, + renameBot: (id) => { ui.set(state => ({ ...state, details: id, view: 'details', document: null, renaming: true, tab: null })) }, // `id` opens one Bot (page 'bots') or one group chat (page 'groups'). `back` is where // closing the page returns to; a page the inbox opened sends the queue back (#2541). openSettings: (page = 'general', id = null, back = null) => { @@ -561,7 +608,7 @@ export function apply(ctx) { if (mode !== 'bot' && mode !== 'agent') return if (surface.getSnapshot().mode === mode) return if (mode === 'agent') { - ui.set(state => ({ ...state, details: null, view: 'details', settings: null, remoteBotSettings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, inbox: null, board: null, toast: null })) + ui.set(state => ({ ...state, details: null, view: 'details', document: null, settings: null, remoteBotSettings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, inbox: null, board: null, toast: null })) } writeMode(mode) surface.set(state => ({ ...state, mode })) @@ -725,7 +772,7 @@ export function apply(ctx) { if (!bot) return browsers.ensureTabs(bot.id) if (browsers.tabs.getSnapshot()[bot.id]?.active == null) browsers.openTab(bot.id) - ui.set(state => ({ ...state, details: id, view: 'browser', renaming: false, tab: null })) + ui.set(state => ({ ...state, details: id, view: 'browser', document: null, renaming: false, tab: null })) }, // '+' on the strip or the drawer's new-tab card: a blank tab in the browser view. browserNewTab: (id) => { @@ -733,7 +780,7 @@ export function apply(ctx) { if (!bot) return null browsers.ensureTabs(bot.id) const tabId = browsers.openTab(bot.id) - ui.set(state => ({ ...state, details: id, view: 'browser', renaming: false, tab: null })) + ui.set(state => ({ ...state, details: id, view: 'browser', document: null, renaming: false, tab: null })) return tabId }, // A drawer card: its tab active, the panel on the browser view. @@ -741,7 +788,7 @@ export function apply(ctx) { const bot = roster.getSnapshot().byId[id] if (!bot) return browsers.activate(bot.id, tabId) - ui.set(state => ({ ...state, details: id, view: 'browser' })) + ui.set(state => ({ ...state, details: id, view: 'browser', document: null })) }, browserEnsure: botId => browsers.ensureTabs(botId), browserCloseTab: (botId, tabId) => browsers.closeTab(botId, tabId), @@ -754,9 +801,9 @@ export function apply(ctx) { } actions.setPanelView = (view) => { if (view !== 'details' && view !== 'browser') return - ui.set(state => (state.details && state.view !== view ? { ...state, view } : state)) + ui.set(state => (state.details && state.view !== view ? { ...state, view, document: view === 'document' ? state.document : null } : state)) } - actions.closePanel = () => { ui.set(state => (state.details ? { ...state, details: null, view: 'details', renaming: false, tab: null } : state)) } + actions.closePanel = () => { ui.set(state => (state.details ? { ...state, details: null, view: 'details', document: null, renaming: false, tab: null } : state)) } // Whether AccountLauncher holds the shell's settings seat; FooterAccount steps aside if so. actions.flybotSlotEntries = name => ctx.slots.entries?.(name) ?? [] actions.signInEntry = () => ctx.slots.entries?.('settings.models.sign-in')?.[0] ?? null @@ -956,6 +1003,7 @@ export function apply(ctx) { installCompiledStyles(FLYBOT_CSS, 'flybot'), installCompiledStyles(MEMBER_CSS, 'members'), installCompiledStyles(USER_MESSAGE_CSS, 'user-messages'), + installCompiledStyles(PARITY_SHELL_CSS, 'parity-shell'), installCompiledStyles(MOBILE_CSS, 'mobile'), installCompiledStyles(PANE_MIN_WIDTH_CSS, 'panes'), installCompiledStyles(PROJECT_BOARD_CSS, 'project-board'), @@ -984,6 +1032,7 @@ export function apply(ctx) { ] const installConversation = () => [ installCompiledStyles(CONVERSATION_CSS, 'conversation'), + installCompiledStyles(PARITY_SHELL_CSS, 'parity-shell-conversation'), installMentions(), installAtMenu(), // The shell's own Session header stays, so the child seats it renders keep @@ -1042,6 +1091,7 @@ export function apply(ctx) { const style = installStyles(RETURN_CSS, 'return') return () => style.remove() }, 'ds-bot: return styles') + ctx.effect(() => installSendShortcut(roster), 'ds-bot: send shortcut') shadow('sidebar.footer.action', { id: 'bot-return', order: -300, inject: face }, BotReturn) // The main view decides `plain`: a DSH Agent Session keeps the Bot shell but diff --git a/core/src/client/memory-panel.js b/core/src/client/memory-panel.js index aa13c7401..8da6a34e0 100644 --- a/core/src/client/memory-panel.js +++ b/core/src/client/memory-panel.js @@ -3,12 +3,13 @@ // answers from the entries or changes them. Modeled on ChatGPT's memory summary. import { createElement as h, Fragment, useCallback, useEffect, useRef, useState } from 'react' import { useEscape } from './overlay-hooks.js' -import { ArrowUpIcon, CheckIcon, ChevronLeftIcon, ChevronRightIcon, CloseIcon, DotsIcon, MemoryIcon, TrashIcon } from './icons.js' +import { ArrowUpIcon, CheckIcon, ChevronLeftIcon, ChevronRightIcon, CloseIcon, DotsIcon, MemoryIcon, SearchIcon, TrashIcon } from './icons.js' import { dateLocale, hostText, t } from './i18n.js' import { memoryBlockedNotice, memoryEmptyNotice } from './memory-empty.js' import { summaryBlocks } from './text.js' import { useLinger } from './motion.js' import { readOnlyLine } from './read-only.js' +import { filterMemoryEntries, memoryStats, memoryTopics, sameTopic } from '../shared/memory-catalog.js' const POLL_MS = 1500 const MENU_EXIT_MS = 120 @@ -153,13 +154,13 @@ function EntryRow({ entry, remove }) { }, confirming ? t('Remove') : h(TrashIcon)) : null) } -function Entries({ bot, view, remove }) { +function Entries({ bot, view, remove, subset = false }) { const groups = groupEntries(view.entries) const refused = memoryBlockedNotice(view) const sections = [ { scope: 'own', title: t("{name}'s memory", { name: bot.name }), size: view.sizes.own }, { scope: 'team', title: t('Team memory'), hint: t('Every Bot reads it'), size: view.sizes.team }, - ] + ].filter(section => !subset || groups.some(group => group.scope === section.scope)) return h('div', { className: 'bt-mem-entries' }, refused === null ? null : h('div', { className: 'bt-mem-empty-text', role: 'status' }, refused), sections.map(section => h('section', { key: section.scope, className: 'bt-mem-section' }, @@ -239,12 +240,46 @@ function useNow(every) { return now } + +function MemoryNav({ bot, view, page, topic, query, setQuery, openOverview, openEntries, openTopic }) { + const stats = memoryStats(view?.entries) + const topics = memoryTopics(view?.entries) + const own = topics.filter(item => item.scope === 'own') + const team = topics.filter(item => item.scope === 'team') + const labelOf = (item) => item.topic ?? t('Main memory') + const item = (kind, title, count, on, current) => h('button', { + type: 'button', className: 'bt-mem-nav-item', 'aria-current': current ? 'page' : undefined, onClick: on, + }, + h('span', { className: 'bt-mem-nav-label' }, title), + count === undefined ? null : h('span', { className: 'bt-mem-nav-count' }, String(count))) + const block = (title, items) => items.length === 0 ? null : h('div', { className: 'bt-mem-nav-group' }, + h('div', { className: 'bt-mem-nav-heading' }, title), + items.map(entry => h(Fragment, { key: `${entry.scope}:${entry.topic ?? ''}` }, + item('topic', labelOf(entry), entry.count, () => openTopic(entry), page === 'entries' && sameTopic(topic, entry))))) + return h('nav', { className: 'bt-mem-nav', 'aria-label': t('Memory directory') }, + h('label', { className: 'bt-mem-search' }, + h(SearchIcon), + h('input', { + className: 'bt-mem-search-input', type: 'search', value: query, + placeholder: t('Search memory'), 'aria-label': t('Search memory'), + onChange: event => setQuery(event.target.value), + })), + h('div', { className: 'bt-mem-nav-list' }, + item('overview', t('Overview'), undefined, openOverview, page === 'summary' && query.trim() === ''), + item('entries', t('All entries'), stats.entries, () => openEntries(null), page === 'entries' && !topic && query.trim() === ''), + block(t("{name}'s memory", { name: bot.name }), own), + block(t('Team memory'), team))) +} + export function MemoryDialog({ bot, actions, roster, leaving = false }) { const { view, error, load, show } = useMemoryView(bot.id, actions) // A read-only window refuses both writes below at the host, so the panel draws neither and // says why in the host's own sentence — the same one the sidebar and the Settings header carry. const locked = typeof roster?.readOnly === 'string' && roster.readOnly.trim() !== '' const [page, setPage] = useState('summary') + const [topic, setTopic] = useState(null) + const [query, setQuery] = useState('') + const [navHidden, setNavHidden] = useState(false) const [menu, setMenu] = useState(false) const [menuShown, menuLeaving] = useLinger(menu, MENU_EXIT_MS) const [text, setText] = useState('') @@ -269,9 +304,10 @@ export function MemoryDialog({ bot, actions, roster, leaving = false }) { window.removeEventListener('keydown', onKey, true) } }, [menu]) - const regenerate = () => { setMenu(false); setPage('summary'); void load({ regenerate: true }) } - const openEntries = () => { setMenu(false); setPage('entries') } - const backToSummary = () => { setPage('summary'); void load({ summarize: true }) } + const regenerate = () => { setMenu(false); setPage('summary'); setTopic(null); setQuery(''); void load({ regenerate: true }) } + const openEntries = (nextTopic = null) => { setMenu(false); setPage('entries'); setTopic(nextTopic); setQuery('') } + const openOverview = () => { setMenu(false); setPage('summary'); setTopic(null); setQuery(''); void load({ summarize: true }) } + const backToSummary = () => openOverview() const remove = async (entry) => { try { show(await actions.memoryForget(bot.id, entry)) @@ -299,42 +335,72 @@ export function MemoryDialog({ bot, actions, roster, leaving = false }) { } const count = view?.entries.length ?? 0 + const stats = memoryStats(view?.entries) const when = view?.summary ? ago(view.summary.at, now) : null + const searching = query.trim() !== '' + const filtered = view === null ? [] + : searching ? filterMemoryEntries(view.entries, query) + : topic ? view.entries.filter(entry => sameTopic({ scope: entry.scope, topic: entry.topic ?? null }, topic)) + : view.entries + const listed = view === null ? null : { ...view, entries: filtered } const status = view === null ? '' - : page === 'entries' ? (count === 1 ? t('1 entry') : t('{count} entries', { count })) + : searching ? (filtered.length === 1 ? t('1 entry') : t('{count} entries', { count: filtered.length })) + : page === 'entries' ? (filtered.length === 1 ? t('1 entry') : t('{count} entries', { count: filtered.length })) : view.summarizing && view.summary ? t('Updating…') : view.summary && view.fresh ? (when ? t('Updated {time}', { time: when }) : t('Updated just now')) - : '' + : [stats.entries ? (stats.entries === 1 ? t('1 entry') : t('{count} entries', { count: stats.entries })) : null, + stats.topics ? (stats.topics === 1 ? t('1 topic') : t('{count} topics', { count: stats.topics })) : null].filter(Boolean).join(' · ') + const title = searching ? t('Search memory') + : page === 'entries' ? (topic ? (topic.topic ?? t('Main memory')) : t('All entries')) + : t('Memory summary') + const showEntries = searching || page === 'entries' const busy = answer?.pending === true return h('div', { className: 'bt-mem-layer', 'data-leaving': leaving || undefined }, h('div', { className: 'bt-scrim bt-mem-scrim', onMouseDown: close }), - h('div', { className: 'bt-mem', role: 'dialog', 'aria-modal': true, 'aria-label': t("{name}'s memory", { name: bot.name }) }, + h('div', { className: 'bt-mem', role: 'dialog', 'aria-modal': true, 'aria-label': t("{name}'s memory", { name: bot.name }), 'data-nav': navHidden ? 'hidden' : undefined }, h('div', { className: 'bt-mem-head' }, - page === 'entries' ? h('button', { type: 'button', className: 'bt-icon-btn', 'aria-label': t('Back to the summary'), onClick: backToSummary }, h(ChevronLeftIcon)) : null, - h('h2', null, page === 'entries' ? t('All entries') : t('Memory summary')), - h('span', { className: 'bt-mem-status' }, page === 'summary' ? [bot.name, status].filter(Boolean).join(' · ') : status), + h('button', { + type: 'button', className: 'bt-icon-btn', + 'aria-label': navHidden ? t('Show directory') : t('Hide directory'), + 'aria-pressed': !navHidden, + onClick: () => setNavHidden(value => !value), + }, navHidden ? h(ChevronRightIcon) : h(ChevronLeftIcon)), + page === 'entries' || searching ? h('button', { type: 'button', className: 'bt-icon-btn', 'aria-label': t('Back to the summary'), onClick: backToSummary }, h(ChevronLeftIcon)) : null, + h('h2', null, title), + h('span', { className: 'bt-mem-status' }, page === 'summary' && !searching ? [bot.name, status].filter(Boolean).join(' · ') : status), h('span', { className: 'bt-mem-head-gap' }), h('button', { ref: dotsRef, type: 'button', className: 'bt-icon-btn', 'aria-label': t('Memory options'), 'aria-haspopup': 'menu', 'aria-expanded': menu, onClick: () => setMenu(value => !value) }, h(DotsIcon)), h('button', { type: 'button', className: 'bt-icon-btn', 'aria-label': t('Close memory'), onClick: close }, h(CloseIcon)), menuShown ? h('div', { ref: menuRef, className: 'bt-menu bt-mem-menu', role: 'menu', 'aria-label': t('Memory options'), 'data-leaving': menuLeaving || undefined }, - h('button', { type: 'button', role: 'menuitem', onClick: openEntries }, + h('button', { type: 'button', role: 'menuitem', onClick: () => openEntries(null) }, h('span', { className: 'bt-menu-label' }, t('All entries')), h('span', { className: 'bt-menu-hint' }, String(count))), h('button', { type: 'button', role: 'menuitem', disabled: count === 0 || view?.summarizing, onClick: regenerate }, h('span', { className: 'bt-menu-label' }, t('Regenerate summary')))) : null), - h('div', { className: 'bt-mem-body' }, - readOnlyLine(h, roster, actions), - error ? h('div', { className: 'bt-error', role: 'alert', style: { padding: 0 } }, hostText(error)) : null, - view === null ? (error ? null : h(Skeleton)) - : page === 'entries' ? h(Entries, { bot, view, remove: locked ? null : remove }) - : h(Summary, { bot, view, regenerate })), - h('div', { className: 'bt-mem-foot' }, - answer ? h(Reply, { answer, dismiss: () => setAnswer(null) }) : null, - locked ? null : h('form', { className: 'bt-mem-ask', onSubmit: ask }, - h('input', { - ref: inputRef, className: 'bt-mem-input', value: text, maxLength: 2000, disabled: view === null, - placeholder: t('Ask or update'), 'aria-label': t("Ask about or update {name}'s memory", { name: bot.name }), - onChange: event => setText(event.target.value), - }), - h('button', { type: 'submit', className: 'bt-mem-send', disabled: busy || text.trim() === '', 'aria-label': t('Send') }, - busy ? h('span', { className: 'bt-mem-spin', 'aria-hidden': true }) : h(ArrowUpIcon)))))) + h('div', { className: 'bt-mem-shell' }, + navHidden ? null : h(MemoryNav, { + bot, view, page, topic, query, setQuery, openOverview, + openEntries, openTopic: item => openEntries(item), + }), + h('div', { className: 'bt-mem-main' }, + h('div', { className: 'bt-mem-body' }, + readOnlyLine(h, roster, actions), + error ? h('div', { className: 'bt-error', role: 'alert', style: { padding: 0 } }, hostText(error)) : null, + view === null ? (error ? null : h(Skeleton)) + : showEntries + ? (searching && filtered.length === 0 + ? h('div', { className: 'bt-mem-empty' }, + h('div', { className: 'bt-mem-empty-title' }, t('No entries match "{query}"', { query: query.trim() })), + h('div', { className: 'bt-mem-empty-text' }, t('Try a different word, or clear the search to see every entry.'))) + : h(Entries, { bot, view: listed, remove: locked ? null : remove, subset: searching || Boolean(topic) })) + : h(Summary, { bot, view, regenerate })), + h('div', { className: 'bt-mem-foot' }, + answer ? h(Reply, { answer, dismiss: () => setAnswer(null) }) : null, + locked ? null : h('form', { className: 'bt-mem-ask', onSubmit: ask }, + h('input', { + ref: inputRef, className: 'bt-mem-input', value: text, maxLength: 2000, disabled: view === null, + placeholder: t('Ask or update'), 'aria-label': t("Ask about or update {name}'s memory", { name: bot.name }), + onChange: event => setText(event.target.value), + }), + h('button', { type: 'submit', className: 'bt-mem-send', disabled: busy || text.trim() === '', 'aria-label': t('Send') }, + busy ? h('span', { className: 'bt-mem-spin', 'aria-hidden': true }) : h(ArrowUpIcon)))))))) } diff --git a/core/src/client/message-fold.js b/core/src/client/message-fold.js new file mode 100644 index 000000000..5a288e8db --- /dev/null +++ b/core/src/client/message-fold.js @@ -0,0 +1,88 @@ +// Long-message folding in chat bubbles, and the General setting that drives it. +// Compact / standard / no folding set how much of a long message is shown as a +// preview; a long document with several sections can collapse into a card +// opened beside the conversation. + +import { createElement as h, useEffect, useState } from 'react' +import { MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives' +import { CloseIcon } from './icons.js' +import { t } from './i18n.js' +import { + DEFAULT_FOLDING, documentHeadings, documentTitle as titleOf, + previewOf, shouldFold, showsDocumentCard, +} from '../shared/message-fold.js' + +export { + DEFAULT_FOLDING, FOLD_MODES, FOLD_THRESHOLDS, documentHeadings, documentTitle, + exceedsThreshold, foldingOf, isLongDocument, previewOf, shouldFold, showsDocumentCard, +} from '../shared/message-fold.js' + +export function FoldedContent({ text, folding, streaming = false, actions, sessionId, children }) { + const [open, setOpen] = useState(false) + const mode = folding?.mode ?? DEFAULT_FOLDING.mode + const cards = folding?.documentCards === true || (folding?.documentCards !== false && DEFAULT_FOLDING.documentCards) + useEffect(() => { setOpen(false) }, [mode, cards, text]) + + const render = typeof children === 'function' + ? children + : (Array.isArray(children) && children.length === 1 && typeof children[0] === 'function' ? children[0] : null) + const raw = String(text ?? '') + if (streaming) return render ? render(raw) : null + if (mode !== 'none' && showsDocumentCard(raw, { ...folding, documentCards: cards })) { + const title = titleOf(raw) || t('Document') + const count = Math.max(documentHeadings(raw).length, 1) + return h('div', { className: 'bt-document-message' }, + h(DocumentCard, { title, count, onOpen: () => actions?.openDocument?.({ title, text: raw, sessionId }) }), + h('button', { type: 'button', className: 'bt-fold-toggle', 'aria-expanded': open, + onClick: () => setOpen(value => !value) }, t(open ? 'Hide message text' : 'Show message text')), + open ? (render ? render(raw) : h(MarkdownText, { text: raw, labels: mdLabels(), variant: 'compact' })) : null) + + } + if (!shouldFold(raw, mode)) return render ? render(raw) : null + const shown = open ? raw : previewOf(raw, mode) + return h('div', { className: 'bt-fold', 'data-folded': open ? undefined : '' }, + render ? render(shown) : null, + h('button', { + type: 'button', + className: 'bt-fold-toggle', + 'aria-expanded': open, + onClick: (event) => { event.preventDefault(); event.stopPropagation(); setOpen(value => !value) }, + }, t(open ? 'Show less' : 'Show more'))) +} + +export function DocumentCard({ title, count, onOpen }) { + const sections = t('{count} sections', { count }) + return h('button', { + type: 'button', + className: 'bt-doc-card', + onClick: (event) => { event.preventDefault(); event.stopPropagation(); onOpen?.() }, + 'aria-label': `${title}. ${sections}. ${t('Open beside the conversation')}`, + }, + h('span', { className: 'bt-doc-card-icon', 'aria-hidden': true }, h(DocIcon)), + h('span', { className: 'bt-doc-card-copy' }, + h('span', { className: 'bt-doc-card-title' }, title), + h('span', { className: 'bt-doc-card-meta' }, sections)), + h('span', { className: 'bt-doc-card-go' }, t('Open beside the conversation'))) +} + +function DocIcon() { + return h('svg', { width: 22, height: 22, viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor', strokeWidth: 1.6, strokeLinecap: 'round', strokeLinejoin: 'round', 'aria-hidden': true }, + h('path', { d: 'M7 3.5h7l5 5V20a1.5 1.5 0 0 1-1.5 1.5h-10.5A1.5 1.5 0 0 1 5.5 20V5A1.5 1.5 0 0 1 7 3.5z' }), + h('path', { d: 'M14 3.5V9h5.5' }), + h('path', { d: 'M8.5 13h7M8.5 16.5h5' })) +} + +const mdLabels = () => ({ code: { copyLabel: t('Copy'), copiedLabel: t('Copied') }, footnotes: t('Footnotes') }) + +export function DocumentPane({ document, onClose }) { + const title = document?.title || t('Document') + const text = String(document?.text ?? '') + return h('div', { className: 'bt-doc-pane', 'aria-label': title }, + h('div', { className: 'bt-doc-pane-head' }, + h('div', { className: 'bt-doc-pane-copy' }, + h('h2', { className: 'bt-doc-pane-title' }, title), + h('p', { className: 'bt-doc-pane-hint' }, t('Opened beside the conversation.'))), + h('button', { type: 'button', className: 'bt-icon-btn', 'aria-label': t('Close document'), onClick: onClose }, h(CloseIcon))), + h('div', { className: 'bt-doc-pane-body' }, + h(MarkdownText, { text, labels: mdLabels(), variant: 'compact' }))) +} diff --git a/core/src/client/message-tools.js b/core/src/client/message-tools.js new file mode 100644 index 000000000..1f1f4b4e4 --- /dev/null +++ b/core/src/client/message-tools.js @@ -0,0 +1,150 @@ +import { createElement as h, useEffect, useRef, useState } from 'react' +import { createPortal } from 'react-dom' +import { SmileIcon, ReplyIcon, DotsIcon, CheckIcon, DownloadIcon, CopyIcon } from './icons.js' +import { t } from './i18n.js' +import { MESSAGE_REACTIONS, isLockedRoster, messageActionIds } from '../shared/message-actions.js' + +// Closes a popover on a press outside the given elements or on Escape. +export function useDismiss(open, close, refs) { + useEffect(() => { + if (!open) return undefined + const onDown = (event) => { + if (refs.some(ref => ref.current?.contains(event.target))) return + close() + } + const onKey = (event) => { if (event.key === 'Escape') { event.stopPropagation(); close() } } + window.addEventListener('mousedown', onDown) + window.addEventListener('keydown', onKey, true) + return () => { window.removeEventListener('mousedown', onDown); window.removeEventListener('keydown', onKey, true) } + }, [open, close]) +} + +function downloadMessage(text, name) { + const url = URL.createObjectURL(new Blob([text], { type: 'text/markdown' })) + const link = Object.assign(document.createElement('a'), { href: url, download: `${name}-message.md` }) + link.click() + setTimeout(() => URL.revokeObjectURL(url), 1000) +} + +// The hover toolbar and the overflow / right-click menu for one message. Only +// actions the client can run are drawn: add a reaction, quote into the composer, +// copy, or download. A locked window hides Reply (it writes into the composer). +export function MessageTools({ + text, + name, + sessionId, + react, + actions, + roster, + contextAt, + className = 'bt-tools', +}) { + const [panel, setPanel] = useState(null) + const [place, setPlace] = useState(null) + const [copied, setCopied] = useState(false) + const tools = useRef(null) + const pop = useRef(null) + const locked = isLockedRoster(roster) + const ids = messageActionIds({ + text, + sessionId, + canReact: typeof react === 'function', + canReply: typeof actions?.quote === 'function', + locked, + }) + const [dismissed, setDismissed] = useState(null) + const [note, setNote] = useState('') + const close = () => { + setDismissed(contextAt?.token ?? dismissed) + setPanel(null) + } + const cursorPlace = (at) => { + if (!at) return null + const width = typeof window === 'undefined' ? 1400 : window.innerWidth + const height = typeof window === 'undefined' ? 800 : window.innerHeight + const below = at.y + 220 < height + return { + left: Math.max(8, Math.min(at.x, width - 228)), + ...(below ? { top: at.y } : { bottom: height - at.y + 4, '--bt-origin': 'bottom left' }), + } + } + const openFromContext = Boolean(contextAt?.token && contextAt.token !== dismissed && ids.length > 0) + const shown = openFromContext ? 'more' : panel + const menuPlace = openFromContext ? cursorPlace(contextAt) : place + const openAt = (kind, event, { cursor = false } = {}) => { + if (!cursor && panel === kind) { close(); return } + setDismissed(contextAt?.token ?? dismissed) + const width = typeof window === 'undefined' ? 1400 : window.innerWidth + const height = typeof window === 'undefined' ? 800 : window.innerHeight + const rect = event?.currentTarget?.getBoundingClientRect?.() + const below = cursor + ? event.clientY + 220 < height + : rect && rect.bottom + 220 < height + const left = cursor + ? Math.min(event.clientX, width - 228) + : Math.min(rect.left, width - 228) + setPlace(kind === 'react' && !cursor + ? { left: rect.left + rect.width / 2, top: rect.top - 6, '--bt-origin': 'bottom center' } + : { left: Math.max(8, left), ...(below + ? { top: cursor ? event.clientY : rect.bottom + 4 } + : { bottom: height - (cursor ? event.clientY : rect.top) + 4, '--bt-origin': 'bottom left' }) }) + setPanel(kind) + } + useDismiss(shown !== null, close, [tools, pop]) + useEffect(() => { if (shown) pop.current?.querySelector?.('button')?.focus?.() }, [shown, contextAt?.token]) + const copy = async () => { + try { + if (typeof navigator.clipboard?.writeText !== 'function') { setNote(t('Clipboard unavailable')); return } + await navigator.clipboard.writeText(text) + setCopied(true) + setNote(t('Copied')) + setTimeout(() => setCopied(false), 1000) + } catch { setNote(t('Could not copy message')) } + } + const download = () => { + try { downloadMessage(text, name); close() } + catch { setNote(t('Could not download message')) } + } + const reply = () => actions.quote(sessionId, text) + const item = (label, Icon, run, keepOpen = false) => h('button', { key: label, type: 'button', role: 'menuitem', onClick: () => { if (!keepOpen) close(); run() } }, h(Icon), label) + const menuItems = [] + if (ids.includes('reply')) menuItems.push(item(t('Reply'), ReplyIcon, reply)) + if (ids.includes('copy')) menuItems.push(item(copied ? t('Copied') : t('Copy'), copied ? CheckIcon : CopyIcon, copy, true)) + if (ids.includes('download')) menuItems.push(item(t('Download'), DownloadIcon, download, true)) + if (ids.length === 0) return null + return h('div', { ref: tools, className, 'data-open': shown !== null || undefined }, + ids.includes('react') ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('Add reaction'), title: t('Add reaction'), 'aria-expanded': shown === 'react', onClick: event => openAt('react', event) }, h(SmileIcon)) : null, + ids.includes('reply') ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('Reply'), title: t('Reply'), onClick: reply }, h(ReplyIcon)) : null, + menuItems.length > 0 || ids.includes('react') + ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('More message actions'), title: t('More'), 'aria-haspopup': 'menu', 'aria-expanded': shown === 'more', onClick: event => openAt('more', event) }, copied ? h(CheckIcon) : h(DotsIcon)) + : null, + shown === 'react' ? createPortal(h('div', { ref: pop, className: 'bt-react-strip', role: 'menu', 'aria-label': t('Reactions'), style: menuPlace }, + MESSAGE_REACTIONS.map(emoji => h('button', { key: emoji, type: 'button', role: 'menuitem', 'aria-label': emoji, onClick: () => { close(); react(emoji) } }, emoji))), document.body) : null, + shown === 'more' ? createPortal(h('div', { ref: pop, className: 'bt-menu', role: 'menu', 'aria-label': t('Message actions'), style: menuPlace, + onKeyDown: event => { + if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return + const buttons = [...(pop.current?.querySelectorAll?.('button:not(:disabled)') ?? [])] + if (!buttons.length) return + event.preventDefault() + const at = buttons.indexOf(document.activeElement) + const next = event.key === 'Home' ? 0 : event.key === 'End' ? buttons.length - 1 : (at + (event.key === 'ArrowDown' ? 1 : -1) + buttons.length) % buttons.length + buttons[next].focus() + } }, + ids.includes('react') + ? h('div', { key: 'reacts', className: 'bt-menu-reacts', role: 'group', 'aria-label': t('Reactions') }, + MESSAGE_REACTIONS.map(emoji => h('button', { key: emoji, type: 'button', role: 'menuitem', 'aria-label': emoji, onClick: () => { close(); react(emoji) } }, emoji))) + : null, + ids.includes('react') && menuItems.length > 0 ? h('div', { key: 'sep', className: 'bt-menu-sep', role: 'separator' }) : null, + ...menuItems, + note ? h('div', { role: 'status', 'aria-live': 'polite', className: 'bt-menu-hint bt-message-note' }, note) : null), document.body) : null) +} + +let contextToken = 0 + +export function onMessageContextMenu(event, setContextAt, { live = false } = {}) { + if (live) return + if (event.target?.closest?.('a[href], input, textarea, [role="menu"]')) return + event.preventDefault() + event.stopPropagation() + setContextAt({ x: event.clientX, y: event.clientY, token: ++contextToken }) +} diff --git a/core/src/client/mobile.js b/core/src/client/mobile.js index 8256cc98d..5d0dd823b 100644 --- a/core/src/client/mobile.js +++ b/core/src/client/mobile.js @@ -9,6 +9,17 @@ export const MOBILE_MAX_WIDTH = 640 export const MOBILE_CSS = ` @media (max-width:${MOBILE_MAX_WIDTH}px){ +.bt-appearance-seg{flex-wrap:wrap} +.bt-appearance-seg button{height:auto;min-height:36px;white-space:normal;overflow-wrap:anywhere} +.bt-ng-split{grid-template-columns:minmax(0,1fr);min-height:0} +.bt-mem-shell{flex-direction:column} +.bt-mem-nav{width:auto;max-height:36vh;border-right:0;border-bottom:.5px solid var(--bt-line)} +.bt-menu{max-width:calc(100vw - 16px)} +.bt-message-note{white-space:normal;overflow-wrap:anywhere;padding:6px 8px;max-width:220px} +.bt-utools,.bt-tools{opacity:1;visibility:visible} +.bt-umsg{flex-wrap:wrap} +.bt-menu-reacts{flex-wrap:wrap} + .bt-held-actions{max-width:100%} .bt-held-card{padding:10px 12px} :is(.bt-held-card,.bt-flybot-approval) .bt-flybot-approval-actions{gap:8px;margin-top:8px} diff --git a/core/src/client/new-chat.js b/core/src/client/new-chat.js index 3ee0ac28c..a9c76cda6 100644 --- a/core/src/client/new-chat.js +++ b/core/src/client/new-chat.js @@ -1,3 +1,4 @@ +import { shouldSendOnKey, sendKeyOf } from './appearance.js' import { createElement as h, useRef, useState } from 'react' import { PlusIcon, PeopleIcon, ArrowUpIcon, BotIcon, ChatIcon, TerminalIcon } from './icons.js' import { AdminStar, BotMark } from './mark.js' @@ -20,6 +21,7 @@ export function NewChat({ mode, roster, actions }) { const [compose, setCompose] = useState(mode !== 'new') // A new group chat picks its admin first, then the other members. const [admin, setAdmin] = useState(null) + const [name, setName] = useState('') const [message, setMessage] = useState('') const [busy, setBusy] = useState(false) const [error, setError] = useState('') @@ -137,7 +139,7 @@ export function NewChat({ mode, roster, actions }) { ...members.map(id => ({ kind: 'bot', id, role: id === admin ? 'admin' : 'member' })), ...remotes, ] - const room = await actions.createRoom(members, { admin, ...(participants ? { participants } : {}) }) + const room = await actions.createRoom(members, { admin, ...(name.trim() ? { name: name.trim() } : {}), ...(participants ? { participants } : {}) }) if (text) await actions.send(room.id, text) actions.openSession(room.id) close() @@ -244,23 +246,31 @@ export function NewChat({ mode, roster, actions }) { placeholder: mode === 'search' ? t('Search Bots…') : choosingAdmin ? t('Choose the group admin') : group ? t('Who to chat with…') : t('Start a chat with…'), onChange: (event) => { setQuery(event.target.value); setCursor(0) }, onKeyDown: (event) => { - if (event.nativeEvent.isComposing) return + if (event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229) return if (event.key === 'ArrowDown') { event.preventDefault(); setCursor(Math.min(active + 1, options.length - 1)) } else if (event.key === 'ArrowUp') { event.preventDefault(); setCursor(Math.max(active - 1, 0)) } else if (event.key === 'Enter' && options[active]) { event.preventDefault(); options[active].run() } else if (event.key === 'Backspace' && query === '') unpick() }, }), - group && admin !== null ? (locked + group ? (locked ? readOnlyLine(h, roster, actions, { key: 'readonly-admin' }) : h('button', { - type: 'button', className: 'bt-send bt-to-create', disabled: busy || picked.length === 0, - title: picked.length === 0 ? t('Add at least one more Bot') : undefined, onClick: createGroup, + type: 'button', className: 'bt-send bt-to-create', disabled: busy || admin === null || picked.length === 0, + title: admin === null || picked.length === 0 ? t('Add at least one more Bot') : undefined, onClick: createGroup, }, t('Create group chat'))) : null, h('button', { type: 'button', className: 'bt-x', 'aria-label': t('Close new chat'), onClick: close }, '×')), + group ? h('label', { className: 'bt-ng-name-row bt-nc-name' }, + h('span', { className: 'bt-ng-name-label' }, t('Group name')), + h('input', { + className: 'bt-ng-name-input', value: name, maxLength: 60, readOnly: locked, + placeholder: t('Group name (optional)'), + 'aria-label': t('Group name'), + onChange: event => setName(event.target.value), + })) : null, h('div', { ref: drop, className: 'bt-drop' }, h('div', { ref: glide.box, role: 'listbox', 'aria-label': t('Recipients'), className: 'bt-drop-list' }, h('span', { ref: glide.thumb, className: 'bt-thumb', 'aria-hidden': true }), - options.length === 0 ? h('div', { className: 'bt-hint' }, mode === 'search' ? t('No Bots match') : t('Type a name to create a Bot')) + options.length === 0 ? h('div', { className: 'bt-hint' }, mode === 'search' || group ? t('No Bots match') : t('Type a name to create a Bot')) : options.map((option, index) => h('button', { key: option.key, type: 'button', role: 'option', className: 'bt-option', 'aria-selected': index === active, 'data-flip': option.key, onMouseEnter: () => setCursor(index), onClick: option.run, @@ -291,14 +301,14 @@ export function NewChat({ mode, roster, actions }) { h('div', { className: 'bt-nc-card' }, h('span', { className: 'bt-nc-plus', 'aria-hidden': true }, h(PlusIcon)), h('textarea', { - rows: 1, value: message, placeholder, 'aria-label': placeholder, + rows: 1, value: message, placeholder, readOnly: locked, 'aria-label': placeholder, onChange: event => setMessage(event.target.value), onKeyDown: (event) => { - if (event.key === 'Enter' && !event.shiftKey && !event.nativeEvent.isComposing) { event.preventDefault(); sendMessage() } + if (!locked && shouldSendOnKey(event, sendKeyOf(roster.prefs))) { event.preventDefault(); sendMessage() } }, }), locked - ? (group && admin !== null + ? (group ? null : readOnlyLine(h, roster, actions, { key: 'readonly-compose' })) : h('button', { type: 'button', className: 'bt-nc-send', 'aria-label': t('Send message'), disabled: busy || message.trim() === '' || picked.length === 0, onClick: sendMessage }, h(ArrowUpIcon)))))) diff --git a/core/src/client/overlays.js b/core/src/client/overlays.js index 7b4d7af3e..ed9f8e872 100644 --- a/core/src/client/overlays.js +++ b/core/src/client/overlays.js @@ -30,13 +30,13 @@ export function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useA previous.current = current if (current) actions.followPanel?.(current) }, [current]) - const open = ui.details ? { id: ui.details, view: ui.view ?? 'details', renaming: ui.renaming, tab: ui.tab } : null + const open = ui.details ? { id: ui.details, view: ui.view ?? 'details', renaming: ui.renaming, tab: ui.tab, document: ui.document ?? null } : null const [kept, setKept] = useState(open) useEffect(() => { if (open) { setKept(open); return undefined } const timer = setTimeout(() => setKept(null), PANEL_LINGER_MS) return () => clearTimeout(timer) - }, [ui.details, ui.view, ui.renaming, ui.tab]) + }, [ui.details, ui.view, ui.renaming, ui.tab, ui.document]) const pane = open ?? kept const [settings, settingsLeaving] = useLinger(ui.settings, DIALOG_EXIT_MS) const remoteBotId = ui.remoteBotSettings && roster.byId[ui.remoteBotSettings]?.remote ? ui.remoteBotSettings : null @@ -51,7 +51,7 @@ export function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useA ui.palette ? createPortal(h(CommandPalette, { key: ui.palette.token, start: ui.palette.query, token: ui.palette.token, roster, actions, useSessions }), document.body) : null, ui.exchange ? createPortal(h(ExchangeDialog, { pair: ui.exchange, roster, actions }), document.body) : null, ui.voice ? createPortal(h(VoiceMode, { key: ui.voice, sessionId: ui.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null, - menu ? createPortal(h(ContextMenu, { key: `${menu.kind ?? ''}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, leaving: menuLeaving }), document.body) : null, + menu ? createPortal(h(ContextMenu, { key: `${menu.kind ?? ''}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, unread: ui.unread, leaving: menuLeaving }), document.body) : null, settings ? createPortal(h(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null, remoteBotSettings ? createPortal(h(RemoteBotSettingsSheet, { key: remoteBotSettings, bot: roster.byId[remoteBotSettings], roster, actions, leaving: remoteLeaving }), document.body) : null, memory && roster.byId[memory] ? createPortal(h(MemoryDialog, { key: memory, bot: roster.byId[memory], roster, actions, leaving: memoryLeaving }), document.body) : null, diff --git a/core/src/client/palette.js b/core/src/client/palette.js index a8d042a57..7d226b330 100644 --- a/core/src/client/palette.js +++ b/core/src/client/palette.js @@ -1,3 +1,5 @@ +import { HistoryHitDialog } from './history-hit.js' +import { useHistorySearch } from './history-search.js' import { createElement as h, Fragment, useEffect, useState } from 'react' import { FishLogo } from '@deepseek-ai/dsh-client-ui-primitives' import { isMainOf } from './sources.js' @@ -9,18 +11,25 @@ import { QUICK_EDGES, useFlip, useGlide } from './motion.js' import { t } from './i18n.js' import { isListedRemoteChat, pickerBotLabel } from '../shared/remote-label.js' import { seatedCount } from './group-settings.js' +import { PALETTE_FILTERS, PALETTE_MESSAGE_MIN, paletteEmptyKind, paletteFilterAllows } from '../shared/palette-search.js' + +// Four real categories: names, commands, loaded outlines, and (when supported) +// owner-scoped local Bot history via a bounded read-only host query. Group/remote +// history remains loaded-only. No all-instance or filesystem search is implied. -// Search is a command palette: a 560px dialog, a search header, and 49px -// rows (24px avatar, title, subtitle). Bots and groups match on name and role; past -// messages match on their text, read by `readableLine`, the same reader `previewOf` uses — a header, -// a delegation trace and a fence are routing or data, never the row (#1347). const paletteText = (raw, names) => readableLine(String(raw ?? ''), names) const PALETTE_EXIT_MS = 160 export function CommandPalette({ start, token, roster, actions, useSessions }) { const [query, setQuery] = useState(start ?? '') const [cursor, setCursor] = useState(0) const [leaving, setLeaving] = useState(false) + const [filter, setFilter] = useState('all') + const [selectedHit, setSelectedHit] = useState(null) + const history = useHistorySearch(!selectedHit && paletteFilterAllows(filter, 'messages') ? actions.searchMessages : undefined, query.trim()) + const historyEnabled = typeof actions.searchMessages === 'function' + const historyVisible = paletteFilterAllows(filter, 'messages') const wanted = query.trim().toLowerCase() + const emptyKind = paletteEmptyKind(query, filter) const close = () => { if (leaving) return setLeaving(true) @@ -30,7 +39,7 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { const ids = [...roster.bots.map(currentPart), ...roster.rooms.map(item => item.id)] const names = botNames(roster) const found = useSessions((list) => { - if (wanted.length < 2) return '[]' + if (wanted.length < PALETTE_MESSAGE_MIN) return '[]' const hits = [] for (const id of ids) { const outline = list.projectionsBySession?.[id]?.values?.turnOutline ?? list.byId[id]?.projectionValues?.turnOutline @@ -65,14 +74,22 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { run: async () => { if (room.hidden) await actions.setFlags(room.id, { hidden: false }); actions.openSession(room.id) }, })), ] - if (people.length) sections.push([t('Bots'), people]) + if (emptyKind !== 'empty' && paletteFilterAllows(filter, 'chats') && people.length) sections.push([t('Bots'), people]) const agents = (roster.agents ?? []).filter(() => matchesName('DSH Agent')).map(agent => ({ key: agent.id, avatar: h('span', { className: 'bt-palette-agent' }, h(FishLogo, { size: 18 })), title: 'DSH Agent', subtitle: t('Plain dsh session'), run: () => actions.openAgent(agent.id), })) - if (agents.length) sections.push(['DSH Agent', agents]) - const messages = JSON.parse(found).map(([id, turn, snippet]) => { + if (emptyKind !== 'empty' && paletteFilterAllows(filter, 'chats') && agents.length) sections.push(['DSH Agent', agents]) + const historyRows = history.items.filter(hit => roster.byId[hit.botId]).map(hit => ({ + key: `history:${hit.sessionId}:${hit.seq}`, title: roster.byId[hit.botId].name, subtitle: hit.snippet, + avatar: h(BotAvatar, { bot: roster.byId[hit.botId], size: 24, badge: false, live: false }), + badge: t(hit.earlier ? 'Earlier part; view read-only history' : 'View read-only history'), + keepOpen: true, + run: () => setSelectedHit({ botId: hit.botId, sessionId: hit.sessionId, hitToken: hit.hitToken }), + })) + if (emptyKind !== 'empty' && historyVisible && historyRows.length) sections.push([t('Local Bot chat history'), historyRows]) + const messages = JSON.parse(found).filter(([id, turn]) => !history.items.some(hit => hit.sessionId === id && hit.turn === turn)).map(([id, turn, snippet]) => { const bot = roster.byId[id] const room = roster.roomsById[id] return { @@ -81,14 +98,14 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { run: () => actions.openSession(id), } }) - if (messages.length) sections.push([t('Messages'), messages]) + if (emptyKind !== 'empty' && paletteFilterAllows(filter, 'messages') && messages.length) sections.push([t('Messages'), messages]) const commands = [ { key: 'cmd:new', icon: h(PlusIcon), title: t('New chat'), run: () => actions.openNewChat('new') }, { key: 'cmd:bot', icon: h(PlusIcon), title: t('Create Bot'), run: () => actions.openNewChat('create') }, { key: 'cmd:group', icon: h(PeopleIcon), title: t('Create group chat'), run: () => actions.openNewChat('group') }, { key: 'cmd:settings', icon: h(GearIcon), title: t('Settings'), run: () => actions.openSettings('general') }, ].filter(command => matchesName(command.title)) - if (commands.length) sections.push([t('Commands'), commands]) + if (emptyKind !== 'empty' && paletteFilterAllows(filter, 'commands') && commands.length) sections.push([t('Commands'), commands]) const rows = sections.flatMap(([, items]) => items) const active = Math.min(cursor, Math.max(rows.length - 1, 0)) const shown = rows.map(row => row.key).join('\n') @@ -101,8 +118,9 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { const choose = (row) => { if (!row || leaving) return void Promise.resolve(row.run()).catch(error => actions.reportError(error, 'menu')) - close() + if (!row.keepOpen) close() } + if (selectedHit) return h(HistoryHitDialog, { key: selectedHit.hitToken, hit: selectedHit, roster, actions, onBack: () => setSelectedHit(null) }) let index = -1 return h('div', { className: 'bt-palette-layer', 'data-leaving': leaving || undefined }, h('div', { className: 'bt-backdrop', onMouseDown: close }), @@ -110,7 +128,7 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { h('div', { className: 'bt-palette-head' }, h('span', { className: 'bt-palette-glyph', 'aria-hidden': true }, h(SearchIcon)), h('input', { - autoFocus: true, value: query, placeholder: t('Search Bots, chats and messages'), 'aria-label': t('Search'), + autoFocus: true, value: query, placeholder: t(historyEnabled ? 'Search chats and local Bot history' : 'Search Bots, chats, and loaded messages'), 'aria-label': t('Search'), role: 'combobox', 'aria-expanded': true, 'aria-controls': 'bt-palette-list', onChange: (event) => { setQuery(event.target.value); setCursor(0) }, onKeyDown: (event) => { @@ -120,14 +138,42 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { else if (event.key === 'Enter') { event.preventDefault(); choose(rows[active]) } }, }), - query ? h('button', { type: 'button', className: 'bt-palette-clear', 'aria-label': t('Clear search'), onClick: () => { setQuery(''); setCursor(0) } }, h(CloseIcon)) : null), + h('button', { type: 'button', className: 'bt-palette-clear', 'aria-label': t('Close'), onClick: close }, h(CloseIcon))), + h('div', { className: 'bt-palette-filters', role: 'tablist', 'aria-label': t('Search filters') }, + PALETTE_FILTERS.map(id => h('button', { + key: id, type: 'button', role: 'tab', className: 'bt-palette-filter', + 'data-filter': id, 'aria-selected': filter === id, + tabIndex: filter === id ? 0 : -1, + onKeyDown: event => { + if (!['ArrowLeft', 'ArrowRight', 'Home', 'End'].includes(event.key)) return + event.preventDefault() + const index = PALETTE_FILTERS.indexOf(filter) + const next = event.key === 'Home' ? 0 : event.key === 'End' ? PALETTE_FILTERS.length - 1 + : (index + (event.key === 'ArrowRight' ? 1 : -1) + PALETTE_FILTERS.length) % PALETTE_FILTERS.length + setFilter(PALETTE_FILTERS[next]); setCursor(0) + event.currentTarget.parentElement?.querySelectorAll('[role=tab]')?.[next]?.focus() + }, onClick: () => { setFilter(id); setCursor(0) }, + }, t(id === 'all' ? 'All' : id === 'chats' ? 'Chats' : id === 'messages' ? 'Messages' : 'Commands')))), + historyVisible ? h('div', { className: 'bt-palette-history' }, + h('p', { className: 'bt-palette-scope' }, t(historyEnabled ? 'History: your local Bots in this instance. Other chats: loaded messages only.' : 'History unavailable; searching loaded messages only.')), + h('span', { role: 'status', 'aria-live': 'polite' }, + [...query].length > 256 ? t('History query is limited to 256 characters.') + : history.status === 'loading' ? t('Searching history…') + : history.status === 'error' ? t('History query failed; showing loaded messages only.') + : history.incomplete ? t('Some history could not be read; results are incomplete.') : '', + history.limited ? t('History search reached a safety limit; narrow your query.') : ''), + history.cursor ? h('button', { type: 'button', className: 'bt-soft bt-soft-sm', disabled: history.status === 'loading', onClick: history.more }, t('Search more history')) : null) : null, h('div', { ref: listRef, id: 'bt-palette-list', className: 'bt-palette-list', role: 'listbox', 'aria-label': t('Results') }, h('span', { ref: glide.thumb, className: 'bt-thumb', 'aria-hidden': true }), rows.length === 0 ? h('div', { className: 'bt-palette-empty' }, h('span', { className: 'bt-palette-empty-icon', 'aria-hidden': true }, h(SearchIcon)), - h('span', { className: 'bt-palette-empty-label' }, t('No results')), - h('span', { className: 'bt-palette-empty-hint' }, t('Try a Bot name or words from a message'))) + h('span', { className: 'bt-palette-empty-label' }, historyVisible && history.status === 'loading' ? t('Searching history…') : historyVisible && history.cursor ? t('More history remains to be searched') : historyVisible && (history.incomplete || history.limited) ? t('No matches in the searched portion') : emptyKind === 'none' ? t('No results') : t('Search chats and messages')), + h('span', { className: 'bt-palette-empty-hint' }, + historyEnabled && historyVisible ? t('Enter text to search local Bot history; other chats use loaded messages.') + : emptyKind === 'short' ? t('Type at least two characters to search messages already loaded') + : emptyKind === 'none' ? t('Try a Bot name, a group name, or words from a loaded message') + : t('Type a Bot name, a group name, or words from a loaded message'))) : sections.map(([title, items]) => h(Fragment, { key: title }, h('div', { className: 'bt-palette-section', role: 'presentation', 'data-flip': `section:${title}` }, title), items.map((row) => { diff --git a/core/src/client/parity-shell.js b/core/src/client/parity-shell.js new file mode 100644 index 000000000..5d8a7a016 --- /dev/null +++ b/core/src/client/parity-shell.js @@ -0,0 +1,55 @@ +// Chat-shell details measured from the visual-reference screenshots +// at 1920×1072 (see ui-reference.md). Values are calibrated CSS, not copied +// brand assets. The product name and mark stay FlyBot. +export const ICON_RAIL_WIDTH = 72 +export const CHAT_LIST_WIDTH = 360 +export const SHELL_LEFT_WIDTH = ICON_RAIL_WIDTH + CHAT_LIST_WIDTH +export const COMPOSER_HEIGHT = 86 +export const HEADER_HEIGHT = 56 + +export const PARITY_SHELL_CSS = ` +.bt-side.bt-side-split{display:flex;flex-direction:row;align-items:stretch;min-height:100%;background:var(--bt-sidebar);min-width:0} +.bt-icon-rail{flex:none;width:72px;display:flex;flex-direction:column;align-items:center;gap:6px;padding:16px 8px 12px;box-sizing:border-box;border-right:1px solid var(--bt-line);background:color-mix(in srgb,var(--bt-sidebar) 92%,#000 8%)} +.bt-brand-rail{display:flex;align-items:center;justify-content:center;width:40px;height:40px;flex:none} +.bt-brand-rail .bt-mark,.bt-brand-rail .bt-mark svg{width:28px;height:28px} +.bt-rail-btn{width:40px;height:40px;border:0;border-radius:12px;padding:0;background:transparent;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;transition:background-color .12s ease,color .12s ease,opacity .12s ease} +.bt-rail-btn svg{width:20px;height:20px} +.bt-rail-btn:hover{background:var(--bt-hover);color:var(--bt-ink)} +.bt-rail-btn[aria-current=page],.bt-icon-rail .bt-row[aria-current=page]{background:var(--bt-selected,color-mix(in srgb,var(--bt-accent) 28%,transparent));color:var(--bt-ink)} +.bt-rail-btn:disabled{opacity:.4;cursor:not-allowed} +.bt-rail-btn:focus-visible,.bt-brand-rail:focus-visible,.bt-icon-rail .bt-row:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px} +.bt-chat-col{flex:1 1 auto;min-width:0;display:flex;flex-direction:column;background:var(--bt-sidebar)} +.bt-side.bt-side-split .bt-side-top{display:flex;align-items:center;padding:10px 12px 8px;gap:8px} +.bt-side.bt-side-split .bt-brand{align-items:center} +.bt-side.bt-side-split .bt-row{min-height:48px;padding:8px 10px;border-radius:12px;align-items:center} +.bt-side.bt-side-split .bt-row:hover{background:var(--bt-hover)} +.bt-side.bt-side-split .bt-row[aria-current=page]{background:var(--bt-selected,color-mix(in srgb,var(--bt-accent) 22%,transparent))} +.bt-side.bt-side-split .bt-row-name{font-size:14px;line-height:20px;font-weight:500;color:var(--bt-ink)} +.bt-side.bt-side-split .bt-row[aria-current=page] .bt-row-name{font-weight:600} +.bt-side.bt-side-split .bt-row-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0} +.bt-side.bt-side-split .bt-row-preview{font-size:12px;line-height:16px;font-weight:400;color:var(--bt-ink-2);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-side.bt-side-split .bt-list{flex:1 1 auto;min-height:0;overflow-x:hidden;overflow-y:auto;scrollbar-width:thin;padding:4px 8px 12px} +.bt-side.bt-side-split .bt-hint{margin:24px 12px;padding:0;text-align:center;color:var(--bt-ink-3);font-size:13px;line-height:18px} +.bt-plus-menu{border-radius:16px;border:1px solid var(--bt-line-2);background:var(--bt-card);padding:8px} + +@media (min-width:1025px){ +[class*="_sidebar"]:has(.bt-side-split),[class*="Sidebar"]:has(.bt-side-split){width:432px;min-width:432px;max-width:432px;flex:none} +.bt-chat-col{width:360px;max-width:360px} +} + +@media (min-width:641px){ +[class*="_header"]:has(.bt-head){min-height:56px;margin:8px 12px 0;padding:0 12px;border-radius:16px;background:var(--bt-card);border:1px solid var(--bt-line);box-sizing:border-box;display:flex;align-items:center} +[data-composer-card]{min-height:86px!important;border-radius:20px!important;padding:10px 14px!important;background:var(--bt-bubble)!important;border:1px solid color-mix(in srgb,var(--bt-ink) 22%,transparent)!important;box-shadow:none!important;align-items:center!important} +[data-composer-card]:has(> [data-slot="conversation.input.attachments"] *),[data-composer-card]:has([data-composer-input] br + *),[data-composer-card]:has([data-composer-input] > :nth-child(2)){border-radius:16px!important;align-items:flex-end!important} +[class*="_root"]:has(> [data-composer-card]){padding:8px 16px 12px!important} +[data-composer-card] [class*="_tools"]{order:1;flex:none;align-self:center;margin:0;gap:6px!important} +[data-composer-card]>[data-input-scroll]{order:2;flex:1 1 0;min-width:0;min-height:44px;padding:6px 12px!important;margin:0!important} +[data-composer-card] [class*="_trailing"]{order:3;flex:none;align-self:center;margin:0;gap:8px} +[data-composer-card] [data-composer-input]{min-height:44px;padding:8px 0!important;font-size:14px;line-height:20px} +[data-composer-card] [data-composer-placeholder]::after{font-size:14px;line-height:20px;color:var(--bt-ink-3)} +[data-composer-card] .bt-plus,.bt-mic,.bt-voice,[data-composer-card] button[class*="_primary"]{width:32px!important;height:32px!important} +[data-composer-card] .bt-plus svg,.bt-mic svg,.bt-voice svg,[data-composer-card] button[class*="_primary"] svg{width:18px;height:18px} +[data-composer-card] .bt-plus:disabled,.bt-mic:disabled,.bt-voice:disabled,[data-composer-card] button:disabled{opacity:.4;cursor:not-allowed} +[data-composer-card] .bt-plus:focus-visible,.bt-mic:focus-visible,.bt-voice:focus-visible,[data-composer-card] button:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px} +} +`; diff --git a/core/src/client/schedules.js b/core/src/client/schedules.js index e36c4dbc4..8467fe38f 100644 --- a/core/src/client/schedules.js +++ b/core/src/client/schedules.js @@ -52,6 +52,75 @@ export const schedulesReadFailure = failure => (typeof failure === 'string' && f : null) const localZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone + +// IANA names the form can actually send (#3110). A value already on the task stays listed +// even if this runtime's Intl set is short. +export function timeZoneOptions(current) { + const supported = typeof Intl.supportedValuesOf === 'function' ? Intl.supportedValuesOf('timeZone') : [] + const zone = String(current ?? '').trim() + // Some runtimes omit UTC from `supportedValuesOf`; it is still a valid IANA name the host accepts. + const list = supported.length ? ['UTC', ...supported] : ['UTC', 'Asia/Shanghai'] + if (zone) list.unshift(zone) + return [...new Set(list.filter(Boolean))] +} + +function zoneParts(ms, timeZone) { + const parts = new Intl.DateTimeFormat('en-US', { + timeZone: timeZone || 'UTC', + hourCycle: 'h23', + year: 'numeric', + month: '2-digit', + day: '2-digit', + hour: '2-digit', + minute: '2-digit', + second: '2-digit', + }).formatToParts(new Date(ms)) + const value = type => Number(parts.find(part => part.type === type)?.value) + return Date.UTC(value('year'), value('month') - 1, value('day'), value('hour'), value('minute'), value('second')) +} + +// A stored instant as a datetime-local value in the chosen zone (#3110), not always the browser's. +export function wallClockInput(ms, timeZone) { + const at = Number(ms) + if (!Number.isFinite(at)) return '' + const zone = String(timeZone ?? '').trim() || localZone() + const parts = new Intl.DateTimeFormat('en-US', { + timeZone: zone, + hourCycle: 'h23', + year: 'numeric', + month: '2-digit', + day: '2-digit', + hour: '2-digit', + minute: '2-digit', + }).formatToParts(new Date(at)) + const value = type => parts.find(part => part.type === type)?.value + if (!value('year')) return '' + return `${value('year')}-${value('month')}-${value('day')}T${value('hour')}:${value('minute')}` +} + +// The ISO instant for a wall clock in that zone. DSH stores the instant; daily/weekly send the +// zone itself. A time that does not exist (a DST gap) is rejected. +export function instantFromWallClock(wall, timeZone) { + const match = String(wall ?? '').match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?$/) + if (!match) throw new Error('Pick a date and time') + const asUtc = Date.UTC( + Number(match[1]), Number(match[2]) - 1, Number(match[3]), + Number(match[4]), Number(match[5]), Number(match[6] ?? 0), + ) + const zone = String(timeZone ?? '').trim() || 'UTC' + let instant = asUtc + for (let step = 0; step < 3; step += 1) { + const shown = zoneParts(instant, zone) + const delta = shown - asUtc + if (delta === 0) break + instant -= delta + } + if (zoneParts(instant, zone) === asUtc) return new Date(instant).toISOString() + for (const probe of [instant - 3_600_000, instant + 3_600_000, instant - 7_200_000, instant + 7_200_000]) { + if (zoneParts(probe, zone) === asUtc) return new Date(probe).toISOString() + } + throw new Error('Pick a date and time') +} const clock = time => String(time ?? '').slice(0, 5) const when = (ms, options) => new Intl.DateTimeFormat(dateLocale(), options).format(ms) function dayAndTime(ms) { @@ -221,11 +290,6 @@ const KINDS = [['at', 'Once'], ['daily', 'Every day'], ['weekly', 'Every week'], // The form says one unit with one count ("1 minute"), so each unit carries both words. const UNITS = [['seconds', 1, 'second', 'seconds'], ['minutes', 60, 'minute', 'minutes'], ['hours', 3600, 'hour', 'hours'], ['days', 86400, 'day', 'days']] -// A stored instant as the value of a datetime-local input, in this browser's zone. -function localInput(ms) { - const date = new Date(ms) - return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(date.getMinutes())}` -} // What the form starts with: a new task's defaults, or the edited task's own values. // A cron rule has no control here, so it is kept unless another kind is picked. export function formStart(task) { @@ -236,7 +300,7 @@ export function formStart(task) { title: task?.title ?? '', prompt: task?.prompt ?? '', kind: once ? 'at' : task?.kind ?? 'daily', - at: once && !Number.isNaN(Date.parse(task.scheduledAt)) ? localInput(Date.parse(task.scheduledAt)) : inAnHour(), + at: once && !Number.isNaN(Date.parse(task.scheduledAt)) ? wallClockInput(Date.parse(task.scheduledAt), task?.timeZone || localZone()) : inAnHour(), time: task?.time ? clock(task.time) : '09:00', weekdays: task?.kind === 'weekly' && Array.isArray(task.weekdays) ? task.weekdays : [1, 2, 3, 4, 5], count: Math.max(1, Math.round(seconds / size)), @@ -245,6 +309,17 @@ export function formStart(task) { } } +// The form's `when` payload (#3110): the chosen IANA zone is what the host sends to DSH as +// `time_zone` for daily/weekly, and what a once task uses to turn the wall clock into an instant. +// Repeat-every has no zone in the schedule engine, so the form does not send one. +export function whenFromForm({ kind, at, time, weekdays, timeZone, count, unit } = {}) { + const zone = String(timeZone ?? '').trim() || localZone() + if (kind === 'cron') return { kind: 'keep' } + if (kind === 'at') return { kind, at: instantFromWallClock(at, zone), timeZone: zone } + if (kind === 'every') return { kind, seconds: Math.round(Number(count) * UNITS.find(([id]) => id === unit)[1]) } + return { kind, time, timeZone: zone, ...(kind === 'weekly' ? { weekdays } : {}) } +} + function TaskForm({ roster, actions, start, task, onDone, onCancel }) { // A task goes to a Bot's chat or to a group chat, where it reads as your message. const first = formStart(task) @@ -259,19 +334,10 @@ function TaskForm({ roster, actions, start, task, onDone, onCancel }) { const [weekdays, setWeekdays] = useState(first.weekdays) const [count, setCount] = useState(first.count) const [unit, setUnit] = useState(first.unit) + const [timeZone, setTimeZone] = useState(first.timeZone) const [busy, setBusy] = useState(false) const [error, setError] = useState('') - const timing = () => { - if (kind === 'cron') return { kind: 'keep' } - // A once task is an instant; the host reads its wall clock in this zone when quiet - // hours are on (#1166). The others carry their zone with the time itself. - if (kind === 'at') return { kind, at: new Date(at).toISOString(), timeZone: first.timeZone } - // Seconds, not minutes: DSH takes any interval of 60s or more, so a 90s repeat must - // survive the form instead of being rounded to two minutes (#1651). - if (kind === 'every') return { kind, seconds: Math.round(Number(count) * UNITS.find(([id]) => id === unit)[1]) } - // An edited task keeps its own time zone; a new one takes this browser's. - return { kind, time, timeZone: first.timeZone, ...(kind === 'weekly' ? { weekdays } : {}) } - } + const timing = () => whenFromForm({ kind, at, time, weekdays, timeZone, count, unit }) const submit = (event) => { event.preventDefault() if (busy || target === '') return @@ -313,6 +379,19 @@ function TaskForm({ roster, actions, start, task, onDone, onCancel }) { h('input', { className: 'bt-input bt-task-count', type: 'number', min: 1, value: count, 'aria-label': t('How many'), onChange: event => setCount(event.target.value) }), h('select', { className: 'bt-select bt-task-unit', value: unit, 'aria-label': t('Unit'), onChange: event => setUnit(event.target.value) }, UNITS.map(([id, , one, many]) => h('option', { key: id, value: id }, t(Number(count) === 1 ? one : many))))) : null)), + // Visible, and submitted, only when the engine uses a zone (#3110). A repeat-every interval + // has none; a cron rule is kept as stored unless the kind changes. + kind === 'at' || kind === 'daily' || kind === 'weekly' + ? h('label', { className: 'bt-set-row bt-bs-row' }, + h('span', { className: 'bt-set-copy' }, h('span', { className: 'bt-bs-label' }, t('Time zone'))), + h('select', { + className: 'bt-select bt-task-timezone', + 'data-flybot': 'task-timezone', + value: timeZone, + 'aria-label': t('Time zone'), + onChange: event => setTimeZone(event.target.value), + }, timeZoneOptions(timeZone).map(zone => h('option', { key: zone, value: zone }, zone)))) + : null, error ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-danger bt-set-hint', role: 'alert' }, error)) : null, h('div', { className: 'bt-set-row bt-task-foot' }, h('button', { type: 'button', className: 'bt-soft bt-soft-sm', onClick: onCancel }, t('Cancel')), diff --git a/core/src/client/settings.js b/core/src/client/settings.js index b8526aef4..426f9c642 100644 --- a/core/src/client/settings.js +++ b/core/src/client/settings.js @@ -1,7 +1,10 @@ import { createElement as h, useCallback, useEffect, useRef, useState } from 'react' import { ACCENT_INKS, INKS } from './inks.js' import { isMainOf } from './sources.js' -import { allThemes } from './themes.js' +import { allThemes, resolveThemeId } from './themes.js' +import { appearanceOf, sendKeyOf } from './appearance.js' +import { foldingOf } from './message-fold.js' +import { ChannelsPage } from './connectors.js' import { WorkflowIcon } from './icons.js' import { WorkflowsPage } from './workflows.js' import { CloseIcon, ChevronLeftIcon, ChevronRightIcon, ClockIcon, ConnectorIcon, FolderIcon, InfoIcon, PlugIcon, PlusIcon, SlidersIcon, SETTINGS_ICONS } from './icons.js' @@ -22,15 +25,15 @@ import { SchedulesPage, lockedWindow } from './schedules.js' import { FeedbackIcon, FeedbackPage } from './feedback.js' import { FolderMenu } from './folder-menu.js' import { AboutPage } from './about.js' -import { t } from './i18n.js' +import { canSetLocale, languageLabel, setInterfaceLocale, t } from './i18n.js' import { readOnlyLine } from './read-only.js' const capitalize = word => word[0].toUpperCase() + word.slice(1) // Settings dialog: a 198px page list beside the page. Bots and group chats each list // their members, and one opens on its own settings form. Usage widens the dialog. -const SETTINGS_PAGES = [['general', 'General'], ['bots', 'Bots'], ['groups', 'Group chats'], ['projects', 'Projects'], ['connectors', 'Connectors'], ['capabilities', 'Capabilities'], ['plugins', 'Plugins'], ['schedules', 'Scheduled tasks'], ['workflows', 'Workflows'], ['usage', 'Usage'], ['secrets', 'Secrets'], ['feedback', 'Feedback'], ['about', 'About FlyBot']] -const PAGE_ICONS = { ...SETTINGS_ICONS, projects: FolderIcon, connectors: ConnectorIcon, workflows: WorkflowIcon, capabilities: PlugIcon, plugins: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon } +const SETTINGS_PAGES = [['general', 'General'], ['bots', 'Bots'], ['groups', 'Group chats'], ['projects', 'Projects'], ['connectors', 'Connectors'], ['channels', 'Channels'], ['capabilities', 'Capabilities'], ['plugins', 'Plugins'], ['schedules', 'Scheduled tasks'], ['workflows', 'Workflows'], ['usage', 'Usage'], ['secrets', 'Secrets'], ['feedback', 'Feedback'], ['about', 'About FlyBot']] +const PAGE_ICONS = { ...SETTINGS_ICONS, projects: FolderIcon, connectors: ConnectorIcon, channels: ConnectorIcon, workflows: WorkflowIcon, capabilities: PlugIcon, plugins: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon } function SetSection({ title, children }) { return h('section', { className: 'bt-set-section' }, h('h3', null, title), h('div', { className: 'bt-set-card' }, children)) @@ -102,11 +105,35 @@ function PluginsPage({ call }) { return h(PluginsView, { answer, error, onFlip: flip }) } -// General is Appearance and Notifications; the switch to classic Agent mode is the account menu's (#393). +// General is Appearance, language, send shortcut, and Notifications; the switch +// to classic Agent mode is the account menu's (#393). +const APPEARANCE_MODES = [ + ['light', 'Light theme'], + ['dark', 'Dark theme'], + ['auto', 'Automatic'], + ['system', 'Match system'], +] +const AUTO_KINDS = [['sun', 'Estimated night hours (time-zone based)'], ['custom', 'Custom hours']] +const SEND_KEYS = [['enter', 'Enter to send'], ['shift-enter', 'Shift+Enter to send']] +const appearanceLabel = appearance => APPEARANCE_MODES.find(([id]) => id === appearance.mode)?.[1] ?? 'Match system' +const autoLabel = appearance => appearance.auto === 'custom' + ? `${appearance.from} – ${appearance.to}` + : 'Estimated night hours (time-zone based)' +const sendKeyLabel = key => SEND_KEYS.find(([id]) => id === key)?.[1] ?? 'Enter to send' +const FOLD_MODE_OPTIONS = [ + ['compact', 'Compact', 'A very short preview, for scanning a conversation.'], + ['standard', 'Standard', 'A moderate preview. Recommended.'], + ['none', 'No folding', 'Show every message in full. Long messages push the conversation off the screen.'], +] +const foldModeLabel = mode => FOLD_MODE_OPTIONS.find(([id]) => id === mode)?.[1] ?? 'Standard' + function GeneralPage({ roster, actions, run }) { const prefs = roster.prefs ?? {} const themes = allThemes() - const current = themes[prefs.theme] ? prefs.theme : 'deepseek' + const current = resolveThemeId(prefs, themes) + const appearance = appearanceOf(prefs) + const sendKey = sendKeyOf(prefs) + const folding = foldingOf(prefs) const [custom, setCustom] = useState(prefs.accent ?? '#4d6bfe') const timer = useRef(0) useEffect(() => () => clearTimeout(timer.current), []) @@ -115,14 +142,25 @@ function GeneralPage({ roster, actions, run }) { clearTimeout(timer.current) timer.current = setTimeout(() => run(actions.setPrefs({ accent: value })), 350) } + const setAppearance = (patch) => run(actions.setPrefs({ appearance: { ...appearance, ...patch } })) + const localeChooser = canSetLocale() // The host refuses `set-prefs` in a read-only window, so the page says what is chosen // instead of drawing the controls that would ask for it (#2474). if (lockedWindow(roster)) { const accent = ACCENT_INKS.find(ink => INKS[ink][0] === prefs.accent) return [ h(SetSection, { key: 'look', title: t('Appearance') }, + h(SetRow, { label: t('Appearance'), hint: t(appearanceLabel(appearance)) }), + appearance.mode === 'auto' ? h(SetRow, { label: t('Automatic switch'), hint: t(autoLabel(appearance)) }) : null, h(SetRow, { label: t('Theme'), hint: t(themes[current].label) }), h(SetRow, { label: t('Accent'), hint: accent ? t(capitalize(accent)) : prefs.accent ?? t('Default') })), + h(SetSection, { key: 'language', title: t('Language') }, + h(SetRow, { label: t('Interface language'), hint: t(languageLabel()) })), + h(SetSection, { key: 'shortcuts', title: t('Shortcuts') }, + h(SetRow, { label: t('Send shortcut'), hint: t(sendKeyLabel(sendKey)) })), + h(SetSection, { key: 'folding', title: t('Message folding') }, + h(SetRow, { label: t('Message folding'), hint: t(foldModeLabel(folding.mode)) }), + h(SetRow, { label: t('Collapse long documents into cards'), hint: folding.documentCards ? t('On') : t('Off') })), h(SetSection, { key: 'notify', title: t('Notifications') }, h(SetRow, { label: t('In other chats'), hint: prefs.notifications !== false ? t('On') : t('Off') }), NOTIFY_KINDS.map(([kind, label]) => h(SetRow, { key: kind, label: t(label), hint: prefs.notifications !== false && prefs.notify?.[kind] !== false ? t('On') : t('Off') }))), @@ -130,6 +168,23 @@ function GeneralPage({ roster, actions, run }) { } return [ h(SetSection, { key: 'look', title: t('Appearance') }, + h(SetRow, { label: t('Appearance'), hint: t('How this window looks: light, dark, automatic, or match the system.') }, + h(Segmented, { label: t('Appearance'), value: appearance.mode, className: 'bt-appearance-seg' }, APPEARANCE_MODES.map(([id, label]) => h('button', { + key: id, type: 'button', 'aria-pressed': appearance.mode === id, + onClick: () => { if (appearance.mode !== id) setAppearance({ mode: id }) }, + }, t(label))))), + appearance.mode === 'auto' ? h(SetRow, { label: t('Automatic switch'), hint: t('Switches about a minute after the chosen time, and not in the middle of a turn.') }, + h(Segmented, { label: t('Automatic switch'), value: appearance.auto, className: 'bt-appearance-seg' }, AUTO_KINDS.map(([id, label]) => h('button', { + key: id, type: 'button', 'aria-pressed': appearance.auto === id, + onClick: () => { if (appearance.auto !== id) setAppearance({ auto: id }) }, + }, t(label))))) : null, + appearance.mode === 'auto' && appearance.auto === 'custom' + ? h(SetRow, { label: t('Custom hours') }, + h('label', { className: 'bt-time-field' }, t('Dark from'), + h('input', { className: 'bt-input', type: 'time', 'aria-label': t('Dark from'), value: appearance.from, onChange: event => setAppearance({ from: event.target.value }) })), + h('label', { className: 'bt-time-field' }, t('Dark until'), + h('input', { className: 'bt-input', type: 'time', 'aria-label': t('Dark until'), value: appearance.to, onChange: event => setAppearance({ to: event.target.value }) }))) + : null, h(SetRow, { label: t('Theme'), hint: t('Colors for the whole team, on every device.') }, h('select', { className: 'bt-select', 'aria-label': t('Theme'), value: current, onChange: event => run(actions.setPrefs({ theme: event.target.value })) }, Object.entries(themes).map(([id, theme]) => h('option', { key: id, value: id }, t(theme.label))))), @@ -142,6 +197,41 @@ function GeneralPage({ roster, actions, run }) { })), h('label', { className: 'bt-swatch bt-swatch-custom', title: t('Custom accent'), 'data-on': Boolean(prefs.accent) && !ACCENT_INKS.some(ink => INKS[ink][0] === prefs.accent) }, h('input', { type: 'color', value: custom, 'aria-label': t('Custom accent'), onChange: event => pickCustom(event.target.value) }))))), + h(SetSection, { key: 'language', title: t('Language') }, + localeChooser + ? h(SetRow, { label: t('Interface language') }, + h(Segmented, { label: t('Interface language'), value: languageLabel() === 'Simplified Chinese' ? 'zh' : 'en', className: 'bt-appearance-seg' }, [ + h('button', { key: 'en', type: 'button', 'aria-pressed': languageLabel() !== 'Simplified Chinese', onClick: () => setInterfaceLocale('en') }, t('English')), + h('button', { key: 'zh', type: 'button', 'aria-pressed': languageLabel() === 'Simplified Chinese', onClick: () => setInterfaceLocale('zh') }, t('Simplified Chinese')), + ])) + : h(SetRow, { label: t('Interface language'), hint: `${t(languageLabel())}. ${t('Follows the DeepSeek Harness language.')}` })), + h(SetSection, { key: 'shortcuts', title: t('Shortcuts') }, + h(SetRow, { + label: t('Send shortcut'), + hint: t(sendKey === 'shift-enter' ? 'Enter inserts a new line.' : 'Shift+Enter inserts a new line.'), + }, + h(Segmented, { label: t('Send shortcut'), value: sendKey, className: 'bt-appearance-seg' }, SEND_KEYS.map(([id, label]) => h('button', { + key: id, type: 'button', 'aria-pressed': sendKey === id, + onClick: () => { if (sendKey !== id) run(actions.setPrefs({ sendKey: id === 'enter' ? null : id })) }, + }, t(label)))))), + h(SetSection, { key: 'folding', title: t('Message folding') }, + h('div', { className: 'bt-fold-modes', role: 'radiogroup', 'aria-label': t('Message folding') }, + h('p', { className: 'bt-fold-lead' }, t('Choose how much of a long message to show before it folds.')), + FOLD_MODE_OPTIONS.map(([id, label, hint]) => h('button', { + key: id, type: 'button', role: 'radio', className: 'bt-fold-mode', + 'aria-checked': folding.mode === id, + onClick: () => { if (folding.mode !== id) run(actions.setPrefs({ folding: { mode: id, documentCards: folding.documentCards } })) }, + }, + h('span', { className: 'bt-fold-radio', 'aria-hidden': true }), + h('span', { className: 'bt-fold-mode-copy' }, + h('span', { className: 'bt-fold-mode-label' }, t(label)), + h('span', { className: 'bt-set-hint' }, t(hint)))))), + h(SwitchRow, { + label: t('Collapse long documents into cards'), + hint: t('Messages with several sections appear as a card you can open beside the conversation.'), + on: folding.documentCards, + onChange: on => run(actions.setPrefs({ folding: { mode: folding.mode, documentCards: on } })), + })), // One switch for every system notification (#353), then one per kind (#469). h(SetSection, { key: 'notify', title: t('Notifications') }, h(SwitchRow, { @@ -270,7 +360,7 @@ export function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = const extra = useSettingsPages().map(entry => ({ entry, key: `plugin:${entry.id}` })) // #2877: the Projects page is a Project surface like the sidebar row; with the plugin off or // absent it is not in the list, so a page asked for by name falls back to General below. - const pages = SETTINGS_PAGES.flatMap(item => (item[0] === 'connectors' ? [item, ...extra.map(({ entry, key }) => [key, entry.label ?? entry.id])] : [item])).filter(([key]) => key !== 'projects' || projectPresent()) + const pages = SETTINGS_PAGES.flatMap(item => (item[0] === 'channels' ? [item, ...extra.map(({ entry, key }) => [key, entry.label ?? entry.id])] : [item])).filter(([key]) => key !== 'projects' || projectPresent()) const shown = pages.some(([key]) => key === page) ? page : 'general' const pluginPage = extra.find(({ key }) => key === shown)?.entry const usageFocus = shown === 'usage' && id ? id : null @@ -327,6 +417,7 @@ export function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = shown === 'groups' && !room ? h(GroupsPage, { roster, actions, run }) : null, shown === 'projects' ? h(ProjectsPage, { roster, actions, run, call }) : null, shown === 'connectors' ? h(ConnectorsPage, { roster, actions }) : null, + shown === 'channels' ? h(ChannelsPage, { roster, actions }) : null, shown === 'workflows' ? h(WorkflowsPage, { call, roster, start: id ?? undefined }) : null, pluginPage ? h(SettingsPageSlot, { entry: pluginPage, props: { roster, actions, call, run, t, Section: SetSection, Row: SetRow } }) : null, shown === 'capabilities' ? h(CapabilitiesPage, { roster, actions, run }) : null, diff --git a/core/src/client/sidebar.js b/core/src/client/sidebar.js index b8b15fcf9..3fa6f139d 100644 --- a/core/src/client/sidebar.js +++ b/core/src/client/sidebar.js @@ -13,6 +13,8 @@ import { springEasing, SPRING_SHAPE } from './motion.js' import { hostText, t } from './i18n.js' import { friendBotTitle, roomTitle, sharedRoomTitle, isShownRemoteChat } from '../shared/remote-label.js' import { visibleText } from '../shared/preview.js' +import { matchesSessionFilter, sessionIsUnread } from '../shared/session-list-filter.js' +import { shouldClearManualUnread } from '../shared/session-unread.js' import { showsDshRow } from './dsh-offer.js' import { InboxRow } from './inbox.js' import { KanbanRow } from './kanban.js' @@ -23,9 +25,12 @@ import { ProjectsNav } from './projects-nav.js' // Manual "Mark as Unread" lasts until the conversation is opened again. function useMarkedUnread(id, active, marked, actions) { + const wasActive = useRef(false) useEffect(() => { - if (active && marked) actions.clearUnread(id) - }, [active, marked]) + const opened = shouldClearManualUnread({ active, wasActive: wasActive.current, marked }) + wasActive.current = active + if (opened) actions.clearUnread(id) + }, [active, marked, id]) } const PinMark = () => h('span', { className: 'bt-pin', 'aria-hidden': true }, h(PinMarkIcon)) @@ -340,6 +345,27 @@ function TreeNode({ node, rowProps, markedUnread, collapsed, toggle, actions }) closed ? null : children.map(child => h(TreeNode, { key: child.bot.id, node: child, rowProps, markedUnread, collapsed, toggle, actions }))) } +function SessionFilter({ value, onChange }) { + const items = [ + ['all', t('All')], + ['group', t('Group chats')], + ['direct', t('Direct chats')], + ['unread', t('Unread')], + ] + return h('div', { className: 'bt-session-filter', role: 'radiogroup', 'aria-label': t('Session filter') }, + items.map(([id, label]) => h('button', { + key: id, type: 'button', role: 'radio', className: 'bt-session-filter-btn', + 'data-filter': id, 'aria-checked': value === id, onClick: () => onChange(id), + }, label))) +} + +function sessionFilterEmpty(filter) { + if (filter === 'group') return t('No group chats') + if (filter === 'direct') return t('No direct chats') + if (filter === 'unread') return t('No unread chats') + return null +} + export function TeamSidebar(props) { const { wide, useRoster, useUi, useSessions, actions } = props const listRef = useRef(null) @@ -380,13 +406,33 @@ export function TeamSidebar(props) { // A plugin (the tree) may give the Bots a structure: the list then is one tree under the Main Bot. const structure = useSidebarStructure() const [collapsed, setCollapsed] = useState({}) + const [sessionFilter, setSessionFilter] = useState('all') const toggle = id => setCollapsed(value => ({ ...value, [id]: !value[id] })) // Only own Bots belong to the tree; a friend's Bot stays in the ordered list below it. // structure.include(id) === false hides a Bot from the default list (e.g. tree-archived, #452). const inTree = entry => entry.kind === 'bot' && !entry.item.remote const listed = entry => inTree(entry) && structure?.include?.(entry.item.id) !== false - const tree = structure && wide && main ? botTree([main, ...order.filter(listed).map(entry => entry.item)], main.id, id => structure.parentOf(id)) : null - useListGlide(listRef, wide, order.map(entry => entry.item.id).join(',')) + const statusMap = props.useSessionStatus ? props.useSessionStatus(value => value) : undefined + const unreadIds = useMemo(() => { + const ids = new Set() + const consider = (entry) => { + if (entry?.item && sessionIsUnread(entry, statusMap, markedUnread)) ids.add(entry.item.id) + } + if (main) consider({ kind: 'bot', item: main }) + for (const entry of order) consider(entry) + return ids + }, [order, main, statusMap, markedUnread]) + const showTree = Boolean(structure && wide && main && (sessionFilter === 'all' || sessionFilter === 'direct')) + const tree = showTree ? botTree([main, ...order.filter(listed).map(entry => entry.item)], main.id, id => structure.parentOf(id)) : null + const visibleOrder = order.filter(entry => + !(tree && inTree(entry)) && + !(inTree(entry) && structure?.include?.(entry.item.id) === false) && + matchesSessionFilter(entry, sessionFilter, unreadIds.has(entry.item.id))) + const showMain = !tree && main && matchesSessionFilter({ kind: 'bot', item: main }, sessionFilter, unreadIds.has(main.id)) + const filterEmpty = roster.ready && !showMain && !tree && visibleOrder.length === 0 + ? sessionFilterEmpty(sessionFilter) + : null + useListGlide(listRef, wide, [showMain && main ? main.id : null, ...visibleOrder.map(entry => entry.item.id)].filter(Boolean).join(',')) useLandOnMainBot(roster, useSessions, actions) const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide } // Typing while the sidebar has focus starts a search. @@ -396,15 +442,15 @@ export function TeamSidebar(props) { event.preventDefault() actions.openPalette(event.key) } - return h('div', { className: wide ? 'bt-side' : 'bt-side bt-rail', onKeyDown: typeToSearch }, - wide ? h('div', { className: 'bt-side-top' }, - h('span', { className: 'bt-brand' }, h(BrandMark, { size: 22 }), h(BrandName)), - h(UpdateButton, { useUpdate: props.useUpdate, actions }), - h('button', { type: 'button', className: 'bt-round', 'aria-label': t('Search'), title: t('Search'), onClick: () => actions.openPalette() }, h(SearchIcon)), - h('button', { type: 'button', className: 'bt-round', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))) - : h(Fragment, null, - h(UpdateButton, { useUpdate: props.useUpdate, actions }), - h('button', { type: 'button', className: 'bt-round', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))), + const sideTop = wide ? h('div', { className: 'bt-side-top' }, + h('span', { className: 'bt-brand' }, h(BrandMark, { size: 22 }), h(BrandName)), + h(UpdateButton, { useUpdate: props.useUpdate, actions }), + h('button', { type: 'button', className: 'bt-round', 'aria-label': t('Search'), title: t('Search'), onClick: () => actions.openPalette() }, h(SearchIcon)), + h('button', { type: 'button', className: 'bt-round', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))) + : h(Fragment, null, + h(UpdateButton, { useUpdate: props.useUpdate, actions }), + h('button', { type: 'button', className: 'bt-round', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))) + const sideBody = [ wide && readOnlySaid ? h('div', { className: 'bt-hint bt-read-only', role: 'status' }, hostText(roster.readOnly)) : null, wide && readOnlySaid ? readOnlyReload : null, !wide && readOnlySaid ? h('div', { className: 'bt-hint bt-read-only', role: 'status', title: hostText(roster.readOnly), 'aria-label': hostText(roster.readOnly) }, hostText(roster.readOnly)) : null, @@ -412,15 +458,28 @@ export function TeamSidebar(props) { h(InboxRow, { wide, useRoster, useWork: props.useWork, useUi, actions }), h(KanbanRow, { wide, useUi, actions }), h(ProjectsNav, { wide }), + wide ? h(SessionFilter, { value: sessionFilter, onChange: setSessionFilter }) : null, h('div', { ref: listRef, className: 'bt-list', role: 'region', 'aria-label': t('Bot list') }, tree ? h('div', { className: 'bt-tree', role: 'group', 'aria-label': t('Bot tree') }, tree.map(node => h(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions }))) - : main ? h(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : h('div', { className: 'bt-hint' }, t('Setting up your Main Bot…')), - order.filter(entry => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false)).map(entry => (entry.kind === 'bot' + : showMain ? h(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : h('div', { className: 'bt-hint' }, t('Setting up your Main Bot…')), + visibleOrder.map(entry => (entry.kind === 'bot' ? h(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === 'room' ? h(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : h(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true }))), - wide ? h(FlyBotSections, { roster, actions, renderBot: bot => h(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null)) + filterEmpty ? h('div', { className: 'bt-hint bt-session-filter-empty' }, filterEmpty) : null, + wide && sessionFilter === 'all' ? h(FlyBotSections, { roster, actions, renderBot: bot => h(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null), + ] + // Wide: an icon rail stays visible beside the session list. Search, New, Inbox, + // Kanban, Projects and the FlyBot name/mark remain; the rail repeats Search and + // New as icon buttons so those entries still sit in the header too. + const iconRail = wide ? h('nav', { className: 'bt-icon-rail', 'aria-label': t('FlyBot') }, + h('span', { className: 'bt-brand-rail', title: t('FlyBot') }, h(BrandMark, { size: 28 })), + h('button', { type: 'button', className: 'bt-rail-btn', 'aria-label': t('Search'), title: t('Search'), onClick: () => actions.openPalette() }, h(SearchIcon)), + h('button', { type: 'button', className: 'bt-rail-btn', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))) : null + return h('div', { className: wide ? 'bt-side bt-side-split' : 'bt-side bt-rail', onKeyDown: typeToSearch }, + iconRail, + wide ? h('div', { className: 'bt-chat-col' }, sideTop, ...sideBody) : h(Fragment, null, sideTop, ...sideBody)) } // The update button at the sidebar's top right: a cloud while a newer DS Bot — @@ -649,6 +708,7 @@ export function AccountLauncher({ seat = true, settingsOpen, openSettings, openO [ [t('Usage'), GaugeIcon, () => actions.openSettings('usage')], [t('Connect apps'), ConnectorIcon, () => actions.openConnectors()], + [t('Channels'), ConnectorIcon, () => actions.openSettings('channels')], [t('Plugins'), PlugIcon, () => actions.selectPanel('plugins')], [t('Scheduled tasks'), ClockIcon, () => actions.openSettings('schedules')], [t('Settings'), GearIcon, () => actions.openSettings('general')], @@ -742,6 +802,10 @@ export function BrandName() { // and Connect apps; FooterAccount only shows when the seat went to no one. The // shell's footer classes are CSS-module names, so they match on their stems. export const SIDEBAR_CSS = ` +.bt-session-filter{display:flex;flex-wrap:wrap;gap:4px;padding:8px 10px 2px;flex:none} +.bt-session-filter-btn{height:26px;padding:0 10px;border:.5px solid var(--bt-line);border-radius:999px;background:transparent;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:26px;cursor:pointer} +.bt-session-filter-btn[aria-checked=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink);font-weight:600} +.bt-session-filter-empty{padding:16px 12px;text-align:center} .bt-side-top .bt-brand{cursor:default;padding-left:6px} .bt-side-top .bt-brand:hover{background:none} .bt-brand .bt-mark{flex:none} diff --git a/core/src/client/styles.js b/core/src/client/styles.js index 18ead13b3..b4141238d 100644 --- a/core/src/client/styles.js +++ b/core/src/client/styles.js @@ -13,6 +13,9 @@ import { SPRING_SHAPE, SPRING_TAP, SPRING_STRETCH, SPRING_POP, spring } from './ // CONVERSATION_CSS re-skins the shell's own conversation DOM and styles what only // the conversation renders. export const SHELL_CSS = ` +.bt-palette.bt-history-view{max-height:85vh;display:flex;flex-direction:column;width:min(760px,calc(100vw - 24px))}.bt-history-view h2{font-size:16px;margin:0;flex:1}.bt-history-disclaimer{padding:8px 16px;margin:0;color:var(--bt-ink-2)}.bt-history-content{overflow:auto;min-height:80px;padding:8px 16px;overflow-wrap:anywhere}.bt-history-entry{border-top:1px solid var(--bt-line);padding:8px 0}.bt-history-entry[data-hit]{border-left:3px solid var(--bt-accent);padding-left:10px}.bt-history-entry h3{font-size:12px;color:var(--bt-ink-2);font-weight:500}.bt-history-entry pre{white-space:pre-wrap;overflow-wrap:anywhere;font:inherit;margin:8px 0}.bt-history-foot{display:flex;flex-wrap:wrap;gap:8px;padding:12px 16px;border-top:1px solid var(--bt-line)} + +.bt-palette-history{padding:8px 16px;border-bottom:1px solid var(--bt-line);font-size:12px;color:var(--bt-ink-2);overflow-wrap:anywhere}.bt-palette-scope{margin:0 0 4px}.bt-palette-history button{margin:4px 0;display:block} body{--bt-ink:#141414;--bt-ink-2:rgba(20,20,20,.6);--bt-ink-3:rgba(20,20,20,.36);--bt-bubble:#eeeeee;--bt-sidebar:#f7f7f7;--bt-main:#fcfcfc;--bt-line:rgba(20,20,20,.08);--bt-line-2:rgba(20,20,20,.15);--bt-line-weak:rgba(20,20,20,.1);--bt-hover:rgba(119,119,119,.09);--bt-active:rgba(119,119,119,.17);--bt-card:#ffffff;--bt-accent:#4d6bfe;--bt-green:#00c972;--bt-star:#ff9800;--bt-user:#070707;--bt-user-ink:#fcfcfc;--bt-tag-bg:rgba(20,20,20,.06);--bt-tag-ink:rgba(20,20,20,.56)} body[data-ds-dark-theme]{--bt-ink:#f2f2f2;--bt-ink-2:rgba(242,242,242,.6);--bt-ink-3:rgba(242,242,242,.36);--bt-bubble:#262626;--bt-sidebar:#1b1b1b;--bt-main:#141414;--bt-line:rgba(255,255,255,.08);--bt-line-2:rgba(255,255,255,.15);--bt-line-weak:rgba(255,255,255,.1);--bt-hover:rgba(160,160,160,.12);--bt-active:rgba(160,160,160,.2);--bt-card:#1f1f1f;--bt-user:#f2f2f2;--bt-user-ink:#141414;--bt-tag-bg:rgba(255,255,255,.09);--bt-tag-ink:rgba(242,242,242,.62)} ${Object.entries(INKS).map(([name, [light]]) => `body{--bt-ink-${name}:${light}}`).join('')} @@ -169,6 +172,11 @@ body[data-bt-motion=quiet] .bt-mark[data-poke]{cursor:default} @media (prefers-reduced-motion:reduce){} .bt-head{position:relative;display:flex;justify-content:center;align-items:center;height:40px;flex:none;pointer-events:none} +.bt-head-actions{position:absolute;right:8px;top:50%;transform:translateY(-50%);display:flex;align-items:center;gap:4px;pointer-events:auto;z-index:2} +.bt-head-more{display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px;padding:0;border:0;border-radius:50%;background:var(--bt-main);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2);cursor:pointer;box-shadow:0 1px 2px rgba(0,0,0,.04)} +.bt-head-more:hover{background:var(--bt-hover);color:var(--bt-ink)} +.bt-head-more svg{width:16px;height:16px} +.bt-head-menu{position:fixed;min-width:220px;z-index:40} .bt-pill{pointer-events:auto;display:inline-flex;align-items:center;gap:8px;height:40px;padding:7.5px 13.5px 7.5px 7.5px;border-radius:999px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 2px 8px -1px rgba(0,0,0,.06),0 1px 2px rgba(0,0,0,.04);color:var(--bt-ink);font-family:inherit;font-size:14px;line-height:20px;cursor:pointer;max-width:70%;box-sizing:border-box;transition:background-color .12s ease,transform ${SPRING_TAP.duration}ms ${SPRING_TAP.easing}} .bt-pill:hover{background:color-mix(in srgb,var(--bt-main),#777 9%)} .bt-pill:active{transform:scale(.965)} @@ -203,6 +211,25 @@ body[data-bt-motion=quiet] .bt-mark[data-poke]{cursor:default} .bt-bubble [class*="_markdown"]{color:inherit!important;font-size:inherit!important;line-height:inherit!important} .bt-bubble p{margin:0} .bt-bubble p + p{margin-top:6px} +.bt-fold{display:flex;flex-direction:column;gap:6px;min-width:0} +.bt-fold-toggle{align-self:flex-start;margin:2px 0 0;border:0;background:none;padding:0;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:16px;font-weight:600;cursor:pointer} +.bt-fold-toggle:hover{color:var(--bt-ink);text-decoration:underline;text-underline-offset:2px} +.bt-fold[data-folded] .bt-bubble,[data-folded].bt-fold{position:relative} +.bt-doc-card{display:flex;align-items:center;gap:12px;width:min(100%,440px);box-sizing:border-box;margin:0;padding:12px 14px;border:.5px solid var(--bt-line-2);border-radius:14px;background:var(--bt-card);color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer} +.bt-doc-card:hover{background:var(--bt-hover)} +.bt-doc-card-icon{flex:none;display:inline-flex;align-items:center;justify-content:center;width:36px;height:36px;border-radius:9px;background:var(--bt-tag-bg);color:var(--bt-ink-2)} +.bt-doc-card-copy{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px} +.bt-doc-card-title{font-size:14px;line-height:20px;font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-doc-card-meta{font-size:12px;line-height:16px;color:var(--bt-ink-3)} +.bt-doc-card-go{flex:none;font-size:12px;line-height:16px;color:var(--bt-ink-2);white-space:nowrap} +.bt-umsg .bt-doc-card{width:min(100%,320px)} +.bt-doc-pane{display:flex;flex-direction:column;min-height:0;height:100%;background:var(--bt-main);color:var(--bt-ink)} +.bt-doc-pane-head{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;flex:none;padding:16px 16px 12px;border-bottom:.5px solid var(--bt-line)} +.bt-doc-pane-copy{min-width:0} +.bt-doc-pane-title{margin:0;font-size:16px;line-height:22px;font-weight:600;overflow:hidden;text-overflow:ellipsis} +.bt-doc-pane-hint{margin:4px 0 0;font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow-wrap:anywhere} +.bt-doc-pane-body{flex:1;min-height:0;overflow:auto;padding:16px;font-size:var(--dsh-content-font-size,14px);line-height:calc(var(--dsh-content-font-size,14px) + 8px);overflow-wrap:anywhere} +.bt-doc-pane-body [class*="_markdown"]{color:inherit} .bt-bubble ul,.bt-bubble ol{margin:4px 0;padding-left:20px} .bt-bubble a[href^="${MENTION_ORIGIN}"]{text-decoration:none;font-weight:400;cursor:pointer;white-space:nowrap} .bt-bubble a[href^="${MENTION_ORIGIN}"]::before{content:"";display:inline-block;width:16px;height:16px;margin-right:3px;vertical-align:-3px;background:currentColor;-webkit-mask:${DEFAULT_MASK} center/contain no-repeat;mask:${DEFAULT_MASK} center/contain no-repeat} @@ -291,6 +318,7 @@ button.bt-q-opt:active{background:var(--bt-active)} .bt-newchat{flex:1;display:flex;flex-direction:column;min-width:0;position:relative;animation:bt-veil-in .18s ease-out} .bt-pane[data-menu]{background:transparent}.bt-pane[data-menu] .bt-newchat{flex:none;align-self:flex-start;width:min(280px,calc(100% - 16px));max-height:calc(100% - 16px);margin:8px;overflow:auto;background:var(--bt-card);border:1px solid var(--bt-line-2);border-radius:12px;box-shadow:0 10px 30px rgba(0,0,0,.14),0 2px 6px rgba(0,0,0,.06)}.bt-newchat[data-menu] .bt-drop{position:relative;top:0;left:0;width:auto;max-height:none;margin:0;box-shadow:none;border:0;max-width:none} +.bt-nc-name{margin:8px 16px 0} .bt-to{display:flex;align-items:center;flex-wrap:wrap;gap:6px;min-height:48px;padding:6px 12px;border-bottom:1px solid var(--bt-line);font-size:14px;box-sizing:border-box} .bt-to-label{color:var(--bt-ink-2)} .bt-to input{flex:1;min-width:120px;border:0;outline:none;background:none;color:var(--bt-ink);font-size:14px;height:26px} @@ -688,6 +716,10 @@ button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-side .bt-menu[data-leaving]{pointer-events:none;animation:bt-pop-out .12s cubic-bezier(.4,0,1,1) forwards} .bt-menu-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .bt-menu-hint{flex:none;color:var(--bt-ink-3);font-size:12px;font-variant-numeric:tabular-nums} +.bt-document-message{min-width:0;max-width:100%} +.bt-message-note{white-space:normal;overflow-wrap:anywhere;padding:6px 8px;max-width:220px} +.bt-menu-reacts{display:flex;gap:2px;padding:2px 4px} +.bt-menu-reacts button{width:32px;min-width:32px;height:32px;padding:0;justify-content:center;font-size:18px;line-height:1} .bt-palette-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:140;isolation:isolate;pointer-events:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} .bt-backdrop{position:absolute;inset:0;background:rgba(0,0,0,.46);animation:bt-fade .22s ease-out} .bt-palette{position:absolute;top:50%;left:50%;width:min(560px,92vw);transform:translate(-50%,-50%);display:flex;flex-direction:column;border-radius:12px;background:var(--bt-main);border:1px solid var(--bt-line-2);box-shadow:0 24px 48px -12px rgba(0,0,0,.25);overflow:hidden;color:var(--bt-ink);animation:bt-palette-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} @@ -702,6 +734,9 @@ button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-side .bt-palette-clear{width:18px;height:18px;border:0;padding:0;border-radius:6px;background:none;color:var(--bt-ink-3);display:inline-flex;align-items:center;justify-content:center;cursor:pointer} .bt-palette-clear:hover{color:var(--bt-ink)} .bt-palette-clear svg{width:12px;height:12px} +.bt-palette-filters{display:flex;flex-wrap:wrap;gap:0;padding:0 10px;border-bottom:.5px solid var(--bt-line-2);flex:none} +.bt-palette-filter{height:36px;padding:0 12px;border:0;border-bottom:2px solid transparent;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;cursor:pointer} +.bt-palette-filter[aria-selected=true]{color:var(--bt-ink);border-bottom-color:var(--bt-accent);font-weight:600} .bt-palette-list{position:relative;height:402px;overflow-y:auto;padding:8px;display:flex;flex-direction:column;gap:2px;box-sizing:border-box} .bt-palette-list>.bt-thumb,.bt-drop-list>.bt-thumb{left:0;right:0;border-radius:8px;background:var(--bt-active)} .bt-palette-list>.bt-thumb{left:8px;right:8px} @@ -778,6 +813,20 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} .bt-addlist{display:flex;flex-direction:column;margin-top:4px;padding:4px;border:1px solid var(--bt-line);border-radius:10px;background:var(--bt-card);animation:bt-rise .16s ease-out} .bt-seg{position:relative;display:flex;gap:2px;padding:2px;border-radius:10px;background:var(--bt-hover)} .bt-motion-seg{width:216px} +.bt-appearance-seg{width:min(100%,360px)} +.bt-appearance-seg button{font-size:12px;padding:6px 8px} +.bt-time-field{display:inline-flex;align-items:center;gap:8px;font-size:12px;color:var(--bt-ink-2)} +.bt-time-field .bt-input{width:auto} +.bt-fold-modes{display:flex;flex-direction:column;width:100%} +.bt-fold-lead{margin:0;padding:10px 16px 4px;font-size:12px;line-height:16px;color:var(--bt-ink-2)} +.bt-fold-mode{display:flex;align-items:flex-start;gap:12px;width:100%;margin:0;padding:12px 16px;border:0;border-top:.5px solid var(--bt-line);background:none;color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer;box-sizing:border-box} +.bt-fold-mode:hover{background:var(--bt-hover)} +.bt-fold-radio{flex:none;width:16px;height:16px;margin-top:2px;border:1.5px solid var(--bt-ink-3);border-radius:50%;box-sizing:border-box;background:transparent;position:relative} +.bt-fold-mode[aria-checked=true] .bt-fold-radio{border-color:var(--bt-accent)} +.bt-fold-mode[aria-checked=true] .bt-fold-radio::after{content:"";position:absolute;inset:3px;border-radius:50%;background:var(--bt-accent)} +.bt-fold-mode-copy{display:flex;flex-direction:column;gap:2px;min-width:0} +.bt-fold-mode-label{font-size:14px;line-height:20px;font-weight:600} +.bt-set-card .bt-fold-modes + .bt-set-row,.bt-set-card > .bt-switch{border-top:.5px solid var(--bt-line)} .bt-seg button{position:relative;z-index:1;flex:1;height:30px;border:0;border-radius:8px;background:none;font:inherit;font-size:13px;color:var(--bt-ink-2);cursor:pointer;transition:background-color .15s ease,color .15s ease,box-shadow .15s ease,${spring(SPRING_TAP, 'scale')}} .bt-seg button[aria-pressed=true]{background:var(--bt-card);color:var(--bt-ink);box-shadow:0 1px 3px rgba(0,0,0,.08)} .bt-seg button:disabled{opacity:.4;cursor:default} @@ -795,7 +844,7 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} .bt-mem-row-go{display:inline-flex;align-items:center;gap:2px;color:var(--bt-ink-3);font-size:12px} .bt-mem-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:121;isolation:isolate;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} .bt-mem-scrim{animation:bt-fade .2s ease-out} -.bt-mem{position:relative;width:min(680px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} +.bt-mem{position:relative;width:min(880px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} .bt-mem-head{position:relative;display:flex;align-items:center;gap:8px;height:60px;flex:none;padding:0 14px 0 24px;border-bottom:.5px solid var(--bt-line);box-sizing:border-box} .bt-mem-head .bt-icon-btn{width:32px;height:32px;flex:none} .bt-mem-head [aria-haspopup] svg{width:18px;height:18px;stroke-width:2.6} @@ -805,7 +854,23 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} .bt-mem-head-gap{flex:1} .bt-mem-menu{position:absolute;top:52px;right:50px;min-width:220px;--bt-origin:top right} .bt-mem-menu button:disabled{opacity:.4;cursor:default;background:none} +.bt-mem-shell{flex:1;min-height:0;display:flex} +.bt-mem-main{flex:1;min-width:0;display:flex;flex-direction:column} +.bt-mem-nav{flex:none;width:228px;display:flex;flex-direction:column;gap:10px;padding:12px 10px 16px;border-right:.5px solid var(--bt-line);background:var(--bt-sidebar);min-height:0} +.bt-mem-search{display:flex;align-items:center;gap:8px;margin:0 4px;padding:0 8px;height:32px;border-radius:8px;background:var(--bt-main);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2)} +.bt-mem-search svg{flex:none;width:14px;height:14px} +.bt-mem-search-input{flex:1;min-width:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;outline:none} +.bt-mem-nav-list{display:flex;flex-direction:column;gap:2px;min-height:0;overflow:auto;padding:0 2px} +.bt-mem-nav-group{display:flex;flex-direction:column;gap:2px;margin-top:10px} +.bt-mem-nav-heading{padding:4px 8px 2px;font-size:11px;line-height:14px;font-weight:600;color:var(--bt-ink-3);text-transform:uppercase;letter-spacing:.04em} +.bt-mem-nav-item{display:flex;align-items:center;gap:8px;width:100%;margin:0;padding:6px 8px;border:0;border-radius:8px;background:none;color:var(--bt-ink);font:inherit;font-size:13px;line-height:18px;text-align:left;cursor:pointer} +.bt-mem-nav-item:hover{background:var(--bt-hover)} +.bt-mem-nav-item[aria-current=page]{background:var(--bt-selected,var(--bt-active));font-weight:600} +.bt-mem-nav-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-mem-nav-count{flex:none;font-size:11px;line-height:14px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums} +.bt-mem[data-nav=hidden] .bt-mem-shell{display:flex} .bt-mem-body{flex:1;overflow-y:auto;padding:22px 28px 24px;scrollbar-width:thin;display:flex;flex-direction:column;gap:12px} +@media (max-width:640px){.bt-mem-nav{width:180px}} .bt-mem-summary{transition:opacity .3s ease} .bt-mem-summary[data-stale]{opacity:.55} .bt-mem-summary h3{margin:20px 0 6px;font-size:17px;line-height:26px;font-weight:600} @@ -1050,7 +1115,11 @@ body[data-bt-friend-chat] [data-composer-stats]{display:none!important} .bt-plus:active{scale:.9} .bt-plus svg{width:14px;height:14px;transition:${spring(SPRING_POP, 'rotate')}} .bt-plus[aria-expanded=true] svg{rotate:45deg} -.bt-plus-menu{min-width:180px} +.bt-plus-menu{min-width:220px} +.bt-plus-group{display:flex;flex-direction:column} +.bt-plus-group + .bt-plus-group{border-top:.5px solid var(--bt-line);margin-top:4px;padding-top:4px} +.bt-plus-menu .bt-menu-hint,.bt-head-menu .bt-menu-hint{display:block;padding:2px 12px 8px 36px;font-size:11px;line-height:15px;color:var(--bt-ink-3);white-space:normal;max-width:240px} +.bt-plus-menu button:disabled{opacity:.55;cursor:default} [data-composer-card] [class*="_tools"]{gap:0!important} [data-composer-card] [class*="_modes"]:empty{display:none!important} [data-composer-card] [class*="_activity"]:not(:has([data-slot] > *)){display:none!important} diff --git a/core/src/client/themes.js b/core/src/client/themes.js index 077c24d32..69fa1588e 100644 --- a/core/src/client/themes.js +++ b/core/src/client/themes.js @@ -28,6 +28,13 @@ const THEMES = { light: { bg: '#f7f9fc', sidebar: '#eef2f8', bubble: '#e5ebf5', card: '#ffffff', text: '#121826', user: '#1e3a8a', userText: '#ffffff', accent: '#1e86ff' }, dark: { bg: '#0b1020', sidebar: '#10172a', bubble: '#1a2340', card: '#141c33', text: '#e8edf7', user: '#3b6fd8', userText: '#ffffff', accent: '#4f9dff' }, }, + grove: { + label: 'Grove', + light: { bg: '#f4f7f5', sidebar: '#e8eee9', bubble: '#dfe8e2', card: '#ffffff', text: '#171c19', user: '#235039', userText: '#f4f7f5', accent: '#1f7a54' }, + dark: { bg: '#171c19', sidebar: '#141916', bubble: '#2a332d', card: '#272e2b', text: '#e8eee9', user: '#235039', userText: '#f4f7f5', accent: '#3d9a6e' }, + // #235039 is the measured selected fill from the visual reference Instant-mode sample. + css: 'html body{--bt-selected:color-mix(in srgb,var(--bt-accent) 18%,var(--bt-sidebar))}html body[data-ds-dark-theme]{--bt-selected:#235039}', + }, } const rgba = (hex, alpha) => `rgba(${[1, 3, 5].map(index => parseInt(hex.slice(index, index + 2), 16)).join(',')},${alpha})` function themeVars(mode, dark, accent = mode.accent) { @@ -105,3 +112,17 @@ export function registerTheme(id, theme) { } } export const allThemes = () => ({ ...THEMES, ...customThemes }) +// Fresh profiles, or a stored id the registry no longer has, present Grove so the +// forest shell is the first look of a real FlyBot. A saved DeepSeek / Mono / Paper / +// Moonlight id is honored; those themes stay in the picker. +export const DEFAULT_THEME = 'grove' +export function resolveThemeId(prefs, themes = allThemes()) { + const id = prefs?.theme + return themes[id] ? id : DEFAULT_THEME +} +export function themePrefsRecord(prefs = {}) { + return { + theme: prefs.theme, accent: prefs.accent, motion: prefs.motion, + appearance: prefs.appearance, sendKey: prefs.sendKey, folding: prefs.folding, + } +} diff --git a/core/src/client/user-message.js b/core/src/client/user-message.js index cd7d7077e..54ed51334 100644 --- a/core/src/client/user-message.js +++ b/core/src/client/user-message.js @@ -2,10 +2,12 @@ import { createElement as h, Fragment, useState } from 'react' import * as ui from '@deepseek-ai/dsh-client-ui-primitives' import { mentionSpans } from '../shared/mentions.js' import { BotMark, PersonMark, markBotForMention } from './mark.js' -import { CheckIcon, CopyIcon } from './icons.js' +import { MessageTools, onMessageContextMenu } from './message-tools.js' +import { userMessageReactKey } from '../shared/message-actions.js' import { dateLocale, t } from './i18n.js' import { cleanPeerName, faceAliases, remoteBotTitle, remoteMentionLabel } from '../shared/remote-label.js' import { facePeople, faceSeatLabel, faceSeats } from './face-seats.js' +import { FoldedContent, foldingOf, showsDocumentCard } from './message-fold.js' // ------------------------------------------------------------------------- // The user's own messages. DSH draws every "@word" in them as a file reference, and @@ -155,18 +157,26 @@ function Attachments({ attachments, renderMessageImages }) { })) } -function CopyButton({ text }) { - const [copied, setCopied] = useState(false) - const copy = () => { - void navigator.clipboard?.writeText(text).then(() => { setCopied(true); setTimeout(() => setCopied(false), 1000) }) - } - return h('button', { type: 'button', className: 'bt-tool', 'aria-label': copied ? t('Copied') : t('Copy'), title: copied ? t('Copied') : t('Copy'), onClick: copy }, copied ? h(CheckIcon) : h(CopyIcon)) -} - const clock = time => (typeof time === 'number' ? new Date(time).toLocaleTimeString(dateLocale(), { hour: 'numeric', minute: '2-digit' }) : undefined) // A sent message, or one that joined a running turn ("steering"). -export function UserMessageCell({ node, sessionId, useRoster, actions, renderMessageImages, openFile, openSkill }) { +function userBody({ text, rest, roster, sessionId, incoming, author, referenceLabels, skillNames, references, actions, time }) { + if (text === '' && rest.length === 0) return null + const folding = foldingOf(roster.prefs) + const card = text !== '' && showsDocumentCard(text, folding) + const message = text === '' ? null : h(FoldedContent, { text, folding, actions, sessionId }, card ? undefined : shown => h(UserText, { + text: shown, + bots: mentionableBots(roster, sessionId, { fromFriend: Boolean(incoming && author.ownerName) }), + referenceLabels, skillNames, references, actions, + })) + if (card && rest.length === 0) return message + return h('div', { className: 'bt-ubody', title: clock(time) }, + card ? null : message, + rest.map((block, index) => (ui.JsonBlock ? h(ui.JsonBlock, { key: index, label: t('Content'), payload: block }) : null)), + card ? message : null) +} + +export function UserMessageCell({ node, sessionId, useRoster, useUi, actions, renderMessageImages, openFile, openSkill }) { const roster = useRoster(value => value) const data = node.data ?? {} const { text, attachments, rest } = contentParts(data.content) @@ -185,6 +195,16 @@ export function UserMessageCell({ node, sessionId, useRoster, actions, renderMes // never drawn as held, whatever else in the room waits for approval (#457). const faceMine = Boolean(room?.origin === 'face-to-face' && !incoming) const myName = faceMine ? (facePeople(room, roster).find(entry => entry.mine)?.name || cleanPeerName(roster.self?.displayName, '') || author?.name || '') : '' + const reactKey = userMessageReactKey(sessionId, node) + const reactions = typeof useUi === 'function' + ? useUi(state => (reactKey ? state.reactions?.[reactKey] ?? null : null)) + : null + const picked = reactions?.[0] ?? [] + const [contextAt, setContextAt] = useState(null) + const react = reactKey && typeof actions?.toggleReaction === 'function' + ? emoji => actions.toggleReaction(reactKey, 0, emoji) + : undefined + const who = incoming ? (author?.name || 'message') : (myName || t('You')) return h('div', { className: incoming ? 'bt-umsg bt-umsg-other' : 'bt-umsg', 'data-steering': steering || undefined, @@ -192,6 +212,7 @@ export function UserMessageCell({ node, sessionId, useRoster, actions, renderMes 'data-author': author?.authorId, 'data-author-kind': author?.authorKind, 'data-author-name': author?.name, + onContextMenu: text.trim() ? event => onMessageContextMenu(event, setContextAt) : undefined, }, person ? h('span', { className: 'bt-lead', title: author.name }, h(PersonMark, { name: author.name })) : null, faceMine ? h('span', { className: 'bt-lead', title: myName || undefined }, h(PersonMark, { name: myName || undefined })) : null, @@ -199,11 +220,14 @@ export function UserMessageCell({ node, sessionId, useRoster, actions, renderMes faceMine && myName ? h('span', { className: 'bt-uauthor' }, myName) : author && (incoming || multiHuman) ? h('span', { className: 'bt-uauthor' }, author.name, author.ownerName ? h('span', { className: 'bt-chip' }, t('Friend\'s Bot')) : null) : null, attachments.length > 0 ? h(Attachments, { attachments, renderMessageImages }) : null, - text !== '' || rest.length > 0 ? h('div', { className: 'bt-ubody', title: clock(data.time) }, - h(UserText, { text, bots: mentionableBots(roster, sessionId, { fromFriend: Boolean(incoming && author.ownerName) }), referenceLabels, skillNames: data.skillNames ?? [], references, actions }), - rest.map((block, index) => (ui.JsonBlock ? h(ui.JsonBlock, { key: index, label: t('Content'), payload: block }) : null))) : null, - referenceLabels.length > 0 ? h('div', { className: 'bt-urefs' }, t('Referenced {labels}', { labels: referenceLabels.join(t(', ')) })) : null), - text === '' ? null : h('div', { className: 'bt-utools' }, h(CopyButton, { text }))) + userBody({ text, rest, roster, sessionId, incoming, author, referenceLabels, skillNames: data.skillNames ?? [], references, actions, time: data.time }), + referenceLabels.length > 0 ? h('div', { className: 'bt-urefs' }, t('Referenced {labels}', { labels: referenceLabels.join(t(', ')) })) : null, + picked.length ? h('div', { className: 'bt-reacts' }, picked.map(emoji => h('button', { + key: emoji, type: 'button', className: 'bt-react', 'aria-label': t('Remove reaction {emoji}', { emoji }), onClick: () => actions.toggleReaction(reactKey, 0, emoji), + }, emoji))) : null), + h(MessageTools, { + text, name: who, sessionId, react, actions, roster, contextAt, className: 'bt-utools', + })) } export const USER_MESSAGE_CSS = ` @@ -229,5 +253,7 @@ export const USER_MESSAGE_CSS = ` .bt-ufile-meta{font-size:12px;line-height:15px;color:var(--bt-ink-3);white-space:nowrap;overflow:hidden;text-overflow:ellipsis} .bt-urefs{font-size:13px;line-height:18px;color:var(--bt-ink-3)} .bt-utools{display:flex;flex:none;gap:2px;opacity:0;visibility:hidden;transition:opacity .12s ease,visibility .12s} -.bt-umsg:hover .bt-utools,.bt-umsg:focus-within .bt-utools{opacity:1;visibility:visible} +.bt-umsg:hover .bt-utools,.bt-umsg:focus-within .bt-utools,.bt-utools[data-open]{opacity:1;visibility:visible} +.bt-umsg .bt-reacts{justify-content:flex-end} +.bt-umsg-other .bt-reacts{justify-content:flex-start} ` diff --git a/core/src/host/authz.js b/core/src/host/authz.js index b62eba237..0981324fd 100644 --- a/core/src/host/authz.js +++ b/core/src/host/authz.js @@ -292,6 +292,8 @@ export function install(rt) { // signed-in member ever asked for. Any signed-in actor may list, and the data layer // answers only their own rows (`schedulesView(actor)` in schedules.js). The `schedule-*` // writes keep their Session and target gates below, unchanged. + // Search derives its own allowlist from this instance's owner-scoped local Bots. + if (ep === 'search-messages' || ep === 'history-hit') return ALLOW if (ep === 'schedules') return ALLOW if (BOT_TARGETED.has(ep)) { diff --git a/core/src/host/channel.js b/core/src/host/channel.js index 07326e8aa..d8e796354 100644 --- a/core/src/host/channel.js +++ b/core/src/host/channel.js @@ -6,6 +6,8 @@ import { questionReply } from './parts.js' import { COLORS, EXTRA_COLORS, ROUTE } from './constants.js' import { isFaceRoom, roomTargetOf } from './room-membership.js' import { readQuietHours } from '../shared/quiet-hours.js' +import { readAppearance, readSendKey } from '../shared/appearance-prefs.js' +import { readFolding } from '../shared/message-fold-prefs.js' import { readTurnBudget } from './turn-budget.js' import { faceMentions } from './face-mentions.js' import { visibleText } from '../shared/preview.js' @@ -239,7 +241,7 @@ export function install(rt) { // `diagnostics-clear` is not a read: it truncates `/logs/diagnostics.jsonl`, the file a bug // report is meant to carry, so a host that only reads refuses it instead of erasing the evidence // (#2302). `diagnostics` and `diagnostics-log` stay, because they only read that file. - const READS = new Set(['state', 'models', 'efforts', 'earlier', 'room-progress', 'room-history', 'exchange', 'usage', 'schedules', 'memory-view', 'browser-wait', 'browser-result', 'diagnostics', 'diagnostics-log', 'update-check', 'update-install', 'dsh-update-install', 'repo-stars', 'approval-answer', 'auth-whoami', 'workflows', + const READS = new Set(['history-hit', 'search-messages', 'state', 'models', 'efforts', 'earlier', 'room-progress', 'room-history', 'exchange', 'usage', 'schedules', 'memory-view', 'browser-wait', 'browser-result', 'diagnostics', 'diagnostics-log', 'update-check', 'update-install', 'dsh-update-install', 'repo-stars', 'approval-answer', 'auth-whoami', 'workflows', 'tasks', 'projects', 'project-read', 'project-board', 'project-team', 'project-of', 'project-decision', 'project-memory', 'folders', 'folder-list', 'connector-app-status']) @@ -261,54 +263,80 @@ export function install(rt) { } function setPrefs(body) { + // Validate the complete request before replacing the live prefs. + const prefs = { ...state.prefs } if (body.theme !== undefined) { if (typeof body.theme !== 'string' || !/^[a-z][\w-]{0,31}$/.test(body.theme)) throw invalid('Unknown theme') - state.prefs.theme = body.theme + prefs.theme = body.theme } if (body.accent !== undefined) { - if (body.accent === null || body.accent === '') delete state.prefs.accent - else if (/^#[0-9a-f]{6}$/i.test(body.accent)) state.prefs.accent = body.accent + if (body.accent === null || body.accent === '') delete prefs.accent + else if (/^#[0-9a-f]{6}$/i.test(body.accent)) prefs.accent = body.accent else throw invalid('Accent must be a #rrggbb color') } if (body.motion !== undefined) { - if (body.motion === null || body.motion === 'normal') delete state.prefs.motion - else if (body.motion === 'quiet' || body.motion === 'lively') state.prefs.motion = body.motion + if (body.motion === null || body.motion === 'normal') delete prefs.motion + else if (body.motion === 'quiet' || body.motion === 'lively') prefs.motion = body.motion else throw invalid('Motion must be quiet, normal or lively') } // Notifications are on unless switched off (#353). if (body.notifications !== undefined) { - if (body.notifications === null || body.notifications === true) delete state.prefs.notifications - else if (body.notifications === false) state.prefs.notifications = false + if (body.notifications === null || body.notifications === true) delete prefs.notifications + else if (body.notifications === false) prefs.notifications = false else throw invalid('Notifications must be on or off') } // Each kind is on unless switched off on its own; only the off ones are kept (#469). if (body.notify !== undefined) { const kinds = body.notify if (kinds === null || typeof kinds !== 'object' || Array.isArray(kinds)) throw invalid('Notifications must be on or off') - const notify = { ...state.prefs.notify } + const notify = { ...prefs.notify } for (const [kind, on] of Object.entries(kinds)) { if (!NOTIFY_KINDS.includes(kind) || typeof on !== 'boolean') throw invalid('Notifications must be on or off') if (on) delete notify[kind] else notify[kind] = false } - if (Object.keys(notify).length > 0) state.prefs.notify = notify - else delete state.prefs.notify + if (Object.keys(notify).length > 0) prefs.notify = notify + else delete prefs.notify } // Team quiet hours (#1166): off is the absence of the record, and an invalid window is // refused here, never stored as "always quiet". if (body.quietHours !== undefined) { - const quiet = readQuietHours(body.quietHours, state.prefs.quietHours) - if (quiet === undefined) delete state.prefs.quietHours - else state.prefs.quietHours = quiet + const quiet = readQuietHours(body.quietHours, prefs.quietHours) + if (quiet === undefined) delete prefs.quietHours + else prefs.quietHours = quiet } // Team turn budget (#645, the C half): a whole number of turns per team-local day, `0` off. // Clearing the field is not "off" — it goes back to the default the store seeded — so an // invalid value is refused rather than stored as a number nobody meant. if (body.turnBudget !== undefined) { const budget = readTurnBudget(body.turnBudget) - if (budget === undefined) delete state.prefs.turnBudget - else state.prefs.turnBudget = budget + if (budget === undefined) delete prefs.turnBudget + else prefs.turnBudget = budget } + // Appearance is light / dark / auto / system; auto may follow sunset or a custom window. + if (body.appearance !== undefined) { + const appearance = readAppearance(body.appearance, prefs.appearance) + if (appearance === false) throw invalid('Appearance must be light, dark, auto or system') + if (appearance === undefined) delete prefs.appearance + else prefs.appearance = appearance + } + if (body.sendKey !== undefined) { + const sendKey = readSendKey(body.sendKey) + if (sendKey === false) throw invalid('Send shortcut must be Enter or Shift+Enter') + if (sendKey === undefined) delete prefs.sendKey + else prefs.sendKey = sendKey + } + if (body.folding !== undefined) { + const folding = readFolding(body.folding, prefs.folding) + if (folding === false) { + const cards = body.folding && typeof body.folding === 'object' && !Array.isArray(body.folding) + && body.folding.documentCards !== undefined && typeof body.folding.documentCards !== 'boolean' + throw invalid(cards ? 'Document cards must be on or off' : 'Message folding must be compact, standard or none') + } + if (folding === undefined) delete prefs.folding + else prefs.folding = folding + } + state.prefs = prefs return rt.save() } @@ -333,6 +361,10 @@ export function install(rt) { await rt.loadSecrets() if (body.since === state.revision && (body.models === undefined || body.models === modelsKey())) return ok({ revision: state.revision, unchanged: true, ...live(actor) }) return ok({ ...view(actor), ...live(actor) }) + case 'history-hit': + return ok(await rt.readHistoryHit(body, actor, signal)) + case 'search-messages': + return ok(await rt.searchMessages(body, actor, signal)) case 'models': await rt.catalog({ fresh: true }) return ok({ modelsKey: modelsKey() }) diff --git a/core/src/host/message-search.js b/core/src/host/message-search.js new file mode 100644 index 000000000..541f9e400 --- /dev/null +++ b/core/src/host/message-search.js @@ -0,0 +1,274 @@ +// Read-only, instance-local chat history search. Do not reuse chat-index: its catch-up +// resolves Agents and writes SQLite. Only cold-safe query observations are allowed here. +// No session enumeration API, filesystem path, caller-supplied session or plugin-file scan. +import { createHash, randomUUID } from 'node:crypto' + +export const SEARCH_LIMITS = { query: 256, results: 50, sessions: 500, pagesPerRequest: 8, pages: 200, events: 1000, cursors: 64, concurrent: 4, ttl: 60_000, sourceEvents: 100_000, resultBytes: 65_536, contextBytes: 24_576, messageBytes: 262_144, scanBytes: 2_097_152, tickets: 512 } +const invalid = message => Object.assign(new Error(message), { code: 'bot/invalid' }) +const unavailable = () => Object.assign(new Error('Chat history search is unavailable'), { code: 'bot/search-unavailable' }) +const normalized = text => text.normalize('NFKC').toLowerCase() +const textOf = content => { + if (!Array.isArray(content)) return '' + if (content.length > 10_000) return null + const blocks = [] + let bytes = 0 + for (const block of content) { + if (block?.type !== 'text' || typeof block.text !== 'string') continue + if (block.text.length > SEARCH_LIMITS.messageBytes) return null + bytes += Buffer.byteLength(block.text) + 1 + if (bytes > SEARCH_LIMITS.messageBytes) return null + blocks.push(block.text) + } + return blocks.join('\n') +} +const digest = text => createHash('sha256').update(text).digest('hex') +const historyUnavailable = () => Object.assign(new Error('History result is no longer available. Search again.'), { code: 'bot/history-unavailable' }) +export function utf8Prefix(text, bytes) { + let low = 0, high = Math.min(text.length, bytes) + while (low < high) { + const middle = Math.ceil((low + high) / 2) + if (Buffer.byteLength(text.slice(0, middle)) <= bytes) low = middle + else high = middle - 1 + } + if (low > 0 && text.charCodeAt(low - 1) >= 0xd800 && text.charCodeAt(low - 1) <= 0xdbff) low -= 1 + return text.slice(0, low) +} +const alignedStart = (text, at) => at > 0 && text.charCodeAt(at) >= 0xdc00 && text.charCodeAt(at) <= 0xdfff ? at - 1 : at +const jsonTextPrefix = (text, bytes) => { + const raw = utf8Prefix(text, bytes) + let low = 0, high = raw.length + while (low < high) { + const middle = Math.ceil((low + high) / 2) + if (Buffer.byteLength(JSON.stringify(raw.slice(0, middle))) <= bytes) low = middle + else high = middle - 1 + } + return utf8Prefix(raw.slice(0, low), bytes) +} +const messageText = event => event?.type === 'assistant/message' ? textOf(event.data?.message?.content) + : event?.type === 'user/message' && event.data?.source?.kind === 'user' ? textOf(event.data?.content) : '' +const turnMap = raw => { + const turns = new Map() + let turn + for (const event of raw) { + if (event.type === 'turn/start') turn = event.seq + turns.set(event.seq, Number.isInteger(event.data?.turn) ? event.data.turn : turn) + } + return turns +} + +export function install(rt) { + const cursors = new Map() + const running = new Set() + const tickets = new Map() + const enforced = () => rt.authzEnforced?.() === true + const principal = actor => enforced() ? actor?.memberId : 'legacy-single-human' + const parts = id => rt.partsOf(id).map(part => part.sessionId).filter(id => typeof id === 'string' && id !== '' && id.length <= 256) + const allowed = (actor, target) => { + if (enforced() && !actor) return false + const bot = rt.state.bots?.[target.botId] + return Boolean(typeof target.botId === 'string' && target.botId.length <= 256 && bot && !bot.remote && (!enforced() || bot.ownerId === actor.memberId) + && parts(target.botId).includes(target.sessionId) + && (!enforced() || rt.sessionOwnedBy?.(actor, target.sessionId) === true)) + } + const keep = job => { + const now = Date.now() + for (const [token, saved] of cursors) if (saved.expires <= now) cursors.delete(token) + while (cursors.size >= SEARCH_LIMITS.cursors) cursors.delete(cursors.keys().next().value) + const token = randomUUID() + cursors.set(token, { ...job, expires: now + SEARCH_LIMITS.ttl }) + return token + } + const visibleTurn = (sessionId, turn) => { + const hidden = rt.state.exchangeTurns?.[sessionId] ?? [] + return !hidden.includes(turn) && !(turn === undefined && hidden.length > 0) + } + const ticketFor = data => { + for (const [token, ticket] of tickets) if (ticket.expires <= Date.now()) tickets.delete(token) + while (tickets.size >= SEARCH_LIMITS.tickets) tickets.delete(tickets.keys().next().value) + const token = randomUUID() + tickets.set(token, { ...data, expires: Date.now() + SEARCH_LIMITS.ttl }) + return token + } + const appendPredicate = async () => { + try { + const { isAppendSurfaceEvent } = await import('@deepseek-ai/dsh-session') + if (typeof isAppendSurfaceEvent !== 'function') throw unavailable() + return isAppendSurfaceEvent + } catch { throw unavailable() } + } + const search = async (body, actor, parentSignal) => { + if (!body || typeof body !== 'object' || Array.isArray(body) + || Object.keys(body).some(key => !['query', 'cursor', 'limit'].includes(key)) + || typeof body.query !== 'string' || body.query.length > 1024 || [...body.query].length > SEARCH_LIMITS.query || [...body.query].some(char => char.charCodeAt(0) < 32 && !'\t\n\r'.includes(char))) throw invalid('Search query must be text of at most 256 characters') + if (enforced() && !actor) throw Object.assign(new Error('Sign in first'), { code: 'bot/unauthorized' }) + const query = normalized(body.query.trim()) + const limit = body.limit ?? 20 + if (!Number.isInteger(limit) || limit < 1 || limit > SEARCH_LIMITS.results) throw invalid('Search limit must be between 1 and 50') + const empty = { items: [], cursor: null, scope: 'local-bot-chats', incomplete: false, limited: false } + if (!query) return empty + const provider = rt.ctx.get?.('sessionQuery') + if (typeof provider?.observeSession !== 'function') throw unavailable() + // Native full-text search may index all visible Sessions and only searches + // the current model surface. Human history is append-origin, including turns + // compacted out of model context, never replacement summaries or tool records. + const isAppend = await appendPredicate() + let job + if (body.cursor !== undefined && body.cursor !== null) { + const saved = typeof body.cursor === 'string' && body.cursor.length <= 64 ? cursors.get(body.cursor) : undefined + if (!saved || saved.expires <= Date.now() || saved.principal !== principal(actor) || saved.query !== query) throw invalid('Search page expired; search again') + job = { ...saved } + } else { + const targets = [] + let limited = false + const seen = new Set() + outer: for (const bot of Object.values(rt.state.bots ?? {})) { + if (bot.remote || (enforced() && bot.ownerId !== actor.memberId)) continue + for (const sessionId of parts(bot.id).reverse()) { + const target = { botId: bot.id, sessionId } + if (!allowed(actor, target) || seen.has(sessionId)) continue + if (targets.length === SEARCH_LIMITS.sessions) { limited = true; break outer } + seen.add(sessionId) + targets.push(target) + } + } + job = { targets, at: 0, through: undefined, before: undefined, pages: 0, incomplete: false, limited, principal: principal(actor), query } + } + const items = [] + const signal = parentSignal ? AbortSignal.any([parentSignal, AbortSignal.timeout(6000)]) : AbortSignal.timeout(6000) + const advance = () => { job.at += 1; job.through = undefined; job.before = undefined } + let requests = 0, scannedBytes = 0, resourceStop = false + while (job.at < job.targets.length && items.length < limit && requests < SEARCH_LIMITS.pagesPerRequest && job.pages < SEARCH_LIMITS.pages && !resourceStop) { + signal.throwIfAborted() + const target = job.targets[job.at] + if (!allowed(actor, target)) { advance(); continue } + let observation + try { + requests += 1 + job.pages += 1 + observation = await provider.observeSession(target.sessionId, { signal, projectionMode: 'none' }) + signal.throwIfAborted() + if (!allowed(actor, target)) { advance(); continue } + if (observation.header?.id !== target.sessionId || !Array.isArray(observation.events) || !Number.isSafeInteger(observation.cursor) || observation.cursor < -1) throw unavailable() + // Do not create an index or compute projections. Append-origin is the + // durable human transcript, not the replaceable model context. + const raw = observation.events + if (raw.length > SEARCH_LIMITS.sourceEvents) { job.limited = true; advance(); continue } + if (job.through !== undefined && job.through !== observation.cursor) { + throw invalid('Search history changed; search again') + } + job.through = observation.cursor + const turns = turnMap(raw) + const bySeq = new Map(raw.map(event => [event.seq, event])) + const docs = raw.filter(doc => isAppend(doc) + && ['user/message', 'assistant/message'].includes(doc.type) + && (job.before === undefined || doc.seq < job.before)).slice(-SEARCH_LIMITS.events) + for (let index = docs.length - 1; index >= 0; index -= 1) { + const doc = docs[index] + const previousBefore = job.before + job.before = doc.seq + const event = bySeq.get(doc.seq) + const turn = turns.get(doc.seq) + if (!visibleTurn(target.sessionId, turn)) continue + const text = messageText(event) + if (text === null) { job.limited = true; continue } + scannedBytes += Buffer.byteLength(text) + if (scannedBytes > SEARCH_LIMITS.scanBytes) { job.before = previousBefore; resourceStop = true; break } + const clean = text.normalize('NFKC') + const hit = normalized(clean).indexOf(query) + if (hit < 0) continue + const start = alignedStart(clean, Math.max(0, hit - 50)) + const item = { botId: target.botId, sessionId: target.sessionId, seq: event.seq, ...(turn === undefined ? {} : { turn }), + snippet: utf8Prefix((start ? '…' : '') + clean.slice(start, hit + query.length + 100), 1024), earlier: target.sessionId !== rt.chatOf(target.botId), hitToken: randomUUID() } + if (Buffer.byteLength(JSON.stringify([...items, item])) > SEARCH_LIMITS.resultBytes - 1024) { job.before = previousBefore; resourceStop = true; break } + item.hitToken = ticketFor({ ...target, seq: event.seq, turn, through: observation.cursor, hash: digest(text), query, principal: principal(actor) }) + items.push(item) + if (items.length >= limit) break + } + if (!resourceStop && (docs.length === 0 || (docs.length < SEARCH_LIMITS.events && job.before === docs[0].seq))) advance() + } catch (error) { + if (error.code === 'bot/invalid') throw error + if (signal.aborted) throw unavailable() + job.incomplete = true + advance() + } finally { + try { observation?.[Symbol.dispose]?.() } catch { job.incomplete = true } + } + } + // Recheck at delivery too, including when another request revoked access during await. + const visible = items.filter(item => { + const hidden = rt.state.exchangeTurns?.[item.sessionId] ?? [] + return allowed(actor, item) && !(hidden.includes(item.turn) || (item.turn === undefined && hidden.length > 0)) + }) + if (job.pages >= SEARCH_LIMITS.pages && job.at < job.targets.length) job.limited = true + const cursor = job.at < job.targets.length && job.pages < SEARCH_LIMITS.pages ? keep(job) : null + return { items: visible, cursor, scope: 'local-bot-chats', incomplete: job.incomplete, limited: job.limited || resourceStop } + } + const context = async (body, actor, parentSignal) => { + if (!body || typeof body !== 'object' || Object.keys(body).some(key => key !== 'hitToken') + || typeof body.hitToken !== 'string' || body.hitToken.length > 64) throw historyUnavailable() + const ticket = tickets.get(body.hitToken) + const valid = () => ticket && ticket.expires > Date.now() && ticket.principal === principal(actor) + && allowed(actor, ticket) && visibleTurn(ticket.sessionId, ticket.turn) + if (!valid()) throw historyUnavailable() + const provider = rt.ctx.get?.('sessionQuery') + if (typeof provider?.observeSession !== 'function') throw historyUnavailable() + const isAppend = await appendPredicate() + if (!valid()) throw historyUnavailable() + const signal = parentSignal ? AbortSignal.any([parentSignal, AbortSignal.timeout(6000)]) : AbortSignal.timeout(6000) + let observation, result + try { + signal.throwIfAborted() + observation = await provider.observeSession(ticket.sessionId, { signal, projectionMode: 'none' }) + signal.throwIfAborted() + if (!valid() || observation.header?.id !== ticket.sessionId || observation.cursor !== ticket.through + || !Array.isArray(observation.events) || observation.events.length > SEARCH_LIMITS.sourceEvents) throw historyUnavailable() + const raw = observation.events + const turns = turnMap(raw) + const messages = raw.filter(event => isAppend(event) && ['user/message', 'assistant/message'].includes(event.type) + && visibleTurn(ticket.sessionId, turns.get(event.seq)) + && (event.type !== 'user/message' || event.data?.source?.kind === 'user')) + const at = messages.findIndex(event => event.seq === ticket.seq) + const anchor = at >= 0 ? messageText(messages[at]) : null + if (anchor === null || digest(anchor) !== ticket.hash || !normalized(anchor).includes(ticket.query)) throw historyUnavailable() + const entries = messages.slice(Math.max(0, at - 2), at + 3).map(event => { + const original = messageText(event) + const hit = event.seq === ticket.seq + // Preserve original text; locate the normalized match with a prefix-length + // binary search so width/composition normalization does not replace history. + let start = 0 + if (hit) { + const wanted = normalized(original).indexOf(ticket.query) + let low = 0, high = original.length + while (low < high) { + const middle = Math.floor((low + high) / 2) + if (normalized(original.slice(0, middle)).length < wanted) low = middle + 1 + else high = middle + } + start = alignedStart(original, Math.max(0, low - 256)) + } + const text = original === null ? '' : jsonTextPrefix(original.slice(start), hit ? 8192 : 2048) + return { seq: event.seq, turn: turns.get(event.seq) ?? null, role: event.type === 'user/message' ? 'user' : 'assistant', hit, + text, truncated: original === null || start > 0 || text.length < original.length, omittedBefore: start > 0 } + }) + const list = rt.partsOf(ticket.botId) + result = { scope: 'read-only-history', botId: ticket.botId, sessionId: ticket.sessionId, seq: ticket.seq, + part: list.findIndex(part => part.sessionId === ticket.sessionId) + 1, partCount: list.length, entries } + if (Buffer.byteLength(JSON.stringify(result)) > SEARCH_LIMITS.contextBytes - 64) throw historyUnavailable() + } catch { throw historyUnavailable() } + finally { + try { observation?.[Symbol.dispose]?.() } catch { result = undefined } + } + // Disposal is synchronous but can still reveal a permission change in an + // adapter; recheck after releasing the lease, immediately before delivery. + if (!result || !valid() || result.entries.some(entry => !visibleTurn(ticket.sessionId, entry.turn ?? undefined))) throw historyUnavailable() + return result + } + const bounded = run => async (body, actor, signal) => { + const key = principal(actor) + if (running.has(key) || running.size >= SEARCH_LIMITS.concurrent) throw unavailable() + running.add(key) + try { return await run(body, actor, signal) } finally { running.delete(key) } + } + rt.searchMessages = bounded(search) + rt.readHistoryHit = bounded(context) +} diff --git a/core/src/shared/appearance-prefs.js b/core/src/shared/appearance-prefs.js new file mode 100644 index 000000000..8a32e04d5 --- /dev/null +++ b/core/src/shared/appearance-prefs.js @@ -0,0 +1,36 @@ +// Host-side validation for appearance and send-key prefs. The client module +// (`src/client/appearance.js`) decides how they look; this file only says +// what may be stored. + +const MODES = new Set(['light', 'dark', 'auto', 'system']) +const AUTO = new Set(['sun', 'custom']) +const SEND = new Set(['enter', 'shift-enter']) +const TIME = /^([01]\d|2[0-3]):[0-5]\d$/ +const DEFAULTS = { mode: 'system', auto: 'sun', from: '19:00', to: '07:00' } + +function clock(value, fallback) { + return typeof value === 'string' && TIME.test(value) ? value : fallback +} + +// `null` clears the record (back to the default). An invalid object is refused, +// never stored as "always dark". +export function readAppearance(body, current) { + if (body === null) return undefined + if (typeof body !== 'object' || Array.isArray(body)) return false + const mode = body.mode === undefined ? (current?.mode ?? DEFAULTS.mode) : body.mode + if (!MODES.has(mode)) return false + const auto = body.auto === undefined ? (current?.auto ?? DEFAULTS.auto) : body.auto + if (!AUTO.has(auto)) return false + const from = clock(body.from, current?.from ?? DEFAULTS.from) + const to = clock(body.to, current?.to ?? DEFAULTS.to) + if (body.from !== undefined && (typeof body.from !== 'string' || !TIME.test(body.from))) return false + if (body.to !== undefined && (typeof body.to !== 'string' || !TIME.test(body.to))) return false + if (auto === 'custom' && from === to) return false + return { mode, auto, from, to } +} + +export function readSendKey(value) { + if (value === null || value === 'enter') return undefined + if (SEND.has(value)) return value === 'enter' ? undefined : value + return false +} diff --git a/core/src/shared/group-create.js b/core/src/shared/group-create.js new file mode 100644 index 000000000..88bad7101 --- /dev/null +++ b/core/src/shared/group-create.js @@ -0,0 +1,25 @@ +// Helpers for the New group form. The host already creates a room from an +// admin plus members; this file only matches a search and says when Create +// can run, so the form can align its layout and empty states without a +// second create path. + +import { pickerBotLabel } from './remote-label.js' + +export function groupMemberQuery(query) { + return String(query ?? '').trim().toLowerCase() +} + +export function groupMemberMatches(bot, query) { + const wanted = groupMemberQuery(query) + if (!wanted) return true + if (!bot) return false + const name = String(bot.name ?? '').toLowerCase() + const role = String(bot.role ?? '').toLowerCase() + const label = pickerBotLabel(bot).toLowerCase() + return name.includes(wanted) || role.includes(wanted) || label.includes(wanted) +} + +// A group needs a local admin and at least one more member (local or a friend's Bot). +export function canCreateGroup(admin, members) { + return admin != null && admin !== '' && Array.isArray(members) && members.length > 0 +} diff --git a/core/src/shared/memory-catalog.js b/core/src/shared/memory-catalog.js new file mode 100644 index 000000000..ee65b7a0b --- /dev/null +++ b/core/src/shared/memory-catalog.js @@ -0,0 +1,48 @@ +// Directory and search over a memory panel view. The host already loaded the +// entries; this file only groups them into topics and filters them, so the +// panel can draw a real catalog without inventing pages or a graph. + +export function memoryTopics(entries) { + const map = new Map() + for (const entry of entries ?? []) { + const scope = entry.scope === 'team' ? 'team' : 'own' + const topic = typeof entry.topic === 'string' && entry.topic.trim() !== '' ? entry.topic : null + const key = `${scope}:${topic ?? ''}` + const item = map.get(key) + if (item) item.count += 1 + else map.set(key, { scope, topic, count: 1 }) + } + return [...map.values()].sort((a, b) => { + if (a.scope !== b.scope) return a.scope === 'own' ? -1 : 1 + if ((a.topic === null) !== (b.topic === null)) return a.topic === null ? -1 : 1 + return String(a.topic ?? '').localeCompare(String(b.topic ?? '')) + }) +} + +export function memoryStats(entries) { + const list = entries ?? [] + const topics = new Set() + for (const entry of list) { + if (typeof entry.topic === 'string' && entry.topic.trim() !== '') topics.add(`${entry.scope === 'team' ? 'team' : 'own'}:${entry.topic.trim()}`) + } + return { entries: list.length, topics: topics.size } +} + +// Every whitespace-separated term must appear in the entry text, topic, or author. +export function filterMemoryEntries(entries, query) { + const terms = String(query ?? '').trim().toLowerCase().split(/\s+/).filter(Boolean) + if (terms.length === 0) return [...(entries ?? [])] + return (entries ?? []).filter((entry) => { + const hay = `${entry.text ?? ''} ${entry.topic ?? ''} ${entry.by ?? ''}`.toLowerCase() + return terms.every(term => hay.includes(term)) + }) +} + +export function topicKey(item) { + if (!item) return '' + return `${item.scope === 'team' ? 'team' : 'own'}:${item.topic ?? ''}` +} + +export function sameTopic(a, b) { + return Boolean(a) && Boolean(b) && topicKey(a) === topicKey(b) +} diff --git a/core/src/shared/message-actions.js b/core/src/shared/message-actions.js new file mode 100644 index 000000000..ee03a5da3 --- /dev/null +++ b/core/src/shared/message-actions.js @@ -0,0 +1,48 @@ +// Actions a message toolbar, overflow, or right-click menu may offer. Only ids the +// client can actually run belong here: a reaction stored in local UI state, a quote +// into the open composer, or a copy/download of the message text. There is no host +// API to translate, forward, save to Artifacts, recall, re-edit a turn, pin a +// message, or report one, so those ids are never returned. + +export const MESSAGE_REACTIONS = ['👍', '❤️', '😂', '😮', '😢', '🙏'] + +export function hasMessageText(text) { + return String(text ?? '').trim() !== '' +} + +export function isLockedRoster(roster) { + return typeof roster?.readOnly === 'string' && roster.readOnly.trim() !== '' +} + +// A user bubble only gets a reaction key when the turn identity is stable across reloads. +export function userMessageReactKey(sessionId, node) { + if (sessionId == null || sessionId === '') return undefined + const location = node?.location + const rawTurn = location && (location.kind === 'turn' || location.kind === 'step' || location.turn != null) + ? location.turn + : node?.data?.turn + const turn = typeof rawTurn === 'object' ? rawTurn?.turn : rawTurn + if (!Number.isInteger(turn) || turn < 0) return undefined + return `${sessionId}:${turn}:user` +} + +export function messageActionIds({ + text, + sessionId, + canReact = false, + canReply = false, + locked = false, +} = {}) { + const ids = [] + if (canReact) ids.push('react') + if (canReply && sessionId && !locked && hasMessageText(text)) ids.push('reply') + if (hasMessageText(text)) { + ids.push('copy') + ids.push('download') + } + return ids +} + +export function hasMessageActions(flags) { + return messageActionIds(flags).length > 0 +} diff --git a/core/src/shared/message-fold-prefs.js b/core/src/shared/message-fold-prefs.js new file mode 100644 index 000000000..7b772704f --- /dev/null +++ b/core/src/shared/message-fold-prefs.js @@ -0,0 +1,20 @@ +// Host-side validation for message-folding prefs. The client module +// (`src/client/message-fold.js`) decides how bubbles look; this file only says +// what may be stored. + +const MODES = new Set(['compact', 'standard', 'none']) +export const DEFAULT_FOLDING = { mode: 'standard', documentCards: true } + +// `null` clears the record (back to the default). An invalid object is refused, +// never stored as "always unfolded". +export function readFolding(body, current) { + if (body === null) return undefined + if (typeof body !== 'object' || Array.isArray(body)) return false + const mode = body.mode === undefined ? (current?.mode ?? DEFAULT_FOLDING.mode) : body.mode + if (!MODES.has(mode)) return false + const documentCards = body.documentCards === undefined + ? (current?.documentCards ?? DEFAULT_FOLDING.documentCards) + : body.documentCards + if (typeof documentCards !== 'boolean') return false + return { mode, documentCards } +} diff --git a/core/src/shared/message-fold.js b/core/src/shared/message-fold.js new file mode 100644 index 000000000..c179f99a9 --- /dev/null +++ b/core/src/shared/message-fold.js @@ -0,0 +1,143 @@ +// Pure helpers for long-message folding. The client module draws the bubble +// and the document card; this file is the thresholds, the preview cut, and +// the long-document test, so unit tests can import them without React. + +import { DEFAULT_FOLDING } from './message-fold-prefs.js' + +export { DEFAULT_FOLDING } +export const FOLD_MODES = ['compact', 'standard', 'none'] + +// A message folds when it exceeds either cap for the chosen mode. The preview +// is the shorter of "first N lines" and "first M characters", ending on a line +// or word boundary. Equal-to-the-cap messages stay open — only values *over* +// the threshold fold. +export const FOLD_THRESHOLDS = { + compact: { lines: 4, chars: 240 }, + standard: { lines: 12, chars: 800 }, +} + +const DOCUMENT_MIN_HEADINGS = 2 +const DOCUMENT_MIN_BREAKS = 3 +const MODE_SET = new Set(FOLD_MODES) + +export function foldingOf(prefs) { + const raw = prefs?.folding + if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return { ...DEFAULT_FOLDING } + const mode = MODE_SET.has(raw.mode) ? raw.mode : DEFAULT_FOLDING.mode + const documentCards = typeof raw.documentCards === 'boolean' ? raw.documentCards : DEFAULT_FOLDING.documentCards + return { mode, documentCards } +} + +function clipWord(line, max) { + if (line.length <= max) return line + const slice = line.slice(0, max) + let breakAt = -1 + for (const mark of [' ', '\t', ',', '。', '、', ';', ':', ',', '.', ';', ':', '!', '?', '!', '?']) { + breakAt = Math.max(breakAt, slice.lastIndexOf(mark)) + } + if (breakAt >= Math.min(8, Math.floor(max * 0.4))) return slice.slice(0, breakAt) + return slice +} + +// An odd number of ``` fences means the preview opened a code block it did not +// close. Cut before that opener when there is still prose; otherwise close it +// so the renderer is not left hanging. +function closeFences(preview) { + let fence = null + let offset = 0 + for (const line of preview.split('\n')) { + const match = line.match(/^ {0,3}(`{3,}|~{3,})(.*)$/) + if (match) { + const mark = match[1] + if (!fence) fence = { char: mark[0], length: mark.length, offset } + else if (mark[0] === fence.char && mark.length >= fence.length && match[2].trim() === '') fence = null + } + offset += line.length + 1 + } + if (!fence) return preview + if (preview.slice(0, fence.offset).trim()) return preview.slice(0, fence.offset).trimEnd() + return `${preview}\n${fence.char.repeat(fence.length)}` +} + +// Classify headings/section breaks only outside fenced code. +function proseLines(text) { + let fence = null + return String(text ?? '').split('\n').filter(line => { + const match = line.match(/^ {0,3}(`{3,}|~{3,})(.*)$/) + if (match) { + if (!fence) fence = match[1] + else if (match[1][0] === fence[0] && match[1].length >= fence.length && !match[2].trim()) fence = null + return false + } + return !fence + }) +} + +export function exceedsThreshold(text, cap) { + if (!cap) return false + const raw = String(text ?? '') + if (raw.length > cap.chars) return true + return raw.split('\n').length > cap.lines +} + +export function previewOf(text, mode) { + const cap = FOLD_THRESHOLDS[mode] + const raw = String(text ?? '') + if (!cap) return raw + const lines = raw.split('\n') + const out = [] + let chars = 0 + for (let i = 0; i < lines.length && out.length < cap.lines; i++) { + const line = lines[i] + const extra = (out.length === 0 ? 0 : 1) + line.length + if (out.length === 0 && line.length > cap.chars) { + out.push(clipWord(line, cap.chars)) + break + } + if (out.length > 0 && chars + extra > cap.chars) { + const budget = cap.chars - chars - 1 + if (budget > 0) out.push(clipWord(line, budget)) + break + } + out.push(line) + chars += extra + } + return closeFences(out.join('\n')) +} + +export function shouldFold(text, mode) { + const cap = FOLD_THRESHOLDS[mode] + if (!cap) return false + const raw = String(text ?? '') + if (!exceedsThreshold(raw, cap)) return false + return previewOf(raw, mode) !== raw +} + +export function documentHeadings(text) { + const heads = [] + for (const line of proseLines(text)) { + const match = line.match(/^(#{1,6})\s+(.+?)\s*$/) + if (match) heads.push({ level: match[1].length, title: match[2] }) + } + return heads +} + +export function isLongDocument(text) { + if (!exceedsThreshold(text, FOLD_THRESHOLDS.standard)) return false + if (documentHeadings(text).length >= DOCUMENT_MIN_HEADINGS) return true + const sections = proseLines(text).join('\n').split(/^\s*---\s*$/m).filter(part => part.trim() !== '') + return sections.length >= DOCUMENT_MIN_BREAKS +} + +export function documentTitle(text) { + const first = documentHeadings(text)[0]?.title + if (first) return first + const line = String(text ?? '').split('\n').find(item => item.trim() !== '') ?? '' + const plain = line.replace(/^#{1,6}\s+/, '').trim() + return plain.length > 80 ? `${plain.slice(0, 80).trim()}…` : plain +} + +export function showsDocumentCard(text, folding, { streaming = false } = {}) { + if (streaming || folding?.mode === 'none') return false + return Boolean(folding?.documentCards) && isLongDocument(text) +} diff --git a/core/src/shared/palette-search.js b/core/src/shared/palette-search.js new file mode 100644 index 000000000..61c08b3f3 --- /dev/null +++ b/core/src/shared/palette-search.js @@ -0,0 +1,21 @@ +// Command-palette filters and empty copy. Message hits only come from +// turn outlines already in the session list; the UI must not claim a +// search across chats the host has not loaded. + +export const PALETTE_FILTERS = ['all', 'chats', 'messages', 'commands'] +export const PALETTE_MESSAGE_MIN = 2 + +export function paletteFilterAllows(filter, kind) { + if (filter === 'chats') return kind === 'chats' + if (filter === 'messages') return kind === 'messages' + if (filter === 'commands') return kind === 'commands' + return true +} + +// kind: 'empty' | 'short' | 'none' +export function paletteEmptyKind(query, filter, min = PALETTE_MESSAGE_MIN) { + const wanted = String(query ?? '').trim() + if (wanted === '') return 'empty' + if (filter === 'messages' && wanted.length < min) return 'short' + return 'none' +} diff --git a/core/src/shared/session-list-filter.js b/core/src/shared/session-list-filter.js new file mode 100644 index 000000000..6227a29ec --- /dev/null +++ b/core/src/shared/session-list-filter.js @@ -0,0 +1,36 @@ +// Filters for the sidebar session list. Only kinds the list already has: +// rooms are group chats, Bots and the coding agent are direct chats, and +// unread uses the same marks the rows already draw (completion, a pending +// bot interaction, or a manual unread mark). There is no separate "read" +// filter: it would only be the complement of unread. + +export const SESSION_FILTERS = ['all', 'group', 'direct', 'unread'] + +export function sessionStatusOf(map, id) { + if (id == null || map == null) return undefined + if (typeof map.get === 'function') return map.get(id) + return map[id] +} + +// Session id for a Bot row matches currentPart in the client: sessionId ?? id. +export function sessionIsUnread(entry, statusMap, markedUnread) { + const item = entry?.item + if (!item) return false + if (markedUnread?.[item.id]) return true + if (entry.kind === 'agent') { + return (item.sessions ?? []).some(id => sessionStatusOf(statusMap, id)?.completionUnread === true) + } + if (entry.kind === 'room') { + return sessionStatusOf(statusMap, item.id)?.completionUnread === true + } + const part = item.sessionId ?? item.id + const status = sessionStatusOf(statusMap, part) + return status?.completionUnread === true || status?.pendingInteraction !== undefined +} + +export function matchesSessionFilter(entry, filter, unread = false) { + if (filter === 'group') return entry?.kind === 'room' + if (filter === 'direct') return entry?.kind === 'bot' || entry?.kind === 'agent' + if (filter === 'unread') return unread === true + return true +} diff --git a/core/src/shared/session-pin.js b/core/src/shared/session-pin.js new file mode 100644 index 000000000..dec7bc2f8 --- /dev/null +++ b/core/src/shared/session-pin.js @@ -0,0 +1,23 @@ +// Session pin is a host flag (`setFlags({ pinned })`). Only Bot and room rows the +// sidebar already pins may offer Pin/Unpin. Remote friend Bots, the main-Bot tile, +// agent sessions, and a read-only window have no such write. + +import { isLockedRoster } from './message-actions.js' + +export function sessionPinTarget(roster, sessionId) { + if (sessionId == null || sessionId === '') return null + return roster?.byId?.[sessionId] ?? roster?.roomsById?.[sessionId] ?? null +} + +export function canPinSession(roster, sessionId) { + if (isLockedRoster(roster)) return false + const entry = sessionPinTarget(roster, sessionId) + if (entry == null) return false + if (roster?.byId?.[sessionId]?.remote) return false + if (roster?.mainBotId === sessionId) return false + return true +} + +export function sessionPinned(roster, sessionId) { + return sessionPinTarget(roster, sessionId)?.pinned === true +} diff --git a/core/src/shared/session-unread.js b/core/src/shared/session-unread.js new file mode 100644 index 000000000..3fa66b7dd --- /dev/null +++ b/core/src/shared/session-unread.js @@ -0,0 +1,25 @@ +// Manual unread marks live in UI state (localStorage). Opening a chat +// clears the mark only when the session *becomes* active, so Mark as +// Unread on the open chat stays until the user leaves and comes back. +// completionUnread is a DSH flag that clears when the session is the +// main view; there is no host API to ack it without opening the chat. + +export function shouldClearManualUnread({ active, wasActive, marked }) { + return Boolean(marked) && active === true && wasActive !== true +} + +// The id the sidebar stores in ui.unread: a Bot's roster id, a room id, +// or the coding agent's id — not a Bot's alternate sessionId. +export function unreadEntryId(roster, sessionId) { + if (sessionId == null || sessionId === '') return sessionId + if (roster?.byId?.[sessionId] || roster?.roomsById?.[sessionId]) return sessionId + const bot = (roster?.bots ?? []).find(item => (item.sessionId ?? item.id) === sessionId) + if (bot) return bot.id + const agent = (roster?.agents ?? []).find(item => item.id === sessionId || (item.sessions ?? []).includes(sessionId)) + if (agent) return agent.id + return sessionId +} + +export function isManuallyUnread(unread, id) { + return Boolean(id) && unread?.[id] === true +} diff --git a/core/test/appearance.test.js b/core/test/appearance.test.js new file mode 100644 index 000000000..f848e1747 --- /dev/null +++ b/core/test/appearance.test.js @@ -0,0 +1,113 @@ +// Appearance modes, sunset/custom windows, and the Shift+Enter send-key flip. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { + afterSunset, appearanceOf, applyAppearanceAttribute, handleComposerSendKey, + inNightWindow, isDarkAppearance, latitudeForZone, normalizeSendKey, parseClock, + sendKeyOf, shouldBreakOnKey, shouldSendOnKey, sunMinutes, +} from '../src/client/appearance.js' +import { readAppearance, readSendKey } from '../src/shared/appearance-prefs.js' + +test('fresh prefs match the system; a saved mode is kept', () => { + assert.deepEqual(appearanceOf(undefined), { mode: 'system', auto: 'sun', from: '19:00', to: '07:00' }) + assert.equal(appearanceOf({ appearance: { mode: 'dark' } }).mode, 'dark') + assert.equal(appearanceOf({ appearance: { mode: 'auto', auto: 'custom', from: '18:30', to: '06:45' } }).from, '18:30') + assert.equal(sendKeyOf({}), 'enter') + assert.equal(sendKeyOf({ sendKey: 'shift-enter' }), 'shift-enter') + assert.equal(normalizeSendKey('tab'), 'enter') +}) + +test('light and dark modes ignore the clock and the system', () => { + const noon = new Date('2026-06-21T12:00:00+08:00') + const midnight = new Date('2026-06-21T00:30:00+08:00') + assert.equal(isDarkAppearance({ appearance: { mode: 'light' } }, midnight, true), false) + assert.equal(isDarkAppearance({ appearance: { mode: 'dark' } }, noon, false), true) + assert.equal(isDarkAppearance({ appearance: { mode: 'system' } }, noon, true), true) + assert.equal(isDarkAppearance({ appearance: { mode: 'system' } }, noon, false), false) +}) + +test('automatic sunset-to-sunrise is dark after sunset in Asia/Shanghai', () => { + const zone = 'Asia/Shanghai' + const midsummer = new Date('2026-06-21T12:00:00+08:00') + const sun = sunMinutes(midsummer, { timeZone: zone, latitude: latitudeForZone(zone) }) + assert.ok(sun.sunrise < 6 * 60, `midsummer sunrise should be before 06:00, got ${sun.sunrise}`) + assert.ok(sun.sunset > 18 * 60, `midsummer sunset should be after 18:00, got ${sun.sunset}`) + const midwinter = new Date('2026-12-21T12:00:00+08:00') + const winter = sunMinutes(midwinter, { timeZone: zone, latitude: latitudeForZone(zone) }) + assert.ok(winter.sunrise > sun.sunrise, 'winter sunrise is later than summer') + assert.ok(winter.sunset < sun.sunset, 'winter sunset is earlier than summer') + const afterDark = new Date('2026-12-21T22:00:00+08:00') + const morning = new Date('2026-12-21T08:00:00+08:00') + assert.equal(afterSunset(afterDark, { timeZone: zone, latitude: 31.23 }), true) + assert.equal(afterSunset(morning, { timeZone: zone, latitude: 31.23 }), false) + assert.equal(isDarkAppearance({ appearance: { mode: 'auto', auto: 'sun' } }, afterDark, false, { timeZone: zone, latitude: 31.23 }), true) + assert.equal(isDarkAppearance({ appearance: { mode: 'auto', auto: 'sun' } }, morning, true, { timeZone: zone, latitude: 31.23 }), false) +}) + +test('a custom night window wraps midnight', () => { + const evening = new Date('2026-11-16T20:15:00+08:00') + const afternoon = new Date('2026-11-16T15:00:00+08:00') + const dawn = new Date('2026-11-16T06:00:00+08:00') + assert.equal(inNightWindow(evening, '19:00', '07:00', 'Asia/Shanghai'), true) + assert.equal(inNightWindow(dawn, '19:00', '07:00', 'Asia/Shanghai'), true) + assert.equal(inNightWindow(afternoon, '19:00', '07:00', 'Asia/Shanghai'), false) + assert.equal(isDarkAppearance({ appearance: { mode: 'auto', auto: 'custom', from: '19:00', to: '07:00' } }, afternoon, true, { timeZone: 'Asia/Shanghai' }), false) + assert.equal(parseClock('7:00'), null) + assert.equal(parseClock('19:00'), 19 * 60) +}) + +test('the host refuses a broken appearance or send-key record', () => { + assert.equal(readAppearance(null), undefined) + assert.equal(readAppearance({ mode: 'neon' }), false) + assert.equal(readAppearance({ mode: 'auto', auto: 'custom', from: '19:00', to: '19:00' }), false) + assert.deepEqual(readAppearance({ mode: 'dark' }), { mode: 'dark', auto: 'sun', from: '19:00', to: '07:00' }) + assert.equal(readSendKey('enter'), undefined) + assert.equal(readSendKey('shift-enter'), 'shift-enter') + assert.equal(readSendKey('tab'), false) +}) + +test('Shift+Enter to send intercepts only when that pref is on', () => { + const enter = { key: 'Enter', shiftKey: false, metaKey: false, ctrlKey: false, altKey: false } + const shift = { ...enter, shiftKey: true } + assert.equal(shouldSendOnKey(enter, 'enter'), true) + assert.equal(shouldBreakOnKey(shift, 'enter'), true) + assert.equal(shouldSendOnKey(shift, 'shift-enter'), true) + assert.equal(shouldBreakOnKey(enter, 'shift-enter'), true) + let sent = 0 + let broke = 0 + const event = { ...enter, preventDefault() {}, stopPropagation() {} } + assert.equal(handleComposerSendKey(event, 'enter', { send: () => sent++, insertNewline: () => broke++ }), false) + assert.equal(sent + broke, 0) + assert.equal(handleComposerSendKey(event, 'shift-enter', { send: () => sent++, insertNewline: () => broke++ }), 'break') + assert.equal(broke, 1) + const shiftEvent = { ...shift, preventDefault() {}, stopPropagation() {} } + assert.equal(handleComposerSendKey(shiftEvent, 'shift-enter', { send: () => sent++, insertNewline: () => broke++ }), 'send') + assert.equal(sent, 1) +}) + +test('applyAppearanceAttribute toggles data-ds-dark-theme on a body', () => { + const attrs = new Map() + const body = { + setAttribute(name, value) { attrs.set(name, value) }, + removeAttribute(name) { attrs.delete(name) }, + hasAttribute(name) { return attrs.has(name) }, + } + const doc = { documentElement: {}, body } + assert.equal(applyAppearanceAttribute(true, doc), 'dark') + assert.equal(attrs.has('data-ds-dark-theme'), true) + assert.equal(applyAppearanceAttribute(false, doc), 'light') + assert.equal(attrs.has('data-ds-dark-theme'), false) +}) + + +test('legacy IME keycode 229 never sends or inserts a newline', () => { + for (const shiftKey of [false, true]) { + let invoked = 0 + const result = handleComposerSendKey({ key: 'Enter', keyCode: 229, shiftKey, + preventDefault() { invoked++ }, stopPropagation() { invoked++ } }, 'shift-enter', { + send() { invoked++ }, insertNewline() { invoked++ }, + }) + assert.equal(result, false) + assert.equal(invoked, 0) + } +}) diff --git a/core/test/bench-preflight.test.js b/core/test/bench-preflight.test.js index 2a04fc986..6585fd3e0 100644 --- a/core/test/bench-preflight.test.js +++ b/core/test/bench-preflight.test.js @@ -128,3 +128,13 @@ function runBench({ root, path, harness }, action) { if (result.error) assert.fail(`could not run bench.sh: ${result.error.message}`) return result } + +// Explicit symlink regression, independent of whether node_modules happens to be symlinked. +test('CLI entry still runs when invoked through a symlink', () => { + const { root } = tree() + const entry = join(root, 'preflight.mjs') + symlinkSync(join(here, '../dev/bench-preflight.mjs'), entry) + const result = spawnSync(process.execPath, [entry], { encoding: 'utf8', env: { ...process.env, DSH_HARNESS: '' } }) + assert.equal(result.status, 2) + assert.match(result.stderr, /usage: node dev\/bench-preflight.mjs/) +}) diff --git a/core/test/composer-locked.test.js b/core/test/composer-locked.test.js index 72e9fdf83..c02ef557a 100644 --- a/core/test/composer-locked.test.js +++ b/core/test/composer-locked.test.js @@ -76,7 +76,7 @@ test('read-only window: no menu row opens the schedules page', () => { const rows = menuRows(tree).map(row => all(row).filter(item => typeof item === 'string').join('')) assert.ok(!rows.includes('Scheduled task'), `a read-only window still offers the row: ${JSON.stringify(rows)}`) const scheduleRows = menuRows(tree).filter(row => all(row).includes('Scheduled task')) - for (const row of scheduleRows) row.props.onClick() + for (const row of scheduleRows) row.props.onClick?.() assert.deepEqual(actions.log, []) - assert.deepEqual(scheduleRows.map(row => all(row).filter(item => typeof item === 'string').join('')), []) + assert.ok(scheduleRows.every(row => row.props.disabled === true), 'a visible scheduled-task entry is disabled in a read-only window') }) diff --git a/core/test/context-menu-agent-readonly.test.js b/core/test/context-menu-agent-readonly.test.js index 18c9cfa09..204751751 100644 --- a/core/test/context-menu-agent-readonly.test.js +++ b/core/test/context-menu-agent-readonly.test.js @@ -92,7 +92,7 @@ const AGENT_WRITES = ['Pin', 'Unpin', 'Remove DSH Agent'] const SESSION_WRITES = ['Rename', 'Archive'] const actions = () => ({ - closeMenu: () => {}, markUnread: () => {}, openSettings: () => {}, setFlags: () => {}, renameBot: () => {}, + closeMenu: () => {}, markUnread: () => {}, clearUnread: () => {}, openSettings: () => {}, setFlags: () => {}, renameBot: () => {}, duplicateBot: async () => ({ id: 'copy' }), openSession: () => {}, setMain: () => {}, deleteBot: () => {}, deleteRoom: () => {}, reportError: () => {}, removeAgent: () => {}, beginAgentRename: () => {}, archiveAgentSession: () => {}, @@ -112,22 +112,24 @@ test('a read-only window offers no write in the DSH Agent menus', () => { assert.deepEqual(labels.session.filter(label => SESSION_WRITES.includes(label)), [], 'the session menu still offers a write') }) -test('a read-only window draws no empty menu box', () => { - const menus = menusOf(rosterOf({ readOnly: 'read only' })) - for (const [menu, tree] of Object.entries(menus)) assert.equal(tree, null, `the read-only ${menu} menu drew a box`) +test('a read-only window still offers Mark as Unread, which only touches local UI state', () => { + const labels = labelsOf(menusOf(rosterOf({ readOnly: 'read only' }))) + assert.deepEqual(labels.agent, ['Mark as Unread']) + assert.deepEqual(labels.pinned, ['Mark as Unread']) + assert.deepEqual(labels.session, ['Mark as Unread']) }) -test('a writable window keeps every Agent write exactly as it is', () => { +test('a writable window keeps every Agent write and the unread entry', () => { const labels = labelsOf(menusOf(rosterOf())) - assert.deepEqual(labels.agent, ['Pin', 'Remove DSH Agent']) - assert.deepEqual(labels.pinned, ['Unpin', 'Remove DSH Agent']) - assert.deepEqual(labels.session, ['Rename', 'Archive']) + assert.deepEqual(labels.agent, ['Pin', 'Mark as Unread', 'Remove DSH Agent']) + assert.deepEqual(labels.pinned, ['Unpin', 'Mark as Unread', 'Remove DSH Agent']) + assert.deepEqual(labels.session, ['Mark as Unread', 'Rename', 'Archive']) }) test('a host sentence that trims to nothing is a writable window', () => { for (const readOnly of [undefined, '', ' ']) { const labels = labelsOf(menusOf(rosterOf({ readOnly }))) - assert.deepEqual(labels.agent, ['Pin', 'Remove DSH Agent'], `readOnly ${JSON.stringify(readOnly)} hid the agent writes`) - assert.deepEqual(labels.session, ['Rename', 'Archive'], `readOnly ${JSON.stringify(readOnly)} hid the session writes`) + assert.deepEqual(labels.agent, ['Pin', 'Mark as Unread', 'Remove DSH Agent'], `readOnly ${JSON.stringify(readOnly)} hid the agent writes`) + assert.deepEqual(labels.session, ['Mark as Unread', 'Rename', 'Archive'], `readOnly ${JSON.stringify(readOnly)} hid the session writes`) } }) diff --git a/core/test/context-menu-readonly.test.js b/core/test/context-menu-readonly.test.js index e4f6b4332..aa9094e2f 100644 --- a/core/test/context-menu-readonly.test.js +++ b/core/test/context-menu-readonly.test.js @@ -95,7 +95,7 @@ const WRITES = ['Pin', 'Unpin', 'Duplicate', 'Make Main Bot', 'Remove Main Bot r const KEEPS = ['Mark as Unread', 'Copy conversation ID'] const actions = () => ({ - closeMenu: () => {}, markUnread: () => {}, openSettings: () => {}, setFlags: () => {}, renameBot: () => {}, + closeMenu: () => {}, markUnread: () => {}, clearUnread: () => {}, openSettings: () => {}, setFlags: () => {}, renameBot: () => {}, duplicateBot: async () => ({ id: 'copy' }), openSession: () => {}, setMain: () => {}, deleteBot: () => {}, deleteRoom: () => {}, reportError: () => {}, }) @@ -141,3 +141,27 @@ test('a host sentence that trims to nothing is a writable window', () => { assert.ok(labels.room.includes('Delete group'), `readOnly ${JSON.stringify(readOnly)} hid the room writes`) } }) + +test('a manually unread chat offers Clear unread mark, which clears the local mark', () => { + const calls = [] + const actionsOf = { ...actions(), markUnread: id => calls.push(['unread', id]), clearUnread: id => calls.push(['read', id]) } + const tree = draw(() => ContextMenu({ + menu: { kind: 'bot', id: 'writer', x: 10, y: 10 }, + roster: rosterOf(), actions: actionsOf, unread: { writer: true }, leaving: false, + })) + const items = menuItems(tree) + assert.ok(items.includes('Clear unread mark')) + assert.equal(items.includes('Mark as Unread'), false) + const row = (function find(node) { + if (!node || typeof node !== 'object') return null + if (node.props?.role === 'menuitem' && textOf(node) === 'Clear unread mark') return node + for (const child of node.children ?? []) { + const hit = find(child) + if (hit) return hit + } + return null + })(tree) + assert.ok(row) + row.props.onClick() + assert.deepEqual(calls, [['read', 'writer']]) +}) diff --git a/core/test/flybot-client.test.js b/core/test/flybot-client.test.js index c6d85750a..12173f53c 100644 --- a/core/test/flybot-client.test.js +++ b/core/test/flybot-client.test.js @@ -215,7 +215,7 @@ test('the account menu names each destination as it is named elsewhere (#392, #3 const settings = readFileSync(new URL('../src/client/settings.js', import.meta.url), 'utf8').replace(/\r\n/g, '\n') const menu = source.slice(source.indexOf('const groups = ['), source.indexOf('return h(Fragment, null,', source.indexOf('const groups = ['))) const labels = [...menu.matchAll(/\[t\('([^']+)'\)/g)].map(match => match[1]) - assert.deepEqual(labels, ['Usage', 'Connect apps', 'Plugins', 'Scheduled tasks', 'Settings', 'Switch to classic Agent mode']) + assert.deepEqual(labels, ['Usage', 'Connect apps', 'Channels', 'Plugins', 'Scheduled tasks', 'Settings', 'Switch to classic Agent mode']) // Connectors: the footer button's words, not the second name "Connectors". assert.doesNotMatch(menu, /t\('Connectors'\)/) // Scheduled tasks: the Settings page and a Bot's details use that name, and the row opens that page. diff --git a/core/test/group-create-readonly.test.js b/core/test/group-create-readonly.test.js index b9d4203f1..5cadebc48 100644 --- a/core/test/group-create-readonly.test.js +++ b/core/test/group-create-readonly.test.js @@ -119,7 +119,6 @@ const press = (nodes, predicate) => { node.props.onClick?.() return node } -const chips = nodes => nodes.filter(node => hasClass(node, 'bt-ng-chip')) const groupCreate = nodes => nodes.filter(node => hasClass(node, 'bt-send') && ownText(node).trim() === 'Create group chat') const readOnlyLine = nodes => nodes.filter(node => hasClass(node, 'bt-read-only')) @@ -129,12 +128,10 @@ const settingsGroup = async (roster) => { const { calls, actions } = actionsOf() const form = mount(NewGroupForm, { roster, actions, run, onCreated() {}, onCancel() {} }) let nodes = form.draw() - const adminChip = chips(nodes).find(node => node.props.role === 'radio' && ownText(node).includes('Chief')) - press(nodes, node => node === adminChip) + press(nodes, node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option' && ownText(node).includes('Chief')) await flush() nodes = form.draw() - const memberChip = chips(nodes).find(node => node.props.role === 'checkbox' && ownText(node).includes('Scout')) - press(nodes, node => node === memberChip) + press(nodes, node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option' && ownText(node).includes('Scout')) await flush() nodes = form.draw() const create = groupCreate(nodes)[0] @@ -197,3 +194,58 @@ test('a writable window keeps both group-create controls and still writes', asyn assert.equal(readOnlyLine(pane.nodes).length, 0, 'no read-only line in a writable window') } }) + +const nameInput = nodes => nodes.filter(node => node.type === 'input' && node.props?.['aria-label'] === 'Group name') +const searchInput = nodes => nodes.filter(node => node.type === 'input' && node.props?.['aria-label'] === 'Search members') +const empty = nodes => nodes.filter(node => hasClass(node, 'bt-ng-empty')) + +test('New group form shows the name, search, empty selected pane, and a disabled Create', () => { + const { actions } = actionsOf() + const form = mount(NewGroupForm, { roster: rosterWith(), actions, run, onCreated() {}, onCancel() {} }) + const nodes = form.draw() + assert.equal(nameInput(nodes).length, 1, 'the optional name is visible before anyone is picked') + assert.equal(searchInput(nodes).length, 1, 'members can be searched') + assert.ok(empty(nodes).some(node => ownText(node).includes('No members selected')), 'the selected pane has an empty state') + const create = groupCreate(nodes)[0] + assert.ok(create, 'Create group chat is drawn') + assert.equal(create.props.disabled, true, 'Create stays disabled until members are selected') + assert.equal(ownText(nodes.find(node => hasClass(node, 'bt-ng-intro'))), 'Add a name, then pick Bots to chat with.') +}) + +test('searching hides unmatched Bots, and Create enables after an admin and a member', async () => { + const { actions } = actionsOf() + const form = mount(NewGroupForm, { roster: rosterWith(), actions, run, onCreated() {}, onCancel() {} }) + let nodes = form.draw() + const search = searchInput(nodes)[0] + search.props.onChange({ target: { value: 'Scout' } }) + await flush() + nodes = form.draw() + const options = nodes.filter(node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option') + assert.deepEqual(options.map(ownText), ['Scout']) + search.props.onChange({ target: { value: 'nobody-here' } }) + await flush() + nodes = form.draw() + assert.ok(empty(nodes).some(node => ownText(node).includes('No Bots match'))) + search.props.onChange({ target: { value: '' } }) + await flush() + nodes = form.draw() + press(nodes, node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option' && ownText(node).includes('Chief')) + await flush() + nodes = form.draw() + assert.equal(groupCreate(nodes)[0].props.disabled, true, 'one pick is only the admin') + press(nodes, node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option' && ownText(node).includes('Scout')) + await flush() + nodes = form.draw() + assert.equal(groupCreate(nodes)[0].props.disabled, false) + assert.ok(nodes.some(node => ownText(node).includes('Selected 2'))) +}) + +test('New… group mode draws a disabled Create and an optional name before anyone is picked', () => { + const { actions } = actionsOf() + const pane = mount(NewChat, { mode: 'group', roster: rosterWith(), actions }) + const nodes = pane.draw() + const create = groupCreate(nodes)[0] + assert.ok(create, 'Create group chat is drawn from the start') + assert.equal(create.props.disabled, true) + assert.equal(nameInput(nodes).length, 1) +}) diff --git a/core/test/group-create.test.js b/core/test/group-create.test.js new file mode 100644 index 000000000..c81397324 --- /dev/null +++ b/core/test/group-create.test.js @@ -0,0 +1,28 @@ +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { canCreateGroup, groupMemberMatches, groupMemberQuery } from '../src/shared/group-create.js' + +const chief = { id: 'chief', name: 'Chief', role: 'Coordinator' } +const scout = { id: 'scout', name: 'Scout', role: 'Researcher' } +const remote = { id: 'pat', name: 'Pat', remote: { handle: '@pat.home', ownerName: 'Pat' } } + +test('create stays off until an admin and at least one member are picked', () => { + assert.equal(canCreateGroup(null, []), false) + assert.equal(canCreateGroup('chief', []), false) + assert.equal(canCreateGroup(null, ['scout']), false) + assert.equal(canCreateGroup('', ['scout']), false) + assert.equal(canCreateGroup('chief', ['scout']), true) + assert.equal(canCreateGroup('chief', ['scout', 'pat']), true) +}) + +test('member search matches name, role, or the picker label, and ignores case', () => { + assert.equal(groupMemberQuery(' Scout '), 'scout') + assert.equal(groupMemberMatches(chief, ''), true) + assert.equal(groupMemberMatches(chief, ' '), true) + assert.equal(groupMemberMatches(chief, 'chief'), true) + assert.equal(groupMemberMatches(scout, 'COORD'), false) + assert.equal(groupMemberMatches(scout, 'research'), true) + assert.equal(groupMemberMatches(remote, 'pat'), true) + assert.equal(groupMemberMatches(chief, 'scout'), false) + assert.equal(groupMemberMatches(undefined, 'chief'), false) +}) diff --git a/core/test/held-line.test.js b/core/test/held-line.test.js index d92eec09b..6cd13b831 100644 --- a/core/test/held-line.test.js +++ b/core/test/held-line.test.js @@ -54,7 +54,7 @@ const roomWith = (pendingApprovals, origin = 'face-to-face') => ({ id: 'g1', ori const draw = (room, replies) => { const roster = { bots: [chief], byId: { chief }, roomsById: { g1: room } } const content = [{ type: 'text', text: JSON.stringify({ replies }) }] - return expand(GroupReplies({ sessionId: 'g1', callId: 'c1', done: true, content, roster, actions: {}, useUi: () => null }), ['GroupMessage', 'Bubbles']) + return expand(GroupReplies({ sessionId: 'g1', callId: 'c1', done: true, content, roster, actions: {}, useUi: () => null }), ['GroupMessage', 'Bubbles', 'FoldedContent']) } const said = (text, seq) => ({ botId: 'chief', name: 'Chief', text, ...(seq !== undefined ? { seq } : {}) }) const shownText = drawn => find(drawn, node => node.type?.name === 'MarkdownText').map(node => node.props.text) @@ -137,7 +137,7 @@ test('the held line waits only for the Bot that sent it: another Bot saying the { botId: 'writer', name: 'Writer', text: 'Draft: ship it on Friday' }, { botId: 'chief', name: 'Chief', text: 'Draft: ship it on Friday' }, ] }) }] - const drawn = expand(GroupReplies({ sessionId: 'g1', callId: 'c1', done: true, content, roster, actions: {}, useUi: () => null }), ['GroupMessage', 'Bubbles']) + const drawn = expand(GroupReplies({ sessionId: 'g1', callId: 'c1', done: true, content, roster, actions: {}, useUi: () => null }), ['GroupMessage', 'Bubbles', 'FoldedContent']) assert.equal(find(drawn, node => node.props?.className === 'bt-group-msg').length, 1, 'only Chief\'s line is left out') assert.deepEqual(shownText(drawn), ['Draft: ship it on Friday'], 'Writer\'s identical line is drawn') assert.equal(isHeldLine(room, 'Draft: ship it on Friday', writer), false) diff --git a/core/test/history-hit-state.test.js b/core/test/history-hit-state.test.js new file mode 100644 index 000000000..a54e91f2d --- /dev/null +++ b/core/test/history-hit-state.test.js @@ -0,0 +1,34 @@ +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { historyHookHarness } from './history-hook-harness.js' +const mount=await historyHookHarness('../src/client/history-hit.js','useHistoryHit') +const settle=async()=>{for(let i=0;i<6;i++)await Promise.resolve()} +const view=id=>({scope:'read-only-history',sessionId:id,entries:[{text:'authorized '+id}]}) +test('context uses only the opaque ticket and AbortSignal; switching hit discards stale content immediately',async()=>{ + const env=mount(),pending=[],calls=[] + const read=(body,signal)=>{calls.push({body,signal});return new Promise(resolve=>pending.push(resolve))} + env.draw(read,'old-ticket','alice');await settle();pending[0](view('old'));await settle() + assert.equal(env.draw(read,'old-ticket','alice').value.sessionId,'old') + const changed=env.draw(read,'new-ticket','alice');assert.equal(changed.value,null);assert.equal(changed.status,'loading') + assert.equal(calls[0].signal.aborted,true);await settle() + assert.equal(JSON.stringify(calls[1].body),JSON.stringify({hitToken:'new-ticket'})) + pending[1](view('new'));await settle();assert.equal(env.draw(read,'new-ticket','alice').value.sessionId,'new') +}) +test('account/ownership/part changes clear context before revalidation, and a revoked response exposes no old text',async()=>{ + const env=mount();let count=0 + const read=async()=>{if(count++)throw Error('/secret/config');return view('old')} + env.draw(read,'ticket','alice:old-parts');await settle();assert.ok(env.draw(read,'ticket','alice:old-parts').value) + assert.equal(env.draw(read,'ticket','bob:new-parts').value,null);await settle() + const state=env.draw(read,'ticket','bob:new-parts');assert.equal(state.status,'error');assert.equal(state.value,null);assert.equal(JSON.stringify(state).includes('config'),false) +}) +test('late response after unmount is ignored; deletion disables reads and retry reauthenticates',async()=>{ + const env=mount();let finish,seen + const read=(_body,signal)=>{seen=signal;return new Promise(resolve=>{finish=resolve})} + env.draw(read,'ticket','alive');await settle();env.unmount();assert.equal(seen.aborted,true) + finish(view('late'));await settle();assert.equal(env.draw(read,'ticket','alive').value,null) + const deleted=mount();let reads=0 + const quick=async()=>{reads++;return view('restored')} + deleted.draw(quick,null,'deleted');await settle();assert.equal(reads,0);assert.equal(deleted.draw(quick,null,'deleted').status,'error') + deleted.draw(quick,'ticket','restored');await settle();const ready=deleted.draw(quick,'ticket','restored');assert.equal(ready.value.sessionId,'restored') + ready.reload();deleted.draw(quick,'ticket','restored');await settle();assert.equal(reads,2) +}) diff --git a/core/test/history-hit-view.test.js b/core/test/history-hit-view.test.js new file mode 100644 index 000000000..3c635cad6 --- /dev/null +++ b/core/test/history-hit-view.test.js @@ -0,0 +1,42 @@ +// Actual viewer component; effects are covered by history-hit-state separately. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { build } from 'esbuild' +import { runInNewContext } from 'node:vm' +import { fileURLToPath } from 'node:url' +const bundle=await build({entryPoints:[fileURLToPath(new URL('../src/client/history-hit.js',import.meta.url))],bundle:true,platform:'browser',format:'cjs',write:false,external:['react']}) +const h=(type,props,...children)=>({type,props:{...props,children:children.flat(Infinity)}}) +const text=node=>typeof node==='string'||typeof node==='number'?String(node):Array.isArray(node)?node.map(text).join(''):node?text(node.props?.children):'' +const nodes=(node,out=[])=>{if(Array.isArray(node)){for(const child of node)nodes(child,out)}else if(node&&typeof node==='object'){out.push(node);nodes(node.props?.children,out)}return out} +function draw(status='ready',{deleted=false}={}){ + const bot={id:'bot',ownerId:'alice',sessionId:'live',parts:['old','live']} + const roster={byId:deleted?{}:{bot},self:{memberId:'alice'}} + const access=JSON.stringify([true,'alice','live',['old','live'],'alice']) + const value={scope:'read-only-history',sessionId:'old',part:1,partCount:2,entries:[{seq:1,turn:0,role:'user',hit:true,text:'原始 ABC 历史',truncated:true,omittedBefore:true},{seq:2,turn:0,role:'assistant',hit:false,text:'相邻文本'}]} + const react={createElement:h,useRef:initial=>({current:initial}),useEffect(){},useState:initial=>[initial&&typeof initial==='object'&&'key'in initial?{key:`token:${access}:0`,status,value}:initial,()=>{}]} + const module={exports:{}} + runInNewContext(bundle.outputFiles[0].text,{module,exports:module.exports,require:()=>react}) + let back=0 + const result=module.exports.HistoryHitDialog({hit:{botId:'bot',sessionId:'old',hitToken:'token',snippet:'NEVER USE SEARCH SNIPPET'},roster,actions:{openSession(){throw Error('must not navigate')},readHistoryHit:async()=>value},onBack:()=>back++}) + return {all:nodes(result),back:()=>back} +} +test('read-only viewer identifies its real segment and displays original escaped text, hit marker and truncation notice',()=>{ + const {all,back}=draw() + assert.ok(all.some(node=>node.props?.role==='dialog'&&node.props['aria-label']==='Read-only history match')) + assert.ok(all.some(node=>text(node)==='Segment 1 of 2')) + assert.ok(all.some(node=>node.type==='code'&&text(node)==='old')) + assert.ok(all.some(node=>node.type==='pre'&&text(node)==='原始 ABC 历史'&&node.props.dangerouslySetInnerHTML===undefined)) + assert.ok(all.some(node=>node.props?.['data-hit']===true)) + assert.ok(all.some(node=>text(node)==='Text truncated by the byte limit; this is not complete history.')) + assert.equal(all.some(node=>node.type==='input'||node.type==='textarea'),false) + const buttons=all.filter(node=>node.type==='button') + assert.ok(buttons.every(node=>['Back to search','Reload history context'].includes(text(node))||node.props['aria-label']==='Back to search')) + buttons.find(node=>text(node)==='Back to search').props.onClick();assert.equal(back(),1) +}) +test('loading/error/deleted-roster states never render cached context or the search snippet',()=>{ + for(const [status,deleted] of [['loading',false],['error',false],['ready',true]]){ + const {all}=draw(status,{deleted}) + assert.equal(all.some(node=>node.type==='pre'),false) + assert.equal(all.some(node=>text(node).includes('NEVER USE SEARCH SNIPPET')),false) + } +}) diff --git a/core/test/history-hook-harness.js b/core/test/history-hook-harness.js new file mode 100644 index 000000000..02c8c3bb1 --- /dev/null +++ b/core/test/history-hook-harness.js @@ -0,0 +1,22 @@ +// Shared deterministic effect/timer harness for the two history query hooks. +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' +import { fileURLToPath } from 'node:url' +export async function historyHookHarness(entry, exported) { + const bundled = await build({entryPoints:[fileURLToPath(new URL(entry,import.meta.url))],bundle:true,format:'cjs',platform:'browser',write:false,external:['react']}) + return function mount() { + const slots=[], effects=[], timers=new Map(); let index=0, sequence=0 + const react={ + useState(initial){const at=index++;if(!(at in slots))slots[at]=initial;return [slots[at],next=>{slots[at]=typeof next==='function'?next(slots[at]):next}]}, + useRef(initial){const at=index++;if(!(at in slots))slots[at]={current:initial};return slots[at]}, + useEffect(run,deps){const at=index++;const old=slots[at];if(!old||deps.some((value,i)=>value!==old.deps[i])){effects.push(()=>{old?.off?.();slots[at]={deps,off:run()}})}}, + } + const module={exports:{}} + runInNewContext(bundled.outputFiles[0].text,{module,exports:module.exports,require:()=>react,AbortController,setTimeout:fn=>{const id=++sequence;timers.set(id,fn);return id},clearTimeout:id=>timers.delete(id)}) + return { + draw(...args){index=0;const result=module.exports[exported](...args);while(effects.length)effects.shift()();return result}, + tick(){for(const [id,run] of timers){timers.delete(id);run()}}, + unmount(){for(const value of slots)value?.off?.()}, + } + } +} diff --git a/core/test/history-search-state.test.js b/core/test/history-search-state.test.js new file mode 100644 index 000000000..475136098 --- /dev/null +++ b/core/test/history-search-state.test.js @@ -0,0 +1,39 @@ +// Effect-capable VM hooks, following palette-ui/message-tools harness conventions. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { historyHookHarness } from './history-hook-harness.js' +const mount=await historyHookHarness('../src/client/history-search.js','useHistorySearch') +const reply=(items=[],cursor=null,extra={})=>({scope:'local-bot-chats',items,cursor,...extra}) +const settle=async()=>{await Promise.resolve();await Promise.resolve();await Promise.resolve()} +test('debounces Chinese query; history is async and continuation uses opaque cursor',async()=>{ + const env=mount(),calls=[] + const search=async body=>{calls.push(body);return body.cursor?reply([{seq:2}]):reply([{seq:1}],'opaque')} + env.draw(search,'中');env.draw(search,'中文');env.tick();await settle() + let state=env.draw(search,'中文');assert.equal(calls.length,1);assert.equal(calls[0].query,'中文');assert.equal(state.status,'ready');assert.equal(state.items.length,1) + state.more();await settle();state=env.draw(search,'中文') + assert.equal(calls[1].cursor,'opaque');assert.equal(state.items.length,2) +}) +test('stale responses cannot replace the new query, and unmount ignores delayed results',async()=>{ + const env=mount(),pending=[] + const search=()=>new Promise(resolve=>pending.push(resolve)) + env.draw(search,'old');env.tick();env.draw(search,'new');env.tick() + pending[1](reply([{seq:2}]));await settle();pending[0](reply([{seq:1}]));await settle() + assert.equal(env.draw(search,'new').items[0].seq,2) + env.draw(search,'third');env.tick();env.unmount();pending[2](reply([{seq:3}]));await settle() + assert.equal(env.draw(search,'third').items.length,0) +}) +test('empty/long/unsupported/filter-disabled queries never call the host; backend failure degrades explicitly',async()=>{ + const env=mount();let count=0 + const search=async()=>{count++;throw Error('backend path/config must not appear')} + for(const query of ['', 'x'.repeat(257)]){env.draw(search,query);env.tick();await settle()} + env.draw(undefined,'query');env.tick();assert.equal(count,0) + env.draw(search,'needle');env.tick();await settle();const result=env.draw(search,'needle') + assert.equal(result.status,'error');assert.equal(result.items.length,0);assert.equal(JSON.stringify(result).includes('config'),false) +}) +test('display cap stops pagination and marks incomplete/limited results honestly',async()=>{ + const env=mount();let batch=0 + const search=async()=>reply(Array.from({length:20},(_,seq)=>({seq:++batch*20+seq})),'more',{incomplete:true}) + env.draw(search,'query');env.tick();await settle() + for(let n=0;n<4;n++){env.draw(search,'query').more();await settle()} + const result=env.draw(search,'query');assert.equal(result.items.length,100);assert.equal(result.cursor,null);assert.equal(result.limited,true);assert.equal(result.incomplete,true) +}) diff --git a/core/test/install.test.js b/core/test/install.test.js index 53acddead..20df64966 100644 --- a/core/test/install.test.js +++ b/core/test/install.test.js @@ -180,6 +180,21 @@ test('the client channel answers from the saved state', async (t) => { for (const notify of [{ loud: false }, { failed: 'no' }, ['approval'], null]) { assert.deepEqual((await call('set-prefs', { notify })).error, { code: 'bot/invalid', message: 'Notifications must be on or off', details: {} }) } + assert.equal((await call('set-prefs', { appearance: { mode: 'dark' } })).value.appearance.mode, 'dark') + assert.equal((await call('set-prefs', { appearance: { mode: 'auto', auto: 'custom', from: '21:00', to: '06:30' } })).value.appearance.from, '21:00') + assert.deepEqual((await call('set-prefs', { appearance: { mode: 'neon' } })).error, { code: 'bot/invalid', message: 'Appearance must be light, dark, auto or system', details: {} }) + assert.equal((await call('set-prefs', { sendKey: 'shift-enter' })).value.sendKey, 'shift-enter') + const prefsBefore = structuredClone((await call('state')).value?.prefs ?? {}) + assert.ok((await call('set-prefs', { appearance: { mode: 'light' }, sendKey: 'invalid', folding: { mode: 'none' } })).error) + assert.deepEqual((await call('state')).value?.prefs ?? {}, prefsBefore, 'mixed invalid prefs request changes nothing') + + assert.equal('sendKey' in (await call('set-prefs', { sendKey: 'enter' })).value, false) + assert.deepEqual((await call('set-prefs', { sendKey: 'tab' })).error, { code: 'bot/invalid', message: 'Send shortcut must be Enter or Shift+Enter', details: {} }) + assert.deepEqual((await call('set-prefs', { folding: { mode: 'compact', documentCards: false } })).value.folding, { mode: 'compact', documentCards: false }) + assert.equal((await call('set-prefs', { folding: { mode: 'standard' } })).value.folding.mode, 'standard') + assert.equal((await call('set-prefs', { folding: null })).value.folding, undefined) + assert.deepEqual((await call('set-prefs', { folding: { mode: 'loose' } })).error, { code: 'bot/invalid', message: 'Message folding must be compact, standard or none', details: {} }) + assert.deepEqual((await call('set-prefs', { folding: { mode: 'standard', documentCards: 'yes' } })).error, { code: 'bot/invalid', message: 'Document cards must be on or off', details: {} }) // A refusal from the team code keeps its message for the user. assert.deepEqual((await call('delete-bot', { id: 'nobody' })).error, { code: 'bot/refused', message: 'Unknown Bot', details: {} }) // Off the Desktop profile there are no Bot browsers. diff --git a/core/test/memory-catalog.test.js b/core/test/memory-catalog.test.js new file mode 100644 index 000000000..a2b460dcb --- /dev/null +++ b/core/test/memory-catalog.test.js @@ -0,0 +1,47 @@ +// Directory grouping and search over already-loaded memory entries. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { filterMemoryEntries, memoryStats, memoryTopics, sameTopic, topicKey } from '../src/shared/memory-catalog.js' + +const entries = [ + { text: 'Prefers the window seat on flights', scope: 'own', topic: 'travel', by: null }, + { text: 'Allergic to peanuts', scope: 'own', topic: null, by: null }, + { text: 'Standup is at 10:00', scope: 'team', topic: 'rituals', by: 'Chief' }, + { text: 'The travel budget is tight this quarter', scope: 'team', topic: 'travel', by: 'Writer' }, +] + +test('topics are grouped by scope, untagged first, then by name', () => { + assert.deepEqual(memoryTopics(entries), [ + { scope: 'own', topic: null, count: 1 }, + { scope: 'own', topic: 'travel', count: 1 }, + { scope: 'team', topic: 'rituals', count: 1 }, + { scope: 'team', topic: 'travel', count: 1 }, + ]) + assert.deepEqual(memoryTopics([]), []) + assert.deepEqual(memoryTopics(undefined), []) +}) + +test('stats count entries and named topics, not the untagged main file', () => { + assert.deepEqual(memoryStats(entries), { entries: 4, topics: 3 }) + assert.deepEqual(memoryStats([]), { entries: 0, topics: 0 }) + // own travel and team travel are two topics + assert.equal(memoryStats([{ topic: 'travel', scope: 'own' }, { topic: 'travel', scope: 'team' }]).topics, 2) +}) + +test('search keeps entries that contain every term in the text, topic, or author', () => { + assert.equal(filterMemoryEntries(entries, '').length, 4) + assert.deepEqual(filterMemoryEntries(entries, ' ').map(item => item.text), entries.map(item => item.text)) + assert.deepEqual(filterMemoryEntries(entries, 'window seat').map(item => item.text), ['Prefers the window seat on flights']) + assert.deepEqual(filterMemoryEntries(entries, 'TRAVEL').map(item => item.text), [ + 'Prefers the window seat on flights', + 'The travel budget is tight this quarter', + ]) + assert.deepEqual(filterMemoryEntries(entries, 'chief').map(item => item.text), ['Standup is at 10:00']) + assert.deepEqual(filterMemoryEntries(entries, 'window budget'), []) +}) + +test('a topic key treats missing and empty names as the untagged main file', () => { + assert.equal(topicKey({ scope: 'own' }), 'own:') + assert.equal(sameTopic({ scope: 'team', topic: 'travel' }, { scope: 'team', topic: 'travel' }), true) + assert.equal(sameTopic({ scope: 'own', topic: 'travel' }, { scope: 'team', topic: 'travel' }), false) +}) diff --git a/core/test/memory-panel-readonly.test.js b/core/test/memory-panel-readonly.test.js index be03b7f06..2d188a9ef 100644 --- a/core/test/memory-panel-readonly.test.js +++ b/core/test/memory-panel-readonly.test.js @@ -172,3 +172,26 @@ test('P-475: the dialog is handed the roster, or the panel cannot know the windo const overlays = readFileSync(new URL('../src/client/overlays.js', import.meta.url), 'utf8') assert.match(overlays, /h\(MemoryDialog, \{ key: memory, bot: roster\.byId\[memory\], roster, actions, leaving: memoryLeaving \}\)/) }) + +test('the memory panel draws a directory and filters entries by search', async () => { + reset() + const props = { bot: { id: 'bot1', name: 'Scout' }, actions: actions(), roster: {} } + let tree = render(props) + await flush() + tree = render(props) + assert.match(textOf(tree), /Overview/) + assert.match(textOf(tree), /All entries/) + assert.ok(all(tree).some(node => node.props?.['aria-label'] === 'Memory directory'), 'the directory is named') + const search = all(tree).find(node => node.type === 'input' && node.props?.['aria-label'] === 'Search memory') + assert.ok(search, 'a search field is in the directory') + search.props.onChange({ target: { value: 'second' } }) + tree = render(props) + assert.match(textOf(tree), /A second fact/) + assert.doesNotMatch(textOf(tree), /A saved fact/) + const hide = all(tree).find(node => node.props?.['aria-label'] === 'Hide directory') + assert.ok(hide, 'the directory can be hidden') + hide.props.onClick() + tree = render(props) + assert.equal(all(tree).filter(node => node.props?.['aria-label'] === 'Memory directory').length, 0) + assert.ok(all(tree).some(node => node.props?.['aria-label'] === 'Show directory')) +}) diff --git a/core/test/mention-look.test.js b/core/test/mention-look.test.js index b5ea361da..c18829454 100644 --- a/core/test/mention-look.test.js +++ b/core/test/mention-look.test.js @@ -88,7 +88,7 @@ function chipBot(roster, text) { useRoster: select => select(roster), actions: { openSession() {} }, }) - const marks = find(expand(cell, ['UserText']), node => node.type?.name === 'BotMark') + const marks = find(expand(cell, ['UserText', 'FoldedContent', 'MessageTools']), node => node.type?.name === 'BotMark') assert.equal(marks.length, 1) return marks[0].props.bot } @@ -121,7 +121,7 @@ test('a face-room @ row and mention chip draw the stored friend look, not the ha sessionId: 'room', useRoster: select => select(roster), actions: { openSession() {} }, - }), ['UserText']) + }), ['UserText', 'FoldedContent', 'MessageTools']) const button = find(cell, node => node.props?.className === 'bt-umention')[0] assert.match(JSON.stringify(button.children), /Chief \(SelfA1025\)/) }) diff --git a/core/test/message-actions.test.js b/core/test/message-actions.test.js new file mode 100644 index 000000000..a20f2ce4a --- /dev/null +++ b/core/test/message-actions.test.js @@ -0,0 +1,50 @@ +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { MESSAGE_REACTIONS, hasMessageText, isLockedRoster, userMessageReactKey, messageActionIds, hasMessageActions } from '../src/shared/message-actions.js' +import { canPinSession, sessionPinned, sessionPinTarget } from '../src/shared/session-pin.js' + +test('message actions only include reaction, reply, copy, and download when those can run', () => { + assert.deepEqual(MESSAGE_REACTIONS, ['👍', '❤️', '😂', '😮', '😢', '🙏']) + assert.deepEqual( + messageActionIds({ text: 'Hello', sessionId: 'chief', canReact: true, canReply: true }), + ['react', 'reply', 'copy', 'download'], + ) + assert.ok(!messageActionIds({ text: 'Hello', sessionId: 'chief', canReact: true, canReply: true }).includes('artifacts')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('translate')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('forward')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('report')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('edit')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('pin')) +}) + +test('copy and download need readable text; reply needs a session and a writable window', () => { + assert.equal(hasMessageText(' \n'), false) + assert.deepEqual(messageActionIds({ text: ' ', canReact: true }), ['react']) + assert.deepEqual(messageActionIds({ text: 'Hi', canReply: true }), ['copy', 'download']) + assert.deepEqual(messageActionIds({ text: 'Hi', sessionId: 'chief', canReply: true, locked: true }), ['copy', 'download']) + assert.equal(hasMessageActions({ text: '', canReact: false, canReply: true, sessionId: 'chief' }), false) + assert.equal(hasMessageActions({ text: '', canReact: false, canReply: true }), false) +}) + +test('a user bubble gets a reaction key only from a stable turn identity', () => { + assert.equal(userMessageReactKey('chief', { location: { kind: 'turn', turn: 4 } }), 'chief:4:user') + assert.equal(userMessageReactKey('chief', { data: { turn: 9 } }), 'chief:9:user') + assert.equal(userMessageReactKey('chief', { key: 'unstable', data: { content: [] } }), undefined) + assert.equal(userMessageReactKey('', { data: { turn: 1 } }), undefined) +}) + +test('session pin follows the host flag and skips remote Bots, the main tile, and a locked window', () => { + const chief = { id: 'chief', name: 'Chief', pinned: true } + const writer = { id: 'writer', name: 'Writer', remote: { handle: '@x' } } + const room = { id: 'room', name: 'Review', pinned: false } + const roster = { byId: { chief, writer }, roomsById: { room }, mainBotId: 'chief' } + assert.equal(sessionPinTarget(roster, 'room'), room) + assert.equal(canPinSession(roster, 'chief'), false) + assert.equal(canPinSession(roster, 'writer'), false) + assert.equal(canPinSession(roster, 'room'), true) + assert.equal(sessionPinned(roster, 'chief'), true) + assert.equal(sessionPinned(roster, 'room'), false) + assert.equal(canPinSession({ ...roster, readOnly: 'This window is read-only' }, 'room'), false) + assert.equal(isLockedRoster({ readOnly: ' ' }), false) + assert.equal(canPinSession(roster, 'missing'), false) +}) diff --git a/core/test/message-fold.test.js b/core/test/message-fold.test.js new file mode 100644 index 000000000..9cfa7cd70 --- /dev/null +++ b/core/test/message-fold.test.js @@ -0,0 +1,110 @@ +// Message folding thresholds, previews, document-card detection, and prefs. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { + FOLD_THRESHOLDS, documentHeadings, documentTitle, exceedsThreshold, + foldingOf, isLongDocument, previewOf, shouldFold, showsDocumentCard, +} from '../src/shared/message-fold.js' +import { readFolding } from '../src/shared/message-fold-prefs.js' + +const line = 'A short line of ordinary prose.' +const compactOverChars = 'word '.repeat(60).trim() // 299 chars +const standardOverChars = 'word '.repeat(170).trim() // 849 chars +const manyLines = (n, width = 'This is a line of a longer reply.') => Array.from({ length: n }, () => width).join('\n') +const article = [ + '# Weekly note', + '', + 'An introduction long enough that this document clears the standard threshold, with several short paragraphs so the character count is honest.', + '', + '## Progress', + '', + 'The team shipped the chat shell, the appearance modes, and the send-key preference. The next pass is message folding in the bubble itself, not a setting that does nothing.', + '', + '## Risks', + '', + 'A fake entry would look like a completed feature. The bubble has to fold first, then the setting has to write through set-prefs and change what the bubble shows.', + '', + '## Next', + '', + 'After the setting is stored on the host, opening the same conversation again still folds at the same caps, and a long document still opens as a card beside the thread.', +].join('\n') + +test('fresh prefs are standard with document cards on', () => { + assert.deepEqual(foldingOf(undefined), { mode: 'standard', documentCards: true }) + assert.deepEqual(foldingOf({}), { mode: 'standard', documentCards: true }) + assert.equal(foldingOf({ folding: { mode: 'compact', documentCards: false } }).mode, 'compact') + assert.equal(foldingOf({ folding: { mode: 'compact', documentCards: false } }).documentCards, false) + assert.equal(foldingOf({ folding: { mode: 'wild' } }).mode, 'standard') +}) + +test('a message at the cap stays open; one character or line over folds', () => { + const { compact, standard } = FOLD_THRESHOLDS + assert.equal(compact.lines, 4) + assert.equal(compact.chars, 240) + assert.equal(standard.lines, 12) + assert.equal(standard.chars, 800) + assert.equal(shouldFold('x'.repeat(compact.chars), 'compact'), false) + assert.equal(shouldFold('x'.repeat(compact.chars + 1), 'compact'), true) + assert.equal(shouldFold(manyLines(compact.lines), 'compact'), false) + assert.equal(shouldFold(manyLines(compact.lines + 1), 'compact'), true) + assert.equal(shouldFold('x'.repeat(standard.chars), 'standard'), false) + assert.equal(shouldFold('x'.repeat(standard.chars + 1), 'standard'), true) + assert.equal(shouldFold(manyLines(standard.lines), 'standard'), false) + assert.equal(shouldFold(manyLines(standard.lines + 1), 'standard'), true) + assert.equal(shouldFold(standardOverChars, 'none'), false) + assert.equal(shouldFold(article, 'none'), false) +}) + +test('the preview is capped by lines or characters and does not equal the full text', () => { + const preview = previewOf(manyLines(8), 'compact') + assert.equal(preview.split('\n').length, 4) + assert.notEqual(preview, manyLines(8)) + const clipped = previewOf(compactOverChars, 'compact') + assert.ok(clipped.length <= 240, `compact char preview is ${clipped.length}`) + assert.notEqual(clipped, compactOverChars) + const mid = previewOf(standardOverChars, 'standard') + assert.ok(mid.length <= 800, `standard char preview is ${mid.length}`) + const short = previewOf(line, 'standard') + assert.equal(short, line) + assert.equal(exceedsThreshold(line, FOLD_THRESHOLDS.standard), false) +}) + +test('a preview does not leave a markdown fence open', () => { + const body = 'Intro\n\n```js\n' + 'const n = 1;\n'.repeat(40) + '```\n' + assert.equal(shouldFold(body, 'compact'), true) + const preview = previewOf(body, 'compact') + const ticks = preview.match(/```/g) ?? [] + assert.equal(ticks.length % 2, 0, 'fences come in pairs') +}) + +test('a long document is a multi-heading message that already exceeds standard', () => { + assert.equal(isLongDocument(article), true) + assert.ok(documentHeadings(article).length >= 2) + assert.equal(documentTitle(article), 'Weekly note') + assert.equal(showsDocumentCard(article, { mode: 'standard', documentCards: true }), true) + assert.equal(showsDocumentCard(article, { mode: 'none', documentCards: true }), false) + assert.equal(showsDocumentCard(article, { mode: 'standard', documentCards: false }), false) + assert.equal(showsDocumentCard(article, { mode: 'standard', documentCards: true }, { streaming: true }), false) + const shortDoc = '# One\n\nHello\n\n## Two\n\nWorld' + assert.equal(isLongDocument(shortDoc), false) + const broken = ['Part one is long enough on its own: ' + 'word '.repeat(80), '---', 'Part two keeps going: ' + 'word '.repeat(80), '---', 'Part three finishes: ' + 'word '.repeat(80)].join('\n') + assert.equal(isLongDocument(broken), true) +}) + +test('host set-prefs accepts a folding record and refuses a bad one', () => { + assert.deepEqual(readFolding(null), undefined) + assert.deepEqual(readFolding({ mode: 'compact' }), { mode: 'compact', documentCards: true }) + assert.deepEqual(readFolding({ documentCards: false }, { mode: 'standard', documentCards: true }), { mode: 'standard', documentCards: false }) + assert.equal(readFolding({ mode: 'loose' }), false) + assert.equal(readFolding({ mode: 'standard', documentCards: 'yes' }), false) + assert.equal(readFolding('standard'), false) +}) + + +test('fenced examples are not document headings or section breaks; tilde and longer fences close safely', () => { + for (const fence of ['~~~', '````']) { + const code = `${fence}md\n# Example\n## Not a heading\n---\n---\n${'x'.repeat(900)}\n${fence}` + assert.equal(isLongDocument(code), false) + assert.equal(previewOf(code, 'compact').endsWith(fence), true) + } +}) diff --git a/core/test/message-history-search.test.js b/core/test/message-history-search.test.js new file mode 100644 index 000000000..b5d075acb --- /dev/null +++ b/core/test/message-history-search.test.js @@ -0,0 +1,320 @@ +// All data is isolated in memory. No persistence directory, running instance or user data. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { install, SEARCH_LIMITS } from '../src/host/message-search.js' +import { install as installChannel } from '../src/host/channel.js' +import { install as installAuthz } from '../src/host/authz.js' +const alice = { memberId: 'alice' }, bob = { memberId: 'bob' } +const message = (seq, text, kind = 'user', extra = {}) => ({ seq, time: seq, type: kind === 'assistant' ? 'assistant/message' : 'user/message', surfaceOp: 'append', + data: kind === 'assistant' ? { turn: 0, message: { role: 'assistant', content: [{ type: 'text', text }] } } : { source: { kind: 'user' }, content: [{ type: 'text', text }], turn: 0 }, ...extra }) +function fixture({ logs = {}, bots, observe, dispose } = {}) { + const state = { bots: bots ?? { a: { id: 'a', ownerId: 'alice', sessionId: 'a-live', segments: [{ sessionId: 'a-old' }] }, b: { id: 'b', ownerId: 'bob', sessionId: 'b-live' }, remote: { id: 'remote', ownerId: 'alice', remote: {}, sessionId: 'remote-live' } }, rooms: { room: { id: 'room', sessions: { a: 'internal-group' } } }, authSessions: { t: {} }, members: { alice: {}, bob: {} }, exchangeTurns: {} } + const reads = [], disposed = [] + const provider = { async observeSession(id, opts) { + assert.equal(opts.projectionMode, 'none') + assert.ok(opts.signal instanceof AbortSignal) + reads.push(id) + if (observe) await observe(id) + const events = logs[id] ?? [] + return { header: { id }, events, cursor: events.at(-1)?.seq ?? -1, [Symbol.dispose]: () => { disposed.push(id); dispose?.(id) } } + }, searchEvents() { throw Error('must not build/write the native index') }, listSessions() { throw Error('must not enumerate another instance') } } + const forbidden = () => { throw Error('must never activate, write, save, flush or list') } + const rt = { state, ctx: { get: key => { assert.equal(key, 'sessionQuery'); return provider }, sessionController: { list: forbidden, resolveAgent: forbidden, page: forbidden } }, + save: forbidden, load: forbidden, resolveAgent: forbidden, + partsOf: id => [...(state.bots[id]?.segments ?? []), ...(state.bots[id] ? [{ sessionId: state.bots[id].sessionId ?? id }] : [])], + chatOf: id => state.bots[id]?.sessionId ?? id, + botOf: id => Object.values(state.bots).find(bot => bot.id === id || bot.sessionId === id || bot.segments?.some(part => part.sessionId === id)), + } + installAuthz(rt); install(rt) + return { rt, state, reads, disposed, provider, search: (body, actor = alice) => rt.searchMessages(body, actor) } +} + +test('finds Chinese history in unloaded current and archived parts, without touching foreign sessions or writing', async () => { + const f = fixture({ logs: { 'a-live': [message(1, '现在的中文计划')], 'a-old': [message(1, '从未加载的中文历史', 'assistant')], 'b-live': [message(1, '别人的中文')] } }) + const before = JSON.stringify(f.state) + const result = await f.search({ query: '中文' }) + assert.equal(result.items.length, 2) + assert.deepEqual(result.items.map(hit => hit.sessionId), ['a-live', 'a-old']) + assert.equal(result.items[1].earlier, true) + assert.equal(result.scope, 'local-bot-chats') + assert.equal(result.cursor, null) + assert.equal(JSON.stringify(f.state), before) + assert.deepEqual(f.reads, f.disposed) +}) + +test('one-character Chinese, Unicode width/case, and FTS/regex metacharacters are literal', async () => { + const f = fixture({ logs: { 'a-live': [message(1, '甲 ABC %_*[x]')] } }) + for (const query of ['甲', 'abc', '%_*[x]']) assert.equal((await f.search({ query })).items.length, 1) + assert.equal((await f.search({ query: '" OR *' })).items.length, 0) +}) + +test('empty, invalid and oversized queries never read logs; caller selectors/actor ids grant nothing', async () => { + const f = fixture() + assert.deepEqual((await f.search({ query: ' \n\t' })).items, []) + for (const body of [{query:1},{query:'x'.repeat(257)},{query:'x\0'}, {query:'x',limit:0},{query:'x',limit:51},{query:'x',limit:1.5},{query:'x',sessionId:'b-live'},{query:'x',home:'/other'},{query:'x',actorId:'bob'}]) { + await assert.rejects(f.search(body), {code:'bot/invalid'}) + } + assert.deepEqual(f.reads, []) +}) + +test('only append-origin human/assistant text is searched, including pre-compaction transcript; never tools or model replacement copies', async () => { + const f = fixture({logs:{'a-live':[ + message(1,'needle old human transcript'), + message(2,'needle replacement','user',{surfaceOp:{from:1,to:1}}), + message(3,'needle plugin user','user',{data:{source:{kind:'ds-bot'},content:[{type:'text',text:'needle plugin user'}]}}), + {seq:4,type:'tool/result',surfaceOp:'append',data:{message:{content:[{type:'text',text:'needle tool result'}]}}}, + message(5,'needle log-only','user',{surfaceOp:undefined}), + ]}}) + const result=await f.search({query:'needle'}) + assert.deepEqual(result.items.map(hit=>hit.seq),[1]) +}) + +test('exchange-hidden turns and unknown-turn messages in a hidden session fail closed', async () => { + const hidden=message(1,'needle');const unknown=message(2,'needle');delete unknown.data.turn + const f=fixture({logs:{'a-live':[hidden,unknown,message(3,'needle visible','assistant',{data:{turn:3,message:{content:[{type:'text',text:'needle visible'}]}}})]}}) + f.state.exchangeTurns['a-live']=[0] + assert.deepEqual((await f.search({query:'needle'})).items.map(hit=>hit.seq),[3]) +}) + +test('pagination is bounded, no duplicates, and opaque cursors are query/actor/instance bound', async () => { + const f=fixture({logs:{'a-live':Array.from({length:5},(_,i)=>message(i,'needle '+i))}}) + const first=await f.search({query:'needle',limit:2}) + assert.ok(first.cursor) + for (const [query,actor] of [['different',alice],['needle',bob]]) await assert.rejects(f.search({query,cursor:first.cursor},actor),{code:'bot/invalid'}) + await assert.rejects(fixture().search({query:'needle',cursor:first.cursor}),{code:'bot/invalid'}) + await assert.rejects(f.search({query:'needle',cursor:'../../secret'}),{code:'bot/invalid'}) + const next=await f.search({query:'needle',limit:2,cursor:first.cursor}) + const last=await f.search({query:'needle',limit:2,cursor:next.cursor}) + assert.deepEqual([...first.items,...next.items,...last.items].map(hit=>hit.seq),[4,3,2,1,0]) + assert.equal(last.cursor,null) +}) + +test('authorization denies anonymous in member mode, narrows owners, excludes group/internal/remote sessions', async () => { + const f=fixture({logs:{'b-live':[message(1,'needle')]}}) + assert.equal(f.rt.authorize(null,'search-messages',{}).code,'bot/unauthorized') + await assert.rejects(f.search({query:'needle'},null),{code:'bot/unauthorized'}) + assert.equal(f.rt.authorize(alice,'search-messages',{}).ok,true) + await f.search({query:'needle'}) + assert.deepEqual(f.reads,['a-live','a-old']) + f.reads.length=0 + assert.equal((await f.search({query:'needle'},bob)).items.length,1) + assert.deepEqual(f.reads,['b-live']) +}) + +test('revocation during awaits prevents delivery and subsequent pages recheck ownership', async () => { + let f + f=fixture({logs:{'a-live':[message(1,'needle')]},observe:async id=>{if(id==='a-live') f.state.bots.a.ownerId='bob'}}) + assert.deepEqual((await f.search({query:'needle'})).items,[]) + assert.deepEqual(f.reads,['a-live']) +}) + +test('backend failures are sanitized and explicitly incomplete, never a false exhaustive empty', async () => { + const f=fixture({observe:async()=>{throw Error('/other-instance/config API_KEY=NEVER_RETURN')}}) + const result=await f.search({query:'needle'}) + assert.equal(result.incomplete,true) + assert.equal(JSON.stringify(result).includes('API_KEY'),false) + f.rt.ctx.get=()=>undefined + await assert.rejects(f.search({query:'needle'}),{code:'bot/search-unavailable'}) +}) + +test('continuation detects changed history and expired cursors', async () => { + const logs={'a-live':[message(0,'needle'),message(1,'needle')]} + const f=fixture({logs}) + const first=await f.search({query:'needle',limit:1}) + logs['a-live'].push(message(2,'needle')) + await assert.rejects(f.search({query:'needle',cursor:first.cursor}),{code:'bot/invalid'}) + const now=Date.now + Date.now=()=>now()+SEARCH_LIMITS.ttl+1 + try {await assert.rejects(f.search({query:'needle',cursor:first.cursor}),{code:'bot/invalid'})} finally {Date.now=now} +}) + +test('per-request source reads are capped even when all histories fail; oversized source is explicitly limited', async () => { + const bots=Object.fromEntries(Array.from({length:20},(_,i)=>['a'+i,{id:'a'+i,ownerId:'alice'}])) + const f=fixture({bots,observe:async()=>{throw Error('bad history')}}) + const result=await f.search({query:'needle'}) + assert.equal(f.reads.length,SEARCH_LIMITS.pagesPerRequest) + assert.ok(result.cursor) + assert.equal(result.incomplete,true) + const big=fixture({logs:{'a-live':Array.from({length:SEARCH_LIMITS.sourceEvents+1},()=>message(0,'needle'))}}) + assert.equal((await big.search({query:'needle'})).limited,true) +}) + +test('legacy single-human mode stays instance-local and query never mutates a read-only runtime', async () => { + const f=fixture({logs:{'a-old':[message(0,'needle')]}}) + f.state.authSessions={}; f.rt.readOnly=()=> 'read-only host' + assert.equal((await f.search({query:'needle'},null)).items.length,1) + assert.equal(f.reads.some(id=>id==='remote-live'||id==='internal-group'),false) +}) + + +test('real /api/bot channel allows read-only search, authenticates from the header, and rejects forged payload authority', async () => { + const f=fixture({logs:{'a-old':[message(0,'历史 needle')]}}) + let route + f.rt.ctx.effect=run=>run() + f.rt.ctx.connection={fetch:{register:value=>{route=value;return ()=>{}}}} + f.rt.refresh=async()=>{} + f.rt.load=async()=>{} // installation only; search itself never calls the loader + f.rt.readOnly=()=> 'another window owns the writer' + f.rt.authenticate=async token=>token==='alice-token'?alice:token==='bob-token'?bob:null + f.rt.noteFailure=()=>{throw Error('unexpected internal failure')} + installChannel(f.rt) + const call=async(token,payload,endpoint='search-messages')=> (await route.fetch(new Request('http://fixture.invalid/api/bot',{method:'POST',headers:token?{'x-flybot-member-session':token}:{},body:JSON.stringify({endpoint,payload})}))).json() + const result=await call('alice-token',{query:'历史'}) + assert.equal(result.ok,true) + assert.equal(result.value.items[0].sessionId,'a-old') + const context=await call('alice-token',{hitToken:result.value.items[0].hitToken},'history-hit') + assert.equal(context.ok,true) + assert.equal(context.value.sessionId,'a-old') + assert.equal((await call('bob-token',{hitToken:result.value.items[0].hitToken},'history-hit')).error.code,'bot/history-unavailable') + assert.equal((await call(null,{hitToken:result.value.items[0].hitToken},'history-hit')).error.code,'bot/unauthorized') + assert.equal((await call(null,{query:'历史'})).error.code,'bot/unauthorized') + assert.equal((await call('bob-token',{query:'历史'})).value.items.length,0) + assert.equal((await call('alice-token',{query:'历史',actorId:'bob'})).error.code,'bot/invalid') +}) + +test('per-owner concurrent work is refused and released, without blocking another owner', async () => { + let release + const held=new Promise(resolve=>{release=resolve}) + const f=fixture({observe:async id=>{if(id==='a-live')await held}}) + const pending=f.search({query:'needle'}) + await assert.rejects(f.search({query:'needle'}),{code:'bot/search-unavailable'}) + await f.search({query:'needle'},bob) + release();await pending + await f.search({query:'needle'}) +}) + +test('read-only hit returns its exact earlier segment and original bounded context, never opens an Agent', async () => { + const f=fixture({logs:{'a-old':[message(0,'before'),message(1,'原始 ABC 命中'),message(2,'after','assistant')]}}) + const hit=(await f.search({query:'abc'})).items[0] + const view=await f.rt.readHistoryHit({hitToken:hit.hitToken},alice) + assert.equal(view.scope,'read-only-history');assert.equal(view.sessionId,'a-old');assert.equal(view.part,1);assert.equal(view.partCount,2) + assert.deepEqual(view.entries.map(entry=>entry.text),['before','原始 ABC 命中','after']) + assert.equal(view.entries[1].hit,true) + assert.deepEqual(f.reads,['a-live','a-old','a-old']) + assert.deepEqual(f.reads,f.disposed) +}) + +test('context tickets reject foreign actor, other instance, selectors and expiration before reading', async () => { + const f=fixture({logs:{'a-live':[message(0,'needle')]}}) + const hit=(await f.search({query:'needle'})).items[0], body={hitToken:hit.hitToken} + f.reads.length=0 + for(const [payload,actor] of [[body,bob],[{...body,sessionId:'b-live'},alice],[{hitToken:'../config'},alice]]) { + await assert.rejects(f.rt.readHistoryHit(payload,actor),{code:'bot/history-unavailable'}) + } + await assert.rejects(fixture().rt.readHistoryHit(body,alice),{code:'bot/history-unavailable'}) + assert.deepEqual(f.reads,[]) + const now=Date.now;Date.now=()=>now()+SEARCH_LIMITS.ttl+1 + try {await assert.rejects(f.rt.readHistoryHit(body,alice),{code:'bot/history-unavailable'})} finally {Date.now=now} +}) + +test('stale hits reject appended or modified history, deleted Bot/session, removed segment and newly hidden turns',async()=>{ + for(const change of ['append','modify','bot-delete','session-delete','segment-remove','hidden']){ + const logs={'a-old':[message(0,'needle')]};const f=fixture({logs}) + const hit=(await f.search({query:'needle'})).items[0] + if(change==='append')logs['a-old'].push(message(1,'new')) + if(change==='modify')logs['a-old'][0].data.content[0].text='replaced same seq' + if(change==='bot-delete')delete f.state.bots.a + if(change==='session-delete')delete logs['a-old'] + if(change==='segment-remove')f.state.bots.a.segments=[] + if(change==='hidden')f.state.exchangeTurns['a-old']=[0] + await assert.rejects(f.rt.readHistoryHit({hitToken:hit.hitToken},alice),{code:'bot/history-unavailable'},change) + } +}) + +test('revocation or deletion during the context await, and revocation during dispose, prevent all delivery',async()=>{ + for(const change of ['owner','delete','dispose']){ + let checking=false,f + f=fixture({logs:{'a-old':[message(0,'needle')]},observe:async()=>{ + if(checking&&change==='owner')f.state.bots.a.ownerId='bob' + if(checking&&change==='delete')delete f.state.bots.a + },dispose:()=>{if(checking&&change==='dispose')f.state.bots.a.ownerId='bob'}}) + const hit=(await f.search({query:'needle'})).items[0];checking=true + await assert.rejects(f.rt.readHistoryHit({hitToken:hit.hitToken},alice),{code:'bot/history-unavailable'}) + } +}) + +test('pagination after ownership change skips revoked segments and old tickets cannot acquire context',async()=>{ + const f=fixture({bots:{a:{id:'a',ownerId:'alice',sessionId:'a-live',segments:[{sessionId:'a-old'}]},c:{id:'c',ownerId:'alice',sessionId:'c-live'}},logs:{'a-live':[message(0,'needle'),message(1,'needle')],'a-old':[message(0,'needle')],'c-live':[message(0,'needle c')]}}) + const first=await f.search({query:'needle',limit:1});assert.ok(first.cursor) + f.state.bots.a.ownerId='bob';f.reads.length=0 + const next=await f.search({query:'needle',cursor:first.cursor}) + assert.deepEqual(next.items.map(hit=>hit.botId),['c']) + assert.deepEqual(f.reads,['c-live']) + await assert.rejects(f.rt.readHistoryHit({hitToken:first.items[0].hitToken},alice),{code:'bot/history-unavailable'}) +}) + +test('result UTF-8 bytes are capped and pagination loses no hit at a byte boundary',async()=>{ + const id='分'.repeat(200), query='中'.repeat(256) + const f=fixture({bots:{[id]:{id,ownerId:'alice',sessionId:id}},logs:{[id]:Array.from({length:50},(_,i)=>message(i,'前'.repeat(50)+query+'后'.repeat(100)))}}) + const first=await f.search({query,limit:50}) + assert.ok(Buffer.byteLength(JSON.stringify(first))<=SEARCH_LIMITS.resultBytes) + assert.ok(first.cursor);assert.equal(first.limited,true) + const next=await f.search({query,limit:50,cursor:first.cursor}) + assert.ok(Buffer.byteLength(JSON.stringify(next))<=SEARCH_LIMITS.resultBytes) + assert.equal(new Set([...first.items,...next.items].map(hit=>hit.seq)).size,50) + assert.equal(next.cursor,null) +}) + +test('scan/message bytes are executable limits, distinct from the unbounded native cold materialization',async()=>{ + const f=fixture({logs:{'a-live':Array.from({length:20},(_,i)=>message(i,'x'.repeat(150_000)+' needle'))}}) + const first=await f.search({query:'needle',limit:50}) + assert.ok(first.cursor);assert.equal(first.limited,true);assert.ok(first.items.length<20) + const next=await f.search({query:'needle',limit:50,cursor:first.cursor}) + assert.equal(first.items.length+next.items.length,20) + const large=fixture({logs:{'a-live':[message(0,'needle '+'x'.repeat(SEARCH_LIMITS.messageBytes))]}}) + const skipped=await large.search({query:'needle'}) + assert.equal(skipped.items.length,0);assert.equal(skipped.limited,true) +}) + +test('context enforces UTF-8 output cap, preserves original Unicode and excludes hidden/tool/plugin neighbors',async()=>{ + const logs={'a-old':[message(0,'😄'.repeat(10_000)),message(1,'😄'.repeat(10_000)+' needle 原文'),message(2,'😄'.repeat(10_000),'assistant'),message(3,'hidden','user',{data:{turn:3,source:{kind:'user'},content:[{type:'text',text:'NEVER-HIDDEN'}]}}),{seq:4,type:'tool/result',surfaceOp:'append',data:{content:[{type:'text',text:'NEVER-TOOL'}]}}]} + const f=fixture({logs});f.state.exchangeTurns['a-old']=[3] + const hit=(await f.search({query:'needle'})).items[0] + const view=await f.rt.readHistoryHit({hitToken:hit.hitToken},alice) + assert.ok(Buffer.byteLength(JSON.stringify(view))<=SEARCH_LIMITS.contextBytes) + assert.ok(view.entries.some(entry=>entry.hit&&entry.text.includes('needle 原文')&&entry.truncated)) + assert.ok(view.entries.every(entry=>!entry.text.includes('\uFFFD') && entry.text.isWellFormed())) + assert.equal(JSON.stringify(view).includes('NEVER'),false) +}) + +test('context cancellation propagates to the provider and shares search concurrency budget',async()=>{ + let checking=false,signalSeen,release,entered + const started=new Promise(resolve=>{entered=resolve}) + const held=new Promise(resolve=>{release=resolve}) + const f=fixture({logs:{'a-live':[message(0,'needle')]}}) + const hit=(await f.search({query:'needle'})).items[0] + const observe=f.provider.observeSession + f.provider.observeSession=async(id,opts)=>{if(checking){signalSeen=opts.signal;entered();await held}return observe(id,opts)} + checking=true + const abort=new AbortController() + const pending=f.rt.readHistoryHit({hitToken:hit.hitToken},alice,abort.signal) + await started + await assert.rejects(f.search({query:'needle'}),{code:'bot/search-unavailable'}) + abort.abort();release() + await assert.rejects(pending,{code:'bot/history-unavailable'}) + assert.equal(signalSeen.aborted,true) +}) + +test('global concurrency and segment-count caps execute before unbounded corpus work',async()=>{ + let release,entered,count=0 + const held=new Promise(resolve=>{release=resolve}), started=new Promise(resolve=>{entered=resolve}) + const bots=Object.fromEntries(Array.from({length:5},(_,i)=>['a'+i,{id:'a'+i,ownerId:'owner'+i}])) + const f=fixture({bots,observe:async()=>{if(++count===4)entered();await held}}) + const pending=Array.from({length:4},(_,i)=>f.search({query:'needle'},{memberId:'owner'+i})) + await started + await assert.rejects(f.search({query:'needle'},{memberId:'owner4'}),{code:'bot/search-unavailable'}) + release();await Promise.all(pending) + const many=fixture({bots:Object.fromEntries(Array.from({length:SEARCH_LIMITS.sessions+1},(_,i)=>['b'+i,{id:'b'+i,ownerId:'alice'}]))}) + const result=await many.search({query:'needle'}) + assert.equal(result.limited,true);assert.equal(many.reads.length,SEARCH_LIMITS.pagesPerRequest) +}) + + +test('JSON escaping is included in the context byte budget, not mistaken for raw UTF-8 length',async()=>{ + const text='\n\t\\"'.repeat(6000) + const f=fixture({logs:{'a-live':[message(0,text),message(1,text+'needle'+text),message(2,text,'assistant')]}}) + const hit=(await f.search({query:'needle'})).items[0] + const view=await f.rt.readHistoryHit({hitToken:hit.hitToken},alice) + assert.ok(view.entries.some(entry=>entry.hit&&entry.text.includes('needle')&&entry.truncated)) + assert.ok(Buffer.byteLength(JSON.stringify(view))<=SEARCH_LIMITS.contextBytes) +}) diff --git a/core/test/message-tools.test.js b/core/test/message-tools.test.js new file mode 100644 index 000000000..a64ce514b --- /dev/null +++ b/core/test/message-tools.test.js @@ -0,0 +1,325 @@ +// Message hover toolbar, overflow, and right-click only offer actions FlyBot can run: +// reaction, reply/quote, copy, and download. Locked windows hide Reply. User bubbles +// share the same menu. Unimplemented items (Artifacts, translate, forward, report) are absent. +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' + +const runtime = { instances: new Map(), key: 'root', index: 0, dirty: false } +function instance(key) { + let inst = runtime.instances.get(key) + if (!inst) { + inst = { slots: [], refs: [], pending: [], deps: new Map(), cleanups: new Map() } + runtime.instances.set(key, inst) + } + return inst +} +function withInstance(key, run) { + const previousKey = runtime.key + const previousIndex = runtime.index + runtime.key = key + runtime.index = 0 + try { return run() } finally { runtime.key = previousKey; runtime.index = previousIndex } +} +function recordEffect(run, deps) { + instance(runtime.key).pending.push({ index: runtime.index++, run, deps }) +} +function commitEffects() { + for (const inst of runtime.instances.values()) { + const pending = inst.pending + inst.pending = [] + for (const { index, run, deps } of pending) { + const previous = inst.deps.get(index) + const changed = !deps || !previous || deps.length !== previous.length || deps.some((dep, at) => !Object.is(dep, previous[at])) + if (!changed) continue + const cleanup = inst.cleanups.get(index) + if (typeof cleanup === 'function') cleanup() + inst.cleanups.delete(index) + inst.deps.set(index, deps ? [...deps] : null) + const next = run() + if (typeof next === 'function') inst.cleanups.set(index, next) + } + } +} +const react = { + createElement: (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }), + Fragment: Symbol('F'), + useEffect: (run, deps) => recordEffect(run, deps), + useLayoutEffect: (run, deps) => recordEffect(run, deps), + useMemo: (make) => make(), + useCallback: (fn) => fn(), + useRef: (current) => { + const inst = instance(runtime.key) + const index = runtime.index++ + if (!(index in inst.refs)) inst.refs[index] = { current } + return inst.refs[index] + }, + useSyncExternalStore: (_subscribe, get) => get(), + useState: (initial) => { + const inst = instance(runtime.key) + const index = runtime.index++ + if (!(index in inst.slots)) inst.slots[index] = typeof initial === 'function' ? initial() : initial + const set = (next) => { + const value = typeof next === 'function' ? next(inst.slots[index]) : next + if (Object.is(value, inst.slots[index])) return + inst.slots[index] = value + runtime.dirty = true + } + return [inst.slots[index], set] + }, +} + +const io = { clipboard: 'ok', download: 'ok', writes: [], downloads: [], keys: null } +class TestElement { closest(selector) { return selector === '[data-composer-card]' ? this.card : this } } +async function load(entry) { + const bundle = await build({ + entryPoints: [fileURLToPath(new URL(`../src/client/${entry}`, import.meta.url))], + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], + }) + const env = { + module: { exports: {} }, Element: TestElement, Event: class Event { constructor(type) { this.type = type } }, + document: { body: {}, hidden: false, addEventListener() {}, removeEventListener() {}, createElement: () => ({ click() { if (io.download === 'fail') throw new Error('download failed'); io.downloads.push(true) } }) }, + Blob: class Blob {}, URL: { createObjectURL: () => 'blob:test', revokeObjectURL() {} }, + navigator: { language: 'en', clipboard: { writeText: async text => { if (io.clipboard === 'fail') throw new Error('denied'); io.writes.push(text) } } }, + window: { innerHeight: 800, innerWidth: 1400, addEventListener(name, handler) { if (name === 'keydown') io.keys = handler }, removeEventListener() {} }, + setTimeout, clearTimeout, + } + env.require = (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return { MarkdownText: props => ({ type: 'span', props: { className: 'bt-md', text: props.text, children: [] } }), projectUserText: text => text } + throw new Error(`Unexpected platform module ${name}`) + } + runInNewContext(bundle.outputFiles[0].text, env) + return env.module.exports +} + +const cells = await load('cells.js') +const userMod = await load('user-message.js') +const composerMod = await load('composer.js') + +const expand = (node, path = 'r') => { + if (node === null || node === undefined || typeof node === 'boolean') return null + if (Array.isArray(node)) return node.map((child, at) => expand(child, `${path}.${at}`)) + if (typeof node !== 'object') return node + if (typeof node.type === 'function') return withInstance(path, () => expand(node.type(node.props), path)) + return { ...node, props: { ...node.props, children: expand(node.props.children, path) } } +} +function render(node) { + runtime.dirty = false + for (const inst of runtime.instances.values()) inst.pending = [] + const tree = expand(node) + commitEffects() + return tree +} +function flush(draw) { + let tree = render(draw()) + for (let i = 0; i < 8 && runtime.dirty; i++) tree = render(draw()) + return tree +} +const find = (node, match, out = []) => { + if (node === null || node === undefined) return out + if (Array.isArray(node)) { + for (const child of node) find(child, match, out) + return out + } + if (typeof node !== 'object') return out + if (match(node)) out.push(node) + find(node.props?.children, match, out) + return out +} +const labelled = (node, label) => node.type === 'button' && (node.props?.['aria-label'] === label || (node.props?.children ?? []).includes(label)) +const button = (root, label) => find(root, node => labelled(node, label))[0] +const press = (node) => node.props.onClick({ currentTarget: { getBoundingClientRect: () => ({ left: 10, top: 10, width: 40, height: 20, bottom: 30, right: 50 }) } }) +const labels = (root) => find(root, node => node.type === 'button').map(node => node.props?.['aria-label'] ?? (Array.isArray(node.props?.children) ? node.props.children.find(child => typeof child === 'string') : null)).filter(Boolean) +const forbidden = (root) => labels(root).filter(label => /artifact|translate|forward|report|studio|template|select multiple|ask ai/i.test(String(label))) + +const chief = { id: 'chief', name: 'Chief', color: 'green' } +const roster = { bots: [chief], byId: { chief }, rooms: [], roomsById: {}, exchangeTurns: {}, questions: {}, secretRequests: {}, secrets: [] } + +function mountBubbles({ text = 'weekly note', locked = false, quotes = [], reactions = [], prefs, streaming = false } = {}) { + runtime.instances.clear() + const actions = { + quote: (sessionId, value) => { quotes.push([sessionId, value]) }, + toggleReaction: (key, index, emoji) => { reactions.push([key, index, emoji]) }, + openSession() {}, + } + const team = { ...roster, prefs, ...(locked ? { readOnly: 'This window is read-only.' } : {}) } + const draw = () => react.createElement(cells.Bubbles, { + texts: [text], roster: team, streaming, selfId: chief.id, actions, sessionId: 'chief', msgKey: 'chief:1:2', + useUi: () => null, + }) + return { draw, actions, quotes, reactions, tree: flush(draw) } +} + +test('a reply bubble offers reaction, reply, and more; the overflow has copy and download only from real actions', () => { + const { draw, quotes, reactions, tree: first } = mountBubbles() + assert.ok(button(first, 'Add reaction')) + assert.ok(button(first, 'Reply')) + assert.ok(button(first, 'More message actions')) + press(button(first, 'More message actions')) + const tree = flush(draw) + const menu = find(tree, node => node.props?.['aria-label'] === 'Message actions')[0] + assert.ok(menu, 'the overflow menu opens') + const shown = labels(menu) + assert.ok(shown.includes('Reply')) + assert.ok(shown.includes('Copy')) + assert.ok(shown.includes('Download')) + assert.ok(shown.includes('👍')) + assert.deepEqual(forbidden(menu), [], 'unimplemented items stay off the menu') + press(button(menu, 'Reply')) + assert.deepEqual(quotes, [['chief', 'weekly note']]) + runtime.instances.clear() + const again = mountBubbles({ reactions }) + press(button(again.tree, 'Add reaction')) + const strip = find(flush(again.draw), node => node.props?.['aria-label'] === 'Reactions')[0] + press(button(strip, '👍')) + assert.deepEqual(reactions, [['chief:1:2', 0, '👍']]) +}) + +test('right-clicking a bubble opens the same message menu at the cursor', () => { + const { draw, tree: first } = mountBubbles() + const row = find(first, node => String(node.props?.className ?? '').split(/\s+/).includes('bt-msg'))[0] + assert.ok(row.props.onContextMenu) + row.props.onContextMenu({ + preventDefault() {}, stopPropagation() {}, clientX: 120, clientY: 80, target: { closest: () => null }, + }) + const menu = find(flush(draw), node => node.props?.['aria-label'] === 'Message actions')[0] + assert.ok(menu) + const shown = labels(menu) + assert.ok(shown.includes('Copy') && shown.includes('Download') && shown.includes('Reply')) + assert.deepEqual(forbidden(menu), []) +}) + +test('a locked window keeps copy and download, and hides reply', () => { + const { tree } = mountBubbles({ locked: true }) + assert.equal(button(tree, 'Reply'), undefined) + assert.ok(button(tree, 'Add reaction')) + assert.ok(button(tree, 'More message actions')) + press(button(tree, 'More message actions')) + // Remount after press needs the same runtime instances — press already set state on this tree's + // instance. Re-flush the same draw. +}) + +test('a locked window overflow lists copy and download, not reply', () => { + const { draw, tree: first } = mountBubbles({ locked: true }) + press(button(first, 'More message actions')) + const menu = find(flush(draw), node => node.props?.['aria-label'] === 'Message actions')[0] + const shown = labels(menu) + assert.ok(!shown.includes('Reply')) + assert.ok(shown.includes('Copy')) + assert.ok(shown.includes('Download')) +}) + +function mountUser({ locked = false, quotes = [], withTurn = true } = {}) { + runtime.instances.clear() + const actions = { quote: (sessionId, value) => { quotes.push([sessionId, value]) }, toggleReaction() {}, openSession() {} } + const team = locked ? { ...roster, readOnly: 'This window is read-only.' } : roster + const node = { + kind: 'user', + location: withTurn ? { kind: 'turn', turn: 3 } : undefined, + data: { content: [{ type: 'text', text: 'Draft the weekly note' }] }, + } + const draw = () => react.createElement(userMod.UserMessageCell, { + node, sessionId: 'chief', useRoster: select => select(team), useUi: () => ({ reactions: {} }), actions, + }) + return { draw, quotes, tree: flush(draw) } +} + +test('a user bubble offers reply, copy, and download, and has no unimplemented items', () => { + const { draw, quotes, tree: first } = mountUser() + assert.ok(button(first, 'Reply')) + assert.ok(button(first, 'More message actions')) + assert.ok(button(first, 'Add reaction'), 'a stable turn identity lets the user bubble react') + press(button(first, 'More message actions')) + const menu = find(flush(draw), node => node.props?.['aria-label'] === 'Message actions')[0] + const shown = labels(menu) + assert.ok(shown.includes('Reply') && shown.includes('Copy') && shown.includes('Download')) + assert.deepEqual(forbidden(menu), []) + press(button(first, 'Reply')) + assert.deepEqual(quotes, [['chief', 'Draft the weekly note']]) +}) + +test('a user bubble without a turn identity has no reaction control, and a locked one has no reply', () => { + const plain = mountUser({ withTurn: false }) + assert.equal(button(plain.tree, 'Add reaction'), undefined) + assert.ok(button(plain.tree, 'Reply')) + const locked = mountUser({ locked: true }) + assert.equal(button(locked.tree, 'Reply'), undefined) + assert.ok(button(locked.tree, 'More message actions')) +}) + + +test('clipboard and download failures are handled with visible status; right-click menu closes and can reopen', async () => { + const { draw, tree: first } = mountBubbles() + press(button(first, 'More message actions')) + io.clipboard = 'fail' + press(button(flush(draw), 'Copy')) + await new Promise(resolve => setTimeout(resolve, 0)) + assert.ok(find(flush(draw), n => n.props?.role === 'status').length) + io.clipboard = 'ok' + press(button(flush(draw), 'Copy')) + await new Promise(resolve => setTimeout(resolve, 0)) + assert.ok(io.writes.includes('weekly note')) + io.download = 'fail' + press(button(flush(draw), 'Download')) + assert.ok(find(flush(draw), n => n.props?.role === 'status').length) + io.download = 'ok' + press(button(flush(draw), 'Download')) + assert.ok(io.downloads.length > 0) + assert.equal(find(flush(draw), n => n.props?.['aria-label'] === 'Message actions').length, 0) + let tree = flush(draw) + const rightClick = () => find(tree, n => n.props?.className === 'bt-msg')[0].props.onContextMenu({ + clientX: 80, clientY: 80, target: { closest: () => null }, preventDefault() {}, stopPropagation() {}, + }) + rightClick(); tree = flush(draw) + press(button(find(tree, n => n.props?.['aria-label'] === 'Message actions')[0], 'Reply')) + tree = flush(draw) + assert.equal(find(tree, n => n.props?.['aria-label'] === 'Message actions').length, 0, 'context menu closes after reply') + rightClick(); tree = flush(draw) + assert.equal(find(tree, n => n.props?.['aria-label'] === 'Message actions').length, 1, 'can reopen immediately') +}) + + +test('folding, document cards, quoting, no-fold and streaming compose without hiding access to text', () => { + const text = '# Full report\n' + 'A long paragraph. '.repeat(60) + '\n## Next steps\nFinish review.' + let mounted = mountBubbles({ text, prefs: { folding: { mode: 'standard', documentCards: true } } }) + assert.ok(button(mounted.tree, 'Show message text'), 'a document card keeps an inline full-text control') + press(button(mounted.tree, 'Show message text')) + let tree = flush(mounted.draw) + assert.ok(find(tree, n => n.props?.text === text).length, 'inline expansion renders the complete text') + press(button(tree, 'More message actions')) + tree = flush(mounted.draw) + press(button(find(tree, n => n.props?.['aria-label'] === 'Message actions')[0], 'Reply')) + assert.deepEqual(mounted.quotes, [['chief', text]], 'reply quotes full raw text, not the preview') + mounted = mountBubbles({ text, prefs: { folding: { mode: 'none', documentCards: true } } }) + assert.equal(button(mounted.tree, 'Show message text'), undefined, 'no-fold also bypasses card conversion') + assert.ok(find(mounted.tree, n => n.props?.text === text).length) + mounted = mountBubbles({ text, streaming: true, prefs: { folding: { mode: 'compact', documentCards: true } } }) + assert.equal(button(mounted.tree, 'More message actions'), undefined) + assert.equal(button(mounted.tree, 'Show message text'), undefined) + assert.ok(find(mounted.tree, n => n.props?.text === text).length, 'streaming renders full text without premature folding') +}) + +test('installed Shift+Enter shortcut respects IME, multiline, disabled send and read-only roster', () => { + const field = new TestElement() + let clicks = 0; let inputEvents = 0 + const sendButton = { disabled: false, getAttribute() { return null }, click() { clicks++ } } + field.card = { querySelector() { return sendButton } } + field.value = 'abc'; field.selectionStart = 1; field.selectionEnd = 1 + field.dispatchEvent = () => inputEvents++ + const snapshot = { prefs: { sendKey: 'shift-enter' } } + composerMod.installSendShortcut({ getSnapshot: () => snapshot }) + const key = io.keys + const event = (more = {}) => ({ key: 'Enter', target: field, preventDefault() {}, stopPropagation() {}, ...more }) + key(event({ keyCode: 229, shiftKey: true })); assert.equal(clicks, 0) + key(event()); assert.equal(field.value, 'a\nbc'); assert.equal(inputEvents, 1) + key(event({ shiftKey: true })); assert.equal(clicks, 1) + sendButton.disabled = true + key(event({ shiftKey: true })); assert.equal(clicks, 1) + snapshot.readOnly = 'This window is read-only.' + key(event()); assert.equal(inputEvents, 1) +}) diff --git a/core/test/mobile-layout.test.js b/core/test/mobile-layout.test.js index 9fdcce65b..13534f92b 100644 --- a/core/test/mobile-layout.test.js +++ b/core/test/mobile-layout.test.js @@ -54,7 +54,7 @@ test('the client installs the phone styles after the shell styles they override' const index = readFileSync(new URL('../src/client/index.js', import.meta.url), 'utf8') const at = name => index.indexOf(`installCompiledStyles(${name}`) assert.ok(at('MOBILE_CSS') > 0, 'MOBILE_CSS is installed') - for (const earlier of ['SHELL_CSS', 'INBOX_CSS', 'FLYBOT_CSS']) assert.ok(at(earlier) >= 0 && at(earlier) < at('MOBILE_CSS'), `${earlier} comes first`) + for (const earlier of ['SHELL_CSS', 'INBOX_CSS', 'FLYBOT_CSS', 'PARITY_SHELL_CSS']) assert.ok(at(earlier) >= 0 && at(earlier) < at('MOBILE_CSS'), `${earlier} comes first`) const bundle = readFileSync(new URL('../client.js', import.meta.url), 'utf8') assert.ok(bundle.includes('.bt-inbox-actions :is(.bt-soft,.bt-send){height:36px'), 'client.js carries the phone styles') }) diff --git a/core/test/new-chat.test.js b/core/test/new-chat.test.js index 8b9b1797f..82cc4a7a5 100644 --- a/core/test/new-chat.test.js +++ b/core/test/new-chat.test.js @@ -66,7 +66,7 @@ test('the sidebar + menu wires plugin actions in after New group chat', () => { assert.match(sidebar, /const inTree = entry => entry\.kind === 'bot' && !entry\.item\.remote/) assert.match(sidebar, /structure\?\.include\?\.\(entry\.item\.id\) !== false/) assert.match(sidebar, /botTree\(\[main, \.\.\.order\.filter\(listed\)/) - assert.match(sidebar, /order\.filter\(entry => !\(tree && inTree\(entry\)\) && !\(inTree\(entry\) && structure\?\.include/) + assert.match(sidebar, /!\(tree && inTree\(entry\)\) &&\n\s*!\(inTree\(entry\) && structure\?\.include\?\.\(entry\.item\.id\) === false\) &&\n\s*matchesSessionFilter/) assert.equal(DICTIONARY.zh['Copy my handle'], '复制我的 handle') assert.equal(DICTIONARY.zh['Face-to-face'], '面对面') assert.equal(DICTIONARY.zh['Face-to-face room'], '面对面房间') diff --git a/core/test/palette-history-ui.test.js b/core/test/palette-history-ui.test.js new file mode 100644 index 000000000..d76ed694a --- /dev/null +++ b/core/test/palette-history-ui.test.js @@ -0,0 +1,129 @@ +// Empty state, no-match state, and type filters for the command palette. +// View-only seam for history state; real asynchronous hook is covered separately. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' + +const { outputFiles } = await build({ + stdin: { contents: "export { CommandPalette } from './src/client/palette.js'", resolveDir: fileURLToPath(new URL('..', import.meta.url)) }, + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], + plugins: [{name:'history-view-state',setup(b){b.onLoad({filter:/history-search\.js$/},()=>({contents:"export const useHistorySearch = search => { globalThis.__capture(typeof search === 'function'); return globalThis.__history() }",loader:'js'}))}}], +}) + +const h = (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }) +let historyState = {items:[],status:'ready',cursor:null} +let historyEnabled, opened +let slots = [] +let index = 0 +const react = { + createElement: h, Fragment: Symbol('F'), + useMemo: (fn) => { const at = index++; if (!(at in slots)) slots[at] = fn(); return slots[at] }, + useState: (initial) => { + const at = index++ + if (!(at in slots)) slots[at] = typeof initial === 'function' ? initial() : initial + return [slots[at], (value) => { slots[at] = typeof value === 'function' ? value(slots[at]) : value }] + }, + useCallback: (fn) => fn, + useRef: (value) => { const at = index++; if (!(at in slots)) slots[at] = { current: value }; return slots[at] }, + useEffect() {}, + useLayoutEffect() {}, +} +const module = { exports: {} } +runInNewContext(outputFiles[0].text, { + module, exports: module.exports, console, setTimeout, clearTimeout, + __history:()=>historyState, __capture:value=>{historyEnabled=value}, + document: { hidden: false, querySelector: () => null }, + window: { addEventListener() {}, removeEventListener() {} }, + navigator: { language: 'en' }, + localStorage: { getItem: () => null, setItem() {} }, + requestAnimationFrame: () => 0, cancelAnimationFrame() {}, + require: (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return { FishLogo: () => null, MarkdownText: ({ text }) => text } + throw new Error(`Unexpected platform module ${name}`) + }, +}) +const { CommandPalette } = module.exports + +const chief = { id: 'chief', name: 'Chief', role: 'Coordinator', sessionId: 'chief' } +const roster = { bots: [chief], byId: { chief }, rooms: [], roomsById: {}, agents: [], exchangeTurns: {} } +const sessions = { + projectionsBySession: { chief: { values: { turnOutline: [{ turn: 1, prompt: 'Weekly note for Chief', response: 'Here is the draft.' }] } } }, + byId: {}, +} +const expand = (node) => { + if (node == null) return node + if (Array.isArray(node)) return node.map(expand) + if (typeof node !== 'object') return node + if (typeof node.type === 'function') return expand(node.type(node.props ?? {})) + return { ...node, props: { ...node.props, children: expand(node.props?.children) } } +} +const all = (node, out = []) => { + if (node == null) return out + if (Array.isArray(node)) { for (const item of node) all(item, out); return out } + if (typeof node !== 'object') return out + out.push(node) + all(node.props?.children, out) + return out +} +const ownText = (node) => { + const walk = (value) => { + if (Array.isArray(value)) return value.map(walk).join('') + if (typeof value === 'string' || typeof value === 'number') return String(value) + if (value && typeof value === 'object') return walk(value.props?.children) + return '' + } + return walk(node?.props?.children) +} +const hasClass = (node, name) => String(node.props?.className ?? '').split(/\s+/).includes(name) + +const mount = (start = '') => { + slots = [] + const draw = () => { + index = 0 + return all(expand(CommandPalette({ + start, token: 't', roster, + actions: { closePalette() {}, searchMessages: async()=>{}, openSession(id) {opened=id}, openNewChat() {}, openSettings() {}, setFlags: async () => {}, openAgent() {} }, + useSessions: select => select(sessions), + }))) + } + return draw +} + +test('history results open a read-only context view instead of navigating the current chat; four tags still gate history',()=>{ + historyState={items:[{botId:'chief',sessionId:'chief-old',seq:7,snippet:'未加载的中文历史',earlier:true,hitToken:'opaque-hit'}],status:'ready',cursor:null} + const draw=mount('中文');let nodes=draw() + assert.ok(nodes.some(node=>ownText(node)==='Local Bot chat history')) + assert.ok(nodes.some(node=>ownText(node)==='Earlier part; view read-only history')) + for(const label of ['Chats','Commands','Messages','All']){ + nodes.find(node=>hasClass(node,'bt-palette-filter')&&ownText(node)===label).props.onClick();nodes=draw() + assert.equal(historyEnabled,['Messages','All'].includes(label)) + assert.equal(nodes.some(node=>node.props?.role==='option'&&ownText(node).includes('未加载的中文历史')),['Messages','All'].includes(label)) + } + nodes.find(node=>node.props?.role==='option'&&ownText(node).includes('未加载的中文历史')).props.onClick() + nodes=draw() + assert.equal(opened,undefined) + assert.ok(nodes.some(node=>node.props?.role==='dialog'&&node.props['aria-label']==='Read-only history match')) + assert.ok(nodes.some(node=>ownText(node)==='This is segment history, not the current chat. No Bot is activated.')) + assert.equal(nodes.some(node=>node.type==='pre'&&ownText(node).includes('未加载的中文历史')),false,'search snippets cannot masquerade as authorized context') +}) +test('loading, continuation and incomplete states never claim an exhaustive no-results search',()=>{ + for(const state of [{status:'loading'}, {status:'ready',cursor:'opaque'}, {status:'ready',incomplete:true}, {status:'ready',limited:true}]){ + historyState={items:[],cursor:null,...state};const nodes=mount('zzzz')() + assert.equal(nodes.some(node=>hasClass(node,'bt-palette-empty-label')&&ownText(node)==='No results'),false) + } + let more=0;historyState={items:[],status:'ready',cursor:'opaque',more:()=>more++} + const nodes=mount('zzzz')();nodes.find(node=>ownText(node)==='Search more history').props.onClick();assert.equal(more,1) +}) +test('backend error explicitly falls back to loaded outlines; no global/files tag or all-history claim',()=>{ + historyState={items:[],status:'error',cursor:null} + const nodes=mount('Chief')() + assert.ok(nodes.some(node=>ownText(node)==='History query failed; showing loaded messages only.')) + assert.ok(nodes.some(node=>node.props?.role==='option'&&ownText(node).includes('Weekly note'))) + assert.deepEqual(nodes.filter(node=>hasClass(node,'bt-palette-filter')).map(ownText),['All','Chats','Messages','Commands']) + assert.equal(nodes.some(node=>ownText(node)==='Search all chats'),false) +}) diff --git a/core/test/palette-search.test.js b/core/test/palette-search.test.js new file mode 100644 index 000000000..dfe9686a6 --- /dev/null +++ b/core/test/palette-search.test.js @@ -0,0 +1,27 @@ +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { PALETTE_FILTERS, PALETTE_MESSAGE_MIN, paletteEmptyKind, paletteFilterAllows } from '../src/shared/palette-search.js' + +test('the public palette filters are all, chats, messages, and commands', () => { + assert.deepEqual(PALETTE_FILTERS, ['all', 'chats', 'messages', 'commands']) + assert.equal(PALETTE_MESSAGE_MIN, 2) + assert.equal(PALETTE_FILTERS.includes('artifacts'), false) + assert.equal(PALETTE_FILTERS.includes('files'), false) +}) + +test('each filter keeps only kinds the palette can actually search', () => { + assert.equal(paletteFilterAllows('all', 'chats'), true) + assert.equal(paletteFilterAllows('all', 'messages'), true) + assert.equal(paletteFilterAllows('chats', 'chats'), true) + assert.equal(paletteFilterAllows('chats', 'messages'), false) + assert.equal(paletteFilterAllows('messages', 'commands'), false) + assert.equal(paletteFilterAllows('commands', 'commands'), true) +}) + +test('empty kind distinguishes a blank query, a short message query, and no matches', () => { + assert.equal(paletteEmptyKind('', 'all'), 'empty') + assert.equal(paletteEmptyKind(' ', 'chats'), 'empty') + assert.equal(paletteEmptyKind('h', 'messages'), 'short') + assert.equal(paletteEmptyKind('hi', 'messages'), 'none') + assert.equal(paletteEmptyKind('h', 'all'), 'none') +}) diff --git a/core/test/palette-ui.test.js b/core/test/palette-ui.test.js new file mode 100644 index 000000000..9d38cd39d --- /dev/null +++ b/core/test/palette-ui.test.js @@ -0,0 +1,130 @@ +// Empty state, no-match state, and type filters for the command palette. +// Message search only reads turn outlines already loaded in the session list. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' + +const { outputFiles } = await build({ + stdin: { contents: "export { CommandPalette } from './src/client/palette.js'", resolveDir: fileURLToPath(new URL('..', import.meta.url)) }, + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], +}) + +const h = (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }) +let slots = [] +let index = 0 +const react = { + createElement: h, Fragment: Symbol('F'), + useMemo: (fn) => { const at = index++; if (!(at in slots)) slots[at] = fn(); return slots[at] }, + useState: (initial) => { + const at = index++ + if (!(at in slots)) slots[at] = typeof initial === 'function' ? initial() : initial + return [slots[at], (value) => { slots[at] = typeof value === 'function' ? value(slots[at]) : value }] + }, + useCallback: (fn) => fn, + useRef: (value) => { const at = index++; if (!(at in slots)) slots[at] = { current: value }; return slots[at] }, + useEffect() {}, + useLayoutEffect() {}, +} +const module = { exports: {} } +runInNewContext(outputFiles[0].text, { + module, exports: module.exports, console, setTimeout, clearTimeout, + document: { hidden: false, querySelector: () => null }, + window: { addEventListener() {}, removeEventListener() {} }, + navigator: { language: 'en' }, + localStorage: { getItem: () => null, setItem() {} }, + requestAnimationFrame: () => 0, cancelAnimationFrame() {}, + require: (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return { FishLogo: () => null, MarkdownText: ({ text }) => text } + throw new Error(`Unexpected platform module ${name}`) + }, +}) +const { CommandPalette } = module.exports + +const chief = { id: 'chief', name: 'Chief', role: 'Coordinator', sessionId: 'chief' } +const roster = { bots: [chief], byId: { chief }, rooms: [], roomsById: {}, agents: [], exchangeTurns: {} } +const sessions = { + projectionsBySession: { chief: { values: { turnOutline: [{ turn: 1, prompt: 'Weekly note for Chief', response: 'Here is the draft.' }] } } }, + byId: {}, +} +const expand = (node) => { + if (node == null) return node + if (Array.isArray(node)) return node.map(expand) + if (typeof node !== 'object') return node + if (typeof node.type === 'function') return expand(node.type(node.props ?? {})) + return { ...node, props: { ...(node.props ?? {}), children: expand(node.props?.children) } } +} +const all = (node, out = []) => { + if (node == null) return out + if (Array.isArray(node)) { for (const item of node) all(item, out); return out } + if (typeof node !== 'object') return out + out.push(node) + all(node.props?.children, out) + return out +} +const ownText = (node) => { + const walk = (value) => { + if (Array.isArray(value)) return value.map(walk).join('') + if (typeof value === 'string' || typeof value === 'number') return String(value) + if (value && typeof value === 'object') return walk(value.props?.children) + return '' + } + return walk(node?.props?.children) +} +const hasClass = (node, name) => String(node.props?.className ?? '').split(/\s+/).includes(name) + +const mount = (start = '') => { + slots = [] + const draw = () => { + index = 0 + return all(expand(CommandPalette({ + start, token: 't', roster, + actions: { closePalette() {}, openSession() {}, openNewChat() {}, openSettings() {}, setFlags: async () => {}, openAgent() {} }, + useSessions: select => select(sessions), + }))) + } + return draw +} + +test('an empty query shows the empty state, type filters, and a close control; it does not prefill chats or messages', () => { + const nodes = mount('')() + assert.ok(nodes.some(node => hasClass(node, 'bt-palette-empty'))) + assert.ok(nodes.some(node => ownText(node) === 'Search chats and messages')) + assert.ok(nodes.some(node => String(ownText(node)).includes('loaded message'))) + assert.equal(nodes.some(node => ownText(node) === 'Search all chats' || String(ownText(node)).includes('all content')), false) + const tabs = nodes.filter(node => hasClass(node, 'bt-palette-filter')) + assert.deepEqual(tabs.map(ownText), ['All', 'Chats', 'Messages', 'Commands']) + assert.equal(tabs.some(node => ownText(node) === 'Artifacts' || ownText(node) === 'Files'), false) + assert.ok(nodes.some(node => node.props?.['aria-label'] === 'Close')) + assert.equal(nodes.filter(node => node.props?.role === 'option').length, 0) +}) + +test('a query with no matches shows the no-results state', () => { + const nodes = mount('zzzz-no-such')() + assert.ok(nodes.some(node => ownText(node) === 'No results')) + assert.ok(nodes.some(node => String(ownText(node)).includes('loaded message'))) +}) + +test('the Messages filter finds loaded outlines, and the Chats filter hides those hits', () => { + const draw = mount('Chief') + let nodes = draw() + const titles = () => nodes.filter(node => hasClass(node, 'bt-palette-title')).map(ownText) + assert.ok(titles().includes('Chief')) + assert.ok(nodes.some(node => String(ownText(node)).includes('Weekly note') || String(ownText(node)).includes('draft'))) + const press = (label) => { + const tab = nodes.find(node => hasClass(node, 'bt-palette-filter') && ownText(node) === label) + assert.ok(tab, label) + tab.props.onClick() + nodes = draw() + } + press('Messages') + assert.equal(titles().includes('Chief') && nodes.some(node => hasClass(node, 'bt-palette-section') && ownText(node) === 'Bots'), false) + assert.ok(nodes.some(node => hasClass(node, 'bt-palette-section') && ownText(node) === 'Messages') || nodes.some(node => String(ownText(node)).includes('draft'))) + press('Chats') + assert.ok(titles().includes('Chief')) + assert.equal(nodes.some(node => hasClass(node, 'bt-palette-section') && ownText(node) === 'Messages'), false) +}) diff --git a/core/test/parity-shell.test.js b/core/test/parity-shell.test.js new file mode 100644 index 000000000..fc52ef16d --- /dev/null +++ b/core/test/parity-shell.test.js @@ -0,0 +1,106 @@ +// First-batch chat-shell layout: icon rail, denser list, pill composer, Grove theme. +// Brand must stay FlyBot. Existing sidebar entries must remain. Phone rules stay in MOBILE_CSS. +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { test } from 'node:test' +import { allThemes, themeCss } from '../src/client/themes.js' +import { ICON_RAIL_WIDTH, CHAT_LIST_WIDTH, SHELL_LEFT_WIDTH, COMPOSER_HEIGHT, HEADER_HEIGHT, PARITY_SHELL_CSS } from '../src/client/parity-shell.js' + +const src = name => readFileSync(new URL(`../src/client/${name}`, import.meta.url), 'utf8') +const index = readFileSync(new URL('../src/client/index.js', import.meta.url), 'utf8') + +test('Grove is a selectable theme and is not named after another product', () => { + const grove = allThemes().grove + assert.equal(grove.label, 'Grove') + assert.equal(grove.dark.bg, '#171c19') + assert.equal(grove.dark.card, '#272e2b') + assert.equal(grove.dark.bubble, '#2a332d') + assert.equal(grove.dark.accent, '#3d9a6e') + assert.equal(grove.light.text, '#171c19') + const css = themeCss(grove) + assert.match(css, /--bt-main:#171c19/) + assert.doesNotMatch(src('themes.js'), /Teamily|teamily/i) + assert.doesNotMatch(src('parity-shell.js'), /Teamily|teamily/i) +}) + +test('the default themes and DeepSeek option remain available', () => { + const themes = allThemes() + assert.ok(themes.deepseek) + assert.ok(themes.mono) + assert.ok(themes.paper) + assert.ok(themes.moonlight) + assert.equal(themes.deepseek.dark.bg, '#141414') +}) + +test('wide sidebar keeps the FlyBot name and mark, and adds a 72px icon rail', () => { + const sidebar = src('sidebar.js') + assert.match(sidebar, /function BrandName\(\) \{\n return h\('span', \{ style: \{ fontWeight: 600, fontSize: 14 \} \}, t\('FlyBot'\)\)\n\}/) + assert.match(sidebar, /function BrandMark\(\{ size = 24 \}\) \{\n return h\('span', \{ className: 'bt-brand-mark' \}, h\(FlyBotMark, \{ size \}\)\)\n\}/) + assert.match(sidebar, /className: 'bt-icon-rail', 'aria-label': t\('FlyBot'\)/) + assert.match(sidebar, /className: wide \? 'bt-side bt-side-split' : 'bt-side bt-rail'/) + assert.equal(ICON_RAIL_WIDTH, 72) + assert.match(PARITY_SHELL_CSS, /\.bt-icon-rail\{[^}]*width:72px/) +}) + +test('Search, New, Inbox, Kanban and Projects stay in the sidebar', () => { + const sidebar = src('sidebar.js') + assert.match(sidebar, /'aria-label': t\('Search'\)/) + assert.match(sidebar, /'aria-label': t\('New…'\)/) + assert.equal(sidebar.match(/h\(InboxRow,/g)?.length, 1) + assert.ok(sidebar.indexOf('h(InboxRow,') < sidebar.indexOf("className: 'bt-list'")) + assert.equal(sidebar.match(/h\(KanbanRow,/g)?.length, 1) + assert.equal(sidebar.match(/h\(ProjectsNav,/g)?.length, 1) + assert.ok(sidebar.includes("h(FlyBotSections,")) +}) + +test('desktop composer is a taller rounded pill; phone rules are not moved here', () => { + assert.match(PARITY_SHELL_CSS, /@media \(min-width:641px\)/) + const desktop = PARITY_SHELL_CSS.split('@media (min-width:641px)')[1] + assert.match(desktop, /\[data-composer-card\]\{[^}]*min-height:86px/) + assert.match(desktop, /\[data-composer-card\]\{[^}]*border-radius:20px/) + assert.match(desktop, /\[data-composer-card\] \[class\*=\"_tools\"\]\{order:1/) + assert.match(desktop, /\[data-composer-card\]>\[data-input-scroll\]\{order:2/) + assert.match(desktop, /\[data-composer-card\] \[class\*=\"_trailing\"\]\{order:3/) + assert.match(desktop, /:focus-visible\{outline:2px solid var\(--bt-accent\)/) + assert.doesNotMatch(PARITY_SHELL_CSS, /@media \(max-width:640px\)/) + assert.doesNotMatch(PARITY_SHELL_CSS, /\.bt-flybot-approvals\{left:/) +}) + +test('parity shell styles install after conversation and flybot styles, before phone styles', () => { + const at = name => index.indexOf(`installCompiledStyles(${name}`) + assert.ok(at('PARITY_SHELL_CSS') > 0, 'PARITY_SHELL_CSS is installed in the shell group') + assert.ok(at('FLYBOT_CSS') < at('PARITY_SHELL_CSS')) + assert.ok(at('PARITY_SHELL_CSS') < at('MOBILE_CSS')) + const conv = index.indexOf("installCompiledStyles(CONVERSATION_CSS, 'conversation')") + const again = index.indexOf("installCompiledStyles(PARITY_SHELL_CSS, 'parity-shell-conversation')") + assert.ok(conv >= 0 && again > conv, 'composer overrides follow CONVERSATION_CSS') +}) + + +test('shell metrics follow the 1920×1072 screenshot measurements', () => { + assert.equal(ICON_RAIL_WIDTH, 72) + assert.equal(CHAT_LIST_WIDTH, 360) + assert.equal(SHELL_LEFT_WIDTH, 432) + assert.equal(COMPOSER_HEIGHT, 86) + assert.equal(HEADER_HEIGHT, 56) + assert.match(PARITY_SHELL_CSS, /\.bt-icon-rail\{[^}]*width:72px/) + assert.match(PARITY_SHELL_CSS, /\.bt-icon-rail\{[^}]*gap:6px/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn\{[^}]*width:40px;height:40px/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn\{[^}]*border-radius:12px/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn svg\{width:20px;height:20px\}/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-row-name\{font-size:14px;line-height:20px;font-weight:500/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-row-preview\{font-size:12px;line-height:16px;font-weight:400/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-row-title\{[^}]*text-overflow:ellipsis;white-space:nowrap/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-list\{[^}]*overflow-y:auto/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-hint\{[^}]*text-align:center/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn:disabled\{opacity:\.4;cursor:not-allowed\}/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn:hover\{background:var\(--bt-hover\)/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn\[aria-current=page\][^}]*--bt-selected/) + const desktop = PARITY_SHELL_CSS.split('@media (min-width:641px)')[1] + assert.match(desktop, /min-height:56px/) + assert.match(desktop, /min-height:86px/) + assert.match(desktop, /border-radius:20px/) + assert.match(desktop, /border:1px solid/) + assert.match(PARITY_SHELL_CSS, /@media \(min-width:1025px\)/) + assert.match(PARITY_SHELL_CSS, /width:432px;min-width:432px/) +}) diff --git a/core/test/schedules-client.test.js b/core/test/schedules-client.test.js index 8498e8bd3..ad79bc0f6 100644 --- a/core/test/schedules-client.test.js +++ b/core/test/schedules-client.test.js @@ -36,7 +36,7 @@ runInNewContext(outputFiles[0].text, { throw new Error(`Unexpected platform module ${name}`) }, }) -const { SchedulesPage, BotSchedules, ScheduleSummary, RoomSchedules, CopyRow, openPlugins, formStart, timingText, schedulesReadFailure, reachText } = module.exports +const { SchedulesPage, BotSchedules, ScheduleSummary, RoomSchedules, CopyRow, openPlugins, formStart, timingText, schedulesReadFailure, reachText, whenFromForm, wallClockInput, instantFromWallClock, timeZoneOptions } = module.exports // Every node and string under a tree; an array (what a page returns) is walked too. const all = (node, out = []) => { if (Array.isArray(node)) { for (const item of node) all(item, out); return out } @@ -127,6 +127,9 @@ test('Edit opens the task form filled in, and saving updates that task (#354)', assert.ok(all(form).some(node => node.type === 'textarea' && node.props.value === 'Sum up')) assert.ok(text(form).includes('Save changes')) assert.equal(all(card).filter(node => node.type === 'form').length, 1) + const zone = all(form).find(node => node.props?.['data-flybot'] === 'task-timezone') + assert.equal(zone?.props.value, 'Asia/Shanghai') + assert.ok(all(zone).some(node => node.props?.value === 'UTC' || node === 'UTC'), 'the picker lists UTC') form.props.onSubmit({ preventDefault() {} }) await new Promise(resolve => setImmediate(resolve)) assert.deepEqual(JSON.parse(JSON.stringify(sent)), [{ sessionId: 'chat-b1', id: 's1', target: 'b1', title: 'Briefing', prompt: 'Sum up', when: { kind: 'daily', time: '09:00', timeZone: 'Asia/Shanghai' } }]) @@ -139,6 +142,44 @@ test('the form starts from the edited task: repeat interval, one time, cron kept assert.deepEqual([once.kind, once.at], ['at', '2030-01-02T07:05']) assert.equal(formStart({ kind: 'cron', expression: '0 9 * * 1', timeZone: 'UTC' }).kind, 'cron') assert.deepEqual([formStart(undefined).kind, formStart(undefined).title, formStart(undefined).time], ['daily', '', '09:00']) + const shanghaiOnce = formStart({ kind: 'at', scheduledAt: '2030-01-02T07:05:00.000Z', timeZone: 'Asia/Shanghai' }) + assert.equal(shanghaiOnce.at, '2030-01-02T15:05') + assert.equal(shanghaiOnce.timeZone, 'Asia/Shanghai') +}) + +test('#3110: wall clocks convert through the chosen zone, and daily/weekly send that zone to the host', () => { + assert.equal(instantFromWallClock('2030-01-02T15:05', 'Asia/Shanghai'), '2030-01-02T07:05:00.000Z') + assert.equal(instantFromWallClock('2030-01-02T07:05', 'UTC'), '2030-01-02T07:05:00.000Z') + assert.equal(instantFromWallClock('2030-07-02T09:00', 'America/New_York'), '2030-07-02T13:00:00.000Z') + assert.equal(instantFromWallClock('2030-01-02T09:00', 'America/New_York'), '2030-01-02T14:00:00.000Z') + assert.equal(wallClockInput(Date.parse('2030-01-02T07:05:00.000Z'), 'Asia/Shanghai'), '2030-01-02T15:05') + const asJson = value => JSON.parse(JSON.stringify(value)) + assert.deepEqual(asJson(whenFromForm({ kind: 'daily', time: '09:00', timeZone: 'America/Los_Angeles' })), { + kind: 'daily', time: '09:00', timeZone: 'America/Los_Angeles', + }) + assert.deepEqual(asJson(whenFromForm({ kind: 'weekly', time: '18:30', weekdays: [1, 5], timeZone: 'UTC' })), { + kind: 'weekly', time: '18:30', timeZone: 'UTC', weekdays: [1, 5], + }) + const once = asJson(whenFromForm({ kind: 'at', at: '2030-01-02T15:05', timeZone: 'Asia/Shanghai' })) + assert.deepEqual(once, { kind: 'at', at: '2030-01-02T07:05:00.000Z', timeZone: 'Asia/Shanghai' }) + const every = asJson(whenFromForm({ kind: 'every', count: 2, unit: 'hours', timeZone: 'Asia/Shanghai' })) + assert.deepEqual(every, { kind: 'every', seconds: 7200 }) + assert.equal('timeZone' in every, false, 'an interval has no time_zone in the engine') + assert.ok(timeZoneOptions('Asia/Shanghai').includes('Asia/Shanghai')) + assert.ok(timeZoneOptions('Asia/Shanghai').includes('UTC')) + assert.ok(timeZoneOptions('Not/AZone').includes('Not/AZone'), 'a stored zone stays selectable') +}) + +test('#3110: the timezone picker is on once/daily/weekly forms and not on a repeat-every form', () => { + seeded.push({ available: true, tasks: [ACTIVE] }, ACTIVE) + const daily = render(BotSchedules({ bot: { id: 'b1' }, roster: ROSTER, actions: spy() })) + const dailyZone = all(daily).find(node => node.props?.['data-flybot'] === 'task-timezone') + assert.ok(dailyZone, 'the daily form shows a timezone control') + assert.equal(dailyZone.props.value, 'Asia/Shanghai') + const everyTask = { id: 'e1', sessionId: 'chat-b1', botId: 'b1', title: 'Ping', prompt: 'Ping', kind: 'every', everySeconds: 3600, scheduledAt: '2030-01-01T01:00:00.000Z', status: 'active' } + seeded.push({ available: true, tasks: [everyTask] }, everyTask) + const every = render(BotSchedules({ bot: { id: 'b1' }, roster: ROSTER, actions: spy() })) + assert.equal(all(every).some(node => node.props?.['data-flybot'] === 'task-timezone'), false, 'repeat-every has no zone in the engine, so no control') }) // #1651 (P-132): an interval that is not a whole number of minutes was shown rounded and @@ -260,19 +301,21 @@ test('turning quiet hours on saves the default window as the settings write (#11 assert.deepEqual(JSON.parse(JSON.stringify(sent)), [{ quietHours: { on: true, from: '22:00', to: '07:00' } }]) }) -test('a once task sends its zone, so the host reads its wall clock (#1166)', async () => { +test('a once task sends its zone, so the host reads its wall clock (#1166, #3110)', async () => { const sent = [] const actions = { ...spy(), scheduleUpdate: async (task) => { sent.push(task); return OFF } } const once = { ...ACTIVE, kind: 'at', scheduledAt: '2030-01-02T07:05:00.000Z' } seeded.push({ available: true, tasks: [once], quietHours: QUIET }, once) const card = render(BotSchedules({ bot: { id: 'b1' }, roster: ROSTER, actions })) const form = all(card).find(node => node.type === 'form') + const zone = all(form).find(node => node.props?.['data-flybot'] === 'task-timezone') + assert.equal(zone?.props.value, 'Asia/Shanghai') form.props.onSubmit({ preventDefault() {} }) await new Promise(resolve => setImmediate(resolve)) const [when] = JSON.parse(JSON.stringify(sent)).map(task => task.when) assert.equal(when.kind, 'at') - assert.equal(typeof when.timeZone, 'string') - assert.notEqual(when.timeZone, '') + assert.equal(when.timeZone, 'Asia/Shanghai') + assert.equal(when.at, '2030-01-02T07:05:00.000Z', 'the wall clock is read in the chosen zone, not only attached') }) test('the repeat-task warning is the view flag, not the page scanning its tasks (#1199)', () => { @@ -791,7 +834,7 @@ test('#2232: Quiet hours and the form announce a refusal, not only print it', as const start = formStart(ACTIVE) seeded.push( { available: true, tasks: [] }, true, null, false, '', '22:00', '07:00', - 'b1', start.title, start.prompt, start.kind, start.at, start.time, start.weekdays, start.count, start.unit, false, sentence, + 'b1', start.title, start.prompt, start.kind, start.at, start.time, start.weekdays, start.count, start.unit, start.timeZone, false, sentence, ) const formShown = render(SchedulesPage({ roster: ROSTER, actions: formActions, start: 'b1' })) const formAlerts = alertsOf(formShown) diff --git a/core/test/session-list-filter.test.js b/core/test/session-list-filter.test.js new file mode 100644 index 000000000..6a02a7675 --- /dev/null +++ b/core/test/session-list-filter.test.js @@ -0,0 +1,50 @@ +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { matchesSessionFilter, sessionIsUnread, sessionStatusOf, SESSION_FILTERS } from '../src/shared/session-list-filter.js' + +const chief = { kind: 'bot', item: { id: 'chief', name: 'Chief' } } +const writer = { kind: 'bot', item: { id: 'writer', name: 'Writer', sessionId: 'writer-s' } } +const room = { kind: 'room', item: { id: 'room-1', name: 'Review room' } } +const agent = { kind: 'agent', item: { id: 'dsh', sessions: ['a1', 'a2'] } } + +test('the public filters are all, group, direct, and unread', () => { + assert.deepEqual(SESSION_FILTERS, ['all', 'group', 'direct', 'unread']) +}) + +test('all keeps every row; group is rooms; direct is Bots and the coding agent', () => { + assert.equal(matchesSessionFilter(chief, 'all'), true) + assert.equal(matchesSessionFilter(room, 'all'), true) + assert.equal(matchesSessionFilter(agent, 'all'), true) + assert.equal(matchesSessionFilter(room, 'group'), true) + assert.equal(matchesSessionFilter(chief, 'group'), false) + assert.equal(matchesSessionFilter(agent, 'group'), false) + assert.equal(matchesSessionFilter(chief, 'direct'), true) + assert.equal(matchesSessionFilter(agent, 'direct'), true) + assert.equal(matchesSessionFilter(room, 'direct'), false) +}) + +test('unread keeps only rows already marked unread, and never invents a read chip', () => { + assert.equal(matchesSessionFilter(chief, 'unread', false), false) + assert.equal(matchesSessionFilter(chief, 'unread', true), true) + assert.equal(matchesSessionFilter(room, 'unread', true), true) + assert.equal(SESSION_FILTERS.includes('read'), false) +}) + +test('unread follows completion, a pending bot interaction, or a manual mark', () => { + const map = new Map([ + ['chief', { completionUnread: true }], + ['writer-s', { pendingInteraction: { id: 'q1' } }], + ['room-1', { completionUnread: true }], + ['a2', { completionUnread: true }], + ]) + assert.equal(sessionIsUnread(chief, map, {}), true) + assert.equal(sessionIsUnread(writer, map, {}), true) + assert.equal(sessionIsUnread(room, map, {}), true) + assert.equal(sessionIsUnread(agent, map, {}), true) + assert.equal(sessionIsUnread(chief, new Map(), { chief: true }), true) + assert.equal(sessionIsUnread(writer, new Map(), {}), false) + assert.equal(sessionIsUnread(room, new Map(), {}), false) + assert.equal(sessionIsUnread(agent, new Map(), {}), false) + assert.equal(sessionStatusOf({ chief: { completionUnread: true } }, 'chief')?.completionUnread, true) + assert.equal(sessionStatusOf(null, 'chief'), undefined) +}) diff --git a/core/test/session-unread.test.js b/core/test/session-unread.test.js new file mode 100644 index 000000000..b53a2308f --- /dev/null +++ b/core/test/session-unread.test.js @@ -0,0 +1,39 @@ +import { sessionIsUnread, matchesSessionFilter } from '../src/shared/session-list-filter.js' +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { isManuallyUnread, shouldClearManualUnread, unreadEntryId } from '../src/shared/session-unread.js' + +test('manual unread clears only when a chat becomes active, not while it stays open', () => { + assert.equal(shouldClearManualUnread({ active: true, wasActive: false, marked: true }), true) + assert.equal(shouldClearManualUnread({ active: true, wasActive: true, marked: true }), false) + assert.equal(shouldClearManualUnread({ active: false, wasActive: true, marked: true }), false) + assert.equal(shouldClearManualUnread({ active: true, wasActive: false, marked: false }), false) +}) + +test('unreadEntryId uses the Bot, room, or agent id the sidebar stores', () => { + const writer = { id: 'writer', sessionId: 'sess-w' } + const roster = { + bots: [{ id: 'chief', sessionId: 'chief' }, writer], + byId: { chief: { id: 'chief' }, writer }, + rooms: [{ id: 'room-1' }], + roomsById: { 'room-1': { id: 'room-1' } }, + agents: [{ id: 'dsh', sessions: ['a1'] }], + } + assert.equal(unreadEntryId(roster, 'writer'), 'writer') + assert.equal(unreadEntryId(roster, 'sess-w'), 'writer') + assert.equal(unreadEntryId(roster, 'room-1'), 'room-1') + assert.equal(unreadEntryId(roster, 'a1'), 'dsh') + assert.equal(unreadEntryId(roster, 'missing'), 'missing') + assert.equal(isManuallyUnread({ writer: true }, 'writer'), true) + assert.equal(isManuallyUnread({}, 'writer'), false) +}) + + +test('clearing the manual mark does not acknowledge system unread or remove it from unread filter', () => { + const entry = { kind: 'bot', item: { id: 'chief' } } + const system = { chief: { completionUnread: true } } + assert.equal(sessionIsUnread(entry, system, { chief: true }), true) + assert.equal(matchesSessionFilter(entry, 'unread', sessionIsUnread(entry, system, {})), true) + assert.equal(sessionIsUnread(entry, { chief: { pendingInteraction: { kind: 'question' } } }, {}), true) + assert.equal(sessionIsUnread(entry, {}, {}), false) +}) diff --git a/core/test/settings-page-keys.test.js b/core/test/settings-page-keys.test.js index d85463ac1..c7f7c441f 100644 --- a/core/test/settings-page-keys.test.js +++ b/core/test/settings-page-keys.test.js @@ -28,7 +28,7 @@ function clientSources(dir, out = []) { test('every openSettings() page key exists in SETTINGS_PAGES', () => { const keys = new Set(settingsPageKeys()) - assert.equal(keys.size, 13, 'the settings dialog lists thirteen pages') + assert.equal(keys.size, 14, 'the settings dialog lists fourteen pages') const unknown = [] let seen = 0 diff --git a/core/test/settings-page-slot.test.js b/core/test/settings-page-slot.test.js index f37182949..e299ec27b 100644 --- a/core/test/settings-page-slot.test.js +++ b/core/test/settings-page-slot.test.js @@ -39,7 +39,7 @@ test('a flybot.settings.page entry is listed after Connectors and drawn with the const tree = SettingsDialog({ page: 'plugin:social', id: null, roster, actions, useUpdate: () => ({}) }) const nodes = all(tree) const items = nodes.filter(node => node.type === 'button' && node.props.className === 'bt-settings-item').map(text) - assert.deepEqual(items.slice(4, 7), ['Connectors', 'Bot Social', 'Capabilities']) + assert.deepEqual(items.slice(4, 8), ['Connectors', 'Channels', 'Bot Social', 'Capabilities']) assert.equal(text(nodes.find(node => node.type === 'h2')), 'Bot Social') const slot = nodes.find(node => node.props?.entry?.id === 'social') assert.ok(slot) @@ -56,6 +56,6 @@ test('a page whose plugin is gone falls back to General, and without plugins the const nodes = all(tree) assert.equal(text(nodes.find(node => node.type === 'h2')), 'General') const items = nodes.filter(node => node.type === 'button' && node.props.className === 'bt-settings-item').map(text) - assert.deepEqual(items.slice(0, 7), ['General', 'Bots', 'Group chats', 'Projects', 'Connectors', 'Capabilities', 'Plugins']) + assert.deepEqual(items.slice(0, 8), ['General', 'Bots', 'Group chats', 'Projects', 'Connectors', 'Channels', 'Capabilities', 'Plugins']) assert.equal(nodes.some(node => node.props?.entry !== undefined), false) }) diff --git a/core/test/settings-readonly-pages.test.js b/core/test/settings-readonly-pages.test.js index bedad0b72..b4bba68d4 100644 --- a/core/test/settings-readonly-pages.test.js +++ b/core/test/settings-readonly-pages.test.js @@ -1,7 +1,7 @@ // #2474: in a window that holds the team read-only the host refuses every write with -// `bot/read-only`, but seven Settings pages still drew their controls: General's theme +// `bot/read-only`, but eight Settings pages still drew their controls: General's theme // select and switches, the Bots page's Main Bot and animation controls, and the live forms -// of a Bot, a group chat, Connectors, Capabilities and Secrets. Each page now reads the +// of a Bot, a group chat, Connectors, Channels, Capabilities and Secrets. Each page now reads the // roster's own read-only sentence through `lockedWindow` and draws a plain-text view // instead: no control anywhere, and the facts of the page kept as text. A writable window // is untouched, and the standing sentence stays in the dialog header — once per page. @@ -79,6 +79,7 @@ const writer = { id: 'writer', name: 'Writer', role: 'Editor', model: 'mock/m1', const editor = { id: 'editor', name: 'Editor', role: '', model: 'mock/m1', workDir: null, instructions: '' } const room = { id: 'r1', name: 'Ops', admin: 'chief', members: ['chief', 'writer'], mode: 'admin', notice: 'Read this first.', named: true, workDir: '/work/ops', participants: [{ kind: 'human', id: 'owner-1', displayName: 'Alice', role: 'admin' }] } const github = { id: 'github', name: 'GitHub', kind: 'tool', state: 'ready', account: 'xuke' } +const feishu = { id: 'feishu', name: 'Feishu', kind: 'channel', state: 'off' } const browser = { name: 'browser', kind: 'mcp', transport: 'stdio', description: 'Open pages' } const token = { name: 'GITHUB_TOKEN', purpose: 'Push branches', scope: 'all', createdAt: 0 } const baseRoster = { @@ -90,7 +91,7 @@ const baseRoster = { mainBotId: 'chief', prefs: { theme: 'deepseek', motion: 'quiet', notifications: true }, models: [{ id: 'm1', name: 'Mock One', served: true }], - connectors: [github], + connectors: [github, feishu], capabilities: [browser], secrets: [token], humans: [], @@ -198,11 +199,12 @@ const INTERACTIVE = new Set(['button', 'a', 'input', 'select', 'textarea']) const isInteractive = (node) => INTERACTIVE.has(nameOf(node)) || typeof node.props?.onClick === 'function' const PAGES = [ - { key: 'general', id: null, name: 'GeneralPage', facts: ['DeepSeek', 'On'] }, + { key: 'general', id: null, name: 'GeneralPage', facts: ['DeepSeek', 'On', 'Standard'] }, { key: 'bots', id: null, name: 'BotsPage', facts: ['Main Bot', 'Chief', 'Writer', 'Bot animation', 'Quiet'] }, { key: 'bots', id: 'chief', name: 'BotSettingsForm', facts: ['Chief', 'Researcher', 'Run the team.'] }, { key: 'groups', id: 'r1', name: 'GroupSettingsForm', facts: ['Ops', 'Chief', 'Writer', 'Alice', 'Read this first.'] }, { key: 'connectors', id: null, name: 'ConnectorsPage', facts: ['GitHub', 'xuke'] }, + { key: 'channels', id: null, name: 'ChannelsPage', facts: ['Feishu'] }, { key: 'capabilities', id: null, name: 'CapabilitiesPage', facts: ['browser', 'Open pages'] }, { key: 'secrets', id: null, name: 'SecretsPage', facts: ['GITHUB_TOKEN', 'Push branches'] }, ] @@ -210,7 +212,7 @@ const PAGES = [ // Pressing what a locked page draws may navigate; it may not write. const pressure = (nodes) => nodes.filter(node => nameOf(node) === 'button') -test('a read-only window draws no write control on any of the seven Settings pages (#2474)', () => { +test('a read-only window draws no write control on any of the eight Settings pages (#2474)', () => { const controls = [] const writes = [] const missing = [] @@ -253,7 +255,9 @@ test('a writable window keeps every page as it is today (#2474)', () => { const general = mount(baseRoster, 'general', null, 'GeneralPage').nodes assert.equal(general.filter(node => node.type === 'select').length, 1, 'General keeps its theme select') assert.equal(general.filter(node => node.type === 'input').length, 1, 'General keeps its colour field') - assert.equal(counts(general), 6, 'General keeps its four switches beside them') + // Theme select, accent field, four notification switches, appearance and send-shortcut + // segmenteds, plus the document-card switch (folding modes are radio buttons, not widgets). + assert.equal(counts(general), 9, 'General keeps its theme, accent, appearance, shortcut, folding and notification controls') const bots = mount(baseRoster, 'bots', null, 'BotsPage').nodes assert.equal(bots.filter(node => node.type === 'select').length, 2, 'Bots keeps both of its Main Bot selects') @@ -262,6 +266,7 @@ test('a writable window keeps every page as it is today (#2474)', () => { assert.ok(counts(mount(baseRoster, 'bots', 'chief', 'BotSettingsForm').nodes) >= 3, 'a Bot keeps its live form') assert.ok(counts(mount(baseRoster, 'groups', 'r1', 'GroupSettingsForm').nodes) >= 3, 'a group keeps its live form') assert.ok(mount(baseRoster, 'connectors', null, 'ConnectorsPage').nodes.some(node => nameOf(node) === 'ConnectorRow'), 'Connectors keeps its live rows') + assert.ok(mount(baseRoster, 'channels', null, 'ChannelsPage').nodes.some(node => nameOf(node) === 'ConnectorRow'), 'Channels keeps the Feishu row') assert.ok(mount(baseRoster, 'capabilities', null, 'CapabilitiesPage').nodes.some(node => nameOf(node) === 'CapabilityRow'), 'Capabilities keeps its rows') assert.ok(mount(baseRoster, 'secrets', null, 'SecretsPage').nodes.some(node => nameOf(node) === 'SecretRow'), 'Secrets keeps its rows') }) diff --git a/core/test/sidebar-parity-events.test.js b/core/test/sidebar-parity-events.test.js new file mode 100644 index 000000000..0c0f3645a --- /dev/null +++ b/core/test/sidebar-parity-events.test.js @@ -0,0 +1,186 @@ +// First-batch shell: the icon rail and header entries actually fire navigation, typing +// focuses search, and the collapsed rail keeps its existing shape. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' +import { MOBILE_CSS } from '../src/client/mobile.js' +import { PARITY_SHELL_CSS } from '../src/client/parity-shell.js' + +const { outputFiles } = await build({ + stdin: { + contents: "export { TeamSidebar } from './src/client/sidebar.js'", + resolveDir: fileURLToPath(new URL('..', import.meta.url)), + }, + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], +}) + +const h = (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }) +class Component { + constructor(props) { this.props = props } + setState() {} +} +const react = { + createElement: h, + Fragment: Symbol('Fragment'), + Component, + PureComponent: Component, + createRef: () => ({ current: null }), + useState: initial => [typeof initial === 'function' ? initial() : initial, () => {}], + useEffect() {}, + useLayoutEffect() {}, + useRef: value => ({ current: value }), + useCallback: fn => fn, + useMemo: fn => fn(), +} +const slots = { entries: () => [], subscribe: () => () => {}, version: () => 0 } +const module = { exports: {} } +class Element {} +runInNewContext(outputFiles[0].text, { + module, exports: module.exports, console, Date, JSON, Promise, Symbol, Element, + __flybot__: { slots, call: () => {} }, + require: (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return {} + throw new Error(`Unexpected platform module ${name}`) + }, +}) +const { TeamSidebar } = module.exports + +const walk = (node, out = []) => { + if (Array.isArray(node)) { + for (const child of node) walk(child, out) + return out + } + if (!node || typeof node !== 'object') return out + out.push(node) + walk(node.props?.children, out) + return out +} +const all = tree => walk(tree) +const byClass = (tree, name) => all(tree).filter(node => { + const value = node.props?.className + return typeof value === 'string' && value.split(' ').includes(name) +}) +const buttonsNamed = (tree, label) => all(tree).filter(node => node.type === 'button' && node.props?.['aria-label'] === label) + +function renderSidebar({ wide, actions }) { + const roster = { ready: true, bots: [], rooms: [], agents: [], byId: {}, roomsById: {}, mainBotId: undefined } + const defaults = { + openInbox() {}, openBoard() {}, openPalette() {}, openNewChat() {}, + landOnMainBot() {}, clearUnread() {}, isAgentSession: () => false, + } + return TeamSidebar({ + wide, + useRoster: select => select(roster), + useUi: select => select({}), + useSessions: select => select({ ids: [], byId: {} }), + useRegistry: () => {}, + useUpdate: select => select({}), + useWork: select => select({}), + useSessionStatus: select => select({}), + useSessionRetainInfo: select => select({}), + useActivity: select => select({}), + actions: { ...defaults, ...actions }, + }) +} + +test('wide sidebar Search and New in the rail and the header open the same actions', () => { + const palette = [] + const created = [] + const tree = renderSidebar({ + wide: true, + actions: { + openPalette: (query) => palette.push(query ?? 'open'), + openNewChat: (kind) => created.push(kind), + }, + }) + assert.equal(byClass(tree, 'bt-side-split').length, 1) + assert.equal(byClass(tree, 'bt-rail').length, 0) + const rail = byClass(tree, 'bt-icon-rail') + assert.equal(rail.length, 1) + assert.equal(rail[0].type, 'nav') + assert.equal(rail[0].props['aria-label'], 'FlyBot') + + const search = buttonsNamed(tree, 'Search') + const createdBtns = buttonsNamed(tree, 'New…') + assert.equal(search.length, 2, 'Search stays in the header and is also on the rail') + assert.equal(createdBtns.length, 2, 'New stays in the header and is also on the rail') + for (const button of [...search, ...createdBtns]) { + assert.equal(button.props.type, 'button') + assert.equal(typeof button.props.onClick, 'function') + assert.ok(button.props.title) + } + + search[0].props.onClick() + search[1].props.onClick() + assert.deepEqual(palette, ['open', 'open']) + createdBtns[0].props.onClick() + createdBtns[1].props.onClick() + assert.deepEqual(created, ['new', 'new']) +}) + +test('typing a character in the wide sidebar opens search with that character', () => { + const palette = [] + const tree = renderSidebar({ wide: true, actions: { openPalette: (query) => palette.push(query) } }) + const event = { + key: 'c', + defaultPrevented: false, + metaKey: false, + ctrlKey: false, + altKey: false, + nativeEvent: { isComposing: false }, + target: {}, + preventDefault() { this.defaultPrevented = true }, + } + tree.props.onKeyDown(event) + assert.equal(event.defaultPrevented, true) + assert.deepEqual(palette, ['c']) +}) + +test('modifier keys and Space do not steal focus for search', () => { + const palette = [] + const tree = renderSidebar({ wide: true, actions: { openPalette: (query) => palette.push(query) } }) + const fire = (extra) => { + const event = { + key: 'c', defaultPrevented: false, metaKey: false, ctrlKey: false, altKey: false, + nativeEvent: { isComposing: false }, target: {}, preventDefault() { this.defaultPrevented = true }, + ...extra, + } + tree.props.onKeyDown(event) + return event + } + fire({ metaKey: true }) + fire({ ctrlKey: true }) + fire({ altKey: true }) + fire({ key: ' ' }) + fire({ key: 'Enter' }) + fire({ key: 'c', nativeEvent: { isComposing: true } }) + assert.deepEqual(palette, []) +}) + +test('the collapsed rail keeps New, and does not draw the wide icon rail', () => { + const created = [] + const tree = renderSidebar({ wide: false, actions: { openNewChat: (kind) => created.push(kind) } }) + assert.equal(byClass(tree, 'bt-rail').length, 1) + assert.equal(byClass(tree, 'bt-icon-rail').length, 0) + assert.equal(byClass(tree, 'bt-side-split').length, 0) + const createdBtns = buttonsNamed(tree, 'New…') + assert.equal(createdBtns.length, 1) + createdBtns[0].props.onClick() + assert.deepEqual(created, ['new']) +}) + +test('desktop composer and header restyles stay above the phone breakpoint, and phone approval offsets stay put', () => { + assert.match(PARITY_SHELL_CSS, /@media \(min-width:641px\)/) + const desktop = PARITY_SHELL_CSS.split('@media (min-width:641px)')[1] + assert.match(desktop, /min-height:86px/) + assert.match(desktop, /border-radius:20px/) + assert.doesNotMatch(PARITY_SHELL_CSS.split('@media (min-width:641px)')[0], /min-height:86px/) + assert.match(MOBILE_CSS, /@media \(max-width:640px\)/) + assert.match(MOBILE_CSS, /\.bt-flybot-approvals\{left:64px/) + assert.match(MOBILE_CSS, /\.bt-flybot-pointers\{[^}]*max-width:calc\(100vw - 72px\)/) +}) diff --git a/core/test/sidebar-session-filter.test.js b/core/test/sidebar-session-filter.test.js new file mode 100644 index 000000000..2309e4d3d --- /dev/null +++ b/core/test/sidebar-session-filter.test.js @@ -0,0 +1,175 @@ +// The sidebar session filter only offers kinds the list already has: all, group +// chats, direct chats, and unread (from the same marks the rows already draw). +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' + +const { outputFiles } = await build({ + stdin: { + contents: "export { TeamSidebar } from './src/client/sidebar.js'", + resolveDir: fileURLToPath(new URL('..', import.meta.url)), + }, + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], +}) + +const h = (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }) +let slots = [] +let index = 0 +const react = { + createElement: h, Component: class {}, Fragment: Symbol('F'), + useMemo: (fn) => { const at = index++; if (!(at in slots)) slots[at] = fn(); return slots[at] }, + useState: (initial) => { + const at = index++ + if (!(at in slots)) slots[at] = typeof initial === 'function' ? initial() : initial + return [slots[at], (value) => { slots[at] = typeof value === 'function' ? value(slots[at]) : value }] + }, + useCallback: (fn) => fn, + useRef: (value) => { const at = index++; if (!(at in slots)) slots[at] = { current: value }; return slots[at] }, + useEffect() {}, + useLayoutEffect() {}, + useSyncExternalStore: (_subscribe, get) => get(), +} +const win = { location: { hash: '' }, innerHeight: 800, addEventListener() {}, removeEventListener() {}, matchMedia: () => ({ matches: false, addEventListener() {}, removeEventListener() {} }) } +const module = { exports: {} } +runInNewContext(outputFiles[0].text, { + module, exports: module.exports, console, setTimeout, clearTimeout, setImmediate, queueMicrotask, + requestAnimationFrame: () => 0, cancelAnimationFrame() {}, + Date, JSON, Promise, Symbol, Map, Set, + document: { hidden: false, addEventListener() {}, removeEventListener() {}, body: {}, querySelector: () => null }, + navigator: { language: 'en' }, + localStorage: { getItem: () => null, setItem() {} }, + window: win, + __flybot__: { slots: { entries: () => [], subscribe: () => () => {}, version: () => 0 }, call: () => {} }, + require: (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return {} + throw new Error(`Unexpected platform module ${name}`) + }, +}) +const { TeamSidebar } = module.exports + +const chief = { id: 'chief', name: 'Chief' } +const writer = { id: 'writer', name: 'Writer' } +const room = { id: 'room-1', name: 'Review room', origin: 'group' } +const statuses = new Map([ + ['writer', { completionUnread: true }], +]) +const roster = { + ready: true, bots: [chief, writer], rooms: [room], agents: [], + byId: { chief, writer }, roomsById: { 'room-1': room }, mainBotId: 'chief', +} +const OPAQUE = new Set(['BotRow', 'RoomRow', 'AgentRow', 'InboxRow', 'KanbanRow', 'ProjectsNav', 'FlyBotSections', 'TreeNode', 'UpdateButton', 'BrandMark', 'BrandName']) +const expand = (node) => { + if (Array.isArray(node)) return node.map(expand) + if (!node || typeof node !== 'object') return node + if (typeof node.type === 'function' && !OPAQUE.has(node.type.name)) return expand(node.type(node.props ?? {})) + const props = node.props ?? {} + return { ...node, props: { ...props, children: expand(props.children) } } +} +const all = (node, out = []) => { + if (node == null) return out + if (Array.isArray(node)) { for (const item of node) all(item, out); return out } + if (typeof node !== 'object') return out + out.push(node) + all(node.props?.children, out) + return out +} +const ownText = (node) => { + const walk = (value) => { + if (Array.isArray(value)) return value.map(walk).join('') + if (typeof value === 'string' || typeof value === 'number') return String(value) + if (value && typeof value === 'object') return walk(value.props?.children) + return '' + } + return walk(node?.props?.children) +} +const hasClass = (node, name) => String(node.props?.className ?? '').split(/\s+/).includes(name) + +const mount = () => { + slots = [] + const draw = () => { + index = 0 + return all(expand(TeamSidebar({ + wide: true, + useRoster: select => select(roster), + useUi: select => select({ unread: {} }), + useSessions: select => select({ ids: ['chief', 'writer', 'room-1'], byId: { chief: { updatedAt: 3 }, writer: { updatedAt: 2 }, 'room-1': { updatedAt: 1 } } }), + useRegistry: () => {}, + useUpdate: select => select({}), + useWork: select => select({}), + useSessionStatus: select => select(statuses), + useSessionRetainInfo: select => select({}), + useActivity: select => select({}), + actions: { + openInbox() {}, openBoard() {}, openPalette() {}, openNewChat() {}, + landOnMainBot() {}, clearUnread() {}, isAgentSession: () => false, + }, + }))) + } + return draw +} + +test('the wide sidebar offers All, Group chats, Direct chats, and Unread, and no Read chip', () => { + const nodes = mount()() + const bar = nodes.find(node => hasClass(node, 'bt-session-filter')) + assert.ok(bar, 'the session filter is drawn above the list') + const chips = nodes.filter(node => hasClass(node, 'bt-session-filter-btn')) + assert.deepEqual(chips.map(ownText), ['All', 'Group chats', 'Direct chats', 'Unread']) + assert.equal(chips.find(node => ownText(node) === 'All').props['aria-checked'], true) + assert.equal(nodes.some(node => ownText(node) === 'Read' && hasClass(node, 'bt-session-filter-btn')), false) + const kinds = nodes.filter(node => typeof node.type === 'function').map(node => node.type.name) + assert.ok(kinds.includes('BotRow')) + assert.ok(kinds.includes('RoomRow')) +}) + +test('Group chats keeps rooms, Direct chats keeps Bots, Unread keeps only marked rows', () => { + const draw = mount() + let nodes = draw() + const press = label => { + const chip = nodes.find(node => hasClass(node, 'bt-session-filter-btn') && ownText(node) === label) + assert.ok(chip, label) + chip.props.onClick() + nodes = draw() + } + const names = (kind) => nodes.filter(node => node.type?.name === kind).map(node => (node.props.bot ?? node.props.room)?.name) + press('Group chats') + assert.deepEqual(names('RoomRow'), ['Review room']) + assert.deepEqual(names('BotRow'), []) + press('Direct chats') + assert.deepEqual(names('RoomRow'), []) + assert.ok(names('BotRow').includes('Chief')) + assert.ok(names('BotRow').includes('Writer')) + press('Unread') + assert.deepEqual(names('BotRow'), ['Writer']) + assert.deepEqual(names('RoomRow'), []) + press('All') + assert.ok(names('BotRow').includes('Chief')) + assert.ok(names('RoomRow').includes('Review room')) +}) + +test('the narrow rail does not draw session filter chips', () => { + slots = [] + index = 0 + const tree = TeamSidebar({ + wide: false, + useRoster: select => select(roster), + useUi: select => select({ unread: {} }), + useSessions: select => select({ ids: [], byId: {} }), + useRegistry: () => {}, + useUpdate: select => select({}), + useWork: select => select({}), + useSessionStatus: select => select(statuses), + useSessionRetainInfo: select => select({}), + useActivity: select => select({}), + actions: { + openInbox() {}, openBoard() {}, openPalette() {}, openNewChat() {}, + landOnMainBot() {}, clearUnread() {}, isAgentSession: () => false, + }, + }) + const nodes = all(expand(tree)) + assert.equal(nodes.some(node => hasClass(node, 'bt-session-filter')), false) +}) diff --git a/core/test/theme-prefs.test.js b/core/test/theme-prefs.test.js new file mode 100644 index 000000000..e067e240d --- /dev/null +++ b/core/test/theme-prefs.test.js @@ -0,0 +1,83 @@ +// Theme choice in a real FlyBot: Grove is the unsaved default, existing themes stay selectable, +// and the same record installTheme writes to localStorage can be read back. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { DICTIONARY, installLocale, t } from '../src/client/i18n.js' +import { + DEFAULT_THEME, allThemes, resolveThemeId, themeCss, themePrefsRecord, +} from '../src/client/themes.js' + +test('a profile with no saved theme presents Grove, and a saved id is kept', () => { + assert.equal(DEFAULT_THEME, 'grove') + assert.equal(resolveThemeId(undefined), 'grove') + assert.equal(resolveThemeId({}), 'grove') + assert.equal(resolveThemeId({ theme: 'unknown-theme' }), 'grove') + assert.equal(resolveThemeId({ theme: 'deepseek' }), 'deepseek') + assert.equal(resolveThemeId({ theme: 'mono' }), 'mono') + assert.equal(resolveThemeId({ theme: 'paper' }), 'paper') + assert.equal(resolveThemeId({ theme: 'moonlight' }), 'moonlight') + assert.equal(resolveThemeId({ theme: 'grove' }), 'grove') +}) + +test('every shipped theme stays in the picker, including Grove and DeepSeek', () => { + const themes = allThemes() + assert.deepEqual(Object.keys(themes).sort(), ['deepseek', 'grove', 'mono', 'moonlight', 'paper'].sort()) + assert.equal(themes.grove.label, 'Grove') + assert.equal(themes.deepseek.label, 'DeepSeek') +}) + +test('Grove tokens are the forest shell; DeepSeek tokens stay the original greys', () => { + const grove = themeCss(allThemes().grove) + assert.match(grove, /html body\{[^}]*--bt-main:#f4f7f5/) + assert.match(grove, /html body\[data-ds-dark-theme\]\{[^}]*--bt-main:#171c19/) + assert.match(grove, /--bt-card:#272e2b/) + assert.match(grove, /--bt-accent:#3d9a6e/) + assert.match(grove, /--bt-selected:#235039/) + const deepseek = themeCss(allThemes().deepseek) + assert.match(deepseek, /html body\[data-ds-dark-theme\]\{[^}]*--bt-main:#141414/) + assert.match(deepseek, /--bt-accent:#5b7bff/) + assert.doesNotMatch(grove, /Teamily|teamily/) +}) + +test('the localStorage record installTheme writes can be resolved on the next load', () => { + const store = new Map() + const storage = { + setItem(key, value) { store.set(key, value) }, + getItem(key) { return store.get(key) ?? null }, + } + const key = 'ds-bot:prefs' + storage.setItem(key, JSON.stringify(themePrefsRecord({ theme: 'grove', accent: '#1f7a54', motion: 'normal' }))) + const saved = JSON.parse(storage.getItem(key)) + assert.equal(saved.theme, 'grove') + assert.equal(resolveThemeId(saved), 'grove') + + storage.setItem(key, JSON.stringify(themePrefsRecord({ theme: 'deepseek', motion: 'quiet' }))) + const kept = JSON.parse(storage.getItem(key)) + assert.equal(kept.theme, 'deepseek') + assert.equal(resolveThemeId(kept), 'deepseek') + + storage.setItem(key, JSON.stringify(themePrefsRecord({}))) + const blank = JSON.parse(storage.getItem(key)) + assert.equal(blank.theme, undefined) + assert.equal(resolveThemeId(blank), 'grove') +}) + +test('Grove has a Chinese label, like the other theme names', () => { + assert.equal(DICTIONARY.zh.Grove, '林间') + const dicts = new Map() + const off = installLocale({ + register: (ns, locale, dict) => { dicts.set(`${ns}:${locale}`, dict); return () => dicts.delete(`${ns}:${locale}`) }, + bind: ns => (key) => dicts.get(`${ns}:zh`)?.[key] ?? key, + getLocale: () => ({ active: 'zh' }), + }) + try { + for (const theme of Object.values(allThemes())) { + assert.equal(typeof t(theme.label), 'string') + assert.notEqual(t(theme.label), '') + } + assert.equal(t('Grove'), '林间') + assert.equal(t('DeepSeek'), 'DeepSeek') + } finally { + off() + } +}) diff --git a/core/test/turn-tail.test.js b/core/test/turn-tail.test.js index a6d10b70d..5438a014b 100644 --- a/core/test/turn-tail.test.js +++ b/core/test/turn-tail.test.js @@ -67,7 +67,7 @@ function cellProps({ closingSeq = 10, turn = finished } = {}) { } return { props, asked, links } } -const markdownOf = props => find(expand(AssistantCell(props), ['Bubbles']), node => node.type === MarkdownText) +const markdownOf = props => find(expand(AssistantCell(props), ['Bubbles', 'FoldedContent']), node => node.type === MarkdownText) test('a reply that closes its turn links the files the turn changed or delivered', () => { const { props, asked, links } = cellProps() @@ -106,7 +106,7 @@ test('the turn tail entry notes when the turn ended and shows the pause before t test('a reply to a line the friend typed themselves is drawn as the person, not as the Bot', () => { const { props } = cellProps() const typed = { ...props, useRoster: select => select({ ...roster, remoteTypedTurns: { b: { 3: 'Bob' } } }) } - const drawn = expand(AssistantCell(typed), ['PersonMessage', 'PersonMark', 'Bubbles']) + const drawn = expand(AssistantCell(typed), ['PersonMessage', 'PersonMark', 'Bubbles', 'FoldedContent']) const [person] = find(drawn, node => node.props?.['data-person'] !== undefined) assert.equal(person.props['data-person'], 'Bob') assert.equal(find(drawn, node => /\bbt-person-mark\b/.test(node.props?.className ?? '')).length, 1) @@ -114,8 +114,8 @@ test('a reply to a line the friend typed themselves is drawn as the person, not assert.equal(find(drawn, node => node.type === MarkdownText).length, 1, 'the text is still rendered as markdown') // Another turn, or no mark at all: the Bot\'s own bubble. const other = { ...props, useRoster: select => select({ ...roster, remoteTypedTurns: { b: { 9: 'Bob' } } }) } - assert.equal(find(expand(AssistantCell(other), ['PersonMessage', 'PersonMark', 'Bubbles']), node => node.props?.['data-person'] !== undefined).length, 0) - assert.equal(find(expand(AssistantCell(props), ['PersonMessage', 'PersonMark', 'Bubbles']), node => node.props?.['data-person'] !== undefined).length, 0) + assert.equal(find(expand(AssistantCell(other), ['PersonMessage', 'PersonMark', 'Bubbles', 'FoldedContent']), node => node.props?.['data-person'] !== undefined).length, 0) + assert.equal(find(expand(AssistantCell(props), ['PersonMessage', 'PersonMark', 'Bubbles', 'FoldedContent']), node => node.props?.['data-person'] !== undefined).length, 0) }) // #275: a friend's line in my Bot's own chat came while I was away. The NEW divider marks it; once diff --git a/docs/subsystems/core-client.md b/docs/subsystems/core-client.md index 09bcb93d3..924a09410 100644 --- a/docs/subsystems/core-client.md +++ b/docs/subsystems/core-client.md @@ -540,3 +540,7 @@ a negative or unreadable count, a count with no generation) and leaves the memor carries the pair, `unchanged` included, through the real `ownedLive` whitelist on a signed-in deployment) and `core/test/state-link-notice.test.js` (both restart orders, the refresh baseline, said once per count, both languages). + +## Staged Teamily parity delivery (#3110) + +The staged Teamily-parity delivery adds appearance/send-key preferences, non-streaming message folding and document views, memory catalog search, group picking, list filters/unread/pin and message tools. `history-search.js` and `history-hit.js` separate cancellable query and original-context reads; historical rows never call current-chat navigation. A read-only modal identifies the actual segment and renders original text, clearing stale responses on identity/roster changes. Four palette tags and explicit loaded-only fallback remain; this is not full feature parity or browser acceptance. `core/client.js` is rebuilt from source. diff --git a/docs/subsystems/core-host.md b/docs/subsystems/core-host.md index b18c032ad..a003b7607 100644 --- a/docs/subsystems/core-host.md +++ b/docs/subsystems/core-host.md @@ -891,3 +891,9 @@ the host side only, so the tier stays T2 and `core/src/shared/` is untouched. ## The Project run seam (#1856) `fb.projects` is the one seam a workflow run's Project binding goes through. `read(id)` answers the Project record or `undefined`; `bindRun(runId, projectId)` writes `state.projectRuns[runId]` through `bindProject({ kind: 'run', … })` — the path the `project-bind` endpoint already uses — and saves. An unknown Project throws the store's own refusal, so the caller (the workflow plugin) treats it as a refused binding and keeps the run. A host without either function answers `undefined` and never throws, which is what an older plugin instance sees. + +## Staged Teamily parity delivery (#3110) + +`message-search.js`, installed by `core/index.js`, serves `search-messages` and `history-hit` through the authenticated channel READS allowlist. It only observes the current actor's local Bot own-chat segments, excludes hidden turns/tool/model replacements, and rechecks permissions around reads and before delivery. Opaque expiring actor/instance/snapshot-bound tickets expose original bounded context without activating an Agent or writing a search index. Query/concurrency/segment/scan/JSON limits and cooperative cancellation are executable, but native cold observation materializes a whole Session before our event/byte checks: no pre-materialization hard I/O or peak-memory guarantee. Shared appearance/folding/group/list/unread/pin helpers carry validated view preferences, not new cross-owner reach. + +The product target is a complete open-source Teamily alternative, not a permanent restriction to existing APIs. The server architecture is a management server plus FlyBot containers: the management server owns accounts, workspaces, permissions and container lifecycle; FlyBot containers execute Agents. Both are open-source and self-hostable. Container allocation granularity and orchestration technology remain undecided. Integrate existing FlyBot/Bot Social through explicit adapters rather than preserve unrelated backends or force all execution into one process. Missing models/backends are implementation work still owed. This staged PR does not perform that migration or close #3110. diff --git a/docs/subsystems/ds-bot-core.md b/docs/subsystems/ds-bot-core.md index 25fcd31af..3ed220374 100644 --- a/docs/subsystems/ds-bot-core.md +++ b/docs/subsystems/ds-bot-core.md @@ -126,3 +126,9 @@ that page has a command behind it. - Hand-editing `ds-bot/` or `client.js`. - Forgetting `node scripts/ds-bot-patches.mjs generate && check`. - Running the bench against `~/.dsh`. + +## Staged Teamily parity delivery (#3110) + +`core/dev/bench-preflight.mjs` resolves its CLI entry through real paths so a symlink-launched invocation still runs preflight; tests retain the original assertions. `core/dev/offline-fixture/` bundles actual client components with declared in-memory host and primitive mocks. Only source/manifests are committed; dependencies, render-check, dist and logs are excluded. Build writes local `dist/`, asserts the component source manifest and absence of real API transport, and supports SSR smoke. A policy refusal blocked file:// navigation before loading; SSR/VM tests and old hand-authored HTML mockups are not browser/production acceptance. + +The product target is a complete open-source Teamily alternative, not a permanent restriction to existing APIs. The server architecture is a management server plus FlyBot containers: the management server owns accounts, workspaces, permissions and container lifecycle; FlyBot containers execute Agents. Both are open-source and self-hostable. Container allocation granularity and orchestration technology remain undecided. Integrate existing FlyBot/Bot Social through explicit adapters rather than preserve unrelated backends or force all execution into one process. Missing models/backends are implementation work still owed. This staged PR does not perform that migration or close #3110. diff --git a/docs/subsystems/plugin-runtime.md b/docs/subsystems/plugin-runtime.md index 661d687fa..03edf5aac 100644 --- a/docs/subsystems/plugin-runtime.md +++ b/docs/subsystems/plugin-runtime.md @@ -131,3 +131,7 @@ FlyBot's plugin API surface on top of the patched core: host hooks, client slots - A remote sender's line that reaches a local Bot's own chat through `flybot.bot.send` stamps that Bot's `friendLineAt` in the roster (its row turns unread in a window where the chat is not open) and marks the sender's first line `remote.firstContact` (#420, `src/host/delivery.js`). A refused send stamps nothing. Covered by `core/test/flybot.test.js`. - The approval card queue (`FlyBotApprovals`) runs all its hooks on every render, before its empty-queue early return: a hook after it makes React throw when the first hold arrives and no card ever draws (#254; `core/test/overlay-approvals.test.js`). - A card's decisions are writes. In a window that holds the team read-only (`lockedWindow` from `client/schedules.js`) `FlyBotApprovals` draws no `Retry` / `Reject` / `Approve` and puts the host's own sentence in their place on one `role="status"` line (`bt-hint bt-read-only`). The count is per status and never three on one card — a pending card draws 2 (Reject, Approve) and a failed-but-retryable one 1 (Retry) in a writable window, and the two statuses are exclusive. Since #2409 that waiting bubble's head line also carries the age of the wait (`Waiting for your approval · 12 min`). The held-reply bubble (`HeldReplyActions`, roster passed from `cells.js`) follows the same rule in both of its shapes, including the settled `bt-held-note` Retry next to "Not sent: delivery failed". `flybot/decide` is not one of the host's read endpoints, so the click could only earn `bot/read-only` (#2310; `core/test/approvals-readonly.test.js`). + +## Staged Teamily parity delivery (#3110) + +The parity client's constructor imports now include the real history, appearance and folding modules; `core/test/flybot-client.test.js` updates its explicit mock-module seam accordingly. No new plugin privilege, slot contract or runtime write capability is introduced by that test adaptation. The real component offline fixture explicitly mocks missing primitives/host capabilities and is not a substitute for testing the installed runtime. diff --git a/docs/subsystems/project.md b/docs/subsystems/project.md index e2e40c84e..6eb6d849a 100644 --- a/docs/subsystems/project.md +++ b/docs/subsystems/project.md @@ -90,3 +90,7 @@ read a Project through the store, the channel and the board (`core/test/projects `project-board-panels`, `project-board-view`, `project-settings-page`, `projects-nav`, `project-board-readonly`, `project-board-entry`, `project-board-levels`, `readonly-window-reads`); they apply the domain with `core/test/project-domain.js`. + +## Staged Teamily parity delivery (#3110) + +The Project Assistant backfills an existing daily 09:00 project digest into automation state when Automation is opened later, rather than adding a duplicate task. `plugins/project/test/project-assistant.test.js` covers that existing-schedule path. This is a compatibility/idempotence repair, not a claim to a new general workflow scheduler. diff --git a/docs/subsystems/social.md b/docs/subsystems/social.md index 77820c040..aa550a58c 100644 --- a/docs/subsystems/social.md +++ b/docs/subsystems/social.md @@ -243,3 +243,9 @@ Covered by the plugin's own tests under `plugins/social/` / core test suite as w - Putting social logic under `core/`. - Assuming social owns `web-search.js`. - Importing `../../../core/…` from plugin runtime sources (breaks a packaged install, #153). + +## Staged Teamily parity delivery (#3110) + +Share and face-room integration paths preserve stopped/frozen/revoked Bot refusals as structured user-visible errors; empty successful responses do not become invented invite/share success. The client retains and presents the refusal, with tests for typed local/upstream errors, and the face-room time test follows the intended local-time behavior. This FlyBot-side delivery does not change historical Bot Social grant meaning or migrate server data. Upstream Bot Social's grant door is tracked independently; do not overwrite newer assertInvitable and no-side-effect refusal guards with the old local patch. + +The product target is a complete open-source Teamily alternative, not a permanent restriction to existing APIs. The server architecture is a management server plus FlyBot containers: the management server owns accounts, workspaces, permissions and container lifecycle; FlyBot containers execute Agents. Both are open-source and self-hostable. Container allocation granularity and orchestration technology remain undecided. Integrate existing FlyBot/Bot Social through explicit adapters rather than preserve unrelated backends or force all execution into one process. Missing models/backends are implementation work still owed. This staged PR does not perform that migration or close #3110. diff --git a/patches/ds-bot/0001-core-fixes.patch b/patches/ds-bot/0001-core-fixes.patch index 1fec1c80e..fa06dbedb 100644 --- a/patches/ds-bot/0001-core-fixes.patch +++ b/patches/ds-bot/0001-core-fixes.patch @@ -179,7 +179,7 @@ diff --git a/src/client/bot-browsers.js b/src/client/bot-browsers.js diff --git a/src/client/browser-pane.js b/src/client/browser-pane.js --- a/src/client/browser-pane.js +++ b/src/client/browser-pane.js -@@ -4,6 +4,7 @@ +@@ -4,24 +4,17 @@ // body-level layer by bot-browsers.js; the panel draws the strip and the toolbar // and reports the rectangle the shown webview covers. import { createElement as h, useEffect, useLayoutEffect, useRef, useState } from 'react' @@ -187,7 +187,10 @@ diff --git a/src/client/browser-pane.js b/src/client/browser-pane.js import { createPortal } from 'react-dom' import { BotMark } from './mark.js' import { STORAGE } from './storage.js' -@@ -13,15 +13,6 @@ import { t } from './i18n.js' + import { SPRING_SHAPE, springEasing } from './motion.js' + import { DetailsDrawer } from './details-drawer.js' ++import { DocumentPane } from './message-fold.js' + import { t } from './i18n.js' export const PANEL_LINGER_MS = 300 const WIDTH_KEY = STORAGE.browserWidth @@ -226,6 +229,42 @@ diff --git a/src/client/browser-pane.js b/src/client/browser-pane.js // The conversation column's right margin lives in one rule of our own, matched on the // column's exact class. A custom property on would restyle the whole page, tens +@@ -279,13 +279,14 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) + + /** + * One aside for the Bot's details and browser. `pane` is +- * `{ id, view: 'details'|'browser', renaming, tab }`; `id` is the Session id the ++ * `{ id, view: 'details'|'browser'|'document', renaming, tab, document }`; `id` is the Session id the + * panel follows. Without the Desktop bridge the browser view never shows. + */ + export function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) { + const bot = roster.byId[pane.id] + const canBrowse = Boolean(bot && roster.browser === true && actions.browserShow) +- const view = pane.view === 'browser' && canBrowse ? 'browser' : 'details' ++ const view = pane.view === 'browser' && canBrowse ? 'browser' ++ : pane.view === 'document' && pane.document ? 'document' : 'details' + const tabState = useBrowserTabs(map => (bot ? (map[bot.id] ?? EMPTY_TABS) : EMPTY_TABS)) + const active = tabState.active + const page = useBrowserPages(pages => (active ? pages[active] : null) ?? EMPTY_PAGE) +@@ -471,7 +471,7 @@ export function BotPanel({ pane, leaving, roster, actions, useSessions, useSessi + + const hasStrip = canBrowse && tabState.ids.length > 0 + return h('aside', { +- ref: root, className: 'bt-panel', 'data-view': view, 'aria-label': view === 'browser' && bot ? t("{name}'s browser", { name: bot.name }) : t('Conversation details'), ++ ref: root, className: 'bt-panel', 'data-view': view, 'aria-label': view === 'browser' && bot ? t("{name}'s browser", { name: bot.name }) : view === 'document' ? (pane.document?.title || t('Document')) : t('Conversation details'), + 'data-leaving': leaving || undefined, 'aria-hidden': leaving || undefined, 'data-settling': settling || undefined, + 'data-instant': instant || undefined, 'data-dragging': dragging || undefined, style: { '--bt-panel-w': `${panelWidth}px` }, + onAnimationEnd: (event) => { if (event.target === event.currentTarget) setLanded(true) }, +@@ -483,6 +483,9 @@ export function BotPanel({ pane, leaving, roster, actions, useSessions, useSessi + hasStrip ? h(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null, + view === 'browser' && bot + ? h(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) ++ : view === 'document' ++ ? h('div', { key: `document:${pane.id}:${pane.document?.title ?? ''}`, className: 'bt-panel-view' }, ++ h(DocumentPane, { document: pane.document, onClose: () => actions.closePanel() })) + : h('div', { key: `details:${pane.id}:${pane.renaming ? 'rename' : ''}:${pane.tab ?? ''}`, className: 'bt-panel-view' }, + h(DetailsDrawer, { + sessionId: pane.id, startRenaming: pane.renaming, startTab: pane.tab, hasStrip, diff --git a/src/client/connectors.js b/src/client/connectors.js --- a/src/client/connectors.js +++ b/src/client/connectors.js @@ -470,7 +509,7 @@ diff --git a/src/client/connectors.js b/src/client/connectors.js return h('div', { ref: row, className: 'bt-connector', 'data-state': connector.state }, h('div', { className: 'bt-connector-head' }, h('span', { className: 'bt-connector-mark' }, Mark ? h(Mark) : null), -@@ -44,23 +44,64 @@ function ConnectorRow({ connector, actions }) { +@@ -44,23 +44,85 @@ function ConnectorRow({ connector, actions }) { h('span', { className: 'bt-connector-status' }, statusText(connector))), h('span', { className: 'bt-connector-actions' }, connector.state === 'error' ? h('button', { type: 'button', className: 'bt-soft bt-soft-sm', disabled: busy, onClick: () => void run(actions.connectorRetry(connector.id)) }, t('Try again')) : null, @@ -520,25 +559,50 @@ diff --git a/src/client/connectors.js b/src/client/connectors.js error ? h('div', { className: 'bt-connector-error', role: 'alert' }, error) : null) } - // Settings → Connectors: one row per connector. - export function ConnectorsPage({ roster, actions }) { +-// Settings → Connectors: one row per connector. +-export function ConnectorsPage({ roster, actions }) { ++function connectorsOf(roster, kind) { const list = roster?.connectors ?? [] ++ return kind ? list.filter(connector => connector.kind === kind) : list ++} ++ ++// Settings → Connectors: one row per connector. Channels is the same list ++// filtered to kind === 'channel' (today: Feishu), never a catalogue of ++// messaging apps FlyBot has not wired up. ++export function ConnectorsPage({ roster, actions, kind, empty, hint }) { ++ const list = connectorsOf(roster, kind) ++ const vacant = empty ?? t('No connectors') ++ const note = hint ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, hint)) : null + // Every connect, disconnect and send is refused in a read-only window, so the page says + // what each connector is doing instead of drawing its row (#2474). + if (lockedWindow(roster)) { + return h('section', { className: 'bt-set-section' }, -+ h('div', { className: 'bt-set-card bt-connectors-card' }, list.length === 0 -+ ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, t('No connectors'))) -+ : list.map(connector => h('div', { key: connector.id, className: 'bt-set-row' }, -+ h('span', { className: 'bt-set-copy' }, -+ h('span', { className: 'bt-bs-label' }, connector.name), -+ h('span', { className: 'bt-set-hint' }, statusText(connector))))))) ++ h('div', { className: 'bt-set-card bt-connectors-card' }, ++ note, ++ list.length === 0 ++ ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, vacant)) ++ : list.map(connector => h('div', { key: connector.id, className: 'bt-set-row' }, ++ h('span', { className: 'bt-set-copy' }, ++ h('span', { className: 'bt-bs-label' }, connector.name), ++ h('span', { className: 'bt-set-hint' }, statusText(connector))))))) + } return h('section', { className: 'bt-set-section' }, - h('div', { className: 'bt-set-card bt-connectors-card' }, list.length === 0 - ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, t('No connectors'))) +- h('div', { className: 'bt-set-card bt-connectors-card' }, list.length === 0 +- ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, t('No connectors'))) - : list.map(connector => h(ConnectorRow, { key: connector.id, connector, actions })))) -+ : list.map(connector => h(ConnectorRow, { key: connector.id, connector, roster, actions })))) ++ h('div', { className: 'bt-set-card bt-connectors-card' }, ++ note, ++ list.length === 0 ++ ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-set-hint' }, vacant)) ++ : list.map(connector => h(ConnectorRow, { key: connector.id, connector, roster, actions })))) ++} ++ ++export function ChannelsPage({ roster, actions }) { ++ return h(ConnectorsPage, { ++ roster, actions, kind: 'channel', ++ empty: t('No channels yet.'), ++ hint: t('Only integrations FlyBot already has appear here.'), ++ }) } diff --git a/src/client/feedback.js b/src/client/feedback.js --- a/src/client/feedback.js @@ -852,7 +916,7 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js Content: '内容', 'Referenced {labels}': '引用了 {labels}', ', ': '、', -@@ -41,22 +41,81 @@ const ZH = { +@@ -41,22 +41,84 @@ const ZH = { ' and ': '、', and: '和', '{count} members': '{count} 位成员', @@ -879,6 +943,9 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js + 'Could not create the invite. Use Bot settings → Sharing → Copy invite link for this Bot.': '无法创建邀请。请在 Bot 设置 → Sharing 里使用 Copy invite link for this Bot。', + 'Add friend': '添加好友', + 'Friend requests': '好友请求', ++ 'A friend': '一位好友', ++ '{name} requests a share': '{name} 请求分享', ++ '{name} requests {capability}': '{name} 请求 {capability}', + 'Accept or decline incoming requests.': '接受或拒绝收到的请求。', + 'Accept invite': '接受邀请', + "Paste a friend’s invite link or code.": '粘贴朋友的邀请链接或邀请码。', @@ -1170,10 +1237,63 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js // Shapes Whale: '鲸鱼', Star: '星星', Moon: '月亮', Wave: '声波', Squircle: '圆角方', Bull: '牛角', Blossom: '花朵', -@@ -301,6 +301,8 @@ const ZH = { +@@ -295,12 +295,61 @@ const ZH = { + 'Group chats': '群聊', + Secrets: '密钥', + Appearance: '外观', ++ Grove: '林间', + Theme: '主题', + 'Colors for the whole team, on every device.': '整个团队的配色,所有设备同步。', + Accent: '强调色', 'Unread marks, badges, and the brand mark.': '未读标记、徽标和品牌标志。', 'Theme accent': '主题强调色', 'Custom accent': '自定义强调色', ++ 'Light theme': '浅色', ++ 'Dark theme': '深色', ++ Automatic: '自动', ++ 'Match system': '跟随系统', ++ 'How this window looks: light, dark, automatic, or match the system.': '此窗口的外观:浅色、深色、自动,或跟随系统。', ++ 'Automatic switch': '自动切换', ++ 'Sunset to sunrise': '日落到日出', ++ 'Custom hours': '自定义时段', ++ 'Dark from': '深色开始', ++ 'Dark until': '深色结束', ++ 'Switches about a minute after the chosen time, and not in the middle of a turn.': '到点后约再等一分钟,且不会打断正在进行的回复。', ++ Language: '语言', ++ 'Interface language': '界面语言', ++ 'Follows the DeepSeek Harness language.': '跟随 DeepSeek Harness 的界面语言。', ++ English: 'English', ++ 'Simplified Chinese': '简体中文', ++ Shortcuts: '快捷键', ++ 'Send shortcut': '发送快捷键', ++ 'Enter to send': 'Enter 发送', ++ 'Shift+Enter to send': 'Shift+Enter 发送', ++ 'Enter inserts a new line.': 'Enter 换行。', ++ 'Shift+Enter inserts a new line.': 'Shift+Enter 换行。', ++ 'Message folding': '消息折叠', ++ 'Choose how much of a long message to show before it folds.': '选择长消息在对话里折叠前展示多少内容。', ++ Compact: '紧凑', ++ 'A very short preview, for scanning a conversation.': '只展示很短的预览。适合以扫读为主的场景。', ++ Standard: '标准', ++ 'A moderate preview. Recommended.': '展示适中的预览。推荐。', ++ 'No folding': '不折叠', ++ 'Show every message in full. Long messages push the conversation off the screen.': '完整展示每条消息。长消息会把对话推离屏幕。', ++ 'Collapse long documents into cards': '长文档收成卡片', ++ 'Messages with several sections appear as a card you can open beside the conversation.': '含多个章节的消息显示为卡片,可在对话旁边打开阅读,不再铺满屏幕。', ++ 'Open beside the conversation': '在对话旁打开', ++ 'Opened beside the conversation.': '已在对话旁打开。', ++ 'Close document': '关闭文档', ++ '{count} sections': '{count} 个章节', ++ Document: '文档', ++ Channels: '渠道', ++ 'No channels yet.': '还没有渠道。', ++ 'Only integrations FlyBot already has appear here.': '这里只列出 FlyBot 已经接入的渠道。', ++ 'Conversation settings': '会话设置', ++ Attach: '附件', ++ 'Reference a chat is available in a Bot or group chat.': '在 Bot 或群聊里才能引用另一段对话。', ++ 'A read-only window cannot create a scheduled task.': '只读窗口不能创建定时任务。', ++ 'Invite link copied': '邀请链接已复制', ++ 'Could not copy the invite link': '无法复制邀请链接', + On: '开', + None: '无', 'Bots · {count}': 'Bot · {count}', @@ -1229,7 +1349,7 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js 'You have {version}.': '当前版本 {version}。', 'The update did not finish: {reason}': '更新没有完成:{reason}', "What's new": '更新说明', -@@ -360,9 +360,108 @@ const ZH = { +@@ -360,14 +360,128 @@ const ZH = { 'DSH update': 'DSH 更新', 'DSH {version}': 'DSH {version}', 'Restart DSH to start using DSH {version}.': '重启 DSH 后开始使用 DSH {version}。', @@ -1339,6 +1459,26 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js // Command palette Messages: '消息', Commands: '命令', + 'Search Bots, chats and messages': '搜索 Bot、对话和消息', ++ 'Search Bots, chats, and loaded messages': '搜索 Bot、对话和已加载的消息', + 'Clear search': '清除搜索', ++ 'Search filters': '搜索筛选', ++ Chats: '对话', ++ 'Search chats and messages': '搜索对话和消息', ++ 'Type a Bot name, a group name, or words from a loaded message': '输入 Bot 名、群名,或已加载消息里的词', ++ 'Try a Bot name, a group name, or words from a loaded message': '试试 Bot 名、群名,或已加载消息里的词', ++ 'Type at least two characters to search messages already loaded': '至少输入两个字符,搜索已加载的消息', ++ 'Clear unread mark': '清除手动未读标记', ++ 'Estimated night hours (time-zone based)': '估算夜间时段(按时区,非实际日落时间)', ++ 'Could not copy message': '未能复制消息,请重试或手动选择文字复制', ++ 'Could not download message': '未能下载消息,请重试或复制正文', ++ 'Clipboard unavailable': '剪贴板不可用,请手动选择文字复制', ++ 'Show message text': '显示消息正文', ++ 'Hide message text': '收起消息正文', ++ 'Mark as Read': '标为已读', + Results: '结果', + 'No results': '没有结果', + 'Try a Bot name or words from a message': '试试 Bot 名字或消息里的词', @@ -390,11 +390,15 @@ const ZH = { Reply: '回复', 'More message actions': '更多操作', @@ -1463,6 +1603,23 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js 'Save key': '保存密钥', 'Keys your Bots asked for. Bots never see the values: they use them as ': '你的 Bot 请求过的密钥。Bot 永远看不到值:它们在 shell 里通过 ', ' in their shell, and every value is replaced by ': ' 使用,而且发给模型之前,每个值都会被替换成 ', +@@ -545,6 +545,16 @@ const ZH = { + "Manage {name}'s memory": '管理 {name} 的记忆', + "{name}'s memory": '{name} 的记忆', + 'Memory summary': '记忆摘要', ++ Overview: '总览', ++ 'Memory directory': '记忆目录', ++ 'Search memory': '搜索记忆', ++ 'Hide directory': '收起目录', ++ 'Show directory': '显示目录', ++ 'Main memory': '主记忆', ++ '1 topic': '1 个主题', ++ '{count} topics': '{count} 个主题', ++ 'No entries match "{query}"': '没有与“{query}”相符的记忆', ++ 'Try a different word, or clear the search to see every entry.': '换个词试试,或清空搜索查看全部记忆。', + 'All entries': '全部记忆', + 'Memory options': '记忆选项', + 'Close memory': '关闭记忆', @@ -555,8 +555,10 @@ const ZH = { 'Writing the summary…': '正在生成摘要…', 'The summary is out of date: {reason}': '摘要不是最新的:{reason}', @@ -1543,9 +1700,24 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js 'Model call': '模型调用', 'This window': '这个窗口', 'Error log': '错误日志', -@@ -771,12 +771,33 @@ const ZH = { +@@ -770,13 +770,48 @@ const ZH = { + 'Who to chat with…': '想和谁聊…', 'Add at least one more Bot': '再至少添加一个 Bot', Members: '成员', ++ 'Add a name, then pick Bots to chat with.': '添加名称,然后选择要一起聊天的 Bot。', ++ 'Group name (optional)': '输入群组名称(可选)', ++ 'Search members': '搜索成员', ++ 'Selected {count}': '已选 {count}', ++ 'Selected members': '已选成员', ++ 'No members selected': '还没有选择成员', ++ 'No more Bots to add': '没有更多可添加的 Bot', ++ // Session list filters (kinds the sidebar already has) ++ 'Session filter': '会话筛选', ++ 'Direct chats': '单聊', ++ Unread: '未读', ++ 'No group chats': '没有群聊', ++ 'No direct chats': '没有单聊', ++ 'No unread chats': '没有未读会话', // Connectors and scheduled tasks + 'Choose Bots': '选择 Bot', + 'Off for every Bot. Choose which Bots may use it.': '所有 Bot 都未开启。选择哪些 Bot 可以使用。', @@ -1606,7 +1778,7 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js 'Click again to delete': '再点一次删除', 'Delete task': '删除任务', Once: '一次', -@@ -794,6 +794,7 @@ const ZH = { +@@ -794,11 +794,13 @@ const ZH = { minutes: '分钟', hours: '小时', days: '天', @@ -1614,6 +1786,12 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js 'Morning briefing': '早间简报', 'What to do': '要做什么', 'Sum up what changed since yesterday and what needs me today.': '总结一下昨天以来的变化,以及今天需要我处理的事。', + When: '什么时候', + 'Date and time': '日期和时间', ++ 'Time zone': '时区', + Days: '星期', + Time: '时间', + Every: '每', @@ -806,11 +806,24 @@ const ZH = { Unit: '单位', 'Create task': '创建任务', @@ -1806,15 +1984,82 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js 'The admin must be a member of the group': '管理员必须是群成员', 'Unknown group chat': '找不到这个群聊', 'Hand the admin role to another member instead of leaving the group without one': '请把管理员交给其他成员,不要让群聊没有管理员', -@@ -905,6 +905,8 @@ const HOST_ZH = { +@@ -891,6 +891,10 @@ const HOST_ZH = { + 'Only a Main Bot can be replaced': '只能替换主 Bot', + 'A Main Bot cannot be deleted; remove its Main Bot role first': '主 Bot 不能删除,请先取消它的主 Bot 身份', + 'Unknown theme': '未知主题', ++ 'Appearance must be light, dark, auto or system': '外观必须是浅色、深色、自动或跟随系统', ++ 'Send shortcut must be Enter or Shift+Enter': '发送快捷键必须是 Enter 或 Shift+Enter', ++ 'Message folding must be compact, standard or none': '消息折叠必须是紧凑、标准或不折叠', ++ 'Document cards must be on or off': '长文档卡片必须开或关', + 'Accent must be a #rrggbb color': '强调色必须是 #rrggbb 格式', + 'Type the key first': '请先输入密钥', + 'Choose every Bot or a list of Bots': '请选择所有 Bot 或指定的 Bot', +@@ -905,7 +905,44 @@ const HOST_ZH = { 'Write the entry to save.': '请写下要保存的内容。', 'This DeepSeek Harness has no folder chooser': '这个 DeepSeek Harness 没有文件夹选择窗口', 'This DeepSeek Harness cannot list folders': '这个 DeepSeek Harness 不能列出文件夹', + 'No FlyBot core update is available': '没有可用的 FlyBot 核心更新', + 'saved by a newer FlyBot; update FlyBot': '由更新的 FlyBot 保存;请更新 FlyBot', } ++Object.assign(ZH, { ++ "Local Bot chat history": "本机 Bot 对话历史", ++ "Earlier part; opens current chat": "较早分段;打开当前对话", ++ "History; opens current chat": "历史记录;打开当前对话", ++ "Search chats and local Bot history": "搜索对话和本机 Bot 历史", ++ "History: your local Bots in this instance. Other chats: loaded messages only.": "历史范围:本实例中你拥有的本机 Bot。其他对话仅搜索已加载消息。", ++ "History unavailable; searching loaded messages only.": "历史检索不可用,仅搜索已加载消息。", ++ "History query is limited to 256 characters.": "历史搜索词最多 256 个字符。", ++ "Searching history…": "正在搜索历史…", ++ "History query failed; showing loaded messages only.": "历史查询失败,以下仅为已加载消息。", ++ "Some history could not be read; results are incomplete.": "部分历史无法读取,结果不完整。", ++ "History search reached a safety limit; narrow your query.": "历史检索已达到安全上限,请缩小搜索范围。", ++ "Search more history": "继续搜索历史", ++ "More history remains to be searched": "还有历史尚未检索", ++ "Enter text to search local Bot history; other chats use loaded messages.": "输入文字搜索本机 Bot 历史;其他对话只查已加载消息。" ++}) ++Object.assign(ZH, { 'No matches in the searched portion': '已检索部分没有匹配项' }) ++Object.assign(ZH, { ++ "Read-only history match": "只读历史命中", ++ "Back to search": "返回搜索", ++ "This is segment history, not the current chat. No Bot is activated.": "这里是分段历史,不是当前聊天;不会激活 Bot。", ++ "Loading authorized history…": "正在读取有权查看的历史…", ++ "History changed, expired, or is no longer accessible. Search again.": "历史已变化、结果已过期或无权访问,请重新搜索。", ++ "Segment {part} of {count}": "分段 {part} / {count}", ++ "History session": "历史会话", ++ "Matched message": "命中消息", ++ "Nearby message": "相邻消息", ++ "Sequence": "序号", ++ "Turn": "轮次", ++ "Text truncated by the byte limit; this is not complete history.": "正文已按字节上限截断,不是完整历史。", ++ "Reload history context": "重新读取历史上下文", ++ "Earlier part; view read-only history": "较早分段;查看只读历史", ++ "View read-only history": "查看只读历史" ++}) ++Object.assign(ZH, { 'Shows the match and up to two nearby visible messages on each side.': '仅显示命中消息,以及前后各最多两条有权查看的相邻消息。' }) Object.assign(ZH, HOST_ZH) + const fill = (text, params) => (params +@@ -947,6 +947,19 @@ export function language() { + return typeof active === 'string' ? active : 'en' + } + ++export function canSetLocale() { ++ return typeof service?.setLocale === 'function' ++} ++ ++export function setInterfaceLocale(tag) { ++ if (typeof service?.setLocale !== 'function') return undefined ++ return service.setLocale(tag) ++} ++ ++export function languageLabel() { ++ return language().startsWith('zh') ? 'Simplified Chinese' : 'English' ++} ++ + export const dateLocale = () => (language().startsWith('zh') ? 'zh-CN' : 'en-US') + + // Translations for the tests: the Chinese dictionary itself. diff --git a/src/client/member-status.js b/src/client/member-status.js --- a/src/client/member-status.js +++ b/src/client/member-status.js @@ -2082,14 +2327,18 @@ diff --git a/src/client/member-status.js b/src/client/member-status.js diff --git a/src/client/memory-panel.js b/src/client/memory-panel.js --- a/src/client/memory-panel.js +++ b/src/client/memory-panel.js -@@ -5,44 +5,76 @@ import { createElement as h, Fragment, useCallback, useEffect, useRef, useState +@@ -3,46 +3,79 @@ + // answers from the entries or changes them. Modeled on ChatGPT's memory summary. + import { createElement as h, Fragment, useCallback, useEffect, useRef, useState } from 'react' import { useEscape } from './overlay-hooks.js' - import { ArrowUpIcon, CheckIcon, ChevronLeftIcon, ChevronRightIcon, CloseIcon, DotsIcon, MemoryIcon, TrashIcon } from './icons.js' +-import { ArrowUpIcon, CheckIcon, ChevronLeftIcon, ChevronRightIcon, CloseIcon, DotsIcon, MemoryIcon, TrashIcon } from './icons.js' ++import { ArrowUpIcon, CheckIcon, ChevronLeftIcon, ChevronRightIcon, CloseIcon, DotsIcon, MemoryIcon, SearchIcon, TrashIcon } from './icons.js' import { dateLocale, hostText, t } from './i18n.js' +import { memoryBlockedNotice, memoryEmptyNotice } from './memory-empty.js' import { summaryBlocks } from './text.js' import { useLinger } from './motion.js' +import { readOnlyLine } from './read-only.js' ++import { filterMemoryEntries, memoryStats, memoryTopics, sameTopic } from '../shared/memory-catalog.js' const POLL_MS = 1500 const MENU_EXIT_MS = 120 @@ -2206,48 +2455,177 @@ diff --git a/src/client/memory-panel.js b/src/client/memory-panel.js + }, confirming ? t('Remove') : h(TrashIcon)) : null) } - function Entries({ bot, view, remove }) { +-function Entries({ bot, view, remove }) { ++function Entries({ bot, view, remove, subset = false }) { const groups = groupEntries(view.entries) + const refused = memoryBlockedNotice(view) const sections = [ { scope: 'own', title: t("{name}'s memory", { name: bot.name }), size: view.sizes.own }, { scope: 'team', title: t('Team memory'), hint: t('Every Bot reads it'), size: view.sizes.team }, - ] +- ] ++ ].filter(section => !subset || groups.some(group => group.scope === section.scope)) return h('div', { className: 'bt-mem-entries' }, + refused === null ? null : h('div', { className: 'bt-mem-empty-text', role: 'status' }, refused), sections.map(section => h('section', { key: section.scope, className: 'bt-mem-section' }, h('div', { className: 'bt-mem-section-head' }, h('h3', null, section.title), -@@ -201,8 +201,11 @@ function useNow(every) { +@@ -201,9 +201,46 @@ function useNow(every) { return now } -export function MemoryDialog({ bot, actions, leaving = false }) { ++ ++function MemoryNav({ bot, view, page, topic, query, setQuery, openOverview, openEntries, openTopic }) { ++ const stats = memoryStats(view?.entries) ++ const topics = memoryTopics(view?.entries) ++ const own = topics.filter(item => item.scope === 'own') ++ const team = topics.filter(item => item.scope === 'team') ++ const labelOf = (item) => item.topic ?? t('Main memory') ++ const item = (kind, title, count, on, current) => h('button', { ++ type: 'button', className: 'bt-mem-nav-item', 'aria-current': current ? 'page' : undefined, onClick: on, ++ }, ++ h('span', { className: 'bt-mem-nav-label' }, title), ++ count === undefined ? null : h('span', { className: 'bt-mem-nav-count' }, String(count))) ++ const block = (title, items) => items.length === 0 ? null : h('div', { className: 'bt-mem-nav-group' }, ++ h('div', { className: 'bt-mem-nav-heading' }, title), ++ items.map(entry => h(Fragment, { key: `${entry.scope}:${entry.topic ?? ''}` }, ++ item('topic', labelOf(entry), entry.count, () => openTopic(entry), page === 'entries' && sameTopic(topic, entry))))) ++ return h('nav', { className: 'bt-mem-nav', 'aria-label': t('Memory directory') }, ++ h('label', { className: 'bt-mem-search' }, ++ h(SearchIcon), ++ h('input', { ++ className: 'bt-mem-search-input', type: 'search', value: query, ++ placeholder: t('Search memory'), 'aria-label': t('Search memory'), ++ onChange: event => setQuery(event.target.value), ++ })), ++ h('div', { className: 'bt-mem-nav-list' }, ++ item('overview', t('Overview'), undefined, openOverview, page === 'summary' && query.trim() === ''), ++ item('entries', t('All entries'), stats.entries, () => openEntries(null), page === 'entries' && !topic && query.trim() === ''), ++ block(t("{name}'s memory", { name: bot.name }), own), ++ block(t('Team memory'), team))) ++} ++ +export function MemoryDialog({ bot, actions, roster, leaving = false }) { const { view, error, load, show } = useMemoryView(bot.id, actions) + // A read-only window refuses both writes below at the host, so the panel draws neither and + // says why in the host's own sentence — the same one the sidebar and the Settings header carry. + const locked = typeof roster?.readOnly === 'string' && roster.readOnly.trim() !== '' const [page, setPage] = useState('summary') ++ const [topic, setTopic] = useState(null) ++ const [query, setQuery] = useState('') ++ const [navHidden, setNavHidden] = useState(false) const [menu, setMenu] = useState(false) const [menuShown, menuLeaving] = useLinger(menu, MENU_EXIT_MS) -@@ -281,13 +281,14 @@ export function MemoryDialog({ bot, actions, leaving = false }) { + const [text, setText] = useState('') +@@ -228,9 +228,10 @@ export function MemoryDialog({ bot, actions, leaving = false }) { + window.removeEventListener('keydown', onKey, true) + } + }, [menu]) +- const regenerate = () => { setMenu(false); setPage('summary'); void load({ regenerate: true }) } +- const openEntries = () => { setMenu(false); setPage('entries') } +- const backToSummary = () => { setPage('summary'); void load({ summarize: true }) } ++ const regenerate = () => { setMenu(false); setPage('summary'); setTopic(null); setQuery(''); void load({ regenerate: true }) } ++ const openEntries = (nextTopic = null) => { setMenu(false); setPage('entries'); setTopic(nextTopic); setQuery('') } ++ const openOverview = () => { setMenu(false); setPage('summary'); setTopic(null); setQuery(''); void load({ summarize: true }) } ++ const backToSummary = () => openOverview() + const remove = async (entry) => { + try { + show(await actions.memoryForget(bot.id, entry)) +@@ -258,41 +258,72 @@ export function MemoryDialog({ bot, actions, leaving = false }) { + } + + const count = view?.entries.length ?? 0 ++ const stats = memoryStats(view?.entries) + const when = view?.summary ? ago(view.summary.at, now) : null ++ const searching = query.trim() !== '' ++ const filtered = view === null ? [] ++ : searching ? filterMemoryEntries(view.entries, query) ++ : topic ? view.entries.filter(entry => sameTopic({ scope: entry.scope, topic: entry.topic ?? null }, topic)) ++ : view.entries ++ const listed = view === null ? null : { ...view, entries: filtered } + const status = view === null ? '' +- : page === 'entries' ? (count === 1 ? t('1 entry') : t('{count} entries', { count })) ++ : searching ? (filtered.length === 1 ? t('1 entry') : t('{count} entries', { count: filtered.length })) ++ : page === 'entries' ? (filtered.length === 1 ? t('1 entry') : t('{count} entries', { count: filtered.length })) + : view.summarizing && view.summary ? t('Updating…') + : view.summary && view.fresh ? (when ? t('Updated {time}', { time: when }) : t('Updated just now')) +- : '' ++ : [stats.entries ? (stats.entries === 1 ? t('1 entry') : t('{count} entries', { count: stats.entries })) : null, ++ stats.topics ? (stats.topics === 1 ? t('1 topic') : t('{count} topics', { count: stats.topics })) : null].filter(Boolean).join(' · ') ++ const title = searching ? t('Search memory') ++ : page === 'entries' ? (topic ? (topic.topic ?? t('Main memory')) : t('All entries')) ++ : t('Memory summary') ++ const showEntries = searching || page === 'entries' + const busy = answer?.pending === true + return h('div', { className: 'bt-mem-layer', 'data-leaving': leaving || undefined }, + h('div', { className: 'bt-scrim bt-mem-scrim', onMouseDown: close }), +- h('div', { className: 'bt-mem', role: 'dialog', 'aria-modal': true, 'aria-label': t("{name}'s memory", { name: bot.name }) }, ++ h('div', { className: 'bt-mem', role: 'dialog', 'aria-modal': true, 'aria-label': t("{name}'s memory", { name: bot.name }), 'data-nav': navHidden ? 'hidden' : undefined }, + h('div', { className: 'bt-mem-head' }, +- page === 'entries' ? h('button', { type: 'button', className: 'bt-icon-btn', 'aria-label': t('Back to the summary'), onClick: backToSummary }, h(ChevronLeftIcon)) : null, +- h('h2', null, page === 'entries' ? t('All entries') : t('Memory summary')), +- h('span', { className: 'bt-mem-status' }, page === 'summary' ? [bot.name, status].filter(Boolean).join(' · ') : status), ++ h('button', { ++ type: 'button', className: 'bt-icon-btn', ++ 'aria-label': navHidden ? t('Show directory') : t('Hide directory'), ++ 'aria-pressed': !navHidden, ++ onClick: () => setNavHidden(value => !value), ++ }, navHidden ? h(ChevronRightIcon) : h(ChevronLeftIcon)), ++ page === 'entries' || searching ? h('button', { type: 'button', className: 'bt-icon-btn', 'aria-label': t('Back to the summary'), onClick: backToSummary }, h(ChevronLeftIcon)) : null, ++ h('h2', null, title), ++ h('span', { className: 'bt-mem-status' }, page === 'summary' && !searching ? [bot.name, status].filter(Boolean).join(' · ') : status), + h('span', { className: 'bt-mem-head-gap' }), + h('button', { ref: dotsRef, type: 'button', className: 'bt-icon-btn', 'aria-label': t('Memory options'), 'aria-haspopup': 'menu', 'aria-expanded': menu, onClick: () => setMenu(value => !value) }, h(DotsIcon)), + h('button', { type: 'button', className: 'bt-icon-btn', 'aria-label': t('Close memory'), onClick: close }, h(CloseIcon)), + menuShown ? h('div', { ref: menuRef, className: 'bt-menu bt-mem-menu', role: 'menu', 'aria-label': t('Memory options'), 'data-leaving': menuLeaving || undefined }, +- h('button', { type: 'button', role: 'menuitem', onClick: openEntries }, ++ h('button', { type: 'button', role: 'menuitem', onClick: () => openEntries(null) }, + h('span', { className: 'bt-menu-label' }, t('All entries')), h('span', { className: 'bt-menu-hint' }, String(count))), h('button', { type: 'button', role: 'menuitem', disabled: count === 0 || view?.summarizing, onClick: regenerate }, h('span', { className: 'bt-menu-label' }, t('Regenerate summary')))) : null), - h('div', { className: 'bt-mem-body' }, -+ readOnlyLine(h, roster, actions), - error ? h('div', { className: 'bt-error', role: 'alert', style: { padding: 0 } }, hostText(error)) : null, - view === null ? (error ? null : h(Skeleton)) +- h('div', { className: 'bt-mem-body' }, +- error ? h('div', { className: 'bt-error', role: 'alert', style: { padding: 0 } }, hostText(error)) : null, +- view === null ? (error ? null : h(Skeleton)) - : page === 'entries' ? h(Entries, { bot, view, remove }) -+ : page === 'entries' ? h(Entries, { bot, view, remove: locked ? null : remove }) - : h(Summary, { bot, view, regenerate })), - h('div', { className: 'bt-mem-foot' }, - answer ? h(Reply, { answer, dismiss: () => setAnswer(null) }) : null, +- : h(Summary, { bot, view, regenerate })), +- h('div', { className: 'bt-mem-foot' }, +- answer ? h(Reply, { answer, dismiss: () => setAnswer(null) }) : null, - h('form', { className: 'bt-mem-ask', onSubmit: ask }, -+ locked ? null : h('form', { className: 'bt-mem-ask', onSubmit: ask }, - h('input', { - ref: inputRef, className: 'bt-mem-input', value: text, maxLength: 2000, disabled: view === null, - placeholder: t('Ask or update'), 'aria-label': t("Ask about or update {name}'s memory", { name: bot.name }), +- h('input', { +- ref: inputRef, className: 'bt-mem-input', value: text, maxLength: 2000, disabled: view === null, +- placeholder: t('Ask or update'), 'aria-label': t("Ask about or update {name}'s memory", { name: bot.name }), +- onChange: event => setText(event.target.value), +- }), +- h('button', { type: 'submit', className: 'bt-mem-send', disabled: busy || text.trim() === '', 'aria-label': t('Send') }, +- busy ? h('span', { className: 'bt-mem-spin', 'aria-hidden': true }) : h(ArrowUpIcon)))))) ++ h('div', { className: 'bt-mem-shell' }, ++ navHidden ? null : h(MemoryNav, { ++ bot, view, page, topic, query, setQuery, openOverview, ++ openEntries, openTopic: item => openEntries(item), ++ }), ++ h('div', { className: 'bt-mem-main' }, ++ h('div', { className: 'bt-mem-body' }, ++ readOnlyLine(h, roster, actions), ++ error ? h('div', { className: 'bt-error', role: 'alert', style: { padding: 0 } }, hostText(error)) : null, ++ view === null ? (error ? null : h(Skeleton)) ++ : showEntries ++ ? (searching && filtered.length === 0 ++ ? h('div', { className: 'bt-mem-empty' }, ++ h('div', { className: 'bt-mem-empty-title' }, t('No entries match "{query}"', { query: query.trim() })), ++ h('div', { className: 'bt-mem-empty-text' }, t('Try a different word, or clear the search to see every entry.'))) ++ : h(Entries, { bot, view: listed, remove: locked ? null : remove, subset: searching || Boolean(topic) })) ++ : h(Summary, { bot, view, regenerate })), ++ h('div', { className: 'bt-mem-foot' }, ++ answer ? h(Reply, { answer, dismiss: () => setAnswer(null) }) : null, ++ locked ? null : h('form', { className: 'bt-mem-ask', onSubmit: ask }, ++ h('input', { ++ ref: inputRef, className: 'bt-mem-input', value: text, maxLength: 2000, disabled: view === null, ++ placeholder: t('Ask or update'), 'aria-label': t("Ask about or update {name}'s memory", { name: bot.name }), ++ onChange: event => setText(event.target.value), ++ }), ++ h('button', { type: 'submit', className: 'bt-mem-send', disabled: busy || text.trim() === '', 'aria-label': t('Send') }, ++ busy ? h('span', { className: 'bt-mem-spin', 'aria-hidden': true }) : h(ArrowUpIcon)))))))) + } diff --git a/src/client/model-menu.js b/src/client/model-menu.js --- a/src/client/model-menu.js +++ b/src/client/model-menu.js @@ -2509,7 +2887,7 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js .finally(() => { if (!stopped) timer = setTimeout(load, POLL_MS) }) load() return () => { stopped = true; clearTimeout(timer); listeners.delete(setView) } -@@ -33,6 +33,12 @@ export function useSchedules(actions) { +@@ -33,13 +33,94 @@ export function useSchedules(actions) { return view } @@ -2520,9 +2898,78 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js + : null) + const localZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone ++ ++// IANA names the form can actually send (#3110). A value already on the task stays listed ++// even if this runtime's Intl set is short. ++export function timeZoneOptions(current) { ++ const supported = typeof Intl.supportedValuesOf === 'function' ? Intl.supportedValuesOf('timeZone') : [] ++ const zone = String(current ?? '').trim() ++ // Some runtimes omit UTC from `supportedValuesOf`; it is still a valid IANA name the host accepts. ++ const list = supported.length ? ['UTC', ...supported] : ['UTC', 'Asia/Shanghai'] ++ if (zone) list.unshift(zone) ++ return [...new Set(list.filter(Boolean))] ++} ++ ++function zoneParts(ms, timeZone) { ++ const parts = new Intl.DateTimeFormat('en-US', { ++ timeZone: timeZone || 'UTC', ++ hourCycle: 'h23', ++ year: 'numeric', ++ month: '2-digit', ++ day: '2-digit', ++ hour: '2-digit', ++ minute: '2-digit', ++ second: '2-digit', ++ }).formatToParts(new Date(ms)) ++ const value = type => Number(parts.find(part => part.type === type)?.value) ++ return Date.UTC(value('year'), value('month') - 1, value('day'), value('hour'), value('minute'), value('second')) ++} ++ ++// A stored instant as a datetime-local value in the chosen zone (#3110), not always the browser's. ++export function wallClockInput(ms, timeZone) { ++ const at = Number(ms) ++ if (!Number.isFinite(at)) return '' ++ const zone = String(timeZone ?? '').trim() || localZone() ++ const parts = new Intl.DateTimeFormat('en-US', { ++ timeZone: zone, ++ hourCycle: 'h23', ++ year: 'numeric', ++ month: '2-digit', ++ day: '2-digit', ++ hour: '2-digit', ++ minute: '2-digit', ++ }).formatToParts(new Date(at)) ++ const value = type => parts.find(part => part.type === type)?.value ++ if (!value('year')) return '' ++ return `${value('year')}-${value('month')}-${value('day')}T${value('hour')}:${value('minute')}` ++} ++ ++// The ISO instant for a wall clock in that zone. DSH stores the instant; daily/weekly send the ++// zone itself. A time that does not exist (a DST gap) is rejected. ++export function instantFromWallClock(wall, timeZone) { ++ const match = String(wall ?? '').match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?$/) ++ if (!match) throw new Error('Pick a date and time') ++ const asUtc = Date.UTC( ++ Number(match[1]), Number(match[2]) - 1, Number(match[3]), ++ Number(match[4]), Number(match[5]), Number(match[6] ?? 0), ++ ) ++ const zone = String(timeZone ?? '').trim() || 'UTC' ++ let instant = asUtc ++ for (let step = 0; step < 3; step += 1) { ++ const shown = zoneParts(instant, zone) ++ const delta = shown - asUtc ++ if (delta === 0) break ++ instant -= delta ++ } ++ if (zoneParts(instant, zone) === asUtc) return new Date(instant).toISOString() ++ for (const probe of [instant - 3_600_000, instant + 3_600_000, instant - 7_200_000, instant + 7_200_000]) { ++ if (zoneParts(probe, zone) === asUtc) return new Date(probe).toISOString() ++ } ++ throw new Error('Pick a date and time') ++} const clock = time => String(time ?? '').slice(0, 5) const when = (ms, options) => new Intl.DateTimeFormat(dateLocale(), options).format(ms) -@@ -40,6 +40,12 @@ function dayAndTime(ms) { + function dayAndTime(ms) { const sameYear = new Date(ms).getFullYear() === new Date().getFullYear() return when(ms, { ...(sameYear ? {} : { year: 'numeric' }), month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit' }) } @@ -2594,8 +3041,7 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js + const names = carriedConnectors(bot, roster?.connectors).map(connector => connector.name) + return names.length === 0 ? t('Runs with no connectors') : t('Runs with {names}', { names: names.join(', ') }) +} - --function TaskRow({ task, actions, onView, showBot, roster }) { ++ +// #2930: the host stores the reach a task was set with (`carriedAtSet`) beside the one it would take +// now (`carried`). When the two moved apart the row says so — the run itself still uses the current +// reach, because DSH has no hook before a delivery to pin either. An order change is not a change, @@ -2606,7 +3052,8 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js + if (!Array.isArray(now) || !Array.isArray(then)) return false + return now.length !== then.length || now.some(id => !then.includes(id)) +} -+ + +-function TaskRow({ task, actions, onView, showBot, roster }) { +// The window lock, read the way the rest of the client reads it (#2232): the Settings header draws +// the sentence, and this page draws no write the host would refuse. +export const lockedWindow = roster => typeof roster?.readOnly === 'string' && roster.readOnly.trim() !== '' @@ -2678,7 +3125,7 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js type: 'button', className: 'bt-mini bt-task-remove', 'data-confirm': confirming || undefined, disabled: busy, 'aria-label': confirming ? t('Click again to delete') : t('Delete task'), title: confirming ? undefined : t('Delete task'), onClick: remove, }, confirming ? t('Delete') : h(TrashIcon))) -@@ -106,41 +106,78 @@ function inAnHour() { +@@ -106,41 +106,75 @@ function inAnHour() { return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:00` } const KINDS = [['at', 'Once'], ['daily', 'Every day'], ['weekly', 'Every week'], ['every', 'Repeat']] @@ -2686,11 +3133,6 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js +// The form says one unit with one count ("1 minute"), so each unit carries both words. +const UNITS = [['seconds', 1, 'second', 'seconds'], ['minutes', 60, 'minute', 'minutes'], ['hours', 3600, 'hour', 'hours'], ['days', 86400, 'day', 'days']] + -+// A stored instant as the value of a datetime-local input, in this browser's zone. -+function localInput(ms) { -+ const date = new Date(ms) -+ return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(date.getMinutes())}` -+} +// What the form starts with: a new task's defaults, or the edited task's own values. +// A cron rule has no control here, so it is kept unless another kind is picked. +export function formStart(task) { @@ -2701,7 +3143,7 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js + title: task?.title ?? '', + prompt: task?.prompt ?? '', + kind: once ? 'at' : task?.kind ?? 'daily', -+ at: once && !Number.isNaN(Date.parse(task.scheduledAt)) ? localInput(Date.parse(task.scheduledAt)) : inAnHour(), ++ at: once && !Number.isNaN(Date.parse(task.scheduledAt)) ? wallClockInput(Date.parse(task.scheduledAt), task?.timeZone || localZone()) : inAnHour(), + time: task?.time ? clock(task.time) : '09:00', + weekdays: task?.kind === 'weekly' && Array.isArray(task.weekdays) ? task.weekdays : [1, 2, 3, 4, 5], + count: Math.max(1, Math.round(seconds / size)), @@ -2711,6 +3153,17 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js +} -function TaskForm({ roster, actions, start, onDone, onCancel }) { ++// The form's `when` payload (#3110): the chosen IANA zone is what the host sends to DSH as ++// `time_zone` for daily/weekly, and what a once task uses to turn the wall clock into an instant. ++// Repeat-every has no zone in the schedule engine, so the form does not send one. ++export function whenFromForm({ kind, at, time, weekdays, timeZone, count, unit } = {}) { ++ const zone = String(timeZone ?? '').trim() || localZone() ++ if (kind === 'cron') return { kind: 'keep' } ++ if (kind === 'at') return { kind, at: instantFromWallClock(at, zone), timeZone: zone } ++ if (kind === 'every') return { kind, seconds: Math.round(Number(count) * UNITS.find(([id]) => id === unit)[1]) } ++ return { kind, time, timeZone: zone, ...(kind === 'weekly' ? { weekdays } : {}) } ++} ++ +function TaskForm({ roster, actions, start, task, onDone, onCancel }) { // A task goes to a Bot's chat or to a group chat, where it reads as your message. - const [target, setTarget] = useState(start ?? roster.bots[0]?.id ?? '') @@ -2734,22 +3187,15 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js + const [weekdays, setWeekdays] = useState(first.weekdays) + const [count, setCount] = useState(first.count) + const [unit, setUnit] = useState(first.unit) ++ const [timeZone, setTimeZone] = useState(first.timeZone) const [busy, setBusy] = useState(false) const [error, setError] = useState('') - const timing = () => { +- const timing = () => { - if (kind === 'at') return { kind, at: new Date(at).toISOString() } - if (kind === 'every') return { kind, minutes: Math.round(Number(count) * UNITS.find(([id]) => id === unit)[1]) } - return { kind, time, timeZone: localZone(), ...(kind === 'weekly' ? { weekdays } : {}) } -+ if (kind === 'cron') return { kind: 'keep' } -+ // A once task is an instant; the host reads its wall clock in this zone when quiet -+ // hours are on (#1166). The others carry their zone with the time itself. -+ if (kind === 'at') return { kind, at: new Date(at).toISOString(), timeZone: first.timeZone } -+ // Seconds, not minutes: DSH takes any interval of 60s or more, so a 90s repeat must -+ // survive the form instead of being rounded to two minutes (#1651). -+ if (kind === 'every') return { kind, seconds: Math.round(Number(count) * UNITS.find(([id]) => id === unit)[1]) } -+ // An edited task keeps its own time zone; a new one takes this browser's. -+ return { kind, time, timeZone: first.timeZone, ...(kind === 'weekly' ? { weekdays } : {}) } - } +- } ++ const timing = () => whenFromForm({ kind, at, time, weekdays, timeZone, count, unit }) const submit = (event) => { event.preventDefault() - if (busy) return @@ -2782,13 +3228,26 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js kind === 'at' ? h('input', { className: 'bt-input', type: 'datetime-local', value: at, 'aria-label': t('Date and time'), onChange: event => setAt(event.target.value) }) : null, kind === 'weekly' ? h('div', { className: 'bt-task-days', role: 'group', 'aria-label': t('Days') }, [1, 2, 3, 4, 5, 6, 7].map(day => h('button', { key: day, type: 'button', className: 'bt-task-day', 'aria-pressed': weekdays.includes(day), onClick: () => toggleDay(day), -@@ -162,76 +162,252 @@ function TaskForm({ roster, actions, start, onDone, onCancel }) { +@@ -162,76 +162,265 @@ function TaskForm({ roster, actions, start, onDone, onCancel }) { h('span', { className: 'bt-task-every' }, t('Every')), h('input', { className: 'bt-input bt-task-count', type: 'number', min: 1, value: count, 'aria-label': t('How many'), onChange: event => setCount(event.target.value) }), h('select', { className: 'bt-select bt-task-unit', value: unit, 'aria-label': t('Unit'), onChange: event => setUnit(event.target.value) }, - UNITS.map(([id, , label]) => h('option', { key: id, value: id }, t(label))))) : null)), - error ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-danger bt-set-hint' }, error)) : null, + UNITS.map(([id, , one, many]) => h('option', { key: id, value: id }, t(Number(count) === 1 ? one : many))))) : null)), ++ // Visible, and submitted, only when the engine uses a zone (#3110). A repeat-every interval ++ // has none; a cron rule is kept as stored unless the kind changes. ++ kind === 'at' || kind === 'daily' || kind === 'weekly' ++ ? h('label', { className: 'bt-set-row bt-bs-row' }, ++ h('span', { className: 'bt-set-copy' }, h('span', { className: 'bt-bs-label' }, t('Time zone'))), ++ h('select', { ++ className: 'bt-select bt-task-timezone', ++ 'data-flybot': 'task-timezone', ++ value: timeZone, ++ 'aria-label': t('Time zone'), ++ onChange: event => setTimeZone(event.target.value), ++ }, timeZoneOptions(timeZone).map(zone => h('option', { key: zone, value: zone }, zone)))) ++ : null, + error ? h('div', { className: 'bt-set-row' }, h('span', { className: 'bt-danger bt-set-hint', role: 'alert' }, error)) : null, h('div', { className: 'bt-set-row bt-task-foot' }, h('button', { type: 'button', className: 'bt-soft bt-soft-sm', onClick: onCancel }, t('Cancel')), @@ -2905,9 +3364,9 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js h('h3', { className: 'bt-task-head' }, avatar, name), - h('div', { className: 'bt-set-card' }, tasks.map(task => h(TaskRow, { key: task.id, task, actions, roster, onView: publish }))))), + h(TaskList, { tasks, editing, roster, actions, locked, onEdit: edit, onDone: shown, onCancel: () => setEditing(null) }))), - ] - } - ++ ] ++} ++ +// One chat's rows; the task being edited opens the form in its place, and so does the one +// being copied, which opens only the target picker. +function TaskList({ tasks, editing, roster, actions, locked, onEdit, onDone, onCancel, extra = [] }) { @@ -2929,7 +3388,7 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js + const others = [ + ...roster.bots.filter(bot => bot.id !== task.botId).map(bot => [bot.id, bot.name]), + ...roster.rooms.filter(room => room.id !== task.roomId).map(room => [room.id, room.name]), -+ ] + ] + const [target, setTarget] = useState('') + const [busy, setBusy] = useState(false) + const [error, setError] = useState('') @@ -2949,8 +3408,8 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js + h('button', { type: 'submit', className: 'bt-soft bt-soft-sm', disabled: busy || target === '' }, busy ? t('Copying…') : t('Copy')), + h('button', { type: 'button', className: 'bt-soft bt-soft-sm', onClick: onCancel }, t('Cancel')), + error ? h('span', { className: 'bt-danger bt-set-hint', role: 'alert' }, error) : null) -+} -+ + } + // A Bot's tasks in its settings form, with the way to add one. export function BotSchedules({ bot, roster, actions }) { const view = useSchedules(actions) @@ -2995,10 +3454,8 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js + onCancel: () => setEditing(null), + extra: locked ? [] : [h('button', { key: 'new', type: 'button', className: 'bt-set-row bt-bs-row bt-gs-add', onClick: () => actions.openSettings('schedules', bot.id) }, h(PlusIcon), t('New task'))], + })) - } - --// The details panel's line: the Bot's next tasks, or how to add one. --export function ScheduleSummary({ bot, actions }) { ++} ++ +// The panel's rows: three of them, a title carrying the real count above three, and one row +// saying what the cap hid (#2030). A Bot's details line and a group chat's section share it, so +// the two surfaces cannot describe the same list differently. @@ -3011,8 +3468,10 @@ diff --git a/src/client/schedules.js b/src/client/schedules.js + shown.map(task => h('button', { key: task.id, type: 'button', className: 'bt-task-line', onClick: () => actions.openSettings('schedules') }, + h(ClockIcon), h('span', { className: 'bt-task-line-title' }, task.title), h('span', { className: 'bt-task-line-when' }, nextText(task)))), + hidden > 0 ? h('button', { key: 'more', type: 'button', className: 'bt-more', onClick: () => actions.openSettings('schedules') }, t('{count} more not shown', { count: hidden })) : null)) -+} -+ + } + +-// The details panel's line: the Bot's next tasks, or how to add one. +-export function ScheduleSummary({ bot, actions }) { +// The details panel's line: the Bot's next tasks, or how to add one. Paused and finished +// tasks are the Bot's tasks too, so only a Bot with none at all gets the empty state (#2024). +// The rows open the settings list, where a bot id would open the new-task form instead — the @@ -13308,7 +13767,7 @@ diff --git a/test/install.test.js b/test/install.test.js 'effect ds-bot: api route', 'route POST /api/bot', 'effect ds-bot: load state', -@@ -137,6 +137,17 @@ test('the client channel answers from the saved state', async (t) => { +@@ -137,6 +137,32 @@ test('the client channel answers from the saved state', async (t) => { assert.equal((await call('set-prefs', { motion: 'lively' })).value.motion, 'lively') assert.equal('motion' in (await call('set-prefs', { motion: 'normal' })).value, false) assert.deepEqual((await call('set-prefs', { motion: 'wild' })).error, { code: 'bot/invalid', message: 'Motion must be quiet, normal or lively', details: {} }) @@ -13323,6 +13782,21 @@ diff --git a/test/install.test.js b/test/install.test.js + for (const notify of [{ loud: false }, { failed: 'no' }, ['approval'], null]) { + assert.deepEqual((await call('set-prefs', { notify })).error, { code: 'bot/invalid', message: 'Notifications must be on or off', details: {} }) + } ++ assert.equal((await call('set-prefs', { appearance: { mode: 'dark' } })).value.appearance.mode, 'dark') ++ assert.equal((await call('set-prefs', { appearance: { mode: 'auto', auto: 'custom', from: '21:00', to: '06:30' } })).value.appearance.from, '21:00') ++ assert.deepEqual((await call('set-prefs', { appearance: { mode: 'neon' } })).error, { code: 'bot/invalid', message: 'Appearance must be light, dark, auto or system', details: {} }) ++ assert.equal((await call('set-prefs', { sendKey: 'shift-enter' })).value.sendKey, 'shift-enter') ++ const prefsBefore = structuredClone((await call('state')).value?.prefs ?? {}) ++ assert.ok((await call('set-prefs', { appearance: { mode: 'light' }, sendKey: 'invalid', folding: { mode: 'none' } })).error) ++ assert.deepEqual((await call('state')).value?.prefs ?? {}, prefsBefore, 'mixed invalid prefs request changes nothing') ++ ++ assert.equal('sendKey' in (await call('set-prefs', { sendKey: 'enter' })).value, false) ++ assert.deepEqual((await call('set-prefs', { sendKey: 'tab' })).error, { code: 'bot/invalid', message: 'Send shortcut must be Enter or Shift+Enter', details: {} }) ++ assert.deepEqual((await call('set-prefs', { folding: { mode: 'compact', documentCards: false } })).value.folding, { mode: 'compact', documentCards: false }) ++ assert.equal((await call('set-prefs', { folding: { mode: 'standard' } })).value.folding.mode, 'standard') ++ assert.equal((await call('set-prefs', { folding: null })).value.folding, undefined) ++ assert.deepEqual((await call('set-prefs', { folding: { mode: 'loose' } })).error, { code: 'bot/invalid', message: 'Message folding must be compact, standard or none', details: {} }) ++ assert.deepEqual((await call('set-prefs', { folding: { mode: 'standard', documentCards: 'yes' } })).error, { code: 'bot/invalid', message: 'Document cards must be on or off', details: {} }) // A refusal from the team code keeps its message for the user. assert.deepEqual((await call('delete-bot', { id: 'nobody' })).error, { code: 'bot/refused', message: 'Unknown Bot', details: {} }) // Off the Desktop profile there are no Bot browsers. diff --git a/patches/ds-bot/0002-flybot-api-host.patch b/patches/ds-bot/0002-flybot-api-host.patch index 6ec7a7f14..931cfc236 100644 --- a/patches/ds-bot/0002-flybot-api-host.patch +++ b/patches/ds-bot/0002-flybot-api-host.patch @@ -22,13 +22,14 @@ diff --git a/index.js b/index.js import * as delivery from './src/host/delivery.js' import * as roster from './src/host/roster.js' import * as folders from './src/host/folders.js' -@@ -14,22 +14,31 @@ import * as agents from './src/host/agents.js' +@@ -14,22 +14,32 @@ import * as agents from './src/host/agents.js' import * as prompt from './src/host/prompt.js' import * as timeContext from './src/host/time-context.js' import * as tools from './src/host/tools.js' +import * as decisions from './src/host/decisions.js' +import * as meetings from './src/host/meetings.js' import * as chatIndex from './src/host/chat-index.js' ++import * as messageSearch from './src/host/message-search.js' import * as groups from './src/host/groups.js' import * as approvals from './src/host/approvals.js' import * as resume from './src/host/resume.js' @@ -59,7 +60,7 @@ diff --git a/index.js b/index.js // install. Listeners run and tools are listed in registration order, so this order holds: // usage meters model requests after every listener that rewrites them. -const MODULES = [diagnostics, store, models, permissions, turns, delivery, roster, folders, agents, prompt, timeContext, tools, chatIndex, groups, approvals, resume, memory, parts, images, secrets, connectors, capabilities, schedules, browser, usage, update, dshUpdate, channel] -+const MODULES = [diagnostics, store, harness, memberAuth, authz, models, permissions, turns, busyAck, steeringInterrupt, delivery, roster, folders, agents, prompt, timeContext, tools, decisions, meetings, chatIndex, groups, roomMembership, reach, tasks, taskDrive, approvals, resume, memory, parts, turnBudget, images, secrets, connectors, connectorAccess, capabilities, schedules, automationDefault, browser, usage, update, dshUpdate, hooks, remoteChat, workflowStore, health, channel] ++const MODULES = [diagnostics, store, harness, memberAuth, authz, models, permissions, turns, busyAck, steeringInterrupt, delivery, roster, folders, agents, prompt, timeContext, tools, decisions, meetings, chatIndex, messageSearch, groups, roomMembership, reach, tasks, taskDrive, approvals, resume, memory, parts, turnBudget, images, secrets, connectors, connectorAccess, capabilities, schedules, automationDefault, browser, usage, update, dshUpdate, hooks, remoteChat, workflowStore, health, channel] export function apply(ctx, config = {}) { - createRuntime(ctx, config) diff --git a/patches/ds-bot/0003-flybot-api-client.patch b/patches/ds-bot/0003-flybot-api-client.patch index fb5c80262..746942161 100644 --- a/patches/ds-bot/0003-flybot-api-client.patch +++ b/patches/ds-bot/0003-flybot-api-client.patch @@ -551,14 +551,17 @@ diff --git a/src/client/capability-settings.js b/src/client/capability-settings. diff --git a/src/client/cells.js b/src/client/cells.js --- a/src/client/cells.js +++ b/src/client/cells.js -@@ -2,12 +2,20 @@ import { createElement as h, Fragment, useEffect, useLayoutEffect, useMemo, useR - import { createPortal } from 'react-dom' +@@ -1,108 +1,177 @@ + import { createElement as h, Fragment, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react' +-import { createPortal } from 'react-dom' import { MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives' import { inkText } from './inks.js' -import { linkMentions, mentionTarget, dayLabel, contentText, stripHeader, isHiddenTurn, isRelayContext, relaysBefore, relayPart, commRunOf, toolName, toolArgs, reminderPrompts } from './text.js' -+import { currentPart, linkMentions, mentionTarget, MENTION_ORIGIN, dayLabel, contentText, stripHeader, stripTrace, botNames, isHiddenTurn, typedBy, heldReplyOf, isRelayContext, relaysBefore, relayPart, commRunOf, toolName, toolArgs, reminderPrompts, cutText, isPluginTool } from './text.js' - import { SmileIcon, ReplyIcon, DotsIcon, CheckIcon, DownloadIcon, CopyIcon, MemoryIcon } from './icons.js' +-import { SmileIcon, ReplyIcon, DotsIcon, CheckIcon, DownloadIcon, CopyIcon, MemoryIcon } from './icons.js' -import { colorOf, toolState, BotMark, RoomAvatar } from './mark.js' ++import { currentPart, linkMentions, mentionTarget, MENTION_ORIGIN, dayLabel, contentText, stripHeader, stripTrace, botNames, isHiddenTurn, typedBy, heldReplyOf, isRelayContext, relaysBefore, relayPart, commRunOf, toolName, toolArgs, reminderPrompts, cutText, isPluginTool } from './text.js' ++import { MemoryIcon } from './icons.js' ++import { MessageTools, onMessageContextMenu } from './message-tools.js' +import { colorOf, lookBotForRemote, toolState, BotMark, PersonMark, RoomAvatar } from './mark.js' +import { botByName, rosterBot } from './sources.js' import { AnsweredCell, SettledQuestion, PendingQuestion } from './questions.js' @@ -573,8 +576,10 @@ diff --git a/src/client/cells.js b/src/client/cells.js +import { call } from './api.js' import { failureLabel } from './diagnostics.js' import { turnReasoning } from './turn-reasoning.js' ++import { FoldedContent, foldingOf, showsDocumentCard } from './message-fold.js' -@@ -16,37 +16,101 @@ import { turnReasoning } from './turn-reasoning.js' + // ------------------------------------------------------------------------- + // Chat cells const mdLabels = () => ({ code: { copyLabel: t('Copy'), copiedLabel: t('Copied') }, footnotes: t('Footnotes') }) @@ -612,6 +617,17 @@ diff --git a/src/client/cells.js b/src/client/cells.js // `lead` (a sender avatar in group chats) sits beside the last bubble, in the same // row, so it lines up with the bubble whether or not reactions hang below it. -export function Bubbles({ texts, roster, selfId, actions, streaming, sessionId, msgKey, useUi, lead, mentions }) { ++function bubbleBody({ text, roster, selfId, live, mentions, actions, sessionId }) { ++ const folding = foldingOf(roster?.prefs) ++ const render = shown => h(MarkdownText, { text: linkMentions(shown, roster.bots, selfId), streaming: live, labels: mdLabels(), variant: 'compact', fileMentions: mentions }) ++ if (!live && showsDocumentCard(text, folding)) { ++ return h(FoldedContent, { text, folding, actions, sessionId }) ++ } ++ return h('div', { className: 'bt-bubble' }, ++ h(FoldedContent, { text, folding, streaming: live, actions, sessionId }, render)) ++} ++ ++ +export function Bubbles({ texts, roster, selfId, actions, streaming, sessionId, msgKey, msgKeys, useUi, lead, mentions }) { + const openLink = bubbleLinkClick({ actions, subject: selfId ?? sessionId }) const onClick = (event) => { @@ -634,6 +650,7 @@ diff --git a/src/client/cells.js b/src/client/cells.js + // #2123: a message with no text is no message — a turn that ended in tool calls only, or whose reply + // a card elsewhere carries, leaves nothing to draw. The empty and whitespace-only shapes are one: the + // row (bubble and its avatar) is drawn only for a text a person can read. ++ const [contextAt, setContextAt] = useState(null) + const shown = (texts ?? []).filter(text => String(text ?? '').trim() !== '') + if (shown.length === 0) return null return h('div', { className: 'bt-astack', 'data-lead': lead ? '' : undefined, onClickCapture: onClick }, @@ -646,13 +663,19 @@ diff --git a/src/client/cells.js b/src/client/cells.js + const picked = key ? (msgKeys ? reactions?.[key] : reactions)?.[reactIndex(index)] ?? [] : [] + const last = index === shown.length - 1 const live = streaming && last - return h('div', { key: index, className: 'bt-msg' }, +- return h('div', { key: index, className: 'bt-msg' }, ++ return h('div', { key: index, className: 'bt-msg', onContextMenu: event => onMessageContextMenu(event, at => setContextAt({ ...at, index }), { live }) }, h('div', { className: 'bt-msg-line' }, lead && last ? lead : null, - h('div', { className: 'bt-bubble' }, - h(MarkdownText, { text: linkMentions(text, roster.bots, selfId), streaming: live, labels: mdLabels(), variant: 'compact', fileMentions: mentions })), +- h('div', { className: 'bt-bubble' }, +- h(MarkdownText, { text: linkMentions(text, roster.bots, selfId), streaming: live, labels: mdLabels(), variant: 'compact', fileMentions: mentions })), - live ? null : h(MessageTools, { text, name: roster.byId[selfId]?.name ?? t('Bot'), sessionId, react: key ? emoji => actions.toggleReaction(msgKey, index, emoji) : undefined, actions })), -+ live ? null : h(MessageTools, { text, name: roster.byId[selfId]?.name ?? t('Bot'), sessionId, react: key ? emoji => actions.toggleReaction(key, reactIndex(index), emoji) : undefined, actions })), ++ bubbleBody({ text, roster, selfId, live, mentions, actions, sessionId }), ++ live ? null : h(MessageTools, { ++ text, name: roster.byId[selfId]?.name ?? t('Bot'), sessionId, ++ react: key ? emoji => actions.toggleReaction(key, reactIndex(index), emoji) : undefined, ++ actions, roster, contextAt: contextAt?.index === index ? contextAt : null, ++ })), picked.length ? h('div', { className: 'bt-reacts' }, picked.map(emoji => h('button', { - key: emoji, type: 'button', className: 'bt-react', 'aria-label': t('Remove reaction {emoji}', { emoji }), onClick: () => actions.toggleReaction(msgKey, index, emoji), + key: emoji, type: 'button', className: 'bt-react', 'aria-label': t('Remove reaction {emoji}', { emoji }), onClick: () => actions.toggleReaction(key, reactIndex(index), emoji), @@ -660,11 +683,43 @@ diff --git a/src/client/cells.js b/src/client/cells.js })) } +-const REACTIONS = ['👍', '❤️', '😂', '😮', '😢', '🙏'] +- +-// Closes a popover on a press outside the given elements or on Escape. +-function useDismiss(open, close, refs) { +- useEffect(() => { +- if (!open) return undefined +- const onDown = (event) => { +- if (refs.some(ref => ref.current?.contains(event.target))) return +- close() +- } +- const onKey = (event) => { if (event.key === 'Escape') { event.stopPropagation(); close() } } +- window.addEventListener('mousedown', onDown) +- window.addEventListener('keydown', onKey, true) +- return () => { window.removeEventListener('mousedown', onDown); window.removeEventListener('keydown', onKey, true) } +- }, [open]) +-} +- +-// The hover toolbar beside a reply bubble: Add reaction, Reply, More. +-function MessageTools({ text, name, sessionId, react, actions }) { +- const [panel, setPanel] = useState(null) +- const [place, setPlace] = useState(null) +- const [copied, setCopied] = useState(false) +- const tools = useRef(null) +- const pop = useRef(null) +- const close = () => setPanel(null) +- useDismiss(panel !== null, close, [tools, pop]) +- const open = (kind, event) => { +- if (panel === kind) { close(); return } +- const rect = event.currentTarget.getBoundingClientRect() +- const below = rect.bottom + 220 < window.innerHeight +- setPlace(kind === 'react' +- ? { left: rect.left + rect.width / 2, top: rect.top - 6, '--bt-origin': 'bottom center' } +- : { left: Math.min(rect.left, window.innerWidth - 208), ...(below ? { top: rect.bottom + 4 } : { bottom: window.innerHeight - rect.top + 4, '--bt-origin': 'bottom left' }) }) +- setPanel(kind) +// A held send is shown by its card and the sidebar mark, not by a line in a Face-to-face room's history: +// older rooms still hold this line from when the social plugin posted it for a direct message (#278). +const WAITING_OTHERS_NOTICE = "Waiting for the owner's approval" - const REACTIONS = ['👍', '❤️', '😂', '😮', '😢', '🙏'] - +// The closed status line already says who left (#1103). Same rule as +// plugins/social/src/face-rooms.js leaveNoticeCoveredByClose: the plugin does not post the short +// line when it already knows the room closed, and a line posted earlier is not drawn beside the banner. @@ -677,17 +732,18 @@ diff --git a/src/client/cells.js b/src/client/cells.js + if (participant?.remote !== true || participant.leftSeq === undefined) continue + const name = String(participant.ownerName || participant.displayName || participant.name || '').trim() + if (name && (who === name || who.endsWith(` (${name})`))) return true -+ } + } +- const copy = () => { +- void navigator.clipboard?.writeText(text).then(() => { setCopied(true); setTimeout(() => setCopied(false), 1000) }) +- } +- const download = () => { +- const url = URL.createObjectURL(new Blob([text], { type: 'text/markdown' })) +- const link = Object.assign(document.createElement('a'), { href: url, download: `${name}-message.md` }) +- link.click() +- setTimeout(() => URL.revokeObjectURL(url), 1000) + return false +} + - // Closes a popover on a press outside the given elements or on Escape. - function useDismiss(open, close, refs) { - useEffect(() => { -@@ -100,9 +100,45 @@ function MessageTools({ text, name, sessionId, react, actions }) { - item(t('Copy'), CopyIcon, copy), item(t('Download'), DownloadIcon, download)), document.body) : null) - } - +// The first line with something on it, inner runs of whitespace squeezed: a folded row shows it, so +// the row never reads as an empty frame while the text it names sits behind the caret (#1624). +const PEEK_MAX = 160 @@ -707,7 +763,16 @@ diff --git a/src/client/cells.js b/src/client/cells.js + for (const part of graphemes(line)) { + if (kept.length + part.length > PEEK_MAX - CUT.length) break + kept += part -+ } + } +- const item = (label, Icon, run) => h('button', { key: label, type: 'button', role: 'menuitem', onClick: () => { close(); run() } }, h(Icon), label) +- return h('div', { ref: tools, className: 'bt-tools', 'data-open': panel !== null || undefined }, +- react ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('Add reaction'), title: t('Add reaction'), 'aria-expanded': panel === 'react', onClick: event => open('react', event) }, h(SmileIcon)) : null, +- sessionId ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('Reply'), title: t('Reply'), onClick: () => actions.quote(sessionId, text) }, h(ReplyIcon)) : null, +- h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('More message actions'), title: t('More'), 'aria-haspopup': 'menu', 'aria-expanded': panel === 'more', onClick: event => open('more', event) }, copied ? h(CheckIcon) : h(DotsIcon)), +- panel === 'react' ? createPortal(h('div', { ref: pop, className: 'bt-react-strip', role: 'menu', 'aria-label': t('Reactions'), style: place }, +- REACTIONS.map(emoji => h('button', { key: emoji, type: 'button', role: 'menuitem', 'aria-label': emoji, onClick: () => { close(); react(emoji) } }, emoji))), document.body) : null, +- panel === 'more' ? createPortal(h('div', { ref: pop, className: 'bt-menu', role: 'menu', 'aria-label': t('Message actions'), style: place }, +- item(t('Copy'), CopyIcon, copy), item(t('Download'), DownloadIcon, download)), document.body) : null) + return kept + CUT +} +// Nothing but markup: a line count still says something, where a fence fragment says nothing (#1642). @@ -718,8 +783,8 @@ diff --git a/src/client/cells.js b/src/client/cells.js + const lines = text.split('\n').map((part) => part.replace(/\s+/g, ' ').trim()).filter((part) => part !== '') + const prose = lines.find((line) => !isMarkup(line)) + return prose === undefined ? onlyMarkup(lines) : clip(prose) -+} -+ + } + function ThinkingRow({ text }) { + // Folded by default; the caret shows there is something inside. Nothing to show, no row. + if (typeof text !== 'string' || text.trim() === '') return null @@ -1359,17 +1424,20 @@ diff --git a/src/client/cells.js b/src/client/cells.js diff --git a/src/client/context-menu.js b/src/client/context-menu.js --- a/src/client/context-menu.js +++ b/src/client/context-menu.js -@@ -4,6 +4,9 @@ import { currentPart } from './text.js' +@@ -4,14 +4,19 @@ import { currentPart } from './text.js' import { GearIcon, PinIcon, UnreadIcon, PencilIcon, StarLineIcon, CopyIcon, HideIcon, TrashIcon, DuplicateIcon } from './icons.js' import { useEscape } from './overlay-hooks.js' import { t } from './i18n.js' +import { useSidebarStructure } from './flybot-slots.js' +import { pluginItems } from './flybot-registry.js' +import { LinkIcon } from './icons.js' ++import { isManuallyUnread } from '../shared/session-unread.js' - export function ContextMenu({ menu, roster, actions, leaving = false }) { +-export function ContextMenu({ menu, roster, actions, leaving = false }) { ++export function ContextMenu({ menu, roster, actions, unread, leaving = false }) { useEscape(() => actions.closeMenu()) -@@ -12,6 +12,7 @@ export function ContextMenu({ menu, roster, actions, leaving = false }) { + useEffect(() => { + const onDown = (event) => { if (!(event.target instanceof Element) || !event.target.closest('.bt-menu')) actions.closeMenu() } window.addEventListener('mousedown', onDown) return () => window.removeEventListener('mousedown', onDown) }, []) @@ -1377,7 +1445,20 @@ diff --git a/src/client/context-menu.js b/src/client/context-menu.js const ref = useRef(null) const [place, setPlace] = useState({ left: menu.x, top: menu.y }) useLayoutEffect(() => { -@@ -27,28 +27,44 @@ export function ContextMenu({ menu, roster, actions, leaving = false }) { +@@ -19,36 +19,56 @@ export function ContextMenu({ menu, roster, actions, leaving = false }) { + if (!box) return + setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, window.innerHeight - box.height - 8)) }) + }, [menu.x, menu.y]) +- if (menu.kind === 'agent' || menu.kind === 'agent-session') return h(AgentMenu, { menu, roster, actions, leaving }) ++ if (menu.kind === 'agent' || menu.kind === 'agent-session') return h(AgentMenu, { menu, roster, actions, unread, leaving }) + const bot = roster.byId[menu.id] + const room = roster.roomsById[menu.id] + const entry = bot ?? room + if (entry === undefined) return null ++ const marked = isManuallyUnread(unread, menu.id) ++ const unreadItem = marked ++ ? [t('Clear unread mark'), UnreadIcon, () => actions.clearUnread(menu.id)] ++ : [t('Mark as Unread'), UnreadIcon, () => actions.markUnread(menu.id)] const isMainBot = isMainOf(roster, menu.id) const isTile = roster.mainBotId === menu.id const mainCount = (roster.mainBotIds ?? []).length @@ -1407,7 +1488,7 @@ diff --git a/src/client/context-menu.js b/src/client/context-menu.js + const groups = bot?.remote + ? [ + [ -+ [t('Mark as Unread'), UnreadIcon, () => actions.markUnread(menu.id)], ++ unreadItem, + ], + [ + [t('Bot settings'), GearIcon, () => actions.openSettings('bots', bot.id)], @@ -1418,7 +1499,7 @@ diff --git a/src/client/context-menu.js b/src/client/context-menu.js + : [ + [ + isTile || locked ? null : [entry.pinned ? t('Unpin') : t('Pin'), PinIcon, () => actions.setFlags(menu.id, { pinned: !entry.pinned })], -+ [t('Mark as Unread'), UnreadIcon, () => actions.markUnread(menu.id)], ++ unreadItem, + ], + [ + // One way to edit a Bot (#385): its name is edited in Edit Bot too. @@ -1443,17 +1524,31 @@ diff --git a/src/client/context-menu.js b/src/client/context-menu.js index > 0 ? h('div', { className: 'bt-menu-sep', role: 'separator' }) : null, group.map(([label, Icon, run, danger]) => h('button', { key: label, type: 'button', role: 'menuitem', className: danger ? 'bt-danger' : undefined, -@@ -67,28 +67,34 @@ function AgentMenu({ menu, roster, actions, leaving }) { +@@ -57,7 +57,7 @@ export function ContextMenu({ menu, roster, actions, leaving = false }) { + } + + // Menus for the DSH Agent row and its Sessions; none of the Bot entries apply. +-function AgentMenu({ menu, roster, actions, leaving }) { ++function AgentMenu({ menu, roster, actions, unread, leaving }) { + const ref = useRef(null) + const [place, setPlace] = useState({ left: menu.x, top: menu.y }) + useLayoutEffect(() => { +@@ -67,28 +67,42 @@ function AgentMenu({ menu, roster, actions, leaving }) { }, [menu.x, menu.y]) const agent = roster.agentsById[menu.kind === 'agent' ? menu.id : menu.agentId] if (agent === undefined) return null + // A window that holds the team read-only draws none of the writes the host refuses (#2232, #2253). + const locked = typeof roster?.readOnly === 'string' && roster.readOnly.trim() !== '' ++ const marked = isManuallyUnread(unread, agent.id) ++ const unreadItem = marked ++ ? [t('Clear unread mark'), UnreadIcon, () => actions.clearUnread(agent.id)] ++ : [t('Mark as Unread'), UnreadIcon, () => actions.markUnread(agent.id)] const groups = menu.kind === 'agent' ? [ [ - [agent.pinned ? t('Unpin') : t('Pin'), PinIcon, () => actions.setFlags(agent.id, { pinned: !agent.pinned })], + locked ? null : [agent.pinned ? t('Unpin') : t('Pin'), PinIcon, () => actions.setFlags(agent.id, { pinned: !agent.pinned })], ++ unreadItem, ], [ - [t('Remove DSH Agent'), TrashIcon, () => actions.removeAgent(agent.id), true], @@ -1463,6 +1558,9 @@ diff --git a/src/client/context-menu.js b/src/client/context-menu.js : [ [ - [t('Rename'), PencilIcon, () => actions.beginAgentRename(menu.id)], ++ unreadItem, ++ ], ++ [ + locked ? null : [t('Rename'), PencilIcon, () => actions.beginAgentRename(menu.id)], ], [ @@ -1470,7 +1568,7 @@ diff --git a/src/client/context-menu.js b/src/client/context-menu.js + locked ? null : [t('Archive'), TrashIcon, () => actions.archiveAgentSession(agent.id, menu.id), true], ], ] -+ // Every row here writes, so a read-only window has no menu to draw at all. ++ // Host writes stay out of a read-only window; Mark as Unread/Read only touches local UI state. + const shown = groups.map(group => group.filter(Boolean)).filter(group => group.length > 0) + if (shown.length === 0) return null return h('div', { ref, className: 'bt-menu', role: 'menu', 'aria-label': menu.kind === 'agent' ? 'DSH Agent' : t('Session actions'), style: place, 'data-leaving': leaving || undefined }, @@ -1662,7 +1760,7 @@ diff --git a/src/client/icons.js b/src/client/icons.js diff --git a/src/client/index.js b/src/client/index.js --- a/src/client/index.js +++ b/src/client/index.js -@@ -1,44 +1,84 @@ +@@ -1,44 +1,86 @@ +import { FLYBOT_CSS, FlyBotApprovals, FlyBotSessionDock, call as flybotCall, createClientApi as createFlyBotClient } from './flybot-slots.js' +import { createElement as h } from 'react' +import { projectPresent, registry as flybotSlots, setPluginAnswer } from './flybot-registry.js' @@ -1671,22 +1769,25 @@ diff --git a/src/client/index.js b/src/client/index.js -import { isHex, inkText, paintCss } from './inks.js' -import { DEFAULT_MASK, SHAPES, markupCache, maskOf } from './characters.js' -import { countCards, createSource, EMPTY_ROSTER, indexRoster, isAgentSession } from './sources.js' +-import { themeCss, shellTokens, registry, registerShape, registerTheme, allThemes } from './themes.js' +-import { MENTION_ORIGIN, currentPart } from './text.js' +import { isHex } from './inks.js' +import { SHAPES, markupCache } from './characters.js' +import { countCards, createSource, EMPTY_ROSTER, indexRoster, isAgentSession, stateAnswerIsStale, stateRequest } from './sources.js' - import { themeCss, shellTokens, registry, registerShape, registerTheme, allThemes } from './themes.js' --import { MENTION_ORIGIN, currentPart } from './text.js' ++import { themeCss, shellTokens, registry, registerShape, registerTheme, allThemes, resolveThemeId, themePrefsRecord } from './themes.js' ++import { appearanceOf, applyAppearanceAttribute, isDarkAppearance, systemDark } from './appearance.js' +import { currentPart, landingPart, setPluginTools } from './text.js' +import { mentionCss } from './mention-style.js' import { SHELL_CSS, CONVERSATION_CSS, installStyles, installCompiledStyles } from './styles.js' -import { lookOf } from './mark.js' -import { TeamSidebar, ConnectPlugins, YouAvatar, AccountLauncher, FooterAccount, BrandMark, BrandName, BotReturn, SIDEBAR_CSS, RETURN_CSS, holdShellShortcuts } from './sidebar.js' ++import { PARITY_SHELL_CSS } from './parity-shell.js' +import { installBrandChrome, installTabTitle } from './brand.js' +import { TeamSidebar, ConnectApps, YouAvatar, AccountLauncher, ModelsSettingsStep, MODELS_STEP_ID, MODELS_STEP_ORDER, FooterAccount, BrandMark, BrandName, BotReturn, SIDEBAR_CSS, RETURN_CSS, holdShellShortcuts } from './sidebar.js' import { HeaderPill } from './header.js' -import { ComposerPlus, ComposerVoice, menuIcons } from './composer.js' +import { installHeaderEffects } from './header-effects.js' -+import { ComposerIdentity, ComposerPlus, ComposerVoice, menuIcons } from './composer.js' ++import { ComposerIdentity, ComposerPlus, ComposerVoice, installSendShortcut, menuIcons } from './composer.js' import { CHATS_SOURCE, atSources } from './at-menu.js' +import { watchFaceMenu } from './face-at-filter.js' import { VOICE_BUNDLE } from './speech.js' @@ -1768,12 +1869,16 @@ diff --git a/src/client/index.js b/src/client/index.js // `details` is the panel's subject (a Session id); `view` picks details or the // subject Bot's browser inside it. - const ui = createSource({ details: null, view: 'details', renaming: false, tab: null, newChat: null, exchange: null, menu: null, voice: null, palette: null, quote: null, settings: null, memory: null, toast: null, signIn: null, renameAgent: null, unread: savedUnread, reactions: savedReactions, visits: {} }) -+ const ui = createSource({ details: null, view: 'details', renaming: false, tab: null, newChat: null, exchange: null, menu: null, voice: null, palette: null, quote: null, settings: null, remoteBotSettings: null, memory: null, toast: null, signIn: null, renameAgent: null, unread: savedUnread, reactions: savedReactions, visits: {} }) ++ const ui = createSource({ details: null, view: 'details', document: null, renaming: false, tab: null, newChat: null, exchange: null, menu: null, voice: null, palette: null, quote: null, settings: null, remoteBotSettings: null, memory: null, toast: null, signIn: null, renameAgent: null, unread: savedUnread, reactions: savedReactions, visits: {} }) // Bot mode paints the whole team surface; Agent mode withdraws every slot and // style so the shell's own interface returns. `plain` stays false until a Bot-mode // view hosts a plain session, which drops only the conversation replacements. -@@ -79,9 +79,21 @@ export function apply(ctx) { - const dropPanels = () => ui.set(state => (state.details || state.renaming ? { ...state, details: null, view: 'details', renaming: false, tab: null } : state)) +@@ -76,12 +76,24 @@ export function apply(ctx) { + const setPlain = (plain) => surface.set(state => (state.plain === plain ? state : { ...state, plain })) + // A DSH Agent Session shows the plain conversation: the Bot details and browser + // panels would follow it and report it is not on the team, so they close. +- const dropPanels = () => ui.set(state => (state.details || state.renaming ? { ...state, details: null, view: 'details', renaming: false, tab: null } : state)) ++ const dropPanels = () => ui.set(state => (state.details || state.renaming || state.document ? { ...state, details: null, view: 'details', document: null, renaming: false, tab: null } : state)) // A Bot's chat spans several parts, so when it was last left is kept per Bot. const seenKey = id => roster.getSnapshot().byId?.[id]?.id ?? id + // Per Session, the newest turn this visit measured on screen (`noteVisitTail`). Leaving writes @@ -1894,6 +1999,83 @@ diff --git a/src/client/index.js b/src/client/index.js if (next !== last) style.textContent = last = next } render() +@@ -277,35 +277,64 @@ export function apply(ctx) { + const style = installStyles('', 'theme') + let key = '' + let releaseTokens = null +- const render = () => { ++ const originalDark = document.body.hasAttribute('data-ds-dark-theme') ++ const prefsNow = () => { + const snapshot = roster.getSnapshot() +- const prefs = snapshot.ready ? snapshot.prefs ?? {} : savedPrefs ++ return { snapshot, prefs: snapshot.ready ? snapshot.prefs ?? {} : savedPrefs } ++ } ++ const applyDark = (force = false) => { ++ const { prefs } = prefsNow() ++ const wanted = isDarkAppearance(prefs, new Date(), systemDark()) ++ const current = document.body.hasAttribute('data-ds-dark-theme') ++ if (wanted === current) return ++ // Auto/system flips wait out a running turn rather than changing mid-reply. ++ const busy = !force && document.body.querySelector('[data-bt-running], [data-session-running], [aria-busy="true"]') ++ if (busy) return ++ applyAppearanceAttribute(wanted) ++ } ++ const render = () => { ++ const { snapshot, prefs } = prefsNow() + const themes = allThemes() +- const id = themes[prefs.theme] ? prefs.theme : 'deepseek' ++ const id = resolveThemeId(prefs, themes) + const accent = isHex(prefs.accent) ? prefs.accent : undefined + const motion = prefs.motion === 'quiet' || prefs.motion === 'lively' ? prefs.motion : 'normal' ++ const appearance = appearanceOf(prefs) + document.body.dataset.btMotion = motion +- const next = `${id}|${accent ?? ''}|${motion}|${registry.getSnapshot()}` +- if (next === key) return +- key = next +- style.textContent = themeCss(themes[id], accent) +- const release = releaseTokens +- releaseTokens = ctx.theme.overrideTokens('ds-bot', shellTokens(themes[id])) +- if (typeof release === 'function') release() +- if (snapshot.ready) { +- try { localStorage.setItem(PREFS_KEY, JSON.stringify({ theme: prefs.theme, accent: prefs.accent, motion: prefs.motion })) } catch { /* storage unavailable */ } ++ document.body.dataset.btAppearance = appearance.mode ++ const next = `${id}|${accent ?? ''}|${motion}|${appearance.mode}|${appearance.auto}|${appearance.from}|${appearance.to}|${registry.getSnapshot()}` ++ const changed = next !== key ++ if (changed) { ++ key = next ++ style.textContent = themeCss(themes[id], accent) ++ const release = releaseTokens ++ releaseTokens = ctx.theme.overrideTokens('ds-bot', shellTokens(themes[id])) ++ if (typeof release === 'function') release() ++ if (snapshot.ready) { ++ try { localStorage.setItem(PREFS_KEY, JSON.stringify(themePrefsRecord(prefs))) } catch { /* storage unavailable */ } ++ } + } ++ applyDark(changed) + } + render() + const offRoster = roster.subscribe(render) + const offRegistry = registry.subscribe(render) ++ const media = typeof matchMedia === 'function' ? matchMedia('(prefers-color-scheme: dark)') : null ++ const onScheme = () => applyDark() ++ media?.addEventListener?.('change', onScheme) ++ const tick = setInterval(() => applyDark(), 60_000) ++ // Do not immediately fight the host's theme mutation observer. Reconcile on ++ // preference/system changes and the minute tick instead. + return () => { + offRoster() + offRegistry() ++ media?.removeEventListener?.('change', onScheme) ++ clearInterval(tick) ++ applyAppearanceAttribute(originalDark) + try { + if (typeof releaseTokens === 'function') releaseTokens() + } finally { + delete document.body.dataset.btMotion ++ delete document.body.dataset.btAppearance + style.remove() + } + } @@ -325,7 +325,7 @@ export function apply(ctx) { ctx.inject(['shortcuts'], scope => { scope.effect(() => holdShellShortcuts(scope.shortcuts), 'ds-bot: settings shortcut') }) @@ -1911,7 +2093,7 @@ diff --git a/src/client/index.js b/src/client/index.js // A DSH Agent Session id lands on the plain surface, not the Bot skin. if (isAgentSessionId(id)) return actions.openAgentSession(id) ui.set(state => (state.newChat || state.exchange || state.menu || state.palette ? { ...state, newChat: null, exchange: null, menu: null, palette: null } : state)) -@@ -409,15 +409,30 @@ export function apply(ctx) { +@@ -409,16 +409,33 @@ export function apply(ctx) { }, // `last` is the Bot conversation the view held before it cleared: when that part // was archived for a fresh one, the view goes on in the fresh one. @@ -1944,15 +2126,52 @@ diff --git a/src/client/index.js b/src/client/index.js + .finally(() => { reloading -= 1 }) + }, openNewChat: (mode) => { ui.set(state => ({ ...state, newChat: mode, menu: null, palette: null })) }, ++ searchMessages: (body, signal) => call('search-messages', body, signal), ++ readHistoryHit: (body, signal) => call('history-hit', body, signal), openPalette: (query = '') => { ui.set(state => ({ ...state, palette: { query, token: Date.now() }, newChat: null, menu: null })) }, // The token keeps a late exit timer from closing a palette opened again since. -@@ -443,11 +443,24 @@ export function apply(ctx) { - showDetails: (id, tab = null) => { ui.set(state => ({ ...state, details: id, view: 'details', renaming: false, tab })) }, + closePalette: (token) => { ui.set(state => (state.palette && (token === undefined || state.palette.token === token) ? { ...state, palette: null } : state)) }, +@@ -428,26 +428,53 @@ export function apply(ctx) { + toggleDetails: (id, force) => { + ui.set((state) => { + const details = force || state.details !== id || state.view !== 'details' ? id : null +- return { ...state, renaming: false, tab: null, details, view: 'details' } ++ return { ...state, renaming: false, tab: null, details, view: 'details', document: null } + }) + }, ++ // A long-document card opens its full text in the side panel, beside the conversation. ++ openDocument: ({ title, text, sessionId }) => { ++ const id = sessionId ++ if (!id || text == null || String(text) === '') return ++ ui.set(state => ({ ++ ...state, ++ details: id, ++ view: 'document', ++ document: { title: title || 'Document', text: String(text) }, ++ renaming: false, ++ tab: null, ++ })) ++ }, + // The open panel follows the main view; a subject with no browser (a group + // chat, an outside Session) settles on the details view. + followPanel: (id) => { + ui.set((state) => { + if (!state.details || state.details === id) return state +- const view = state.view === 'browser' && roster.getSnapshot().byId[id] === undefined ? 'details' : state.view +- return { ...state, details: id, view, renaming: false, tab: null } ++ const view = state.view === 'browser' && roster.getSnapshot().byId[id] === undefined ? 'details' ++ : state.view === 'document' ? 'details' : state.view ++ return { ...state, details: id, view, document: view === 'document' ? state.document : null, renaming: false, tab: null } + }) + }, +- showDetails: (id, tab = null) => { ui.set(state => ({ ...state, details: id, view: 'details', renaming: false, tab })) }, ++ showDetails: (id, tab = null) => { ui.set(state => ({ ...state, details: id, view: 'details', document: null, renaming: false, tab })) }, // Opening the conversation would move focus to its composer and blur the name field. - renameBot: (id) => { ui.set(state => ({ ...state, details: id, view: 'details', renaming: true, tab: null })) }, +- renameBot: (id) => { ui.set(state => ({ ...state, details: id, view: 'details', renaming: true, tab: null })) }, - // `id` opens one Bot (page 'bots') or one group chat (page 'groups'). - openSettings: (page = 'general', id = null) => { ui.set(state => ({ ...state, settings: { page, id }, menu: null, palette: null, newChat: null })) }, - closeSettings: () => { ui.set(state => (state.settings ? { ...state, settings: null } : state)) }, ++ renameBot: (id) => { ui.set(state => ({ ...state, details: id, view: 'details', document: null, renaming: true, tab: null })) }, + // `id` opens one Bot (page 'bots') or one group chat (page 'groups'). `back` is where + // closing the page returns to; a page the inbox opened sends the queue back (#2541). + openSettings: (page = 'general', id = null, back = null) => { @@ -1979,7 +2198,7 @@ diff --git a/src/client/index.js b/src/client/index.js if (surface.getSnapshot().mode === mode) return if (mode === 'agent') { - ui.set(state => ({ ...state, details: null, view: 'details', settings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, toast: null })) -+ ui.set(state => ({ ...state, details: null, view: 'details', settings: null, remoteBotSettings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, inbox: null, board: null, toast: null })) ++ ui.set(state => ({ ...state, details: null, view: 'details', document: null, settings: null, remoteBotSettings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, inbox: null, board: null, toast: null })) } writeMode(mode) surface.set(state => ({ ...state, mode })) @@ -2068,9 +2287,42 @@ diff --git a/src/client/index.js b/src/client/index.js dismissToast: token => ui.set(state => (state.toast && (token === undefined || state.toast.token === token) ? { ...state, toast: null } : state)), } // Without the Desktop bridge these stay undefined, and no browser control renders. -@@ -610,6 +610,7 @@ export function apply(ctx) { +@@ -577,7 +577,7 @@ export function apply(ctx) { + if (!bot) return + browsers.ensureTabs(bot.id) + if (browsers.tabs.getSnapshot()[bot.id]?.active == null) browsers.openTab(bot.id) +- ui.set(state => ({ ...state, details: id, view: 'browser', renaming: false, tab: null })) ++ ui.set(state => ({ ...state, details: id, view: 'browser', document: null, renaming: false, tab: null })) + }, + // '+' on the strip or the drawer's new-tab card: a blank tab in the browser view. + browserNewTab: (id) => { +@@ -585,7 +585,7 @@ export function apply(ctx) { + if (!bot) return null + browsers.ensureTabs(bot.id) + const tabId = browsers.openTab(bot.id) +- ui.set(state => ({ ...state, details: id, view: 'browser', renaming: false, tab: null })) ++ ui.set(state => ({ ...state, details: id, view: 'browser', document: null, renaming: false, tab: null })) + return tabId + }, + // A drawer card: its tab active, the panel on the browser view. +@@ -593,7 +593,7 @@ export function apply(ctx) { + const bot = roster.getSnapshot().byId[id] + if (!bot) return + browsers.activate(bot.id, tabId) +- ui.set(state => ({ ...state, details: id, view: 'browser' })) ++ ui.set(state => ({ ...state, details: id, view: 'browser', document: null })) + }, + browserEnsure: botId => browsers.ensureTabs(botId), + browserCloseTab: (botId, tabId) => browsers.closeTab(botId, tabId), +@@ -606,10 +606,11 @@ export function apply(ctx) { + } + actions.setPanelView = (view) => { + if (view !== 'details' && view !== 'browser') return +- ui.set(state => (state.details && state.view !== view ? { ...state, view } : state)) ++ ui.set(state => (state.details && state.view !== view ? { ...state, view, document: view === 'document' ? state.document : null } : state)) } - actions.closePanel = () => { ui.set(state => (state.details ? { ...state, details: null, view: 'details', renaming: false, tab: null } : state)) } +- actions.closePanel = () => { ui.set(state => (state.details ? { ...state, details: null, view: 'details', renaming: false, tab: null } : state)) } ++ actions.closePanel = () => { ui.set(state => (state.details ? { ...state, details: null, view: 'details', document: null, renaming: false, tab: null } : state)) } // Whether AccountLauncher holds the shell's settings seat; FooterAccount steps aside if so. + actions.flybotSlotEntries = name => ctx.slots.entries?.(name) ?? [] actions.signInEntry = () => ctx.slots.entries?.('settings.models.sign-in')?.[0] ?? null @@ -2163,7 +2415,7 @@ diff --git a/src/client/index.js b/src/client/index.js actions.referenceChat = (sessionId, span) => { const controller = atMenu?.controllerOf(sessionId) if (controller === undefined || span === undefined) return -@@ -752,33 +752,51 @@ export function apply(ctx) { +@@ -752,33 +752,53 @@ export function apply(ctx) { installCompiledStyles(SHELL_CSS, 'shell'), installCompiledStyles(SIDEBAR_CSS, 'sidebar'), installCompiledStyles(SECRET_CSS, 'secrets'), @@ -2178,6 +2430,7 @@ diff --git a/src/client/index.js b/src/client/index.js + installCompiledStyles(FLYBOT_CSS, 'flybot'), installCompiledStyles(MEMBER_CSS, 'members'), installCompiledStyles(USER_MESSAGE_CSS, 'user-messages'), ++ installCompiledStyles(PARITY_SHELL_CSS, 'parity-shell'), + installCompiledStyles(MOBILE_CSS, 'mobile'), + installCompiledStyles(PANE_MIN_WIDTH_CSS, 'panes'), + installCompiledStyles(PROJECT_BOARD_CSS, 'project-board'), @@ -2207,6 +2460,7 @@ diff --git a/src/client/index.js b/src/client/index.js ] const installConversation = () => [ installCompiledStyles(CONVERSATION_CSS, 'conversation'), ++ installCompiledStyles(PARITY_SHELL_CSS, 'parity-shell-conversation'), installMentions(), installAtMenu(), - shadow('conversation.session.header', { priority: -10, inject: face }, HeaderPill), @@ -2246,7 +2500,7 @@ diff --git a/src/client/index.js b/src/client/index.js shadow('conversation.input.right', { id: 'bot-voice', order: 100, inject: face }, ComposerVoice), shadow('conversation.composer', { priority: -10, -@@ -808,7 +808,14 @@ export function apply(ctx) { +@@ -808,12 +808,20 @@ export function apply(ctx) { shadow('conversation.input.dock', { id: 'bot-model', order: -110, inject: face }, ModelChoiceDock), shadow('conversation.input.dock', { id: 'bot-question', order: -100, inject: face }, QuestionDock), shadow('conversation.input.dock', { id: 'bot-secret', order: -90, inject: face }, SecretDock), @@ -2261,10 +2515,17 @@ diff --git a/src/client/index.js b/src/client/index.js // The return button belongs to neither group: it renders only in Agent mode. ctx.effect(() => { const style = installStyles(RETURN_CSS, 'return') + return () => style.remove() + }, 'ds-bot: return styles') ++ ctx.effect(() => installSendShortcut(roster), 'ds-bot: send shortcut') + shadow('sidebar.footer.action', { id: 'bot-return', order: -300, inject: face }, BotReturn) + + // The main view decides `plain`: a DSH Agent Session keeps the Bot shell but diff --git a/src/client/new-chat.js b/src/client/new-chat.js --- a/src/client/new-chat.js +++ b/src/client/new-chat.js -@@ -1,21 +1,34 @@ +@@ -1,21 +1,36 @@ ++import { shouldSendOnKey, sendKeyOf } from './appearance.js' import { createElement as h, useRef, useState } from 'react' -import { FishLogo } from '@deepseek-ai/dsh-client-ui-primitives' -import { PlusIcon, PeopleIcon, ArrowUpIcon } from './icons.js' @@ -2289,6 +2550,7 @@ diff --git a/src/client/new-chat.js b/src/client/new-chat.js + const [compose, setCompose] = useState(mode !== 'new') // A new group chat picks its admin first, then the other members. const [admin, setAdmin] = useState(null) ++ const [name, setName] = useState('') const [message, setMessage] = useState('') const [busy, setBusy] = useState(false) const [error, setError] = useState('') @@ -2405,7 +2667,7 @@ diff --git a/src/client/new-chat.js b/src/client/new-chat.js + ...members.map(id => ({ kind: 'bot', id, role: id === admin ? 'admin' : 'member' })), + ...remotes, + ] -+ const room = await actions.createRoom(members, { admin, ...(participants ? { participants } : {}) }) ++ const room = await actions.createRoom(members, { admin, ...(name.trim() ? { name: name.trim() } : {}), ...(participants ? { participants } : {}) }) if (text) await actions.send(room.id, text) actions.openSession(room.id) close() @@ -2507,7 +2769,15 @@ diff --git a/src/client/new-chat.js b/src/client/new-chat.js h('span', { className: 'bt-to-label' }, t('To:')), adminBot ? h('span', { key: adminBot.id, className: 'bt-token bt-token-admin', title: t('Admin') }, h(BotMark, { bot: adminBot, size: 16 }), adminBot.name, h(AdminStar), -@@ -149,10 +149,12 @@ export function NewChat({ mode, roster, actions }) { +@@ -142,39 +142,70 @@ export function NewChat({ mode, roster, actions }) { + placeholder: mode === 'search' ? t('Search Bots…') : choosingAdmin ? t('Choose the group admin') : group ? t('Who to chat with…') : t('Start a chat with…'), + onChange: (event) => { setQuery(event.target.value); setCursor(0) }, + onKeyDown: (event) => { +- if (event.nativeEvent.isComposing) return ++ if (event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229) return + if (event.key === 'ArrowDown') { event.preventDefault(); setCursor(Math.min(active + 1, options.length - 1)) } + else if (event.key === 'ArrowUp') { event.preventDefault(); setCursor(Math.max(active - 1, 0)) } + else if (event.key === 'Enter' && options[active]) { event.preventDefault(); options[active].run() } else if (event.key === 'Backspace' && query === '') unpick() }, }), @@ -2515,16 +2785,27 @@ diff --git a/src/client/new-chat.js b/src/client/new-chat.js - type: 'button', className: 'bt-send bt-to-create', disabled: busy || picked.length === 0, - title: picked.length === 0 ? t('Add at least one more Bot') : undefined, onClick: createGroup, - }, t('Create group chat')) : null, -+ group && admin !== null ? (locked ++ group ? (locked + ? readOnlyLine(h, roster, actions, { key: 'readonly-admin' }) + : h('button', { -+ type: 'button', className: 'bt-send bt-to-create', disabled: busy || picked.length === 0, -+ title: picked.length === 0 ? t('Add at least one more Bot') : undefined, onClick: createGroup, ++ type: 'button', className: 'bt-send bt-to-create', disabled: busy || admin === null || picked.length === 0, ++ title: admin === null || picked.length === 0 ? t('Add at least one more Bot') : undefined, onClick: createGroup, + }, t('Create group chat'))) : null, h('button', { type: 'button', className: 'bt-x', 'aria-label': t('Close new chat'), onClick: close }, '×')), ++ group ? h('label', { className: 'bt-ng-name-row bt-nc-name' }, ++ h('span', { className: 'bt-ng-name-label' }, t('Group name')), ++ h('input', { ++ className: 'bt-ng-name-input', value: name, maxLength: 60, readOnly: locked, ++ placeholder: t('Group name (optional)'), ++ 'aria-label': t('Group name'), ++ onChange: event => setName(event.target.value), ++ })) : null, h('div', { ref: drop, className: 'bt-drop' }, h('div', { ref: glide.box, role: 'listbox', 'aria-label': t('Recipients'), className: 'bt-drop-list' }, h('span', { ref: glide.thumb, className: 'bt-thumb', 'aria-hidden': true }), -@@ -162,11 +162,28 @@ export function NewChat({ mode, roster, actions }) { +- options.length === 0 ? h('div', { className: 'bt-hint' }, mode === 'search' ? t('No Bots match') : t('Type a name to create a Bot')) ++ options.length === 0 ? h('div', { className: 'bt-hint' }, mode === 'search' || group ? t('No Bots match') : t('Type a name to create a Bot')) + : options.map((option, index) => h('button', { + key: option.key, type: 'button', role: 'option', className: 'bt-option', 'aria-selected': index === active, 'data-flip': option.key, onMouseEnter: () => setCursor(index), onClick: option.run, }, option.bot ? h(BotMark, { bot: option.bot, size: 22 }) : h('span', { className: 'bt-option-icon' }, option.icon), @@ -2558,13 +2839,17 @@ diff --git a/src/client/new-chat.js b/src/client/new-chat.js h('div', { className: 'bt-nc-card' }, h('span', { className: 'bt-nc-plus', 'aria-hidden': true }, h(PlusIcon)), h('textarea', { -@@ -176,5 +176,9 @@ export function NewChat({ mode, roster, actions }) { - if (event.key === 'Enter' && !event.shiftKey && !event.nativeEvent.isComposing) { event.preventDefault(); sendMessage() } +- rows: 1, value: message, placeholder, 'aria-label': placeholder, ++ rows: 1, value: message, placeholder, readOnly: locked, 'aria-label': placeholder, + onChange: event => setMessage(event.target.value), + onKeyDown: (event) => { +- if (event.key === 'Enter' && !event.shiftKey && !event.nativeEvent.isComposing) { event.preventDefault(); sendMessage() } ++ if (!locked && shouldSendOnKey(event, sendKeyOf(roster.prefs))) { event.preventDefault(); sendMessage() } }, }), - h('button', { type: 'button', className: 'bt-nc-send', 'aria-label': t('Send message'), disabled: busy || message.trim() === '' || picked.length === 0, onClick: sendMessage }, h(ArrowUpIcon)))))) + locked -+ ? (group && admin !== null ++ ? (group + ? null + : readOnlyLine(h, roster, actions, { key: 'readonly-compose' })) + : h('button', { type: 'button', className: 'bt-nc-send', 'aria-label': t('Send message'), disabled: busy || message.trim() === '' || picked.length === 0, onClick: sendMessage }, h(ArrowUpIcon)))))) @@ -2610,8 +2895,19 @@ diff --git a/src/client/overlays.js b/src/client/overlays.js import { useLinger } from './motion.js' // How long a closing dialog or menu stays for its exit (see their [data-leaving] CSS). -@@ -36,8 +36,12 @@ export function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useA - }, [ui.details, ui.view, ui.renaming, ui.tab]) +@@ -27,24 +27,31 @@ export function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useA + previous.current = current + if (current) actions.followPanel?.(current) + }, [current]) +- const open = ui.details ? { id: ui.details, view: ui.view ?? 'details', renaming: ui.renaming, tab: ui.tab } : null ++ const open = ui.details ? { id: ui.details, view: ui.view ?? 'details', renaming: ui.renaming, tab: ui.tab, document: ui.document ?? null } : null + const [kept, setKept] = useState(open) + useEffect(() => { + if (open) { setKept(open); return undefined } + const timer = setTimeout(() => setKept(null), PANEL_LINGER_MS) + return () => clearTimeout(timer) +- }, [ui.details, ui.view, ui.renaming, ui.tab]) ++ }, [ui.details, ui.view, ui.renaming, ui.tab, ui.document]) const pane = open ?? kept const [settings, settingsLeaving] = useLinger(ui.settings, DIALOG_EXIT_MS) + const remoteBotId = ui.remoteBotSettings && roster.byId[ui.remoteBotSettings]?.remote ? ui.remoteBotSettings : null @@ -2623,9 +2919,11 @@ diff --git a/src/client/overlays.js b/src/client/overlays.js return h(Fragment, null, pane ? createPortal(h(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }), document.body) : null, ui.newChat ? createPortal(h(NewChat, { key: ui.newChat, mode: ui.newChat, roster, actions }), document.body) : null, -@@ -46,5 +46,8 @@ export function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useA + ui.palette ? createPortal(h(CommandPalette, { key: ui.palette.token, start: ui.palette.query, token: ui.palette.token, roster, actions, useSessions }), document.body) : null, + ui.exchange ? createPortal(h(ExchangeDialog, { pair: ui.exchange, roster, actions }), document.body) : null, ui.voice ? createPortal(h(VoiceMode, { key: ui.voice, sessionId: ui.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null, - menu ? createPortal(h(ContextMenu, { key: `${menu.kind ?? ''}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, leaving: menuLeaving }), document.body) : null, +- menu ? createPortal(h(ContextMenu, { key: `${menu.kind ?? ''}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, leaving: menuLeaving }), document.body) : null, ++ menu ? createPortal(h(ContextMenu, { key: `${menu.kind ?? ''}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, unread: ui.unread, leaving: menuLeaving }), document.body) : null, settings ? createPortal(h(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null, - memory && roster.byId[memory] ? createPortal(h(MemoryDialog, { key: memory, bot: roster.byId[memory], actions, leaving: memoryLeaving }), document.body) : null) + remoteBotSettings ? createPortal(h(RemoteBotSettingsSheet, { key: remoteBotSettings, bot: roster.byId[remoteBotSettings], roster, actions, leaving: remoteLeaving }), document.body) : null, @@ -2636,7 +2934,9 @@ diff --git a/src/client/overlays.js b/src/client/overlays.js diff --git a/src/client/palette.js b/src/client/palette.js --- a/src/client/palette.js +++ b/src/client/palette.js -@@ -1,16 +1,20 @@ +@@ -1,22 +1,35 @@ ++import { HistoryHitDialog } from './history-hit.js' ++import { useHistorySearch } from './history-search.js' import { createElement as h, Fragment, useEffect, useState } from 'react' import { FishLogo } from '@deepseek-ai/dsh-client-ui-primitives' import { isMainOf } from './sources.js' @@ -2649,24 +2949,42 @@ diff --git a/src/client/palette.js b/src/client/palette.js import { t } from './i18n.js' +import { isListedRemoteChat, pickerBotLabel } from '../shared/remote-label.js' +import { seatedCount } from './group-settings.js' ++import { PALETTE_FILTERS, PALETTE_MESSAGE_MIN, paletteEmptyKind, paletteFilterAllows } from '../shared/palette-search.js' - // Search is a command palette: a 560px dialog, a search header, and 49px - // rows (24px avatar, title, subtitle). Bots and groups match on name and role; past +-// Search is a command palette: a 560px dialog, a search header, and 49px +-// rows (24px avatar, title, subtitle). Bots and groups match on name and role; past -// messages match on their text. -+// messages match on their text, read by `readableLine`, the same reader `previewOf` uses — a header, -+// a delegation trace and a fence are routing or data, never the row (#1347). ++// Four real categories: names, commands, loaded outlines, and (when supported) ++// owner-scoped local Bot history via a bounded read-only host query. Group/remote ++// history remains loaded-only. No all-instance or filesystem search is implied. ++ +const paletteText = (raw, names) => readableLine(String(raw ?? ''), names) const PALETTE_EXIT_MS = 160 export function CommandPalette({ start, token, roster, actions, useSessions }) { const [query, setQuery] = useState(start ?? '') -@@ -24,6 +24,7 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { + const [cursor, setCursor] = useState(0) + const [leaving, setLeaving] = useState(false) ++ const [filter, setFilter] = useState('all') ++ const [selectedHit, setSelectedHit] = useState(null) ++ const history = useHistorySearch(!selectedHit && paletteFilterAllows(filter, 'messages') ? actions.searchMessages : undefined, query.trim()) ++ const historyEnabled = typeof actions.searchMessages === 'function' ++ const historyVisible = paletteFilterAllows(filter, 'messages') + const wanted = query.trim().toLowerCase() ++ const emptyKind = paletteEmptyKind(query, filter) + const close = () => { + if (leaving) return + setLeaving(true) +@@ -24,8 +24,9 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { } useEscape(close) const ids = [...roster.bots.map(currentPart), ...roster.rooms.map(item => item.id)] + const names = botNames(roster) const found = useSessions((list) => { - if (wanted.length < 2) return '[]' +- if (wanted.length < 2) return '[]' ++ if (wanted.length < PALETTE_MESSAGE_MIN) return '[]' const hits = [] + for (const id of ids) { + const outline = list.projectionsBySession?.[id]?.values?.turnOutline ?? list.byId[id]?.projectionValues?.turnOutline @@ -35,7 +35,7 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { const entry = outline[index] if (hidden.includes(entry.turn)) continue @@ -2676,7 +2994,7 @@ diff --git a/src/client/palette.js b/src/client/palette.js const at = text.toLowerCase().indexOf(wanted) if (at < 0) continue const from = Math.max(0, at - 24) -@@ -49,13 +49,13 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { +@@ -49,25 +49,33 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { const matchesName = (...fields) => wanted === '' || fields.some(field => (field ?? '').toLowerCase().includes(wanted)) const sections = [] const people = [ @@ -2693,15 +3011,113 @@ diff --git a/src/client/palette.js b/src/client/palette.js badge: room.hidden ? t('Hidden') : undefined, run: async () => { if (room.hidden) await actions.setFlags(room.id, { hidden: false }); actions.openSession(room.id) }, })), -@@ -81,7 +81,7 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { + ] +- if (people.length) sections.push([t('Bots'), people]) ++ if (emptyKind !== 'empty' && paletteFilterAllows(filter, 'chats') && people.length) sections.push([t('Bots'), people]) + const agents = (roster.agents ?? []).filter(() => matchesName('DSH Agent')).map(agent => ({ + key: agent.id, avatar: h('span', { className: 'bt-palette-agent' }, h(FishLogo, { size: 18 })), title: 'DSH Agent', + subtitle: t('Plain dsh session'), + run: () => actions.openAgent(agent.id), + })) +- if (agents.length) sections.push(['DSH Agent', agents]) +- const messages = JSON.parse(found).map(([id, turn, snippet]) => { ++ if (emptyKind !== 'empty' && paletteFilterAllows(filter, 'chats') && agents.length) sections.push(['DSH Agent', agents]) ++ const historyRows = history.items.filter(hit => roster.byId[hit.botId]).map(hit => ({ ++ key: `history:${hit.sessionId}:${hit.seq}`, title: roster.byId[hit.botId].name, subtitle: hit.snippet, ++ avatar: h(BotAvatar, { bot: roster.byId[hit.botId], size: 24, badge: false, live: false }), ++ badge: t(hit.earlier ? 'Earlier part; view read-only history' : 'View read-only history'), ++ keepOpen: true, ++ run: () => setSelectedHit({ botId: hit.botId, sessionId: hit.sessionId, hitToken: hit.hitToken }), ++ })) ++ if (emptyKind !== 'empty' && historyVisible && historyRows.length) sections.push([t('Local Bot chat history'), historyRows]) ++ const messages = JSON.parse(found).filter(([id, turn]) => !history.items.some(hit => hit.sessionId === id && hit.turn === turn)).map(([id, turn, snippet]) => { + const bot = roster.byId[id] + const room = roster.roomsById[id] + return { +@@ -76,14 +76,14 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { + run: () => actions.openSession(id), + } + }) +- if (messages.length) sections.push([t('Messages'), messages]) ++ if (emptyKind !== 'empty' && paletteFilterAllows(filter, 'messages') && messages.length) sections.push([t('Messages'), messages]) + const commands = [ { key: 'cmd:new', icon: h(PlusIcon), title: t('New chat'), run: () => actions.openNewChat('new') }, { key: 'cmd:bot', icon: h(PlusIcon), title: t('Create Bot'), run: () => actions.openNewChat('create') }, { key: 'cmd:group', icon: h(PeopleIcon), title: t('Create group chat'), run: () => actions.openNewChat('group') }, - { key: 'cmd:settings', icon: h(GearIcon), title: t('Bot settings'), run: () => actions.openSettings('general') }, + { key: 'cmd:settings', icon: h(GearIcon), title: t('Settings'), run: () => actions.openSettings('general') }, ].filter(command => matchesName(command.title)) - if (commands.length) sections.push([t('Commands'), commands]) +- if (commands.length) sections.push([t('Commands'), commands]) ++ if (emptyKind !== 'empty' && paletteFilterAllows(filter, 'commands') && commands.length) sections.push([t('Commands'), commands]) const rows = sections.flatMap(([, items]) => items) + const active = Math.min(cursor, Math.max(rows.length - 1, 0)) + const shown = rows.map(row => row.key).join('\n') +@@ -96,8 +96,9 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { + const choose = (row) => { + if (!row || leaving) return + void Promise.resolve(row.run()).catch(error => actions.reportError(error, 'menu')) +- close() ++ if (!row.keepOpen) close() + } ++ if (selectedHit) return h(HistoryHitDialog, { key: selectedHit.hitToken, hit: selectedHit, roster, actions, onBack: () => setSelectedHit(null) }) + let index = -1 + return h('div', { className: 'bt-palette-layer', 'data-leaving': leaving || undefined }, + h('div', { className: 'bt-backdrop', onMouseDown: close }), +@@ -105,7 +105,7 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { + h('div', { className: 'bt-palette-head' }, + h('span', { className: 'bt-palette-glyph', 'aria-hidden': true }, h(SearchIcon)), + h('input', { +- autoFocus: true, value: query, placeholder: t('Search Bots, chats and messages'), 'aria-label': t('Search'), ++ autoFocus: true, value: query, placeholder: t(historyEnabled ? 'Search chats and local Bot history' : 'Search Bots, chats, and loaded messages'), 'aria-label': t('Search'), + role: 'combobox', 'aria-expanded': true, 'aria-controls': 'bt-palette-list', + onChange: (event) => { setQuery(event.target.value); setCursor(0) }, + onKeyDown: (event) => { +@@ -115,14 +115,42 @@ export function CommandPalette({ start, token, roster, actions, useSessions }) { + else if (event.key === 'Enter') { event.preventDefault(); choose(rows[active]) } + }, + }), +- query ? h('button', { type: 'button', className: 'bt-palette-clear', 'aria-label': t('Clear search'), onClick: () => { setQuery(''); setCursor(0) } }, h(CloseIcon)) : null), ++ h('button', { type: 'button', className: 'bt-palette-clear', 'aria-label': t('Close'), onClick: close }, h(CloseIcon))), ++ h('div', { className: 'bt-palette-filters', role: 'tablist', 'aria-label': t('Search filters') }, ++ PALETTE_FILTERS.map(id => h('button', { ++ key: id, type: 'button', role: 'tab', className: 'bt-palette-filter', ++ 'data-filter': id, 'aria-selected': filter === id, ++ tabIndex: filter === id ? 0 : -1, ++ onKeyDown: event => { ++ if (!['ArrowLeft', 'ArrowRight', 'Home', 'End'].includes(event.key)) return ++ event.preventDefault() ++ const index = PALETTE_FILTERS.indexOf(filter) ++ const next = event.key === 'Home' ? 0 : event.key === 'End' ? PALETTE_FILTERS.length - 1 ++ : (index + (event.key === 'ArrowRight' ? 1 : -1) + PALETTE_FILTERS.length) % PALETTE_FILTERS.length ++ setFilter(PALETTE_FILTERS[next]); setCursor(0) ++ event.currentTarget.parentElement?.querySelectorAll('[role=tab]')?.[next]?.focus() ++ }, onClick: () => { setFilter(id); setCursor(0) }, ++ }, t(id === 'all' ? 'All' : id === 'chats' ? 'Chats' : id === 'messages' ? 'Messages' : 'Commands')))), ++ historyVisible ? h('div', { className: 'bt-palette-history' }, ++ h('p', { className: 'bt-palette-scope' }, t(historyEnabled ? 'History: your local Bots in this instance. Other chats: loaded messages only.' : 'History unavailable; searching loaded messages only.')), ++ h('span', { role: 'status', 'aria-live': 'polite' }, ++ [...query].length > 256 ? t('History query is limited to 256 characters.') ++ : history.status === 'loading' ? t('Searching history…') ++ : history.status === 'error' ? t('History query failed; showing loaded messages only.') ++ : history.incomplete ? t('Some history could not be read; results are incomplete.') : '', ++ history.limited ? t('History search reached a safety limit; narrow your query.') : ''), ++ history.cursor ? h('button', { type: 'button', className: 'bt-soft bt-soft-sm', disabled: history.status === 'loading', onClick: history.more }, t('Search more history')) : null) : null, + h('div', { ref: listRef, id: 'bt-palette-list', className: 'bt-palette-list', role: 'listbox', 'aria-label': t('Results') }, + h('span', { ref: glide.thumb, className: 'bt-thumb', 'aria-hidden': true }), + rows.length === 0 + ? h('div', { className: 'bt-palette-empty' }, + h('span', { className: 'bt-palette-empty-icon', 'aria-hidden': true }, h(SearchIcon)), +- h('span', { className: 'bt-palette-empty-label' }, t('No results')), +- h('span', { className: 'bt-palette-empty-hint' }, t('Try a Bot name or words from a message'))) ++ h('span', { className: 'bt-palette-empty-label' }, historyVisible && history.status === 'loading' ? t('Searching history…') : historyVisible && history.cursor ? t('More history remains to be searched') : historyVisible && (history.incomplete || history.limited) ? t('No matches in the searched portion') : emptyKind === 'none' ? t('No results') : t('Search chats and messages')), ++ h('span', { className: 'bt-palette-empty-hint' }, ++ historyEnabled && historyVisible ? t('Enter text to search local Bot history; other chats use loaded messages.') ++ : emptyKind === 'short' ? t('Type at least two characters to search messages already loaded') ++ : emptyKind === 'none' ? t('Try a Bot name, a group name, or words from a loaded message') ++ : t('Type a Bot name, a group name, or words from a loaded message'))) + : sections.map(([title, items]) => h(Fragment, { key: title }, + h('div', { className: 'bt-palette-section', role: 'presentation', 'data-flip': `section:${title}` }, title), + items.map((row) => { diff --git a/src/client/questions.js b/src/client/questions.js --- a/src/client/questions.js +++ b/src/client/questions.js @@ -2841,7 +3257,7 @@ diff --git a/src/client/questions.js b/src/client/questions.js diff --git a/src/client/sidebar.js b/src/client/sidebar.js --- a/src/client/sidebar.js +++ b/src/client/sidebar.js -@@ -1,16 +1,22 @@ +@@ -1,25 +1,36 @@ -import { createElement as h, Fragment, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from 'react' +import { FlyBotSections, FlyBotAccountHeader, useSidebarStructure, botTree } from './flybot-slots.js' +import { Component, createElement as h, Fragment, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react' @@ -2860,6 +3276,8 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js import { hostText, t } from './i18n.js' +import { friendBotTitle, roomTitle, sharedRoomTitle, isShownRemoteChat } from '../shared/remote-label.js' +import { visibleText } from '../shared/preview.js' ++import { matchesSessionFilter, sessionIsUnread } from '../shared/session-list-filter.js' ++import { shouldClearManualUnread } from '../shared/session-unread.js' import { showsDshRow } from './dsh-offer.js' +import { InboxRow } from './inbox.js' +import { KanbanRow } from './kanban.js' @@ -2867,6 +3285,20 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js // ------------------------------------------------------------------------- // Sidebar + + // Manual "Mark as Unread" lasts until the conversation is opened again. + function useMarkedUnread(id, active, marked, actions) { ++ const wasActive = useRef(false) + useEffect(() => { +- if (active && marked) actions.clearUnread(id) +- }, [active, marked]) ++ const opened = shouldClearManualUnread({ active, wasActive: wasActive.current, marked }) ++ wasActive.current = active ++ if (opened) actions.clearUnread(id) ++ }, [active, marked, id]) + } + + const PinMark = () => h('span', { className: 'bt-pin', 'aria-hidden': true }, h(PinMarkIcon)) @@ -37,77 +37,151 @@ const workKeys = text => (text === '' ? [] : text.split(',').map((key) => { })) const workLine = (lead, tool, more) => h(Shimmer, null, `${lead} · ${workPhrase(tool)}…${more > 0 ? ` +${more}` : ''}`) @@ -3037,7 +3469,7 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js : wide && unread && !active ? h('span', { className: 'bt-unread', 'aria-hidden': true }) : null) } -@@ -235,6 +235,31 @@ function useListGlide(listRef, layout, key) { +@@ -235,6 +235,52 @@ function useListGlide(listRef, layout, key) { }, [layout, key]) } @@ -3065,11 +3497,32 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js + typeof actions === 'function' ? h(NodeActions, { component: actions, bot }) : null), + closed ? null : children.map(child => h(TreeNode, { key: child.bot.id, node: child, rowProps, markedUnread, collapsed, toggle, actions }))) +} ++ ++function SessionFilter({ value, onChange }) { ++ const items = [ ++ ['all', t('All')], ++ ['group', t('Group chats')], ++ ['direct', t('Direct chats')], ++ ['unread', t('Unread')], ++ ] ++ return h('div', { className: 'bt-session-filter', role: 'radiogroup', 'aria-label': t('Session filter') }, ++ items.map(([id, label]) => h('button', { ++ key: id, type: 'button', role: 'radio', className: 'bt-session-filter-btn', ++ 'data-filter': id, 'aria-checked': value === id, onClick: () => onChange(id), ++ }, label))) ++} ++ ++function sessionFilterEmpty(filter) { ++ if (filter === 'group') return t('No group chats') ++ if (filter === 'direct') return t('No direct chats') ++ if (filter === 'unread') return t('No unread chats') ++ return null ++} + export function TeamSidebar(props) { const { wide, useRoster, useUi, useSessions, actions } = props const listRef = useRef(null) -@@ -249,14 +249,38 @@ export function TeamSidebar(props) { +@@ -249,15 +249,59 @@ export function TeamSidebar(props) { const order = useMemo(() => { const stamps = JSON.parse(updated) const entries = [ @@ -3087,6 +3540,7 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js + return entries.sort((a, b) => Number(Boolean(b.item.pinned)) - Number(Boolean(a.item.pinned)) || Number(foreign(a)) - Number(foreign(b)) || b.at - a.at) }, [roster, updated]) const main = roster.byId[roster.mainBotId] +- useListGlide(listRef, wide, order.map(entry => entry.item.id).join(',')) + // A host sentence of nothing but whitespace says nothing, so it draws no hint in either shape. + // Read the same way as the workflow page (#2176), so the two surfaces cannot disagree; the text + // drawn is still the host's own sentence, not a trimmed copy. @@ -3102,20 +3556,59 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js + // A plugin (the tree) may give the Bots a structure: the list then is one tree under the Main Bot. + const structure = useSidebarStructure() + const [collapsed, setCollapsed] = useState({}) ++ const [sessionFilter, setSessionFilter] = useState('all') + const toggle = id => setCollapsed(value => ({ ...value, [id]: !value[id] })) + // Only own Bots belong to the tree; a friend's Bot stays in the ordered list below it. + // structure.include(id) === false hides a Bot from the default list (e.g. tree-archived, #452). + const inTree = entry => entry.kind === 'bot' && !entry.item.remote + const listed = entry => inTree(entry) && structure?.include?.(entry.item.id) !== false -+ const tree = structure && wide && main ? botTree([main, ...order.filter(listed).map(entry => entry.item)], main.id, id => structure.parentOf(id)) : null - useListGlide(listRef, wide, order.map(entry => entry.item.id).join(',')) ++ const statusMap = props.useSessionStatus ? props.useSessionStatus(value => value) : undefined ++ const unreadIds = useMemo(() => { ++ const ids = new Set() ++ const consider = (entry) => { ++ if (entry?.item && sessionIsUnread(entry, statusMap, markedUnread)) ids.add(entry.item.id) ++ } ++ if (main) consider({ kind: 'bot', item: main }) ++ for (const entry of order) consider(entry) ++ return ids ++ }, [order, main, statusMap, markedUnread]) ++ const showTree = Boolean(structure && wide && main && (sessionFilter === 'all' || sessionFilter === 'direct')) ++ const tree = showTree ? botTree([main, ...order.filter(listed).map(entry => entry.item)], main.id, id => structure.parentOf(id)) : null ++ const visibleOrder = order.filter(entry => ++ !(tree && inTree(entry)) && ++ !(inTree(entry) && structure?.include?.(entry.item.id) === false) && ++ matchesSessionFilter(entry, sessionFilter, unreadIds.has(entry.item.id))) ++ const showMain = !tree && main && matchesSessionFilter({ kind: 'bot', item: main }, sessionFilter, unreadIds.has(main.id)) ++ const filterEmpty = roster.ready && !showMain && !tree && visibleOrder.length === 0 ++ ? sessionFilterEmpty(sessionFilter) ++ : null ++ useListGlide(listRef, wide, [showMain && main ? main.id : null, ...visibleOrder.map(entry => entry.item.id)].filter(Boolean).join(',')) useLandOnMainBot(roster, useSessions, actions) const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide } -@@ -276,14 +276,22 @@ export function TeamSidebar(props) { - : h(Fragment, null, - h(UpdateButton, { useUpdate: props.useUpdate, actions }), - h('button', { type: 'button', className: 'bt-round', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))), + // Typing while the sidebar has focus starts a search. +@@ -267,23 +267,44 @@ export function TeamSidebar(props) { + event.preventDefault() + actions.openPalette(event.key) + } +- return h('div', { className: wide ? 'bt-side' : 'bt-side bt-rail', onKeyDown: typeToSearch }, +- wide ? h('div', { className: 'bt-side-top' }, +- h('span', { className: 'bt-brand' }, h(BrandMark, { size: 22 }), h(BrandName)), +- h(UpdateButton, { useUpdate: props.useUpdate, actions }), +- h('button', { type: 'button', className: 'bt-round', 'aria-label': t('Search'), title: t('Search'), onClick: () => actions.openPalette() }, h(SearchIcon)), +- h('button', { type: 'button', className: 'bt-round', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))) +- : h(Fragment, null, +- h(UpdateButton, { useUpdate: props.useUpdate, actions }), +- h('button', { type: 'button', className: 'bt-round', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))), - wide && roster.readOnly ? h('div', { className: 'bt-hint bt-read-only', role: 'status' }, hostText(roster.readOnly)) : null, ++ const sideTop = wide ? h('div', { className: 'bt-side-top' }, ++ h('span', { className: 'bt-brand' }, h(BrandMark, { size: 22 }), h(BrandName)), ++ h(UpdateButton, { useUpdate: props.useUpdate, actions }), ++ h('button', { type: 'button', className: 'bt-round', 'aria-label': t('Search'), title: t('Search'), onClick: () => actions.openPalette() }, h(SearchIcon)), ++ h('button', { type: 'button', className: 'bt-round', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))) ++ : h(Fragment, null, ++ h(UpdateButton, { useUpdate: props.useUpdate, actions }), ++ h('button', { type: 'button', className: 'bt-round', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))) ++ const sideBody = [ + wide && readOnlySaid ? h('div', { className: 'bt-hint bt-read-only', role: 'status' }, hostText(roster.readOnly)) : null, + wide && readOnlySaid ? readOnlyReload : null, + !wide && readOnlySaid ? h('div', { className: 'bt-hint bt-read-only', role: 'status', title: hostText(roster.readOnly), 'aria-label': hostText(roster.readOnly) }, hostText(roster.readOnly)) : null, @@ -3123,18 +3616,31 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js + h(InboxRow, { wide, useRoster, useWork: props.useWork, useUi, actions }), + h(KanbanRow, { wide, useUi, actions }), + h(ProjectsNav, { wide }), ++ wide ? h(SessionFilter, { value: sessionFilter, onChange: setSessionFilter }) : null, h('div', { ref: listRef, className: 'bt-list', role: 'region', 'aria-label': t('Bot list') }, - main ? h(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : h('div', { className: 'bt-hint' }, t('Setting up your Main Bot…')), - order.map(entry => (entry.kind === 'bot' + tree ? h('div', { className: 'bt-tree', role: 'group', 'aria-label': t('Bot tree') }, tree.map(node => h(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions }))) -+ : main ? h(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : h('div', { className: 'bt-hint' }, t('Setting up your Main Bot…')), -+ order.filter(entry => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false)).map(entry => (entry.kind === 'bot' ++ : showMain ? h(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : h('div', { className: 'bt-hint' }, t('Setting up your Main Bot…')), ++ visibleOrder.map(entry => (entry.kind === 'bot' ? h(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === 'room' ? h(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) - : h(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true }))))) + : h(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true }))), -+ wide ? h(FlyBotSections, { roster, actions, renderBot: bot => h(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null)) ++ filterEmpty ? h('div', { className: 'bt-hint bt-session-filter-empty' }, filterEmpty) : null, ++ wide && sessionFilter === 'all' ? h(FlyBotSections, { roster, actions, renderBot: bot => h(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null), ++ ] ++ // Wide: an icon rail stays visible beside the session list. Search, New, Inbox, ++ // Kanban, Projects and the FlyBot name/mark remain; the rail repeats Search and ++ // New as icon buttons so those entries still sit in the header too. ++ const iconRail = wide ? h('nav', { className: 'bt-icon-rail', 'aria-label': t('FlyBot') }, ++ h('span', { className: 'bt-brand-rail', title: t('FlyBot') }, h(BrandMark, { size: 28 })), ++ h('button', { type: 'button', className: 'bt-rail-btn', 'aria-label': t('Search'), title: t('Search'), onClick: () => actions.openPalette() }, h(SearchIcon)), ++ h('button', { type: 'button', className: 'bt-rail-btn', 'aria-label': t('New…'), title: t('New…'), onClick: () => actions.openNewChat('new') }, h(PlusIcon))) : null ++ return h('div', { className: wide ? 'bt-side bt-side-split' : 'bt-side bt-rail', onKeyDown: typeToSearch }, ++ iconRail, ++ wide ? h('div', { className: 'bt-chat-col' }, sideTop, ...sideBody) : h(Fragment, null, sideTop, ...sideBody)) } // The update button at the sidebar's top right: a cloud while a newer DS Bot — @@ -3258,7 +3764,7 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js // `seat` is the shell's settings.launcher seat: at priority -10 the whale wins it // over a shell account plugin's own launcher (the Desktop's "··· More"), which comes // back in Agent mode; FooterAccount stands in while no seat exists at all. -@@ -511,9 +511,10 @@ export function AccountLauncher({ seat = true, settingsOpen, openSettings, openO +@@ -511,9 +511,11 @@ export function AccountLauncher({ seat = true, settingsOpen, openSettings, openO const groups = [ [ [t('Usage'), GaugeIcon, () => actions.openSettings('usage')], @@ -3266,6 +3772,7 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js - [t('Automation tasks'), ClockIcon, () => actions.selectPanel('schedules')], - [t('Bot settings'), GearIcon, () => actions.openSettings('general')], + [t('Connect apps'), ConnectorIcon, () => actions.openConnectors()], ++ [t('Channels'), ConnectorIcon, () => actions.openSettings('channels')], + [t('Plugins'), PlugIcon, () => actions.selectPanel('plugins')], + [t('Scheduled tasks'), ClockIcon, () => actions.openSettings('schedules')], + [t('Settings'), GearIcon, () => actions.openSettings('general')], @@ -3305,7 +3812,7 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js } // Agent mode has none of the shell-group styles, so the return button carries its own. -@@ -582,22 +582,22 @@ export const RETURN_CSS = ` +@@ -582,24 +582,28 @@ export const RETURN_CSS = ` .bt-return{display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;padding:0 14px;border:0;border-radius:999px;background:none;color:inherit;font:inherit;font-size:14px;line-height:20px;cursor:pointer;transition:background-color .12s ease} .bt-return:hover{background:rgba(127,127,127,.14)} .bt-return:active{transform:scale(.96)} @@ -3332,7 +3839,13 @@ diff --git a/src/client/sidebar.js b/src/client/sidebar.js +// and Connect apps; FooterAccount only shows when the seat went to no one. The // shell's footer classes are CSS-module names, so they match on their stems. export const SIDEBAR_CSS = ` ++.bt-session-filter{display:flex;flex-wrap:wrap;gap:4px;padding:8px 10px 2px;flex:none} ++.bt-session-filter-btn{height:26px;padding:0 10px;border:.5px solid var(--bt-line);border-radius:999px;background:transparent;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:26px;cursor:pointer} ++.bt-session-filter-btn[aria-checked=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink);font-weight:600} ++.bt-session-filter-empty{padding:16px 12px;text-align:center} .bt-side-top .bt-brand{cursor:default;padding-left:6px} + .bt-side-top .bt-brand:hover{background:none} + .bt-brand .bt-mark{flex:none} @@ -607,6 +607,10 @@ export const SIDEBAR_CSS = ` .bt-rail .bt-row{position:relative} .bt-rail .bt-pin{position:absolute;top:3px;left:calc(50% + 12px)} @@ -3382,6 +3895,16 @@ diff --git a/src/client/storage.js b/src/client/storage.js diff --git a/src/client/styles.js b/src/client/styles.js --- a/src/client/styles.js +++ b/src/client/styles.js +@@ -13,6 +13,9 @@ import { SPRING_SHAPE, SPRING_TAP, SPRING_STRETCH, SPRING_POP, spring } from './ + // CONVERSATION_CSS re-skins the shell's own conversation DOM and styles what only + // the conversation renders. + export const SHELL_CSS = ` ++.bt-palette.bt-history-view{max-height:85vh;display:flex;flex-direction:column;width:min(760px,calc(100vw - 24px))}.bt-history-view h2{font-size:16px;margin:0;flex:1}.bt-history-disclaimer{padding:8px 16px;margin:0;color:var(--bt-ink-2)}.bt-history-content{overflow:auto;min-height:80px;padding:8px 16px;overflow-wrap:anywhere}.bt-history-entry{border-top:1px solid var(--bt-line);padding:8px 0}.bt-history-entry[data-hit]{border-left:3px solid var(--bt-accent);padding-left:10px}.bt-history-entry h3{font-size:12px;color:var(--bt-ink-2);font-weight:500}.bt-history-entry pre{white-space:pre-wrap;overflow-wrap:anywhere;font:inherit;margin:8px 0}.bt-history-foot{display:flex;flex-wrap:wrap;gap:8px;padding:12px 16px;border-top:1px solid var(--bt-line)} ++ ++.bt-palette-history{padding:8px 16px;border-bottom:1px solid var(--bt-line);font-size:12px;color:var(--bt-ink-2);overflow-wrap:anywhere}.bt-palette-scope{margin:0 0 4px}.bt-palette-history button{margin:4px 0;display:block} + body{--bt-ink:#141414;--bt-ink-2:rgba(20,20,20,.6);--bt-ink-3:rgba(20,20,20,.36);--bt-bubble:#eeeeee;--bt-sidebar:#f7f7f7;--bt-main:#fcfcfc;--bt-line:rgba(20,20,20,.08);--bt-line-2:rgba(20,20,20,.15);--bt-line-weak:rgba(20,20,20,.1);--bt-hover:rgba(119,119,119,.09);--bt-active:rgba(119,119,119,.17);--bt-card:#ffffff;--bt-accent:#4d6bfe;--bt-green:#00c972;--bt-star:#ff9800;--bt-user:#070707;--bt-user-ink:#fcfcfc;--bt-tag-bg:rgba(20,20,20,.06);--bt-tag-ink:rgba(20,20,20,.56)} + body[data-ds-dark-theme]{--bt-ink:#f2f2f2;--bt-ink-2:rgba(242,242,242,.6);--bt-ink-3:rgba(242,242,242,.36);--bt-bubble:#262626;--bt-sidebar:#1b1b1b;--bt-main:#141414;--bt-line:rgba(255,255,255,.08);--bt-line-2:rgba(255,255,255,.15);--bt-line-weak:rgba(255,255,255,.1);--bt-hover:rgba(160,160,160,.12);--bt-active:rgba(160,160,160,.2);--bt-card:#1f1f1f;--bt-user:#f2f2f2;--bt-user-ink:#141414;--bt-tag-bg:rgba(255,255,255,.09);--bt-tag-ink:rgba(242,242,242,.62)} + ${Object.entries(INKS).map(([name, [light]]) => `body{--bt-ink-${name}:${light}}`).join('')} @@ -20,6 +20,7 @@ ${Object.entries(INKS).map(([name, [, dark]]) => `body[data-ds-dark-theme]{--bt- .bt-mark{display:inline-block;flex:none;position:relative;line-height:0} .bt-mark svg{width:100%;height:100%;overflow:visible} @@ -3431,7 +3954,7 @@ diff --git a/src/client/styles.js b/src/client/styles.js .bt-tile-name{font-size:13px;line-height:18px;font-weight:400;max-width:84px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .bt-chip{font-size:11px;line-height:16px;padding:1px 4px;border-radius:4px;background:var(--bt-hover);border:1px solid var(--bt-line);color:var(--bt-ink-2);white-space:nowrap;max-width:84px;overflow:hidden;text-overflow:ellipsis} .bt-row{display:flex;align-items:center;gap:8px;min-height:54px;padding:8px;border:0;border-radius:10px;background:transparent;color:var(--bt-ink);text-align:left;cursor:pointer;width:100%;box-sizing:border-box;font-family:inherit;transition:background-color .12s ease} -@@ -132,27 +132,32 @@ body[data-bt-motion=quiet] .bt-mark[data-poke]{cursor:default} +@@ -132,27 +132,37 @@ body[data-bt-motion=quiet] .bt-mark[data-poke]{cursor:default} .bt-row-body{display:flex;flex-direction:column;min-width:0;flex:1 1 auto} .bt-row-name{display:flex;align-items:center;gap:6px;min-width:0;font-size:14px;line-height:20px;font-weight:400} .bt-row-title{min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} @@ -3459,6 +3982,11 @@ diff --git a/src/client/styles.js b/src/client/styles.js +@media (prefers-reduced-motion:reduce){} .bt-head{position:relative;display:flex;justify-content:center;align-items:center;height:40px;flex:none;pointer-events:none} ++.bt-head-actions{position:absolute;right:8px;top:50%;transform:translateY(-50%);display:flex;align-items:center;gap:4px;pointer-events:auto;z-index:2} ++.bt-head-more{display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px;padding:0;border:0;border-radius:50%;background:var(--bt-main);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2);cursor:pointer;box-shadow:0 1px 2px rgba(0,0,0,.04)} ++.bt-head-more:hover{background:var(--bt-hover);color:var(--bt-ink)} ++.bt-head-more svg{width:16px;height:16px} ++.bt-head-menu{position:fixed;min-width:220px;z-index:40} .bt-pill{pointer-events:auto;display:inline-flex;align-items:center;gap:8px;height:40px;padding:7.5px 13.5px 7.5px 7.5px;border-radius:999px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 2px 8px -1px rgba(0,0,0,.06),0 1px 2px rgba(0,0,0,.04);color:var(--bt-ink);font-family:inherit;font-size:14px;line-height:20px;cursor:pointer;max-width:70%;box-sizing:border-box;transition:background-color .12s ease,transform ${SPRING_TAP.duration}ms ${SPRING_TAP.easing}} .bt-pill:hover{background:color-mix(in srgb,var(--bt-main),#777 9%)} .bt-pill:active{transform:scale(.965)} @@ -3468,7 +3996,7 @@ diff --git a/src/client/styles.js b/src/client/styles.js .bt-pill-mem{flex:none;display:inline-flex;width:0;margin-left:-8px;overflow:hidden;transition:${spring(SPRING_SHAPE, 'width', 'margin-left')}} .bt-pill[data-memory=updated] .bt-pill-mem{width:var(--bt-mem-w);margin-left:0;transition:${spring(SPRING_STRETCH, 'width', 'margin-left')}} .bt-pill-mem-in{flex:none;display:inline-flex;align-items:center;gap:5px;white-space:nowrap;color:var(--bt-ink-2);font-size:13px;font-weight:500;opacity:0;filter:blur(6px);transform:translateX(-8px);transition:opacity .14s ease,filter .18s ease,${spring(SPRING_SHAPE, 'transform')}} -@@ -174,6 +174,7 @@ body[data-bt-motion=quiet] .bt-mark[data-poke]{cursor:default} +@@ -174,12 +174,32 @@ body[data-bt-motion=quiet] .bt-mark[data-poke]{cursor:default} .bt-astack{display:flex;flex-direction:column;align-items:flex-start;gap:4px;margin:0} .bt-bubble{max-width:min(80%,560px,calc(100% - 82px));background:var(--bt-bubble);color:var(--bt-ink);border-radius:18px;padding:7px 12px;font-size:var(--dsh-content-font-size,14px);line-height:calc(var(--dsh-content-font-size,14px) + 8px);box-sizing:border-box;overflow-wrap:anywhere} @@ -3476,11 +4004,37 @@ diff --git a/src/client/styles.js b/src/client/styles.js .bt-msg:not(:first-child)>.bt-msg-line>.bt-bubble{border-start-start-radius:6px} .bt-msg:not(:last-child)>.bt-msg-line>.bt-bubble{border-end-start-radius:6px} .bt-bubble [class*="_markdown"]>*+*{margin-top:10px} -@@ -267,6 +267,7 @@ button.bt-q-opt:active{background:var(--bt-active)} + .bt-bubble [class*="_markdown"]{color:inherit!important;font-size:inherit!important;line-height:inherit!important} + .bt-bubble p{margin:0} + .bt-bubble p + p{margin-top:6px} ++.bt-fold{display:flex;flex-direction:column;gap:6px;min-width:0} ++.bt-fold-toggle{align-self:flex-start;margin:2px 0 0;border:0;background:none;padding:0;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:16px;font-weight:600;cursor:pointer} ++.bt-fold-toggle:hover{color:var(--bt-ink);text-decoration:underline;text-underline-offset:2px} ++.bt-fold[data-folded] .bt-bubble,[data-folded].bt-fold{position:relative} ++.bt-doc-card{display:flex;align-items:center;gap:12px;width:min(100%,440px);box-sizing:border-box;margin:0;padding:12px 14px;border:.5px solid var(--bt-line-2);border-radius:14px;background:var(--bt-card);color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer} ++.bt-doc-card:hover{background:var(--bt-hover)} ++.bt-doc-card-icon{flex:none;display:inline-flex;align-items:center;justify-content:center;width:36px;height:36px;border-radius:9px;background:var(--bt-tag-bg);color:var(--bt-ink-2)} ++.bt-doc-card-copy{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px} ++.bt-doc-card-title{font-size:14px;line-height:20px;font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} ++.bt-doc-card-meta{font-size:12px;line-height:16px;color:var(--bt-ink-3)} ++.bt-doc-card-go{flex:none;font-size:12px;line-height:16px;color:var(--bt-ink-2);white-space:nowrap} ++.bt-umsg .bt-doc-card{width:min(100%,320px)} ++.bt-doc-pane{display:flex;flex-direction:column;min-height:0;height:100%;background:var(--bt-main);color:var(--bt-ink)} ++.bt-doc-pane-head{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;flex:none;padding:16px 16px 12px;border-bottom:.5px solid var(--bt-line)} ++.bt-doc-pane-copy{min-width:0} ++.bt-doc-pane-title{margin:0;font-size:16px;line-height:22px;font-weight:600;overflow:hidden;text-overflow:ellipsis} ++.bt-doc-pane-hint{margin:4px 0 0;font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow-wrap:anywhere} ++.bt-doc-pane-body{flex:1;min-height:0;overflow:auto;padding:16px;font-size:var(--dsh-content-font-size,14px);line-height:calc(var(--dsh-content-font-size,14px) + 8px);overflow-wrap:anywhere} ++.bt-doc-pane-body [class*="_markdown"]{color:inherit} + .bt-bubble ul,.bt-bubble ol{margin:4px 0;padding-left:20px} + .bt-bubble a[href^="${MENTION_ORIGIN}"]{text-decoration:none;font-weight:400;cursor:pointer;white-space:nowrap} + .bt-bubble a[href^="${MENTION_ORIGIN}"]::before{content:"";display:inline-block;width:16px;height:16px;margin-right:3px;vertical-align:-3px;background:currentColor;-webkit-mask:${DEFAULT_MASK} center/contain no-repeat;mask:${DEFAULT_MASK} center/contain no-repeat} +@@ -267,6 +267,8 @@ button.bt-q-opt:active{background:var(--bt-active)} @media (prefers-reduced-motion:reduce){.bt-q{animation:bt-fade .12s ease-out backwards}.bt-q-settled{animation:none}.bt-q-submit{animation:none}} .bt-newchat{flex:1;display:flex;flex-direction:column;min-width:0;position:relative;animation:bt-veil-in .18s ease-out} +.bt-pane[data-menu]{background:transparent}.bt-pane[data-menu] .bt-newchat{flex:none;align-self:flex-start;width:min(280px,calc(100% - 16px));max-height:calc(100% - 16px);margin:8px;overflow:auto;background:var(--bt-card);border:1px solid var(--bt-line-2);border-radius:12px;box-shadow:0 10px 30px rgba(0,0,0,.14),0 2px 6px rgba(0,0,0,.06)}.bt-newchat[data-menu] .bt-drop{position:relative;top:0;left:0;width:auto;max-height:none;margin:0;box-shadow:none;border:0;max-width:none} ++.bt-nc-name{margin:8px 16px 0} .bt-to{display:flex;align-items:center;flex-wrap:wrap;gap:6px;min-height:48px;padding:6px 12px;border-bottom:1px solid var(--bt-line);font-size:14px;box-sizing:border-box} .bt-to-label{color:var(--bt-ink-2)} .bt-to input{flex:1;min-width:120px;border:0;outline:none;background:none;color:var(--bt-ink);font-size:14px;height:26px} @@ -3683,15 +4237,29 @@ diff --git a/src/client/styles.js b/src/client/styles.js .bt-menu button{display:flex;align-items:center;gap:4px;width:100%;min-height:30px;text-align:left;border:0;background:none;border-radius:6px;padding:6px 8px;font:inherit;font-size:13px;line-height:18px;color:var(--bt-ink);cursor:pointer;box-sizing:border-box} .bt-menu button:hover{background:var(--bt-hover)} .bt-menu button svg{flex:none;width:16px;height:16px;margin:0 1px} -@@ -572,7 +572,7 @@ button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-side +@@ -572,7 +572,11 @@ button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-side .bt-menu[data-leaving]{pointer-events:none;animation:bt-pop-out .12s cubic-bezier(.4,0,1,1) forwards} .bt-menu-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .bt-menu-hint{flex:none;color:var(--bt-ink-3);font-size:12px;font-variant-numeric:tabular-nums} -.bt-palette-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:70;pointer-events:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} ++.bt-document-message{min-width:0;max-width:100%} ++.bt-message-note{white-space:normal;overflow-wrap:anywhere;padding:6px 8px;max-width:220px} ++.bt-menu-reacts{display:flex;gap:2px;padding:2px 4px} ++.bt-menu-reacts button{width:32px;min-width:32px;height:32px;padding:0;justify-content:center;font-size:18px;line-height:1} +.bt-palette-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:140;isolation:isolate;pointer-events:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} .bt-backdrop{position:absolute;inset:0;background:rgba(0,0,0,.46);animation:bt-fade .22s ease-out} .bt-palette{position:absolute;top:50%;left:50%;width:min(560px,92vw);transform:translate(-50%,-50%);display:flex;flex-direction:column;border-radius:12px;background:var(--bt-main);border:1px solid var(--bt-line-2);box-shadow:0 24px 48px -12px rgba(0,0,0,.25);overflow:hidden;color:var(--bt-ink);animation:bt-palette-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} .bt-palette-layer[data-leaving]{pointer-events:none} +@@ -586,6 +586,9 @@ button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-side + .bt-palette-clear{width:18px;height:18px;border:0;padding:0;border-radius:6px;background:none;color:var(--bt-ink-3);display:inline-flex;align-items:center;justify-content:center;cursor:pointer} + .bt-palette-clear:hover{color:var(--bt-ink)} + .bt-palette-clear svg{width:12px;height:12px} ++.bt-palette-filters{display:flex;flex-wrap:wrap;gap:0;padding:0 10px;border-bottom:.5px solid var(--bt-line-2);flex:none} ++.bt-palette-filter{height:36px;padding:0 12px;border:0;border-bottom:2px solid transparent;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;cursor:pointer} ++.bt-palette-filter[aria-selected=true]{color:var(--bt-ink);border-bottom-color:var(--bt-accent);font-weight:600} + .bt-palette-list{position:relative;height:402px;overflow-y:auto;padding:8px;display:flex;flex-direction:column;gap:2px;box-sizing:border-box} + .bt-palette-list>.bt-thumb,.bt-drop-list>.bt-thumb{left:0;right:0;border-radius:8px;background:var(--bt-active)} + .bt-palette-list>.bt-thumb{left:8px;right:8px} @@ -609,7 +609,8 @@ button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-side .bt-palette-empty-label{font-size:14px;font-weight:500;color:var(--bt-ink-2)} .bt-palette-empty-hint{font-size:13px;line-height:16px;color:var(--bt-ink-3)} @@ -3702,15 +4270,63 @@ diff --git a/src/client/styles.js b/src/client/styles.js .bt-account{flex:none;width:36px;height:36px;border:0;padding:0;background:none;border-radius:50%;cursor:pointer;display:inline-flex} .bt-account:hover .bt-you,.bt-account[aria-expanded=true] .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-sidebar))} /* Popover keyframes move translate and scale, which compose with a transform the popover -@@ -676,7 +676,7 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} +@@ -661,6 +661,20 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} + .bt-addlist{display:flex;flex-direction:column;margin-top:4px;padding:4px;border:1px solid var(--bt-line);border-radius:10px;background:var(--bt-card);animation:bt-rise .16s ease-out} + .bt-seg{position:relative;display:flex;gap:2px;padding:2px;border-radius:10px;background:var(--bt-hover)} + .bt-motion-seg{width:216px} ++.bt-appearance-seg{width:min(100%,360px)} ++.bt-appearance-seg button{font-size:12px;padding:6px 8px} ++.bt-time-field{display:inline-flex;align-items:center;gap:8px;font-size:12px;color:var(--bt-ink-2)} ++.bt-time-field .bt-input{width:auto} ++.bt-fold-modes{display:flex;flex-direction:column;width:100%} ++.bt-fold-lead{margin:0;padding:10px 16px 4px;font-size:12px;line-height:16px;color:var(--bt-ink-2)} ++.bt-fold-mode{display:flex;align-items:flex-start;gap:12px;width:100%;margin:0;padding:12px 16px;border:0;border-top:.5px solid var(--bt-line);background:none;color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer;box-sizing:border-box} ++.bt-fold-mode:hover{background:var(--bt-hover)} ++.bt-fold-radio{flex:none;width:16px;height:16px;margin-top:2px;border:1.5px solid var(--bt-ink-3);border-radius:50%;box-sizing:border-box;background:transparent;position:relative} ++.bt-fold-mode[aria-checked=true] .bt-fold-radio{border-color:var(--bt-accent)} ++.bt-fold-mode[aria-checked=true] .bt-fold-radio::after{content:"";position:absolute;inset:3px;border-radius:50%;background:var(--bt-accent)} ++.bt-fold-mode-copy{display:flex;flex-direction:column;gap:2px;min-width:0} ++.bt-fold-mode-label{font-size:14px;line-height:20px;font-weight:600} ++.bt-set-card .bt-fold-modes + .bt-set-row,.bt-set-card > .bt-switch{border-top:.5px solid var(--bt-line)} + .bt-seg button{position:relative;z-index:1;flex:1;height:30px;border:0;border-radius:8px;background:none;font:inherit;font-size:13px;color:var(--bt-ink-2);cursor:pointer;transition:background-color .15s ease,color .15s ease,box-shadow .15s ease,${spring(SPRING_TAP, 'scale')}} + .bt-seg button[aria-pressed=true]{background:var(--bt-card);color:var(--bt-ink);box-shadow:0 1px 3px rgba(0,0,0,.08)} + .bt-seg button:disabled{opacity:.4;cursor:default} +@@ -676,9 +676,9 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} .bt-mem-row>svg{flex:none;color:var(--bt-ink-2)} .bt-mem-row-copy{flex:1;text-align:left} .bt-mem-row-go{display:inline-flex;align-items:center;gap:2px;color:var(--bt-ink-3);font-size:12px} -.bt-mem-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:61;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} +.bt-mem-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:121;isolation:isolate;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} .bt-mem-scrim{animation:bt-fade .2s ease-out} - .bt-mem{position:relative;width:min(680px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} +-.bt-mem{position:relative;width:min(680px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} ++.bt-mem{position:relative;width:min(880px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} .bt-mem-head{position:relative;display:flex;align-items:center;gap:8px;height:60px;flex:none;padding:0 14px 0 24px;border-bottom:.5px solid var(--bt-line);box-sizing:border-box} + .bt-mem-head .bt-icon-btn{width:32px;height:32px;flex:none} + .bt-mem-head [aria-haspopup] svg{width:18px;height:18px;stroke-width:2.6} +@@ -688,7 +688,23 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} + .bt-mem-head-gap{flex:1} + .bt-mem-menu{position:absolute;top:52px;right:50px;min-width:220px;--bt-origin:top right} + .bt-mem-menu button:disabled{opacity:.4;cursor:default;background:none} ++.bt-mem-shell{flex:1;min-height:0;display:flex} ++.bt-mem-main{flex:1;min-width:0;display:flex;flex-direction:column} ++.bt-mem-nav{flex:none;width:228px;display:flex;flex-direction:column;gap:10px;padding:12px 10px 16px;border-right:.5px solid var(--bt-line);background:var(--bt-sidebar);min-height:0} ++.bt-mem-search{display:flex;align-items:center;gap:8px;margin:0 4px;padding:0 8px;height:32px;border-radius:8px;background:var(--bt-main);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2)} ++.bt-mem-search svg{flex:none;width:14px;height:14px} ++.bt-mem-search-input{flex:1;min-width:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;outline:none} ++.bt-mem-nav-list{display:flex;flex-direction:column;gap:2px;min-height:0;overflow:auto;padding:0 2px} ++.bt-mem-nav-group{display:flex;flex-direction:column;gap:2px;margin-top:10px} ++.bt-mem-nav-heading{padding:4px 8px 2px;font-size:11px;line-height:14px;font-weight:600;color:var(--bt-ink-3);text-transform:uppercase;letter-spacing:.04em} ++.bt-mem-nav-item{display:flex;align-items:center;gap:8px;width:100%;margin:0;padding:6px 8px;border:0;border-radius:8px;background:none;color:var(--bt-ink);font:inherit;font-size:13px;line-height:18px;text-align:left;cursor:pointer} ++.bt-mem-nav-item:hover{background:var(--bt-hover)} ++.bt-mem-nav-item[aria-current=page]{background:var(--bt-selected,var(--bt-active));font-weight:600} ++.bt-mem-nav-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} ++.bt-mem-nav-count{flex:none;font-size:11px;line-height:14px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums} ++.bt-mem[data-nav=hidden] .bt-mem-shell{display:flex} + .bt-mem-body{flex:1;overflow-y:auto;padding:22px 28px 24px;scrollbar-width:thin;display:flex;flex-direction:column;gap:12px} ++@media (max-width:640px){.bt-mem-nav{width:180px}} + .bt-mem-summary{transition:opacity .3s ease} + .bt-mem-summary[data-stale]{opacity:.55} + .bt-mem-summary h3{margin:20px 0 6px;font-size:17px;line-height:26px;font-weight:600} @@ -780,9 +780,20 @@ body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} export const CONVERSATION_CSS = ` @@ -3838,6 +4454,19 @@ diff --git a/src/client/styles.js b/src/client/styles.js [data-composer-placeholder]::after{content:var(--bt-placeholder,"Message");display:block;font-size:14px;line-height:24px;color:color-mix(in srgb,var(--bt-ink) 36%,transparent)} /* The team's "+" (ComposerPlus) takes the seat of the shell's command-menu button. */ [data-composer-card] button[class*="_add"]{display:none!important} +@@ -882,7 +882,11 @@ header[class*="_header"] .bt-head{flex:1 1 auto;width:100%} + .bt-plus:active{scale:.9} + .bt-plus svg{width:14px;height:14px;transition:${spring(SPRING_POP, 'rotate')}} + .bt-plus[aria-expanded=true] svg{rotate:45deg} +-.bt-plus-menu{min-width:180px} ++.bt-plus-menu{min-width:220px} ++.bt-plus-group{display:flex;flex-direction:column} ++.bt-plus-group + .bt-plus-group{border-top:.5px solid var(--bt-line);margin-top:4px;padding-top:4px} ++.bt-plus-menu .bt-menu-hint,.bt-head-menu .bt-menu-hint{display:block;padding:2px 12px 8px 36px;font-size:11px;line-height:15px;color:var(--bt-ink-3);white-space:normal;max-width:240px} ++.bt-plus-menu button:disabled{opacity:.55;cursor:default} + [data-composer-card] [class*="_tools"]{gap:0!important} + [data-composer-card] [class*="_modes"]:empty{display:none!important} + [data-composer-card] [class*="_activity"]:not(:has([data-slot] > *)){display:none!important} @@ -905,7 +905,9 @@ header[class*="_header"] .bt-head{flex:1 1 auto;width:100%} .bt-mic:active,.bt-voice:active{scale:.9} [data-composer-card]:has(button[class*="_primary"]:disabled) .bt-voice{display:inline-grid} @@ -3856,19 +4485,57 @@ diff --git a/src/client/styles.js b/src/client/styles.js .bt-ububble{max-width:min(560px,78%);background:var(--bt-user);color:var(--bt-user-ink);border-radius:18px;padding:7px 12px;font-size:14px;line-height:20px;box-sizing:border-box;overflow-wrap:anywhere} .bt-ububble [class*="_markdown"],.bt-ububble a{color:inherit!important} .bt-ububble p{margin:0;line-height:22px} +diff --git a/src/client/themes.js b/src/client/themes.js +--- a/src/client/themes.js ++++ b/src/client/themes.js +@@ -28,6 +28,13 @@ const THEMES = { + light: { bg: '#f7f9fc', sidebar: '#eef2f8', bubble: '#e5ebf5', card: '#ffffff', text: '#121826', user: '#1e3a8a', userText: '#ffffff', accent: '#1e86ff' }, + dark: { bg: '#0b1020', sidebar: '#10172a', bubble: '#1a2340', card: '#141c33', text: '#e8edf7', user: '#3b6fd8', userText: '#ffffff', accent: '#4f9dff' }, + }, ++ grove: { ++ label: 'Grove', ++ light: { bg: '#f4f7f5', sidebar: '#e8eee9', bubble: '#dfe8e2', card: '#ffffff', text: '#171c19', user: '#235039', userText: '#f4f7f5', accent: '#1f7a54' }, ++ dark: { bg: '#171c19', sidebar: '#141916', bubble: '#2a332d', card: '#272e2b', text: '#e8eee9', user: '#235039', userText: '#f4f7f5', accent: '#3d9a6e' }, ++ // #235039 is the measured selected fill from the visual reference Instant-mode sample. ++ css: 'html body{--bt-selected:color-mix(in srgb,var(--bt-accent) 18%,var(--bt-sidebar))}html body[data-ds-dark-theme]{--bt-selected:#235039}', ++ }, + } + const rgba = (hex, alpha) => `rgba(${[1, 3, 5].map(index => parseInt(hex.slice(index, index + 2), 16)).join(',')},${alpha})` + function themeVars(mode, dark, accent = mode.accent) { +@@ -105,3 +105,17 @@ export function registerTheme(id, theme) { + } + } + export const allThemes = () => ({ ...THEMES, ...customThemes }) ++// Fresh profiles, or a stored id the registry no longer has, present Grove so the ++// forest shell is the first look of a real FlyBot. A saved DeepSeek / Mono / Paper / ++// Moonlight id is honored; those themes stay in the picker. ++export const DEFAULT_THEME = 'grove' ++export function resolveThemeId(prefs, themes = allThemes()) { ++ const id = prefs?.theme ++ return themes[id] ? id : DEFAULT_THEME ++} ++export function themePrefsRecord(prefs = {}) { ++ return { ++ theme: prefs.theme, accent: prefs.accent, motion: prefs.motion, ++ appearance: prefs.appearance, sendKey: prefs.sendKey, folding: prefs.folding, ++ } ++} diff --git a/src/client/user-message.js b/src/client/user-message.js --- a/src/client/user-message.js +++ b/src/client/user-message.js -@@ -1,9 +1,11 @@ +@@ -1,9 +1,13 @@ import { createElement as h, Fragment, useState } from 'react' import * as ui from '@deepseek-ai/dsh-client-ui-primitives' import { mentionSpans } from '../shared/mentions.js' -import { BotMark } from './mark.js' +-import { CheckIcon, CopyIcon } from './icons.js' +import { BotMark, PersonMark, markBotForMention } from './mark.js' - import { CheckIcon, CopyIcon } from './icons.js' ++import { MessageTools, onMessageContextMenu } from './message-tools.js' ++import { userMessageReactKey } from '../shared/message-actions.js' import { dateLocale, t } from './i18n.js' +import { cleanPeerName, faceAliases, remoteBotTitle, remoteMentionLabel } from '../shared/remote-label.js' +import { facePeople, faceSeatLabel, faceSeats } from './face-seats.js' ++import { FoldedContent, foldingOf, showsDocumentCard } from './message-fold.js' // ------------------------------------------------------------------------- // The user's own messages. DSH draws every "@word" in them as a file reference, and @@ -3991,7 +4658,42 @@ diff --git a/src/client/user-message.js b/src/client/user-message.js } function Attachments({ attachments, renderMessageImages }) { -@@ -87,11 +87,34 @@ export function UserMessageCell({ node, sessionId, useRoster, actions, renderMes +@@ -69,38 +69,90 @@ function Attachments({ attachments, renderMessageImages }) { + })) + } + +-function CopyButton({ text }) { +- const [copied, setCopied] = useState(false) +- const copy = () => { +- void navigator.clipboard?.writeText(text).then(() => { setCopied(true); setTimeout(() => setCopied(false), 1000) }) +- } +- return h('button', { type: 'button', className: 'bt-tool', 'aria-label': copied ? t('Copied') : t('Copy'), title: copied ? t('Copied') : t('Copy'), onClick: copy }, copied ? h(CheckIcon) : h(CopyIcon)) +-} +- + const clock = time => (typeof time === 'number' ? new Date(time).toLocaleTimeString(dateLocale(), { hour: 'numeric', minute: '2-digit' }) : undefined) + + // A sent message, or one that joined a running turn ("steering"). +-export function UserMessageCell({ node, sessionId, useRoster, actions, renderMessageImages, openFile, openSkill }) { ++function userBody({ text, rest, roster, sessionId, incoming, author, referenceLabels, skillNames, references, actions, time }) { ++ if (text === '' && rest.length === 0) return null ++ const folding = foldingOf(roster.prefs) ++ const card = text !== '' && showsDocumentCard(text, folding) ++ const message = text === '' ? null : h(FoldedContent, { text, folding, actions, sessionId }, card ? undefined : shown => h(UserText, { ++ text: shown, ++ bots: mentionableBots(roster, sessionId, { fromFriend: Boolean(incoming && author.ownerName) }), ++ referenceLabels, skillNames, references, actions, ++ })) ++ if (card && rest.length === 0) return message ++ return h('div', { className: 'bt-ubody', title: clock(time) }, ++ card ? null : message, ++ rest.map((block, index) => (ui.JsonBlock ? h(ui.JsonBlock, { key: index, label: t('Content'), payload: block }) : null)), ++ card ? message : null) ++} ++ ++export function UserMessageCell({ node, sessionId, useRoster, useUi, actions, renderMessageImages, openFile, openSkill }) { + const roster = useRoster(value => value) + const data = node.data ?? {} + const { text, attachments, rest } = contentParts(data.content) const referenceLabels = data.referenceLabels ?? [] const references = openFile && openSkill ? { openFile, openSkill } : undefined const steering = node.kind === 'steering' @@ -4008,6 +4710,16 @@ diff --git a/src/client/user-message.js b/src/client/user-message.js + // never drawn as held, whatever else in the room waits for approval (#457). + const faceMine = Boolean(room?.origin === 'face-to-face' && !incoming) + const myName = faceMine ? (facePeople(room, roster).find(entry => entry.mine)?.name || cleanPeerName(roster.self?.displayName, '') || author?.name || '') : '' ++ const reactKey = userMessageReactKey(sessionId, node) ++ const reactions = typeof useUi === 'function' ++ ? useUi(state => (reactKey ? state.reactions?.[reactKey] ?? null : null)) ++ : null ++ const picked = reactions?.[0] ?? [] ++ const [contextAt, setContextAt] = useState(null) ++ const react = reactKey && typeof actions?.toggleReaction === 'function' ++ ? emoji => actions.toggleReaction(reactKey, 0, emoji) ++ : undefined ++ const who = incoming ? (author?.name || 'message') : (myName || t('You')) + return h('div', { + className: incoming ? 'bt-umsg bt-umsg-other' : 'bt-umsg', + 'data-steering': steering || undefined, @@ -4015,6 +4727,7 @@ diff --git a/src/client/user-message.js b/src/client/user-message.js + 'data-author': author?.authorId, + 'data-author-kind': author?.authorKind, + 'data-author-name': author?.name, ++ onContextMenu: text.trim() ? event => onMessageContextMenu(event, setContextAt) : undefined, + }, + person ? h('span', { className: 'bt-lead', title: author.name }, h(PersonMark, { name: author.name })) : null, + faceMine ? h('span', { className: 'bt-lead', title: myName || undefined }, h(PersonMark, { name: myName || undefined })) : null, @@ -4022,13 +4735,20 @@ diff --git a/src/client/user-message.js b/src/client/user-message.js + faceMine && myName ? h('span', { className: 'bt-uauthor' }, myName) + : author && (incoming || multiHuman) ? h('span', { className: 'bt-uauthor' }, author.name, author.ownerName ? h('span', { className: 'bt-chip' }, t('Friend\'s Bot')) : null) : null, attachments.length > 0 ? h(Attachments, { attachments, renderMessageImages }) : null, - text !== '' || rest.length > 0 ? h('div', { className: 'bt-ubody', title: clock(data.time) }, +- text !== '' || rest.length > 0 ? h('div', { className: 'bt-ubody', title: clock(data.time) }, - h(UserText, { text, bots: mentionableBots(roster, sessionId), referenceLabels, skillNames: data.skillNames ?? [], references, actions }), -+ h(UserText, { text, bots: mentionableBots(roster, sessionId, { fromFriend: Boolean(incoming && author.ownerName) }), referenceLabels, skillNames: data.skillNames ?? [], references, actions }), - rest.map((block, index) => (ui.JsonBlock ? h(ui.JsonBlock, { key: index, label: t('Content'), payload: block }) : null))) : null, - referenceLabels.length > 0 ? h('div', { className: 'bt-urefs' }, t('Referenced {labels}', { labels: referenceLabels.join(t(', ')) })) : null), - text === '' ? null : h('div', { className: 'bt-utools' }, h(CopyButton, { text }))) -@@ -99,8 +99,15 @@ export function UserMessageCell({ node, sessionId, useRoster, actions, renderMes +- rest.map((block, index) => (ui.JsonBlock ? h(ui.JsonBlock, { key: index, label: t('Content'), payload: block }) : null))) : null, +- referenceLabels.length > 0 ? h('div', { className: 'bt-urefs' }, t('Referenced {labels}', { labels: referenceLabels.join(t(', ')) })) : null), +- text === '' ? null : h('div', { className: 'bt-utools' }, h(CopyButton, { text }))) ++ userBody({ text, rest, roster, sessionId, incoming, author, referenceLabels, skillNames: data.skillNames ?? [], references, actions, time: data.time }), ++ referenceLabels.length > 0 ? h('div', { className: 'bt-urefs' }, t('Referenced {labels}', { labels: referenceLabels.join(t(', ')) })) : null, ++ picked.length ? h('div', { className: 'bt-reacts' }, picked.map(emoji => h('button', { ++ key: emoji, type: 'button', className: 'bt-react', 'aria-label': t('Remove reaction {emoji}', { emoji }), onClick: () => actions.toggleReaction(reactKey, 0, emoji), ++ }, emoji))) : null), ++ h(MessageTools, { ++ text, name: who, sessionId, react, actions, roster, contextAt, className: 'bt-utools', ++ })) + } export const USER_MESSAGE_CSS = ` .bt-umsg{display:flex;flex-direction:row-reverse;align-items:center;justify-content:flex-start;gap:4px} @@ -4044,6 +4764,15 @@ diff --git a/src/client/user-message.js b/src/client/user-message.js .bt-ubody a{color:inherit} .bt-umention{display:inline-flex;align-items:center;gap:3px;vertical-align:-3px;max-width:100%;padding:0 1px;border:0;background:none;color:inherit;font:inherit;font-weight:600;line-height:inherit;cursor:pointer;border-radius:6px;white-space:nowrap} .bt-umention:hover{text-decoration:underline;text-underline-offset:2px} +@@ -113,5 +113,7 @@ export const USER_MESSAGE_CSS = ` + .bt-ufile-meta{font-size:12px;line-height:15px;color:var(--bt-ink-3);white-space:nowrap;overflow:hidden;text-overflow:ellipsis} + .bt-urefs{font-size:13px;line-height:18px;color:var(--bt-ink-3)} + .bt-utools{display:flex;flex:none;gap:2px;opacity:0;visibility:hidden;transition:opacity .12s ease,visibility .12s} +-.bt-umsg:hover .bt-utools,.bt-umsg:focus-within .bt-utools{opacity:1;visibility:visible} ++.bt-umsg:hover .bt-utools,.bt-umsg:focus-within .bt-utools,.bt-utools[data-open]{opacity:1;visibility:visible} ++.bt-umsg .bt-reacts{justify-content:flex-end} ++.bt-umsg-other .bt-reacts{justify-content:flex-start} + ` diff --git a/test/create-bot.test.js b/test/create-bot.test.js --- a/test/create-bot.test.js +++ b/test/create-bot.test.js @@ -4365,6 +5094,15 @@ diff --git a/test/turn-tail.test.js b/test/turn-tail.test.js // Renders the named components of an element tree, leaving the rest as elements. const expand = (node, names) => { +@@ -66,7 +66,7 @@ function cellProps({ closingSeq = 10, turn = finished } = {}) { + } + return { props, asked, links } + } +-const markdownOf = props => find(expand(AssistantCell(props), ['Bubbles']), node => node.type === MarkdownText) ++const markdownOf = props => find(expand(AssistantCell(props), ['Bubbles', 'FoldedContent']), node => node.type === MarkdownText) + + test('a reply that closes its turn links the files the turn changed or delivered', () => { + const { props, asked, links } = cellProps() @@ -101,3 +101,74 @@ test('the turn tail entry notes when the turn ended and shows the pause before t assert.deepEqual(noted, [['b', 3, 'end', 2_000]]) assert.equal(find(out, node => node.props?.className === 'bt-time-sep').length, 1) @@ -4373,7 +5111,7 @@ diff --git a/test/turn-tail.test.js b/test/turn-tail.test.js +test('a reply to a line the friend typed themselves is drawn as the person, not as the Bot', () => { + const { props } = cellProps() + const typed = { ...props, useRoster: select => select({ ...roster, remoteTypedTurns: { b: { 3: 'Bob' } } }) } -+ const drawn = expand(AssistantCell(typed), ['PersonMessage', 'PersonMark', 'Bubbles']) ++ const drawn = expand(AssistantCell(typed), ['PersonMessage', 'PersonMark', 'Bubbles', 'FoldedContent']) + const [person] = find(drawn, node => node.props?.['data-person'] !== undefined) + assert.equal(person.props['data-person'], 'Bob') + assert.equal(find(drawn, node => /\bbt-person-mark\b/.test(node.props?.className ?? '')).length, 1) @@ -4381,8 +5119,8 @@ diff --git a/test/turn-tail.test.js b/test/turn-tail.test.js + assert.equal(find(drawn, node => node.type === MarkdownText).length, 1, 'the text is still rendered as markdown') + // Another turn, or no mark at all: the Bot\'s own bubble. + const other = { ...props, useRoster: select => select({ ...roster, remoteTypedTurns: { b: { 9: 'Bob' } } }) } -+ assert.equal(find(expand(AssistantCell(other), ['PersonMessage', 'PersonMark', 'Bubbles']), node => node.props?.['data-person'] !== undefined).length, 0) -+ assert.equal(find(expand(AssistantCell(props), ['PersonMessage', 'PersonMark', 'Bubbles']), node => node.props?.['data-person'] !== undefined).length, 0) ++ assert.equal(find(expand(AssistantCell(other), ['PersonMessage', 'PersonMark', 'Bubbles', 'FoldedContent']), node => node.props?.['data-person'] !== undefined).length, 0) ++ assert.equal(find(expand(AssistantCell(props), ['PersonMessage', 'PersonMark', 'Bubbles', 'FoldedContent']), node => node.props?.['data-person'] !== undefined).length, 0) +}) + +// #275: a friend's line in my Bot's own chat came while I was away. The NEW divider marks it; once diff --git a/patches/ds-bot/0005-social-seams.patch b/patches/ds-bot/0005-social-seams.patch index 03963fef7..92773e218 100644 --- a/patches/ds-bot/0005-social-seams.patch +++ b/patches/ds-bot/0005-social-seams.patch @@ -267,7 +267,7 @@ diff --git a/src/client/mark.js b/src/client/mark.js diff --git a/src/host/channel.js b/src/host/channel.js --- a/src/host/channel.js +++ b/src/host/channel.js -@@ -1,10 +1,21 @@ +@@ -1,10 +1,23 @@ // Client channel: the team view the browser renders, and the POST /api/bot endpoints. import { randomUUID } from 'node:crypto' import { createUserMessage } from '@deepseek-ai/dsh-llm' @@ -276,6 +276,8 @@ diff --git a/src/host/channel.js b/src/host/channel.js import { COLORS, EXTRA_COLORS, ROUTE } from './constants.js' +import { isFaceRoom, roomTargetOf } from './room-membership.js' +import { readQuietHours } from '../shared/quiet-hours.js' ++import { readAppearance, readSendKey } from '../shared/appearance-prefs.js' ++import { readFolding } from '../shared/message-fold-prefs.js' +import { readTurnBudget } from './turn-budget.js' +import { faceMentions } from './face-mentions.js' +import { visibleText } from '../shared/preview.js' @@ -463,7 +465,7 @@ diff --git a/src/host/channel.js b/src/host/channel.js defaultModel: rt.cachedDefault() ?? null, permissions: rt.permissionCatalog?.() ?? null, modelsKey: modelsKey(), -@@ -65,22 +65,66 @@ export function install(rt) { +@@ -65,60 +65,178 @@ export function install(rt) { memory: rt.memoryEnabled !== false, // Set while another dsh host holds the team (store.js): why this one cannot change it. readOnly: rt.readOnly() ?? null, @@ -518,7 +520,7 @@ diff --git a/src/host/channel.js b/src/host/channel.js + // `diagnostics-clear` is not a read: it truncates `/logs/diagnostics.jsonl`, the file a bug + // report is meant to carry, so a host that only reads refuses it instead of erasing the evidence + // (#2302). `diagnostics` and `diagnostics-log` stay, because they only read that file. -+ const READS = new Set(['state', 'models', 'efforts', 'earlier', 'room-progress', 'room-history', 'exchange', 'usage', 'schedules', 'memory-view', 'browser-wait', 'browser-result', 'diagnostics', 'diagnostics-log', 'update-check', 'update-install', 'dsh-update-install', 'repo-stars', 'approval-answer', 'auth-whoami', 'workflows', ++ const READS = new Set(['history-hit', 'search-messages', 'state', 'models', 'efforts', 'earlier', 'room-progress', 'room-history', 'exchange', 'usage', 'schedules', 'memory-view', 'browser-wait', 'browser-result', 'diagnostics', 'diagnostics-log', 'update-check', 'update-install', 'dsh-update-install', 'repo-stars', 'approval-answer', 'auth-whoami', 'workflows', + 'tasks', 'projects', 'project-read', 'project-board', 'project-team', 'project-of', 'project-decision', 'project-memory', + 'folders', 'folder-list', 'connector-app-status']) + @@ -540,45 +542,85 @@ diff --git a/src/host/channel.js b/src/host/channel.js + } function setPrefs(body) { ++ // Validate the complete request before replacing the live prefs. ++ const prefs = { ...state.prefs } if (body.theme !== undefined) { -@@ -97,28 +97,72 @@ export function install(rt) { - else if (body.motion === 'quiet' || body.motion === 'lively') state.prefs.motion = body.motion + if (typeof body.theme !== 'string' || !/^[a-z][\w-]{0,31}$/.test(body.theme)) throw invalid('Unknown theme') +- state.prefs.theme = body.theme ++ prefs.theme = body.theme + } + if (body.accent !== undefined) { +- if (body.accent === null || body.accent === '') delete state.prefs.accent +- else if (/^#[0-9a-f]{6}$/i.test(body.accent)) state.prefs.accent = body.accent ++ if (body.accent === null || body.accent === '') delete prefs.accent ++ else if (/^#[0-9a-f]{6}$/i.test(body.accent)) prefs.accent = body.accent + else throw invalid('Accent must be a #rrggbb color') + } + if (body.motion !== undefined) { +- if (body.motion === null || body.motion === 'normal') delete state.prefs.motion +- else if (body.motion === 'quiet' || body.motion === 'lively') state.prefs.motion = body.motion ++ if (body.motion === null || body.motion === 'normal') delete prefs.motion ++ else if (body.motion === 'quiet' || body.motion === 'lively') prefs.motion = body.motion else throw invalid('Motion must be quiet, normal or lively') } + // Notifications are on unless switched off (#353). + if (body.notifications !== undefined) { -+ if (body.notifications === null || body.notifications === true) delete state.prefs.notifications -+ else if (body.notifications === false) state.prefs.notifications = false ++ if (body.notifications === null || body.notifications === true) delete prefs.notifications ++ else if (body.notifications === false) prefs.notifications = false + else throw invalid('Notifications must be on or off') + } + // Each kind is on unless switched off on its own; only the off ones are kept (#469). + if (body.notify !== undefined) { + const kinds = body.notify + if (kinds === null || typeof kinds !== 'object' || Array.isArray(kinds)) throw invalid('Notifications must be on or off') -+ const notify = { ...state.prefs.notify } ++ const notify = { ...prefs.notify } + for (const [kind, on] of Object.entries(kinds)) { + if (!NOTIFY_KINDS.includes(kind) || typeof on !== 'boolean') throw invalid('Notifications must be on or off') + if (on) delete notify[kind] + else notify[kind] = false + } -+ if (Object.keys(notify).length > 0) state.prefs.notify = notify -+ else delete state.prefs.notify ++ if (Object.keys(notify).length > 0) prefs.notify = notify ++ else delete prefs.notify + } + // Team quiet hours (#1166): off is the absence of the record, and an invalid window is + // refused here, never stored as "always quiet". + if (body.quietHours !== undefined) { -+ const quiet = readQuietHours(body.quietHours, state.prefs.quietHours) -+ if (quiet === undefined) delete state.prefs.quietHours -+ else state.prefs.quietHours = quiet ++ const quiet = readQuietHours(body.quietHours, prefs.quietHours) ++ if (quiet === undefined) delete prefs.quietHours ++ else prefs.quietHours = quiet + } + // Team turn budget (#645, the C half): a whole number of turns per team-local day, `0` off. + // Clearing the field is not "off" — it goes back to the default the store seeded — so an + // invalid value is refused rather than stored as a number nobody meant. + if (body.turnBudget !== undefined) { + const budget = readTurnBudget(body.turnBudget) -+ if (budget === undefined) delete state.prefs.turnBudget -+ else state.prefs.turnBudget = budget ++ if (budget === undefined) delete prefs.turnBudget ++ else prefs.turnBudget = budget ++ } ++ // Appearance is light / dark / auto / system; auto may follow sunset or a custom window. ++ if (body.appearance !== undefined) { ++ const appearance = readAppearance(body.appearance, prefs.appearance) ++ if (appearance === false) throw invalid('Appearance must be light, dark, auto or system') ++ if (appearance === undefined) delete prefs.appearance ++ else prefs.appearance = appearance ++ } ++ if (body.sendKey !== undefined) { ++ const sendKey = readSendKey(body.sendKey) ++ if (sendKey === false) throw invalid('Send shortcut must be Enter or Shift+Enter') ++ if (sendKey === undefined) delete prefs.sendKey ++ else prefs.sendKey = sendKey ++ } ++ if (body.folding !== undefined) { ++ const folding = readFolding(body.folding, prefs.folding) ++ if (folding === false) { ++ const cards = body.folding && typeof body.folding === 'object' && !Array.isArray(body.folding) ++ && body.folding.documentCards !== undefined && typeof body.folding.documentCards !== 'boolean' ++ throw invalid(cards ? 'Document cards must be on or off' : 'Message folding must be compact, standard or none') ++ } ++ if (folding === undefined) delete prefs.folding ++ else prefs.folding = folding + } ++ state.prefs = prefs return rt.save() } @@ -607,6 +649,10 @@ diff --git a/src/host/channel.js b/src/host/channel.js - return ok({ ...view(), ...live() }) + if (body.since === state.revision && (body.models === undefined || body.models === modelsKey())) return ok({ revision: state.revision, unchanged: true, ...live(actor) }) + return ok({ ...view(actor), ...live(actor) }) ++ case 'history-hit': ++ return ok(await rt.readHistoryHit(body, actor, signal)) ++ case 'search-messages': ++ return ok(await rt.searchMessages(body, actor, signal)) case 'models': await rt.catalog({ fresh: true }) return ok({ modelsKey: modelsKey() }) diff --git a/patches/ds-bot/0008-client-bundle.patch b/patches/ds-bot/0008-client-bundle.patch index de4876b70..384aac22a 100644 --- a/patches/ds-bot/0008-client-bundle.patch +++ b/patches/ds-bot/0008-client-bundle.patch @@ -160,7 +160,7 @@ diff --git a/client.js b/client.js Content: "内容", "Referenced {labels}": "引用了 {labels}", ", ": "、", -@@ -78,21 +78,80 @@ var ZH = { +@@ -78,21 +78,83 @@ var ZH = { " and ": "、", and: "和", "{count} members": "{count} 位成员", @@ -187,6 +187,9 @@ diff --git a/client.js b/client.js + "Could not create the invite. Use Bot settings → Sharing → Copy invite link for this Bot.": "无法创建邀请。请在 Bot 设置 → Sharing 里使用 Copy invite link for this Bot。", + "Add friend": "添加好友", + "Friend requests": "好友请求", ++ "A friend": "一位好友", ++ "{name} requests a share": "{name} 请求分享", ++ "{name} requests {capability}": "{name} 请求 {capability}", + "Accept or decline incoming requests.": "接受或拒绝收到的请求。", + "Accept invite": "接受邀请", + "Paste a friend’s invite link or code.": "粘贴朋友的邀请链接或邀请码。", @@ -477,10 +480,63 @@ diff --git a/client.js b/client.js // Shapes Whale: "鲸鱼", Star: "星星", -@@ -363,6 +363,8 @@ var ZH = { +@@ -357,12 +357,61 @@ var ZH = { + "Group chats": "群聊", + Secrets: "密钥", + Appearance: "外观", ++ Grove: "林间", + Theme: "主题", + "Colors for the whole team, on every device.": "整个团队的配色,所有设备同步。", + Accent: "强调色", "Unread marks, badges, and the brand mark.": "未读标记、徽标和品牌标志。", "Theme accent": "主题强调色", "Custom accent": "自定义强调色", ++ "Light theme": "浅色", ++ "Dark theme": "深色", ++ Automatic: "自动", ++ "Match system": "跟随系统", ++ "How this window looks: light, dark, automatic, or match the system.": "此窗口的外观:浅色、深色、自动,或跟随系统。", ++ "Automatic switch": "自动切换", ++ "Sunset to sunrise": "日落到日出", ++ "Custom hours": "自定义时段", ++ "Dark from": "深色开始", ++ "Dark until": "深色结束", ++ "Switches about a minute after the chosen time, and not in the middle of a turn.": "到点后约再等一分钟,且不会打断正在进行的回复。", ++ Language: "语言", ++ "Interface language": "界面语言", ++ "Follows the DeepSeek Harness language.": "跟随 DeepSeek Harness 的界面语言。", ++ English: "English", ++ "Simplified Chinese": "简体中文", ++ Shortcuts: "快捷键", ++ "Send shortcut": "发送快捷键", ++ "Enter to send": "Enter 发送", ++ "Shift+Enter to send": "Shift+Enter 发送", ++ "Enter inserts a new line.": "Enter 换行。", ++ "Shift+Enter inserts a new line.": "Shift+Enter 换行。", ++ "Message folding": "消息折叠", ++ "Choose how much of a long message to show before it folds.": "选择长消息在对话里折叠前展示多少内容。", ++ Compact: "紧凑", ++ "A very short preview, for scanning a conversation.": "只展示很短的预览。适合以扫读为主的场景。", ++ Standard: "标准", ++ "A moderate preview. Recommended.": "展示适中的预览。推荐。", ++ "No folding": "不折叠", ++ "Show every message in full. Long messages push the conversation off the screen.": "完整展示每条消息。长消息会把对话推离屏幕。", ++ "Collapse long documents into cards": "长文档收成卡片", ++ "Messages with several sections appear as a card you can open beside the conversation.": "含多个章节的消息显示为卡片,可在对话旁边打开阅读,不再铺满屏幕。", ++ "Open beside the conversation": "在对话旁打开", ++ "Opened beside the conversation.": "已在对话旁打开。", ++ "Close document": "关闭文档", ++ "{count} sections": "{count} 个章节", ++ Document: "文档", ++ Channels: "渠道", ++ "No channels yet.": "还没有渠道。", ++ "Only integrations FlyBot already has appear here.": "这里只列出 FlyBot 已经接入的渠道。", ++ "Conversation settings": "会话设置", ++ Attach: "附件", ++ "Reference a chat is available in a Bot or group chat.": "在 Bot 或群聊里才能引用另一段对话。", ++ "A read-only window cannot create a scheduled task.": "只读窗口不能创建定时任务。", ++ "Invite link copied": "邀请链接已复制", ++ "Could not copy the invite link": "无法复制邀请链接", + On: "开", + None: "无", "Bots · {count}": "Bot · {count}", @@ -536,7 +592,7 @@ diff --git a/client.js b/client.js "You have {version}.": "当前版本 {version}。", "The update did not finish: {reason}": "更新没有完成:{reason}", "What's new": "更新说明", -@@ -420,8 +420,107 @@ var ZH = { +@@ -420,13 +420,127 @@ var ZH = { "DSH update": "DSH 更新", "DSH {version}": "DSH {version}", "Restart DSH to start using DSH {version}.": "重启 DSH 后开始使用 DSH {version}。", @@ -645,6 +701,26 @@ diff --git a/client.js b/client.js // Command palette Messages: "消息", Commands: "命令", + "Search Bots, chats and messages": "搜索 Bot、对话和消息", ++ "Search Bots, chats, and loaded messages": "搜索 Bot、对话和已加载的消息", + "Clear search": "清除搜索", ++ "Search filters": "搜索筛选", ++ Chats: "对话", ++ "Search chats and messages": "搜索对话和消息", ++ "Type a Bot name, a group name, or words from a loaded message": "输入 Bot 名、群名,或已加载消息里的词", ++ "Try a Bot name, a group name, or words from a loaded message": "试试 Bot 名、群名,或已加载消息里的词", ++ "Type at least two characters to search messages already loaded": "至少输入两个字符,搜索已加载的消息", ++ "Clear unread mark": "清除手动未读标记", ++ "Estimated night hours (time-zone based)": "估算夜间时段(按时区,非实际日落时间)", ++ "Could not copy message": "未能复制消息,请重试或手动选择文字复制", ++ "Could not download message": "未能下载消息,请重试或复制正文", ++ "Clipboard unavailable": "剪贴板不可用,请手动选择文字复制", ++ "Show message text": "显示消息正文", ++ "Hide message text": "收起消息正文", ++ "Mark as Read": "标为已读", + Results: "结果", + "No results": "没有结果", + "Try a Bot name or words from a message": "试试 Bot 名字或消息里的词", @@ -446,11 +446,15 @@ var ZH = { Reply: "回复", "More message actions": "更多操作", @@ -767,6 +843,23 @@ diff --git a/client.js b/client.js "Save key": "保存密钥", "Keys your Bots asked for. Bots never see the values: they use them as ": "你的 Bot 请求过的密钥。Bot 永远看不到值:它们在 shell 里通过 ", " in their shell, and every value is replaced by ": " 使用,而且发给模型之前,每个值都会被替换成 ", +@@ -598,6 +598,16 @@ var ZH = { + "Manage {name}'s memory": "管理 {name} 的记忆", + "{name}'s memory": "{name} 的记忆", + "Memory summary": "记忆摘要", ++ Overview: "总览", ++ "Memory directory": "记忆目录", ++ "Search memory": "搜索记忆", ++ "Hide directory": "收起目录", ++ "Show directory": "显示目录", ++ "Main memory": "主记忆", ++ "1 topic": "1 个主题", ++ "{count} topics": "{count} 个主题", ++ 'No entries match "{query}"': "没有与“{query}”相符的记忆", ++ "Try a different word, or clear the search to see every entry.": "换个词试试,或清空搜索查看全部记忆。", + "All entries": "全部记忆", + "Memory options": "记忆选项", + "Close memory": "关闭记忆", @@ -608,8 +608,10 @@ var ZH = { "Writing the summary…": "正在生成摘要…", "The summary is out of date: {reason}": "摘要不是最新的:{reason}", @@ -847,9 +940,24 @@ diff --git a/client.js b/client.js "Model call": "模型调用", "This window": "这个窗口", "Error log": "错误日志", -@@ -821,12 +821,33 @@ var ZH = { +@@ -820,13 +820,48 @@ var ZH = { + "Who to chat with…": "想和谁聊…", "Add at least one more Bot": "再至少添加一个 Bot", Members: "成员", ++ "Add a name, then pick Bots to chat with.": "添加名称,然后选择要一起聊天的 Bot。", ++ "Group name (optional)": "输入群组名称(可选)", ++ "Search members": "搜索成员", ++ "Selected {count}": "已选 {count}", ++ "Selected members": "已选成员", ++ "No members selected": "还没有选择成员", ++ "No more Bots to add": "没有更多可添加的 Bot", ++ // Session list filters (kinds the sidebar already has) ++ "Session filter": "会话筛选", ++ "Direct chats": "单聊", ++ Unread: "未读", ++ "No group chats": "没有群聊", ++ "No direct chats": "没有单聊", ++ "No unread chats": "没有未读会话", // Connectors and scheduled tasks + "Choose Bots": "选择 Bot", + "Off for every Bot. Choose which Bots may use it.": "所有 Bot 都未开启。选择哪些 Bot 可以使用。", @@ -910,7 +1018,7 @@ diff --git a/client.js b/client.js "Click again to delete": "再点一次删除", "Delete task": "删除任务", Once: "一次", -@@ -844,6 +844,7 @@ var ZH = { +@@ -844,11 +844,13 @@ var ZH = { minutes: "分钟", hours: "小时", days: "天", @@ -918,6 +1026,12 @@ diff --git a/client.js b/client.js "Morning briefing": "早间简报", "What to do": "要做什么", "Sum up what changed since yesterday and what needs me today.": "总结一下昨天以来的变化,以及今天需要我处理的事。", + When: "什么时候", + "Date and time": "日期和时间", ++ "Time zone": "时区", + Days: "星期", + Time: "时间", + Every: "每", @@ -856,11 +856,24 @@ var ZH = { Unit: "单位", "Create task": "创建任务", @@ -1114,7 +1228,18 @@ diff --git a/client.js b/client.js "The admin must be a member of the group": "管理员必须是群成员", "Unknown group chat": "找不到这个群聊", "Hand the admin role to another member instead of leaving the group without one": "请把管理员交给其他成员,不要让群聊没有管理员", -@@ -951,10 +951,12 @@ var HOST_ZH = { +@@ -938,6 +938,10 @@ var HOST_ZH = { + "Only a Main Bot can be replaced": "只能替换主 Bot", + "A Main Bot cannot be deleted; remove its Main Bot role first": "主 Bot 不能删除,请先取消它的主 Bot 身份", + "Unknown theme": "未知主题", ++ "Appearance must be light, dark, auto or system": "外观必须是浅色、深色、自动或跟随系统", ++ "Send shortcut must be Enter or Shift+Enter": "发送快捷键必须是 Enter 或 Shift+Enter", ++ "Message folding must be compact, standard or none": "消息折叠必须是紧凑、标准或不折叠", ++ "Document cards must be on or off": "长文档卡片必须开或关", + "Accent must be a #rrggbb color": "强调色必须是 #rrggbb 格式", + "Type the key first": "请先输入密钥", + "Choose every Bot or a list of Bots": "请选择所有 Bot 或指定的 Bot", +@@ -951,10 +951,47 @@ var HOST_ZH = { "The model wrote nothing": "模型没有输出内容", "Write the entry to save.": "请写下要保存的内容。", "This DeepSeek Harness has no folder chooser": "这个 DeepSeek Harness 没有文件夹选择窗口", @@ -1123,16 +1248,54 @@ diff --git a/client.js b/client.js + "No FlyBot core update is available": "没有可用的 FlyBot 核心更新", + "saved by a newer FlyBot; update FlyBot": "由更新的 FlyBot 保存;请更新 FlyBot" }; ++Object.assign(ZH, { ++ "Local Bot chat history": "本机 Bot 对话历史", ++ "Earlier part; opens current chat": "较早分段;打开当前对话", ++ "History; opens current chat": "历史记录;打开当前对话", ++ "Search chats and local Bot history": "搜索对话和本机 Bot 历史", ++ "History: your local Bots in this instance. Other chats: loaded messages only.": "历史范围:本实例中你拥有的本机 Bot。其他对话仅搜索已加载消息。", ++ "History unavailable; searching loaded messages only.": "历史检索不可用,仅搜索已加载消息。", ++ "History query is limited to 256 characters.": "历史搜索词最多 256 个字符。", ++ "Searching history…": "正在搜索历史…", ++ "History query failed; showing loaded messages only.": "历史查询失败,以下仅为已加载消息。", ++ "Some history could not be read; results are incomplete.": "部分历史无法读取,结果不完整。", ++ "History search reached a safety limit; narrow your query.": "历史检索已达到安全上限,请缩小搜索范围。", ++ "Search more history": "继续搜索历史", ++ "More history remains to be searched": "还有历史尚未检索", ++ "Enter text to search local Bot history; other chats use loaded messages.": "输入文字搜索本机 Bot 历史;其他对话只查已加载消息。" ++}); ++Object.assign(ZH, { "No matches in the searched portion": "已检索部分没有匹配项" }); ++Object.assign(ZH, { ++ "Read-only history match": "只读历史命中", ++ "Back to search": "返回搜索", ++ "This is segment history, not the current chat. No Bot is activated.": "这里是分段历史,不是当前聊天;不会激活 Bot。", ++ "Loading authorized history…": "正在读取有权查看的历史…", ++ "History changed, expired, or is no longer accessible. Search again.": "历史已变化、结果已过期或无权访问,请重新搜索。", ++ "Segment {part} of {count}": "分段 {part} / {count}", ++ "History session": "历史会话", ++ "Matched message": "命中消息", ++ "Nearby message": "相邻消息", ++ "Sequence": "序号", ++ "Turn": "轮次", ++ "Text truncated by the byte limit; this is not complete history.": "正文已按字节上限截断,不是完整历史。", ++ "Reload history context": "重新读取历史上下文", ++ "Earlier part; view read-only history": "较早分段;查看只读历史", ++ "View read-only history": "查看只读历史" ++}); ++Object.assign(ZH, { "Shows the match and up to two nearby visible messages on each side.": "仅显示命中消息,以及前后各最多两条有权查看的相邻消息。" }); Object.assign(ZH, HOST_ZH); -var fill = (text, params) => params ? text.replace(/\{(\w+)\}/g, (match, name) => name in params ? String(params[name]) : match) : text; +var fill = (text2, params) => params ? text2.replace(/\{(\w+)\}/g, (match, name) => name in params ? String(params[name]) : match) : text2; var service = null; var bound = null; function installLocale(locale) { -@@ -989,480 +989,356 @@ function language() { - var dateLocale = () => language().startsWith("zh") ? "zh-CN" : "en-US"; - var DICTIONARY = { zh: ZH }; - +@@ -986,483 +986,369 @@ function language() { + const active = service?.getLocale?.().active; + return typeof active === "string" ? active : "en"; + } +-var dateLocale = () => language().startsWith("zh") ? "zh-CN" : "en-US"; +-var DICTIONARY = { zh: ZH }; +- -// src/client/diagnostics.js -var MAX = 30; -var REPEAT_MS = 5 * 60 * 1e3; @@ -1146,46 +1309,7 @@ diff --git a/client.js b/client.js - if (error !== null && typeof error === "object") { - if (noted.has(error)) return; - noted.add(error); -+// src/shared/mentions.js -+var ALL_WORDS = ["all", "everyone", "所有人", "全体"]; -+var NAME_GOES_ON = /^(?:[a-z0-9_\-/\\]|\.[a-z0-9_-])/i; -+var ADDRESS_BEFORE = /[a-z0-9_./]/i; -+var LITERAL = /```[\s\S]*?(?:```|$)|`[^`\n]*`|\[[^\]\n]*\]\([^)\s]*(?:\s+(?:"[^"\n]*"|'[^'\n]*'))?\)/g; -+var fitsAt = (text2, at, word) => text2.slice(at, at + word.length).toLowerCase() === word.toLowerCase() && !NAME_GOES_ON.test(text2.slice(at + word.length)); -+var overlaps = (spans, start, end) => spans.some((span) => start < span.end && span.start < end); -+var stripInvisible = (value) => String(value ?? "").replace(/\p{Cf}/gu, ""); -+var NOT_DRAWN_RANGES = [ -+ [847, 847], -+ [4447, 4448], -+ [6068, 6069], -+ [6155, 6157], -+ [6159, 6159], -+ [10240, 10240], -+ [12644, 12644], -+ [65440, 65440], -+ [65024, 65039], -+ [917760, 917999] -+]; -+var NOT_DRAWN = new RegExp(`[${NOT_DRAWN_RANGES.map(([from, to]) => `\\u{${from.toString(16)}}${to === from ? "" : `-\\u{${to.toString(16)}}`}`).join("")}]`, "gu"); -+var DRAWS_NOTHING = /[\p{Mn}\p{Me}\p{Zs}\p{Zl}\p{Zp}\p{Default_Ignorable_Code_Point}\u2800]/gu; -+function nameProblem(name) { -+ const text2 = stripInvisible(name).trim(); -+ if (text2 === "" || text2.replace(DRAWS_NOTHING, "").trim() === "") return "A Bot needs a name"; -+ if (/[@`\r\n]/.test(text2)) return "A Bot name cannot contain @, ` or a line break"; -+ if (ALL_WORDS.includes(text2.toLowerCase())) return `"${text2}" calls everyone in a group, so it cannot be a Bot name`; -+ return void 0; -+} -+function referenceSpans(text2, labels = []) { -+ const spans = []; -+ for (const label of [...labels].sort((a, b) => b.length - a.length)) { -+ const mention = `@${label}`; -+ for (let at = text2.indexOf(mention); at !== -1; at = text2.indexOf(mention, at + 1)) { -+ const end = at + mention.length; -+ if (at > 0 && ADDRESS_BEFORE.test(text2[at - 1]) || NAME_GOES_ON.test(text2.slice(end)) || overlaps(spans, at, end)) continue; -+ spans.push({ start: at, end, label }); -+ break; -+ } - } +- } - const message = String(error?.message ?? error ?? "error").slice(0, 300); - const code = typeof error?.code === "string" ? error.code : void 0; - const text = `${where}: ${message}`; @@ -1195,28 +1319,11 @@ diff --git a/client.js b/client.js - last.time = now; - last.count = (last.count ?? 1) + 1; - return; -+ return spans.sort((a, b) => a.start - b.start); -+} -+function mentionSpans(text2, bots, { references = [] } = {}) { -+ const value = String(text2 ?? ""); -+ const skip = [ -+ ...[...value.matchAll(LITERAL)].map((match) => ({ start: match.index, end: match.index + match[0].length })), -+ ...referenceSpans(value, references) -+ ]; -+ const byLength = bots.filter((bot) => bot?.name).sort((a, b) => b.name.length - a.name.length); -+ const spans = []; -+ for (let at = value.indexOf("@"); at !== -1; at = value.indexOf("@", at + 1)) { -+ if (at > 0 && ADDRESS_BEFORE.test(value[at - 1]) || overlaps(skip, at, at + 1)) continue; -+ const bot = byLength.find((candidate) => fitsAt(value, at + 1, candidate.name)); -+ const all = bot ? void 0 : ALL_WORDS.find((word) => fitsAt(value, at + 1, word)); -+ if (!bot && !all) continue; -+ const end = at + 1 + (bot ? bot.name.length : all.length); -+ spans.push(bot ? { start: at, end, bot } : { start: at, end, all: true }); -+ at = end - 1; - } +- } - entries.push({ time: now, level: "error", text, ...code ? { code } : {} }); - if (entries.length > MAX) entries.splice(0, entries.length - MAX); -+ return spans; ++function canSetLocale() { ++ return typeof service?.setLocale === "function"; } -var quietly = (where) => (error) => noteClientError(where, error); -var clearClientErrors = () => { @@ -1229,26 +1336,9 @@ diff --git a/client.js b/client.js - language: language(), - userAgent: navigator.userAgent - }; -+function unmatchedMentions(text2, bots, { references = [] } = {}) { -+ const value = String(text2 ?? ""); -+ const skip = [ -+ ...[...value.matchAll(LITERAL)].map((match) => ({ start: match.index, end: match.index + match[0].length })), -+ ...referenceSpans(value, references) -+ ]; -+ const byLength = bots.filter((bot) => bot?.name).sort((a, b) => b.name.length - a.name.length); -+ const missing = []; -+ for (let at = value.indexOf("@"); at !== -1; at = value.indexOf("@", at + 1)) { -+ if (at > 0 && ADDRESS_BEFORE.test(value[at - 1]) || overlaps(skip, at, at + 1)) continue; -+ const bot = byLength.find((candidate) => fitsAt(value, at + 1, candidate.name)); -+ const all = bot ? void 0 : ALL_WORDS.find((word2) => fitsAt(value, at + 1, word2)); -+ if (bot || all) { -+ at += 1 + (bot ? bot.name.length : all.length) - 1; -+ continue; -+ } -+ const word = /^[^\s@,,。.!?!?::;;、()()"'“”]{1,40}/.exec(value.slice(at + 1))?.[0]; -+ if (word) missing.push(`@${word}`); -+ } -+ return missing; ++function setInterfaceLocale(tag) { ++ if (typeof service?.setLocale !== "function") return void 0; ++ return service.setLocale(tag); } -var FAILURES = { - AUTH: "The API key was rejected", @@ -1261,26 +1351,13 @@ diff --git a/client.js b/client.js - TIMEOUT: "The model took too long to answer", - TRANSPORT: "Could not reach the model service", - SESSION: "Its group conversation could not open" -+ -+// src/shared/text-boundary.js -+var isHighSurrogate = (code) => code >= 55296 && code <= 56319; -+var isLowSurrogate = (code) => code >= 56320 && code <= 57343; -+var codePointStart = (text2, at) => at > 0 && isLowSurrogate(text2.charCodeAt(at)) && isHighSurrogate(text2.charCodeAt(at - 1)) ? at - 1 : at; -+var codePointEnd = (text2, end) => end > 0 && isHighSurrogate(text2.charCodeAt(end - 1)) && isLowSurrogate(text2.charCodeAt(end)) ? end - 1 : end; -+var fits = (text2, max) => { -+ const value = String(text2); -+ let n = 0; -+ for (let i = 0; i < value.length; n += 1) i += value.codePointAt(i) > 65535 ? 2 : 1; -+ return n <= max; -+}; -+var cut = (text2, max) => { -+ const flat = String(text2).toWellFormed(); -+ return { text: flat.slice(0, codePointEnd(flat, max)), cut: flat.length > max }; - }; +-}; -function failureLabel(code, message) { - if (FAILURES[code]) return t(FAILURES[code]); - return message || code || t("Unknown error"); --} ++function languageLabel() { ++ return language().startsWith("zh") ? "Simplified Chinese" : "English"; + } -var URL_LIMIT = 7e3; -var WHAT_MAX = 2e3; -var PASTE_NOTE = "DS Bot copied the diagnostics to the clipboard. Paste them here."; @@ -1292,23 +1369,39 @@ diff --git a/client.js b/client.js - const full2 = build(diagnostics); - if (full2.length <= URL_LIMIT) return { url: full2, inline: true }; - const facts = build(`${diagnostics.split("\n\n")[0]} ++var dateLocale = () => language().startsWith("zh") ? "zh-CN" : "en-US"; ++var DICTIONARY = { zh: ZH }; -${REST_NOTE}`); - return { url: facts.length <= URL_LIMIT ? facts : build(PASTE_NOTE), inline: false }; -+// src/shared/remote-label.js -+function cleanPeerName(name, fallback = "") { -+ const text2 = String(name ?? "").toWellFormed().replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/g, " ").replace(/[[\]"`<>]/g, "").replace(/\s+/g, " ").trim(); -+ const label = cut(text2, 60).text; -+ return label || fallback; -+} -+function normRemoteHandle(handle) { -+ return `@${String(handle ?? "").trim().replace(/^@+/, "").toLowerCase()}`; -+} -+function ownerFromHandle(handle) { -+ const parts = String(handle ?? "").replace(/^@/, "").split("."); -+ if (parts.length >= 3 && parts.at(-1) === "home") return parts.at(-2); -+ if (parts.length === 2 && parts[1] === "home") return parts[0]; -+ return ""; ++// src/shared/mentions.js ++var ALL_WORDS = ["all", "everyone", "所有人", "全体"]; ++var NAME_GOES_ON = /^(?:[a-z0-9_\-/\\]|\.[a-z0-9_-])/i; ++var ADDRESS_BEFORE = /[a-z0-9_./]/i; ++var LITERAL = /```[\s\S]*?(?:```|$)|`[^`\n]*`|\[[^\]\n]*\]\([^)\s]*(?:\s+(?:"[^"\n]*"|'[^'\n]*'))?\)/g; ++var fitsAt = (text2, at, word) => text2.slice(at, at + word.length).toLowerCase() === word.toLowerCase() && !NAME_GOES_ON.test(text2.slice(at + word.length)); ++var overlaps = (spans, start, end) => spans.some((span) => start < span.end && span.start < end); ++var stripInvisible = (value) => String(value ?? "").replace(/\p{Cf}/gu, ""); ++var NOT_DRAWN_RANGES = [ ++ [847, 847], ++ [4447, 4448], ++ [6068, 6069], ++ [6155, 6157], ++ [6159, 6159], ++ [10240, 10240], ++ [12644, 12644], ++ [65440, 65440], ++ [65024, 65039], ++ [917760, 917999] ++]; ++var NOT_DRAWN = new RegExp(`[${NOT_DRAWN_RANGES.map(([from, to]) => `\\u{${from.toString(16)}}${to === from ? "" : `-\\u{${to.toString(16)}}`}`).join("")}]`, "gu"); ++var DRAWS_NOTHING = /[\p{Mn}\p{Me}\p{Zs}\p{Zl}\p{Zp}\p{Default_Ignorable_Code_Point}\u2800]/gu; ++function nameProblem(name) { ++ const text2 = stripInvisible(name).trim(); ++ if (text2 === "" || text2.replace(DRAWS_NOTHING, "").trim() === "") return "A Bot needs a name"; ++ if (/[@`\r\n]/.test(text2)) return "A Bot name cannot contain @, ` or a line break"; ++ if (ALL_WORDS.includes(text2.toLowerCase())) return `"${text2}" calls everyone in a group, so it cannot be a Bot name`; ++ return void 0; } - -// src/client/api.js @@ -1328,12 +1421,40 @@ diff --git a/client.js b/client.js - if (error?.name === "AbortError") throw error; - noteClientError(endpoint, Object.assign(new Error(`network error: ${error?.message ?? error}`), { code: "NETWORK" })); - throw markNoted(Object.assign(new Error(t("Could not reach DSH. Check that it is still running.")), { code: "NETWORK", cause: error })); -- } ++function referenceSpans(text2, labels = []) { ++ const spans = []; ++ for (const label of [...labels].sort((a, b) => b.length - a.length)) { ++ const mention = `@${label}`; ++ for (let at = text2.indexOf(mention); at !== -1; at = text2.indexOf(mention, at + 1)) { ++ const end = at + mention.length; ++ if (at > 0 && ADDRESS_BEFORE.test(text2[at - 1]) || NAME_GOES_ON.test(text2.slice(end)) || overlaps(spans, at, end)) continue; ++ spans.push({ start: at, end, label }); ++ break; ++ } + } - if (!response.ok) { - const error = Object.assign(new Error(hostText(`HTTP ${response.status}`)), { code: `HTTP_${response.status}` }); - noteClientError(endpoint, error); - throw error; -- } ++ return spans.sort((a, b) => a.start - b.start); ++} ++function mentionSpans(text2, bots, { references = [] } = {}) { ++ const value = String(text2 ?? ""); ++ const skip = [ ++ ...[...value.matchAll(LITERAL)].map((match) => ({ start: match.index, end: match.index + match[0].length })), ++ ...referenceSpans(value, references) ++ ]; ++ const byLength = bots.filter((bot) => bot?.name).sort((a, b) => b.name.length - a.name.length); ++ const spans = []; ++ for (let at = value.indexOf("@"); at !== -1; at = value.indexOf("@", at + 1)) { ++ if (at > 0 && ADDRESS_BEFORE.test(value[at - 1]) || overlaps(skip, at, at + 1)) continue; ++ const bot = byLength.find((candidate) => fitsAt(value, at + 1, candidate.name)); ++ const all = bot ? void 0 : ALL_WORDS.find((word) => fitsAt(value, at + 1, word)); ++ if (!bot && !all) continue; ++ const end = at + 1 + (bot ? bot.name.length : all.length); ++ spans.push(bot ? { start: at, end, bot } : { start: at, end, all: true }); ++ at = end - 1; + } - const result = await response.json(); - if (!result.ok) { - const code = result.error?.code ?? "bot/error"; @@ -1342,51 +1463,33 @@ diff --git a/client.js b/client.js - if (!REFUSALS.has(code)) { - noteClientError(endpoint, Object.assign(new Error(result.error?.message ?? "Request failed"), { code })); - markNoted(error); -+function isHomeLevelRemote(record) { -+ const handle = String(record?.handle ?? record?.remote?.handle ?? ""); -+ const key = normRemoteHandle(handle); -+ const parts = key.replace(/^@/, "").split("."); -+ return parts.length === 2 && parts[1] === "home"; -+} -+function isListedRemoteChat(bot) { -+ if (!bot) return false; -+ if (bot.hidden) return false; -+ const remote = bot.remote; -+ if (!remote || typeof remote.handle !== "string") return true; -+ if (remote.gone || remote.hidden) return false; -+ if (isHomeLevelRemote(remote)) return false; -+ return true; -+} -+function isShownRemoteChat(bot) { -+ if (!bot) return false; -+ if (isListedRemoteChat(bot)) return true; -+ if (bot.remote?.gone !== true) return false; -+ return bot.hidden !== true || bot.remote.hiddenByGone === true; -+} -+function listedChatBots(roster) { -+ return (roster?.bots ?? []).filter(isListedRemoteChat); ++ return spans; +} -+function splitRoomPicks(roster, ids) { -+ const byId = roster?.byId ?? Object.fromEntries((roster?.bots ?? []).map((bot) => [bot.id, bot])); -+ const members = []; -+ const remotes = []; -+ const seen = /* @__PURE__ */ new Set(); -+ for (const id of ids ?? []) { -+ const bot = byId[id]; -+ const handle = bot?.remote?.handle; -+ if (typeof handle === "string" && handle) { -+ const key = normRemoteHandle(handle); -+ if (seen.has(key)) continue; -+ seen.add(key); -+ remotes.push({ kind: "bot", remote: true, handle: key }); -+ } else { -+ members.push(id); ++function unmatchedMentions(text2, bots, { references = [] } = {}) { ++ const value = String(text2 ?? ""); ++ const skip = [ ++ ...[...value.matchAll(LITERAL)].map((match) => ({ start: match.index, end: match.index + match[0].length })), ++ ...referenceSpans(value, references) ++ ]; ++ const byLength = bots.filter((bot) => bot?.name).sort((a, b) => b.name.length - a.name.length); ++ const missing = []; ++ for (let at = value.indexOf("@"); at !== -1; at = value.indexOf("@", at + 1)) { ++ if (at > 0 && ADDRESS_BEFORE.test(value[at - 1]) || overlaps(skip, at, at + 1)) continue; ++ const bot = byLength.find((candidate) => fitsAt(value, at + 1, candidate.name)); ++ const all = bot ? void 0 : ALL_WORDS.find((word2) => fitsAt(value, at + 1, word2)); ++ if (bot || all) { ++ at += 1 + (bot ? bot.name.length : all.length) - 1; ++ continue; } - throw error; ++ const word = /^[^\s@,,。.!?!?::;;、()()"'“”]{1,40}/.exec(value.slice(at + 1))?.[0]; ++ if (word) missing.push(`@${word}`); } - return result.value; -}; -- ++ return missing; ++} + -// src/client/inks.js -var INKS = { - deepseek: ["#4D6BFE", "#6A84FF"], @@ -1408,7 +1511,17 @@ diff --git a/client.js b/client.js - magenta: ["#FF5EB1", "#E02A88"], - gray: ["#959595", "#777777"], - aurora: ["#00B8D4", "#2EE6E0"] --}; ++// src/shared/text-boundary.js ++var isHighSurrogate = (code) => code >= 55296 && code <= 56319; ++var isLowSurrogate = (code) => code >= 56320 && code <= 57343; ++var codePointStart = (text2, at) => at > 0 && isLowSurrogate(text2.charCodeAt(at)) && isHighSurrogate(text2.charCodeAt(at - 1)) ? at - 1 : at; ++var codePointEnd = (text2, end) => end > 0 && isHighSurrogate(text2.charCodeAt(end - 1)) && isLowSurrogate(text2.charCodeAt(end)) ? end - 1 : end; ++var fits = (text2, max) => { ++ const value = String(text2); ++ let n = 0; ++ for (let i = 0; i < value.length; n += 1) i += value.codePointAt(i) > 65535 ? 2 : 1; ++ return n <= max; + }; -var GRADIENTS = { aurora: [[0, "#A4FFB0"], [0.42, "#00F0E4"], [1, "#2E9EF7"]] }; -var ACCENT_INKS = ["deepseek", "charcoal", "graphite", "rose", "sky", "tangerine", "cobalt"]; -var LEGACY_INKS = { kimi: "charcoal", zai: "graphite", minimax: "rose", stepfun: "sky", mimo: "tangerine", qwen: "cobalt" }; @@ -1441,10 +1554,13 @@ diff --git a/client.js b/client.js - cushion: { body: "M64.2 4.4l3.3-.4 2.8 .2 3.9 .8 2.8 1.1 2.7 1.7 2.4 2.1 1.9 2.4 1.5 2.8 1.2 3.9 7.1 40.6-.1 5-1.4 4.5-1.6 2.9-1.9 2.2-2.2 1.9-2.8 1.7-45.6 17.1-3.4 .9-3.4 .2-4.5-.7-3.4-1.2-3.3-2-2.9-2.7-2.3-3.4-1.5-3.9-7.3-41.7 .1-5 1.4-4.5 1.6-2.9 1.9-2.2 2.2-1.9 2.8-1.7z", shade: "M82.1 10l2.9 4 1.6 4.5 7.3 42.2-.5 5.1-1.1 3.3-1.7 2.9-4.6 4.5-3.3 1.7-46.8 17.4-5.6 .2-4-.7-3.3-1.2-3.4-2.2-1.7-1.8 .6 .4 3.3 .2 4.5-1.2 5.1-2.8 5.3-4.4-6.9-39.4 5-5.7 43.9-16.4 2.3-3.6 1.1-2.8 .5-3.6z", light: "M62.3 4.9l1.8 .1-43.4 16.1 1.1 .4 .8 .9 .1 1.7-1.6 3.4-2.6 3-3.4 2.7-3.4 1.5-3.4-.2-.8-.8-.2-1.2 .4-1.6 1.7-2.9 3.4-3.5 2.3-1.6 3.4-1.6 5.6-1.8 .6-.5 1.1 0 .5-.6 2.3-.5 .6-.6 1.1 0 .6-.6 2.2-.5 .6-.6 1.1 0 .6-.6 2.2-.5 .6-.6 1.1 0 .6-.5 2.2-.6 .6-.6 1.1 0 .6-.5 2.2-.6 .6-.5 1.1-.1 .6-.5 2.2-.6 .6-.5 1.1-.1 .6-.5 2.2-.6 .6-.5 1.1 0 .6-.6 2.2-.6 .6-.5 1.1 0z", eyes: [[51.1, 57.2, 8.4, 22.1, -10], [69.9, 50.1, 8.4, 22.1, -10]] }, - ring: { body: "M48.1 4.3l8-.1 7.8 1.8 7.3 3.5 6.7 5.4 5.2 6.7 4.1 8.3 2.3 8.9 .7 9-1 9.5-2.5 8.9-4.1 8.3-5.3 7.3-6.6 6.1-7.3 4.5-7.8 2.7-8.4 .9-7.2-.8-7.3-2.5-6.7-4.1-5.6-5.3-4.5-6.5-3.5-7.8-2-8.4-.6-8.4 .9-8.9 2.2-8.4 3.5-7.8 4.9-7.2 5.8-6.1 6.3-4.5 7.1-3.3zM50.5 33.8l2.3-.3 1.7 .4 1.6 1.1 2 2.2 1.3 2.8 .8 2.7 .4 3.4-.1 3.3-1.4 6.2-3 5.6-2.2 2.4-2.2 1.6-2.3 1-2.2 .3-1.7-.4-1.6-1.1-2.8-3.7-1.5-5.2-.1-5.5 1.2-5.6 2.4-5 3.6-4z", shade: "M76.2 14.9l1.1-.5 3.4 3.8 2.8 3.9 2.3 4.5 1.6 3.9 1.6 5.6 1.1 8.3-.4 10.1-1.3 6.1-2.6 7.8-4.6 8.3-4.4 5.6-6.2 5.7-6.1 3.8-7.2 2.9-6.2 1.1-7.8-.1-7.2-1.7-3.9-1.6-4-2.2-5.5-4.5-2.8-3.4 1.7-.6 2.4-2.1 2-2.8 1.2-2.8 1.2-5 1.1-13.4 1.4-7.8 2.5-7.8 3.8-7.3 3.3-4.5 3.4-3.4 3.9-3.1 4.4-2.6 3.9-1.5 4.5-1.1 12.3-.9zM50.5 33.8l.6-.3 2.8 0 1.6 .9 2.7 2.8 3 1.4 3.3 .5 6.1 .2 3.9 .9 1.7 1 1.7 1.6 2.1 4.4 .7 4.5-.3 5-1.2 5-1.9 4.5-2.8 4.2-3.3 3.6-3.9 2.8-3.9 1.7-3.4 .6-3.3-.1-3.4-1.1-2.5-1.7-2.5-3-3.6-7-2.9-3.4-2.1-5-.6-5.6 .6-4.4 1-3.4 2.3-4.4 1.4-2.1 2.3-2.2 2.7-1.7z", light: "M41.1 5.9l.5 .1 .2 .5-.3 .6-12.4 13.3-13.1 18.1-2.3 2.1-1.1 0-.2-1.2 .2-2.8 1.6-5 4.6-8.3 3.9-5.1 4.4-4.4 4.5-3.4 5-2.8zM60.5 53.3l1.2-.3 1.1 .6 1.1 1.3 .8 1.8-.2 3.3-1.5 2.8-2 1.7-2.6 1-7.3 .2 2.2-1.4 2.6-2.6z", eyes: [[56.2, 84.6, 5.3, 13.3, -6.8], [71.7, 78.8, 5.1, 13.4, -6.5]] }, - gem: { body: "M57 9.3l2.9-.4 14.9 3.5 19.6 14.1 1 1.4 .6 1.6-.5 2.6-27.1 56.5-1.6 1.8-2.1 .7-15.9-3.4-42.9-30.7-1.3-1.6-.6-1.6 .5-2.6 12-25.2 1.1-1.5 1.5-1z", shade: "M75.7 14.6l.1-.4 .6 .2 16.9 12.3 1.1 .7 .5-.2 .5 .7 .6 2.6-.5 1.6-26.4 55.1-1.2 2.1-1.1 1.1-1.6 .6-2.1 0-14.3-3.3-42.8-30.7 1.5-.2 11.6 2.5 2.2-.7 2.8-2.6 11.9-24.9 .6-.8 38.2-14.2z", light: "M19.1 23.6l1.1-.4 .5 .5 11.7 2.2 1 .9-.2 .5-1.8 2.7-11.7 24.4-1.6 .6-13.3-2.8-.5-.5 12.1-25.4 1.2-1.7z", eyes: [[51.4, 42.9, 6.7, 17.7, -10], [66.1, 37.4, 6.7, 17.7, -10]] } --}; --var PICKER_SHAPES = Object.keys(CHARACTERS); --var PICKER_COLUMNS = 6; --var DEFAULT_SHAPES = ["star", "moon", "gumdrop", "peanut", "bunny", "kitty", "acorn"]; ++var cut = (text2, max) => { ++ const flat = String(text2).toWellFormed(); ++ return { text: flat.slice(0, codePointEnd(flat, max)), cut: flat.length > max }; + }; +-var PICKER_SHAPES = Object.keys(CHARACTERS); +-var PICKER_COLUMNS = 6; +-var DEFAULT_SHAPES = ["star", "moon", "gumdrop", "peanut", "bunny", "kitty", "acorn"]; -var FALLBACK_SHAPE = "gumdrop"; -var MAIN_LOOK = Object.freeze({ shape: "whale", color: "deepseek" }); -var CHARACTER_COLORS = ["black", "brown", "red", "orange", "yellow", "green", "cyan", "blue", "violet", "magenta", "gray", "aurora"]; @@ -1454,6 +1570,68 @@ diff --git a/client.js b/client.js - let value = 2166136261; - for (let index = 0; index < text.length; index += 1) value = Math.imul(value ^ text.charCodeAt(index), 16777619); - return value >>> 0; ++ ++// src/shared/remote-label.js ++function cleanPeerName(name, fallback = "") { ++ const text2 = String(name ?? "").toWellFormed().replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/g, " ").replace(/[[\]"`<>]/g, "").replace(/\s+/g, " ").trim(); ++ const label = cut(text2, 60).text; ++ return label || fallback; ++} ++function normRemoteHandle(handle) { ++ return `@${String(handle ?? "").trim().replace(/^@+/, "").toLowerCase()}`; ++} ++function ownerFromHandle(handle) { ++ const parts = String(handle ?? "").replace(/^@/, "").split("."); ++ if (parts.length >= 3 && parts.at(-1) === "home") return parts.at(-2); ++ if (parts.length === 2 && parts[1] === "home") return parts[0]; ++ return ""; + } +-function defaultColor(id) { +- const t2 = fnv1a(id) + 1831565813 | 0; +- let n = Math.imul(t2 ^ t2 >>> 15, 1 | t2); +- n = n + Math.imul(n ^ n >>> 7, 61 | n) ^ n; +- return DEFAULT_COLORS[Math.floor(((n ^ n >>> 14) >>> 0) / 4294967296 * DEFAULT_COLORS.length)]; ++function isHomeLevelRemote(record) { ++ const handle = String(record?.handle ?? record?.remote?.handle ?? ""); ++ const key = normRemoteHandle(handle); ++ const parts = key.replace(/^@/, "").split("."); ++ return parts.length === 2 && parts[1] === "home"; ++} ++function isListedRemoteChat(bot) { ++ if (!bot) return false; ++ if (bot.hidden) return false; ++ const remote = bot.remote; ++ if (!remote || typeof remote.handle !== "string") return true; ++ if (remote.gone || remote.hidden) return false; ++ if (isHomeLevelRemote(remote)) return false; ++ return true; ++} ++function isShownRemoteChat(bot) { ++ if (!bot) return false; ++ if (isListedRemoteChat(bot)) return true; ++ if (bot.remote?.gone !== true) return false; ++ return bot.hidden !== true || bot.remote.hiddenByGone === true; ++} ++function listedChatBots(roster) { ++ return (roster?.bots ?? []).filter(isListedRemoteChat); ++} ++function splitRoomPicks(roster, ids) { ++ const byId = roster?.byId ?? Object.fromEntries((roster?.bots ?? []).map((bot) => [bot.id, bot])); ++ const members = []; ++ const remotes = []; ++ const seen = /* @__PURE__ */ new Set(); ++ for (const id of ids ?? []) { ++ const bot = byId[id]; ++ const handle = bot?.remote?.handle; ++ if (typeof handle === "string" && handle) { ++ const key = normRemoteHandle(handle); ++ if (seen.has(key)) continue; ++ seen.add(key); ++ remotes.push({ kind: "bot", remote: true, handle: key }); ++ } else { ++ members.push(id); ++ } ++ } + return { members, remotes }; +} +function pickerBotLabel(bot) { @@ -1470,11 +1648,11 @@ diff --git a/client.js b/client.js + isChief: bot.remote.isChief + }); } --function defaultColor(id) { -- const t2 = fnv1a(id) + 1831565813 | 0; -- let n = Math.imul(t2 ^ t2 >>> 15, 1 | t2); -- n = n + Math.imul(n ^ n >>> 7, 61 | n) ^ n; -- return DEFAULT_COLORS[Math.floor(((n ^ n >>> 14) >>> 0) / 4294967296 * DEFAULT_COLORS.length)]; +-function defaultShape(id) { +- let value = fnv1a(id) | 0; +- value = Math.imul(value ^ value >>> 16, 73244475); +- value = Math.imul(value ^ value >>> 13, 3266489909); +- return DEFAULT_SHAPES[((value ^ value >>> 16) >>> 0) % DEFAULT_SHAPES.length]; +var AUTO_OWNER = /^flybot[\s._-]*(?=[0-9a-f]*\d)[0-9a-f]{6,}$/i; +function isAutoOwnerName(name) { + return AUTO_OWNER.test(String(name ?? "").trim()); @@ -1523,17 +1701,12 @@ diff --git a/client.js b/client.js + if (slug && !unusable(slug)) return slug; + return "Bot"; } --function defaultShape(id) { -- let value = fnv1a(id) | 0; -- value = Math.imul(value ^ value >>> 16, 73244475); -- value = Math.imul(value ^ value >>> 13, 3266489909); -- return DEFAULT_SHAPES[((value ^ value >>> 16) >>> 0) % DEFAULT_SHAPES.length]; -+function remoteOwnerBadge(record) { -+ return ownerNameOf(record) || cleanPeerName(record?.handle, "Friend"); - } -var colorOf = (bot) => isColor(bot?.color) ? bot.color : bot?.id ? defaultColor(String(bot.id)) : "black"; -function lookOf(bot) { - const avatar = bot?.avatar ?? {}; ++function remoteOwnerBadge(record) { ++ return ownerNameOf(record) || cleanPeerName(record?.handle, "Friend"); ++} +function friendRecord(bot) { + const remote = bot?.remote && typeof bot.remote === "object" ? bot.remote : {}; return { @@ -2135,7 +2308,7 @@ diff --git a/client.js b/client.js var formatTokens = (count) => count >= 1e6 ? `${(count / 1e6).toFixed(1)}M` : count >= 1e3 ? `${(count / 1e3).toFixed(1)}K` : String(count); function usageOf(list, ids) { let input = 0; -@@ -1624,3156 +1624,8202 @@ function usageOf(list, ids) { +@@ -1624,3885 +1624,11293 @@ function usageOf(list, ids) { const hit = input > 0 ? Math.round(cacheRead / input * 100) : 0; return t("{tokens} tok · Cache hit {hit}%", { tokens: formatTokens(input + output), hit }); } @@ -2291,7 +2464,7 @@ diff --git a/client.js b/client.js + +// src/client/api.js +var ROUTE = "api/bot"; -+var REFUSALS = /* @__PURE__ */ new Set(["bot/refused", "bot/invalid", "bot/read-only", "bot/not-found", "bot/browser-off"]); ++var REFUSALS = /* @__PURE__ */ new Set(["bot/history-unavailable", "bot/search-unavailable", "bot/refused", "bot/invalid", "bot/read-only", "bot/not-found", "bot/browser-off"]); +var call = async (endpoint, payload, signal) => { + let response; + try { @@ -2550,11 +2723,6 @@ diff --git a/client.js b/client.js - if (!node) { - last.current = { key, height: null }; - return; -- } -- const running = node.getAnimations().filter((animation2) => animation2.id === "bt-morph"); -- if (key === state.key) { -- if (running.length === 0) state.height = node.offsetHeight; -- return; +async function mentionCandidates(query, context) { + const rows = []; + for (const entry of registry().entries("flybot.composer.mention")) { @@ -2563,29 +2731,13 @@ diff --git a/client.js b/client.js + } catch (error) { + console.error(`flybot: ${entry.id} mention rows failed`, error); } -- const from = running.length ? node.offsetHeight : state.height; -- for (const animation2 of running) animation2.cancel(); -- const to = node.offsetHeight; -- last.current = { key, height: to }; -- if (from === null || Math.abs(from - to) < 1 || reducedMotion()) return; -- node.dataset.morph = ""; -- const animation = node.animate([{ height: `${from}px` }, { height: `${to}px` }], { duration: SPRING_SHAPE.duration, easing: SPRING_SHAPE.easing, id: "bt-morph" }); -- animation.onfinish = () => { -- delete node.dataset.morph; -- }; -- animation.oncancel = () => { -- if (!node.getAnimations().some((other) => other.id === "bt-morph" && other !== animation)) delete node.dataset.morph; -- }; -- }); +- const running = node.getAnimations().filter((animation2) => animation2.id === "bt-morph"); +- if (key === state.key) { +- if (running.length === 0) state.height = node.offsetHeight; +- return; + } + return rows; - } --function useLinger(value, ms) { -- const [kept, setKept] = (0, import_react.useState)(value); -- (0, import_react.useEffect)(() => { -- if (value) { -- setKept(value); -- return void 0; ++} +var CHANGES_POLL_MS = 3e3; +function createClientApi({ call: callFn, registry: slots = registry, every = setInterval, clear = clearInterval }) { + const listeners2 = /* @__PURE__ */ new Set(); @@ -2606,10 +2758,20 @@ diff --git a/client.js b/client.js + } + } catch { } -- const timer = setTimeout(() => setKept(value), reducedMotion() ? 0 : ms); -- return () => clearTimeout(timer); -- }, [value]); -- return [value || kept, !value && Boolean(kept)]; +- const from = running.length ? node.offsetHeight : state.height; +- for (const animation2 of running) animation2.cancel(); +- const to = node.offsetHeight; +- last.current = { key, height: to }; +- if (from === null || Math.abs(from - to) < 1 || reducedMotion()) return; +- node.dataset.morph = ""; +- const animation = node.animate([{ height: `${from}px` }, { height: `${to}px` }], { duration: SPRING_SHAPE.duration, easing: SPRING_SHAPE.easing, id: "bt-morph" }); +- animation.onfinish = () => { +- delete node.dataset.morph; +- }; +- animation.oncancel = () => { +- if (!node.getAnimations().some((other) => other.id === "bt-morph" && other !== animation)) delete node.dataset.morph; +- }; +- }); + }; + return { + bots: () => callFn("bots"), @@ -2634,7 +2796,13 @@ diff --git a/client.js b/client.js + call: callFn, + poll + }; -+} + } +-function useLinger(value, ms) { +- const [kept, setKept] = (0, import_react.useState)(value); +- (0, import_react.useEffect)(() => { +- if (value) { +- setKept(value); +- return void 0; +function remoteMembers(roster) { + return Array.isArray(roster?.remoteBots) ? roster.remoteBots.filter((bot) => typeof bot?.handle === "string") : []; +} @@ -2668,7 +2836,11 @@ diff --git a/client.js b/client.js + p = parentOf(id); + } catch { + p = void 0; -+ } + } +- const timer = setTimeout(() => setKept(value), reducedMotion() ? 0 : ms); +- return () => clearTimeout(timer); +- }, [value]); +- return [value || kept, !value && Boolean(kept)]; + if (typeof p !== "string" || p === id || !byId.has(p)) return mainId; + const seen = /* @__PURE__ */ new Set([id]); + for (let at = p; at !== mainId; ) { @@ -2996,50 +3168,6 @@ diff --git a/client.js b/client.js -.bt-q-ownrow .bt-q-input{color:var(--bt-ink)} -.bt-q-raised .bt-q-foot{padding:0 8px 8px} -@media (prefers-reduced-motion:reduce){.bt-q{animation:bt-fade .12s ease-out backwards}.bt-q-settled{animation:none}.bt-q-submit{animation:none}} -- --.bt-newchat{flex:1;display:flex;flex-direction:column;min-width:0;position:relative;animation:bt-veil-in .18s ease-out} --.bt-to{display:flex;align-items:center;flex-wrap:wrap;gap:6px;min-height:48px;padding:6px 12px;border-bottom:1px solid var(--bt-line);font-size:14px;box-sizing:border-box} --.bt-to-label{color:var(--bt-ink-2)} --.bt-to input{flex:1;min-width:120px;border:0;outline:none;background:none;color:var(--bt-ink);font-size:14px;height:26px} --.bt-token{display:inline-flex;align-items:center;gap:5px;height:24px;padding:0 6px 0 4px;border-radius:999px;background:var(--bt-hover);font-size:13px;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} --.bt-token button{border:0;background:none;color:var(--bt-ink-2);cursor:pointer;padding:0 2px} --.bt-admin-star{flex:none;display:inline-flex;align-items:center;justify-content:center;width:12px;height:12px;border-radius:50%;corner-shape:round;background:color-mix(in srgb,var(--bt-star) 82%,var(--bt-sidebar));vertical-align:-1px} --.bt-to-star{display:inline-flex;margin-right:-2px;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} --.bt-to .bt-to-create{flex:none;height:28px;padding:0 12px;font-size:13px;animation:bt-q-submit-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out} --.bt-drop{position:absolute;top:48px;left:32px;width:min(550px,calc(100% - 64px));display:flex;flex-direction:column;padding:6px;max-height:min(420px,60vh);overflow-y:auto;background:var(--bt-card);border:1px solid var(--bt-line-2);border-radius:12px;box-shadow:0 6px 20px -4px rgba(0,0,0,.12);box-sizing:border-box;z-index:1;transform-origin:24px 0;animation:bt-pop-drop ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .14s ease-out} --.bt-option{display:flex;align-items:center;gap:10px;border:0;background:none;border-radius:8px;padding:7px 8px;min-height:36px;box-sizing:border-box;font-size:13px;line-height:18px;color:var(--bt-ink);cursor:pointer;text-align:left;width:100%} --.bt-option[aria-selected=true]{background:var(--bt-active)} --.bt-drop-list>.bt-option:not([aria-selected=true]):hover{background:var(--bt-hover)} --.bt-option-label{flex:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} --.bt-option-hint{font-size:11px;color:var(--bt-ink-2);flex:none;animation:bt-veil-in .16s ease-out} --.bt-option-icon{width:22px;height:22px;border-radius:50%;background:var(--bt-hover);color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;flex:none} --.bt-hint{padding:14px;text-align:center;font-size:13px;color:var(--bt-ink-2)} --.bt-nc-spacer{flex:1} --.bt-nc-compose{padding:0 16px 14px;display:flex;justify-content:center} --.bt-nc-card{display:flex;align-items:flex-end;gap:6px;width:100%;max-width:var(--dsh-chat-content-width,748px);min-height:44px;padding:4px 6px;border-radius:22px;border:1px solid var(--bt-line-2);background:var(--bt-main);box-shadow:0 2px 8px -2px rgba(0,0,0,.06);box-sizing:border-box} --.bt-nc-plus{width:34px;height:34px;border-radius:50%;display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink-2);background:var(--bt-hover);flex:none} --.bt-nc-card textarea{flex:1;resize:none;border:0;outline:none;background:none;color:var(--bt-ink);font:inherit;font-size:14px;line-height:20px;padding:7px 4px;min-height:34px;max-height:140px;box-sizing:border-box} --.bt-nc-send{width:34px;height:34px;border-radius:50%;border:0;background:var(--bt-accent);color:var(--bt-accent-ink,#fff);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;flex:none} --.bt-nc-send:disabled{opacity:.3;cursor:default} --.bt-create{flex:1;display:flex;flex-direction:column;min-width:0} --.bt-create-head{display:flex;align-items:center;justify-content:space-between;gap:8px;min-height:48px;padding:6px 12px;border-bottom:1px solid var(--bt-line);box-sizing:border-box} --.bt-create-gap{width:28px} --.bt-create-title{font-size:14px;line-height:20px;font-weight:500} --.bt-create-body{flex:1;overflow-y:auto;padding:28px 16px 32px;display:flex;justify-content:center} --.bt-create-card{width:100%;max-width:400px;display:flex;flex-direction:column;gap:18px;animation:bt-q-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} both,bt-veil-in .22s ease-out both} --.bt-create-preview{display:flex;flex-direction:column;align-items:center;gap:10px} --.bt-create-pop{display:inline-flex;animation:bt-create-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} both} --@keyframes bt-create-pop{from{transform:scale(.72);opacity:.4}} --.bt-create-name{font-size:17px;line-height:24px;font-weight:500;max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-create-step{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin-bottom:-10px} --.bt-create-looks{display:flex;flex-direction:column;gap:10px;padding:10px;border:1px solid var(--bt-line);border-radius:12px;background:var(--bt-card)} --.bt-create-lookbar{justify-content:center} --.bt-create-foot{display:flex;justify-content:flex-end;gap:8px;padding-top:4px} --.bt-create-go{height:36px;padding:0 20px} --@media (prefers-reduced-motion:reduce){.bt-create-card,.bt-create-pop{animation:none}} --.bt-send{height:40px;min-width:40px;border-radius:999px;border:0;background:var(--bt-accent);color:var(--bt-accent-ink,#fff);font-size:14px;padding:0 14px;cursor:pointer} --.bt-send:disabled{opacity:.35;cursor:default} --.bt-error{padding:0 14px 10px;color:#e02135;font-size:12px} +// src/client/characters.js +var CHARACTERS = { + whale: { label: "Whale", body: "M65.3 20.9l5.1 .1 4.8 .9 4.8 1.7 4.3 2.3 3.8 3.1 3 3.4 2.3 3.8 1.6 4.3 .9 4.3 0 4.8-.8 4.8-1.4 4.3-2.3 4.3-3.2 4.3-3.4 3.3-4.3 3.1-7.2 3.5-7.6 1.7-7.2 .1-9.6-1.6-3.3-1-2.9-1.7-8.8-8.9-6-4.7-3.3-.5-7.7 1.1-4.8-.1-4.7-1.2-1.9-1.2-1-1-.5-1.5 .4-1.4 1.1-1.3 1.9-1.3 4.7-1.5 7.7-.6 1.1-.5 .7-1 0-1.4-2.8-7.2-1.2-5.3-.1-4.3 .4-1.4 .9-1.2 1.9-.2 2 1 2.2 2.3 2.2 3.4 3.2 7.6 1.9 9.7 .5-.1 1.1-7.2 1.8-4.8 3.2-5.2 3.9-4.3 4.9-3.9 5.6-2.9 5.8-1.9z", paints: [["M93.3 55.8l1-.3 .1 1.2-2.4 5.3-3.4 4.8-3.8 3.8-4.8 3.4-5.7 2.8-4.8 1.5-4.8 .4 20.1-17.4 5.2-3.7z", "#fff", 1]], shade: "M88.6 29.5l2.4 2.9 1.9 2.8 2.4 6.3 .5 3.3 .1 5.3-1.5 6.6-1.9 4.3-2 3.3-4.8 5.4-5.7 4.3-7.2 3.3-6.2 1.5-6.7 .1-3.3-.2-9.6-1.8-3.3-1.5-2.4-1.9-8.6-8.9-5.3-3.9-3.3-.1-2.9 .2-3.3 .8-5.8 0-4.3-1-2.9-1.9 .6-.6 3.8-1.3 10.5-2.5 4.3 .9 1.4-.1 2.2-1.7 .5-1.4-.3-1.5-1.2-1.4-2.2-1.4-1.2-1.9-.6-12 .4-3.3 .5-.5 2.9 3.8 2.4 4.8 1.9 5.7 .7 5.8 .7 2.8 2.1 2.4 2.7 5.5 3.8 4.3 2.9 2.2 3.3 1 3.4-.4 6.2-3 7.1-4.5 7.3-5.6 6.6-5.9 5.9-6.5 3.7-5.3 1.7-4.2 .1-2.9z", light: "M55.6 22.8l1.9-.3 1.5 .3 .6 1 .1 .9-2 4.3-3.8 5.3-5.8 6.2-5.4 4.4-4.8 2.3-1.4 0-1.2-.5-.8-1.9 .5-3.3 2.5-4.8 3.3-4.3 2.4-2.4 5.3-3.9zM19.3 28.1l-1.4 2 .3-1.1zM21.7 49.1l.6 .5-.3 .5-.8 0zM35.8 52l1.2-.4 .9 .7 .7 1.6-.4 .9-1.2 .1-2.6-.5zM7.2 52.9l-2.9 2.9 1.2-1.6z", eyes: [[72.5, 48.4, 9.3, 23, -15.8], [85.6, 43.4, 7, 22.9, -21.2]] }, @@ -3194,8 +3322,8 @@ diff --git a/client.js b/client.js + return ""; + } +} -+var eyeMarkup = ([cx, cy, w, h50, tilt]) => ``; -+var happyEyeMarkup = ([cx, cy, w, h50, tilt]) => ``; ++var eyeMarkup = ([cx, cy, w, h53, tilt]) => ``; ++var happyEyeMarkup = ([cx, cy, w, h53, tilt]) => ``; +var maskBox = (size) => `maskUnits="userSpaceOnUse" x="${-size}" y="${-size}" width="${size * 3}" height="${size * 3}"`; +var holes = (def, eyes) => `${eyes}`; +var MASK_ID = "%MASK%"; @@ -3230,6 +3358,60 @@ diff --git a/client.js b/client.js +} +var DEFAULT_MASK = maskOf(FALLBACK_SHAPE); +-.bt-newchat{flex:1;display:flex;flex-direction:column;min-width:0;position:relative;animation:bt-veil-in .18s ease-out} +-.bt-to{display:flex;align-items:center;flex-wrap:wrap;gap:6px;min-height:48px;padding:6px 12px;border-bottom:1px solid var(--bt-line);font-size:14px;box-sizing:border-box} +-.bt-to-label{color:var(--bt-ink-2)} +-.bt-to input{flex:1;min-width:120px;border:0;outline:none;background:none;color:var(--bt-ink);font-size:14px;height:26px} +-.bt-token{display:inline-flex;align-items:center;gap:5px;height:24px;padding:0 6px 0 4px;border-radius:999px;background:var(--bt-hover);font-size:13px;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} +-.bt-token button{border:0;background:none;color:var(--bt-ink-2);cursor:pointer;padding:0 2px} +-.bt-admin-star{flex:none;display:inline-flex;align-items:center;justify-content:center;width:12px;height:12px;border-radius:50%;corner-shape:round;background:color-mix(in srgb,var(--bt-star) 82%,var(--bt-sidebar));vertical-align:-1px} +-.bt-to-star{display:inline-flex;margin-right:-2px;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} +-.bt-to .bt-to-create{flex:none;height:28px;padding:0 12px;font-size:13px;animation:bt-q-submit-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out} +-.bt-drop{position:absolute;top:48px;left:32px;width:min(550px,calc(100% - 64px));display:flex;flex-direction:column;padding:6px;max-height:min(420px,60vh);overflow-y:auto;background:var(--bt-card);border:1px solid var(--bt-line-2);border-radius:12px;box-shadow:0 6px 20px -4px rgba(0,0,0,.12);box-sizing:border-box;z-index:1;transform-origin:24px 0;animation:bt-pop-drop ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .14s ease-out} +-.bt-option{display:flex;align-items:center;gap:10px;border:0;background:none;border-radius:8px;padding:7px 8px;min-height:36px;box-sizing:border-box;font-size:13px;line-height:18px;color:var(--bt-ink);cursor:pointer;text-align:left;width:100%} +-.bt-option[aria-selected=true]{background:var(--bt-active)} +-.bt-drop-list>.bt-option:not([aria-selected=true]):hover{background:var(--bt-hover)} +-.bt-option-label{flex:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} +-.bt-option-hint{font-size:11px;color:var(--bt-ink-2);flex:none;animation:bt-veil-in .16s ease-out} +-.bt-option-icon{width:22px;height:22px;border-radius:50%;background:var(--bt-hover);color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;flex:none} +-.bt-hint{padding:14px;text-align:center;font-size:13px;color:var(--bt-ink-2)} +-.bt-nc-spacer{flex:1} +-.bt-nc-compose{padding:0 16px 14px;display:flex;justify-content:center} +-.bt-nc-card{display:flex;align-items:flex-end;gap:6px;width:100%;max-width:var(--dsh-chat-content-width,748px);min-height:44px;padding:4px 6px;border-radius:22px;border:1px solid var(--bt-line-2);background:var(--bt-main);box-shadow:0 2px 8px -2px rgba(0,0,0,.06);box-sizing:border-box} +-.bt-nc-plus{width:34px;height:34px;border-radius:50%;display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink-2);background:var(--bt-hover);flex:none} +-.bt-nc-card textarea{flex:1;resize:none;border:0;outline:none;background:none;color:var(--bt-ink);font:inherit;font-size:14px;line-height:20px;padding:7px 4px;min-height:34px;max-height:140px;box-sizing:border-box} +-.bt-nc-send{width:34px;height:34px;border-radius:50%;border:0;background:var(--bt-accent);color:var(--bt-accent-ink,#fff);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;flex:none} +-.bt-nc-send:disabled{opacity:.3;cursor:default} +-.bt-create{flex:1;display:flex;flex-direction:column;min-width:0} +-.bt-create-head{display:flex;align-items:center;justify-content:space-between;gap:8px;min-height:48px;padding:6px 12px;border-bottom:1px solid var(--bt-line);box-sizing:border-box} +-.bt-create-gap{width:28px} +-.bt-create-title{font-size:14px;line-height:20px;font-weight:500} +-.bt-create-body{flex:1;overflow-y:auto;padding:28px 16px 32px;display:flex;justify-content:center} +-.bt-create-card{width:100%;max-width:400px;display:flex;flex-direction:column;gap:18px;animation:bt-q-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} both,bt-veil-in .22s ease-out both} +-.bt-create-preview{display:flex;flex-direction:column;align-items:center;gap:10px} +-.bt-create-pop{display:inline-flex;animation:bt-create-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} both} +-@keyframes bt-create-pop{from{transform:scale(.72);opacity:.4}} +-.bt-create-name{font-size:17px;line-height:24px;font-weight:500;max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-create-step{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin-bottom:-10px} +-.bt-create-looks{display:flex;flex-direction:column;gap:10px;padding:10px;border:1px solid var(--bt-line);border-radius:12px;background:var(--bt-card)} +-.bt-create-lookbar{justify-content:center} +-.bt-create-foot{display:flex;justify-content:flex-end;gap:8px;padding-top:4px} +-.bt-create-go{height:36px;padding:0 20px} +-@media (prefers-reduced-motion:reduce){.bt-create-card,.bt-create-pop{animation:none}} +-.bt-send{height:40px;min-width:40px;border-radius:999px;border:0;background:var(--bt-accent);color:var(--bt-accent-ink,#fff);font-size:14px;padding:0 14px;cursor:pointer} +-.bt-send:disabled{opacity:.35;cursor:default} +-.bt-error{padding:0 14px 10px;color:#e02135;font-size:12px} ++// src/client/cluster-order.js ++function clusterOrder(people2) { ++ const list = Array.isArray(people2) ? people2 : []; ++ const remote = (bot) => Boolean(bot?.remote); ++ if (!list.some(remote)) return list; ++ const locals = list.filter((bot) => !remote(bot)); ++ const remotes = list.filter(remote); ++ if (list.length <= 4) return [...remotes, ...locals]; ++ return [...locals, ...remotes]; ++} + -.bt-pane{position:fixed;top:var(--dsh-frame-chrome-top,0px);right:0;bottom:0;z-index:45;pointer-events:auto;background:var(--bt-main);color:var(--bt-ink);display:flex;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} -.bt-dialog{flex:1;display:flex;flex-direction:column;min-width:0} -.bt-dialog .bt-head{height:62px} @@ -3251,186 +3433,6 @@ diff --git a/client.js b/client.js -.bt-soft{height:36px;border-radius:999px;border:0;background:var(--bt-hover);color:var(--bt-ink);padding:0 16px;font-size:14px;cursor:pointer} -.bt-soft:hover{background:var(--bt-active)} -.bt-time{display:block;text-align:center;font-size:12px;line-height:16px;color:var(--bt-ink-2);padding:6px 0} -+// src/client/cluster-order.js -+function clusterOrder(people2) { -+ const list = Array.isArray(people2) ? people2 : []; -+ const remote = (bot) => Boolean(bot?.remote); -+ if (!list.some(remote)) return list; -+ const locals = list.filter((bot) => !remote(bot)); -+ const remotes = list.filter(remote); -+ if (list.length <= 4) return [...remotes, ...locals]; -+ return [...locals, ...remotes]; -+} - --.bt-panel{position:fixed;top:var(--dsh-frame-chrome-top,0px);right:0;bottom:0;width:var(--bt-panel-w,320px);pointer-events:auto;z-index:40;background:var(--bt-main);border-left:.5px solid var(--bt-line-2);display:flex;flex-direction:column;color:var(--bt-ink);font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;box-sizing:border-box;animation:bt-pane-in .3s cubic-bezier(.2,0,0,1);transition:width ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} --.bt-panel[data-leaving]{transform:translateX(100%);transition:transform .3s cubic-bezier(.2,0,0,1);pointer-events:none} --.bt-panel[data-instant]{transition:none} --@keyframes bt-pane-in{from{transform:translateX(100%)}} --[class*="_centerCol"]{transition:margin-right ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} --.bt-panel-grip{position:absolute;left:-5px;top:0;bottom:0;width:8px;cursor:col-resize;z-index:3;touch-action:none} --.bt-panel-grip:hover,.bt-panel[data-dragging] .bt-panel-grip{background:linear-gradient(to right,transparent 4px,var(--bt-line-2) 4px,var(--bt-line-2) 6px,transparent 6px)} --.bt-drag-shield{position:fixed;inset:0;z-index:45;cursor:col-resize} --.bt-panel-view{flex:1;min-height:0;display:flex;flex-direction:column} --.bt-drawer-top{display:flex;justify-content:flex-end;gap:8px;padding:12px 17px 6px 12px} --.bt-drawer-id{display:flex;flex-direction:column;align-items:center;padding:14px 16px 0} --.bt-drawer-id>.bt-mark,.bt-drawer-id>.bt-cluster{margin-bottom:16px} --.bt-drawer-name{font-size:17px;line-height:24px;font-weight:500;border:0;background:none;color:inherit;cursor:text;padding:0 6px;border-radius:6px;max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-drawer-name:hover{background:var(--bt-hover)} --.bt-drawer-name-input{font-size:17px;line-height:24px;text-align:center;border:.5px solid var(--bt-line-2);border-radius:6px;padding:0 6px;background:var(--bt-main);color:var(--bt-ink);outline:none;font-weight:500} --.bt-drawer-role{font-size:12px;line-height:16px;color:var(--bt-ink-3);margin-top:6px;text-align:center} --.bt-tabs{position:relative;display:flex;justify-content:center;gap:2px;margin:16px 16px 0} --.bt-tab{position:relative;z-index:1;border:0;background:none;border-radius:9999px;padding:4px 8px;font-size:13px;line-height:20px;color:var(--bt-ink-2);cursor:pointer;white-space:nowrap} --.bt-tab:hover{color:var(--bt-ink)} --.bt-tab[aria-selected=true]{background:var(--bt-hover);color:var(--bt-ink)} --.bt-tabs>.bt-thumb{top:0;bottom:0;border-radius:9999px;background:var(--bt-hover)} --.bt-tabs[data-glide] .bt-tab[aria-selected=true]{background:transparent} --.bt-drawer-body{flex:1;overflow-y:auto;padding:20px 16px 16px;font-size:13px;line-height:18px;display:flex;flex-direction:column;gap:16px} --.bt-empty{text-align:center;color:var(--bt-ink-3);font-size:13px;line-height:18px;padding:8px 12px} --.bt-section-title{font-size:12px;color:var(--bt-ink-2);margin-bottom:6px} --.bt-muted{color:var(--bt-ink-2)} --.bt-swatches{display:flex;flex-wrap:wrap;gap:6px} --.bt-swatch{width:22px;height:22px;border-radius:50%;border:2px solid transparent;cursor:pointer;padding:0;box-shadow:inset 0 0 0 1px var(--bt-line-2)} --.bt-swatch[aria-pressed=true]{border-color:var(--bt-ink)} --.bt-textarea{width:100%;box-sizing:border-box;min-height:120px;border:1px solid var(--bt-line);border-radius:8px;padding:8px;background:var(--bt-card);color:var(--bt-ink);font:inherit;resize:vertical} --.bt-actions{display:flex;gap:8px;flex-wrap:wrap;align-items:center} --.bt-kv{display:flex;justify-content:space-between;gap:8px;font-size:12px;line-height:20px;color:var(--bt-ink-2)} --.bt-kv span:last-child{color:var(--bt-ink);font-variant-numeric:tabular-nums} --.bt-danger{color:#e02135} -- --/* Bot settings: fields, the avatar editor popover, and the details-pane sub-view. */ --.bt-field{display:flex;flex-direction:column;gap:6px} --.bt-field-label{font-size:13px;line-height:18px;font-weight:500} --.bt-input{width:100%;box-sizing:border-box;height:36px;border:1px solid var(--bt-line);border-radius:8px;padding:0 10px;background:var(--bt-card);color:var(--bt-ink);font:inherit;font-size:13px;outline:none} --.bt-input:focus{border-color:var(--bt-line-2)} --.bt-input-area{height:auto;min-height:96px;padding:8px 10px;line-height:18px;resize:vertical} --.bt-note{font-size:12px;line-height:16px;color:var(--bt-ink-3)} --.bt-soft-sm{height:28px;padding:0 12px;font-size:12px} --.bt-set-avatar{display:flex;justify-content:center;padding:4px 0} --.bt-avatar-anchor{position:relative} --.bt-avatar-trigger{position:relative;width:64px;height:64px;border:0;border-radius:50%;background:none;cursor:pointer;padding:0} --.bt-avatar-pencil{position:absolute;right:-2px;bottom:-2px;width:22px;height:22px;border-radius:50%;background:var(--bt-main);border:1px solid var(--bt-line-2);color:var(--bt-ink-2);display:flex;align-items:center;justify-content:center;box-shadow:0 1px 4px rgba(0,0,0,.12)} --.bt-avedit{position:absolute;top:calc(100% + 8px);left:50%;transform:translateX(-50%);width:300px;background:var(--bt-main);border:1px solid var(--bt-line);border-radius:12px;box-shadow:0 12px 40px rgba(0,0,0,.18);padding:10px;z-index:70;display:flex;flex-direction:column;gap:10px;color:var(--bt-ink);transform-origin:top center;animation:bt-pop-drop ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out} --.bt-bs .bt-avedit{transform-origin:32px 0} --.bt-avedit-top{display:flex;align-items:center;justify-content:space-between} --.bt-avedit-tabs{position:relative;display:flex;gap:2px;background:var(--bt-hover);border-radius:999px;padding:2px} --.bt-avedit-tab{position:relative;z-index:1;border:0;background:none;border-radius:999px;padding:3px 10px;font-size:12px;line-height:16px;color:var(--bt-ink-2);cursor:pointer} --.bt-avedit-tab[aria-selected=true]{background:var(--bt-main);color:var(--bt-ink)} --.bt-avedit-tabs>.bt-thumb{top:2px;bottom:2px;border-radius:999px;background:var(--bt-main);box-shadow:0 1px 2px rgba(0,0,0,.06)} --.bt-avedit-tabs[data-glide] .bt-avedit-tab[aria-selected=true]{background:transparent} --.bt-avedit-reset{color:var(--bt-ink-3)} --.bt-avedit-reset:hover{color:var(--bt-ink)} --.bt-shapes{display:flex;flex-direction:column;gap:2px} --.bt-shape-row{display:grid;grid-template-columns:repeat(6,1fr);gap:2px} --.bt-shape{position:relative;aspect-ratio:1;border:0;border-radius:8px;background:none;color:var(--bt-ink);cursor:pointer;display:flex;align-items:center;justify-content:center;padding:0} --.bt-shape:hover{background:var(--bt-hover)} --.bt-shape .bt-ring{position:absolute;left:50%;top:50%;width:36px;height:36px;translate:-50% -50%;overflow:visible;opacity:0;scale:.82;pointer-events:none;transition:opacity .14s ease,${spring(SPRING_POP, "scale")}} --.bt-shape[aria-pressed=true] .bt-ring{opacity:1;scale:1} --.bt-colors{display:flex;justify-content:space-between} --.bt-color{width:22px;height:22px;border-radius:50%;border:2px solid transparent;padding:2px;background:none;cursor:pointer;box-sizing:border-box;transition:border-color .14s ease,${spring(SPRING_TAP, "scale")}} --.bt-color[aria-pressed=true] span{animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} --.bt-color span{display:block;width:100%;height:100%;border-radius:50%} --.bt-color[aria-pressed=true]{border-color:var(--bt-ink)} --.bt-dropzone{border:1.5px dashed var(--bt-line-2);border-radius:10px;padding:18px 12px;display:flex;flex-direction:column;align-items:center;gap:8px;color:var(--bt-ink-2);font-size:12px;line-height:16px;text-align:center} --.bt-dropzone[data-over]{border-color:var(--bt-accent);color:var(--bt-ink)} --.bt-dropzone img{width:64px;height:64px;border-radius:50%;object-fit:cover} --.bt-set-actions{display:flex;gap:8px;flex-wrap:wrap;align-items:center} --.bt-about{white-space:pre-wrap;display:-webkit-box;-webkit-line-clamp:5;-webkit-box-orient:vertical;overflow:hidden} --.bt-about[data-open]{display:block;-webkit-line-clamp:unset} --.bt-more{border:0;background:none;color:var(--bt-ink-3);font-size:12px;line-height:16px;cursor:pointer;padding:2px 0} --.bt-more:hover{color:var(--bt-ink)} --.bt-subhead{display:flex;align-items:center;gap:4px;padding:10px 12px 4px} --.bt-subhead-title{flex:1;font-size:15px;line-height:24px;font-weight:600;padding-left:4px} --.bt-icon-btn{width:28px;height:28px;border-radius:50%;border:0;background:none;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;padding:0} --.bt-icon-btn:hover{background:var(--bt-hover);color:var(--bt-ink)} --.bt-set-body{gap:20px} --.bt-drawer-model{display:flex;flex-direction:column} --.bt-drawer-model .bt-note{margin-top:6px} --.bt-drawer-permission{display:flex;flex-direction:column} --.bt-seg button.bt-perm-danger,.bt-seg button.bt-perm-danger[aria-pressed=true]{color:#e02135} -- --/* Settings dialog: a 198px page list beside the page. */ --.bt-settings-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:60;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} --.bt-scrim{position:absolute;inset:0;background:rgba(0,0,0,.32);animation:bt-fade .22s ease-out} --body[data-ds-dark-theme] .bt-scrim{background:rgba(0,0,0,.5)} --.bt-settings{--bt-set-w:min(800px,calc(100vw - 48px));--bt-set-h:min(620px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));position:relative;width:var(--bt-set-w);height:var(--bt-set-h);background:var(--bt-main);border-radius:16px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;overflow:hidden;color:var(--bt-ink);transition:${spring(SPRING_SHAPE, "width", "height")};animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} --.bt-settings[data-wide]{--bt-set-w:min(1100px,calc(100vw - 48px));--bt-set-h:min(780px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))))} --:is(.bt-settings-layer,.bt-mem-layer)[data-leaving]{pointer-events:none} --:is(.bt-settings-layer,.bt-mem-layer)[data-leaving] .bt-scrim{opacity:0;transition:opacity .16s ease-in} --:is(.bt-settings-layer,.bt-mem-layer)[data-leaving]>[role=dialog]{animation:bt-dialog-sink .16s cubic-bezier(.4,0,1,1) forwards} --@keyframes bt-dialog-rise{from{transform:translateY(12px) scale(.96)}} --@keyframes bt-dialog-sink{to{opacity:0;transform:translateY(6px) scale(.975);filter:blur(3px)}} --@media (prefers-reduced-motion:reduce){.bt-settings{transition:none}.bt-settings,.bt-scrim,.bt-settings-page>*{animation:bt-fade .12s ease-out!important}} --.bt-settings-nav{position:relative;width:198px;flex:none;padding:16px 8px;border-right:.5px solid var(--bt-line);display:flex;flex-direction:column;gap:2px;background:var(--bt-sidebar);box-sizing:border-box} --.bt-settings-item{position:relative;z-index:1;display:flex;align-items:center;gap:8px;padding:6px 8px;border:0;border-radius:8px;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;line-height:20px;cursor:pointer;text-align:left;transition:background-color .12s ease,color .12s ease} --.bt-settings-item:hover{color:var(--bt-ink);background:var(--bt-hover)} --.bt-settings-item[aria-current=page]{background:var(--bt-active);color:var(--bt-ink)} --.bt-settings-nav>.bt-thumb{left:8px;right:8px;border-radius:8px;background:var(--bt-active)} --.bt-settings-nav[data-glide] .bt-settings-item[aria-current=page]{background:transparent} --.bt-settings-shell{margin-top:auto} --/* Usage while another page is open: out of the flow at Usage's own width, so it keeps -- its layout, and not rendered. */ --.bt-settings-usage[data-off]{position:absolute;top:0;left:198px;width:calc(min(1100px,calc(100vw - 48px)) - 198px);height:100%;box-sizing:border-box;content-visibility:hidden;pointer-events:none} --/* The page column takes the dialog's final size at once, so while the dialog resizes -- only its edge moves and the page does not lay out again every frame. */ --.bt-settings-main{flex:none;display:flex;flex-direction:column;min-width:0;width:calc(var(--bt-set-w) - 198px);height:var(--bt-set-h)} --.bt-settings-head{display:flex;align-items:center;gap:6px;padding:16px 56px 4px 20px} --.bt-settings-head h2{margin:0;font-size:15px;line-height:24px;font-weight:600;animation:bt-veil-in .2s ease-out} --.bt-settings-head>.bt-icon-btn{animation:bt-back-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out} --@keyframes bt-back-in{from{translate:6px 0;scale:.8}} --.bt-settings-scroll{flex:1;overflow-y:auto;padding:12px 20px 24px;display:flex;flex-direction:column;gap:20px;scrollbar-width:thin} --.bt-settings-page>:not(.bt-us){animation:bt-page-up ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .22s ease-out backwards} --.bt-settings-page[data-move=in]>:not(.bt-us){animation-name:bt-page-in,bt-veil-in} --.bt-settings-page[data-move=out]>:not(.bt-us){animation-name:bt-page-out,bt-veil-in} --.bt-settings-page>:nth-child(2){animation-delay:30ms} --.bt-settings-page>:nth-child(3){animation-delay:60ms} --.bt-settings-page>:nth-child(4){animation-delay:90ms} --.bt-settings-page>:nth-child(n+5){animation-delay:120ms} --@keyframes bt-page-up{from{transform:translateY(10px)}} --@keyframes bt-page-in{from{transform:translateX(18px)}} --@keyframes bt-page-out{from{transform:translateX(-18px)}} --.bt-settings-close{position:absolute;top:12px;right:12px;width:32px;height:32px;border-radius:50%;border:0;background:var(--bt-hover);color:var(--bt-ink-2);display:flex;align-items:center;justify-content:center;cursor:pointer;padding:0} --.bt-settings-close:hover{background:var(--bt-active);color:var(--bt-ink)} --.bt-settings-form{display:flex;flex-direction:column;gap:16px} --.bt-set-section h3{font-size:13px;line-height:18px;font-weight:600;margin:0 0 8px;padding:0 4px} --.bt-set-card{border:1px solid var(--bt-line);border-radius:12px;background:var(--bt-card);display:flex;flex-direction:column} --.bt-set-card>*+*{border-top:.5px solid var(--bt-line)} --.bt-set-row{display:flex;align-items:center;gap:12px;padding:10px 12px;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;line-height:18px;text-align:left;width:100%;box-sizing:border-box;border-radius:0} --button.bt-set-row{cursor:pointer} --button.bt-set-row:hover{background:var(--bt-hover)} --.bt-set-card>.bt-set-row+.bt-set-row{border-top:.5px solid var(--bt-line)} --.bt-set-row:first-child{border-top-left-radius:12px;border-top-right-radius:12px} --.bt-set-row:last-child{border-bottom-left-radius:12px;border-bottom-right-radius:12px} --.bt-set-copy{flex:1;display:flex;flex-direction:column;gap:2px;min-width:0} --.bt-set-hint{font-size:12px;line-height:16px;color:color-mix(in srgb,var(--bt-ink-2) 50%,var(--bt-ink-3))} --.bt-set-control{flex:none;display:flex;align-items:center;gap:6px} --.bt-set-value{font-size:13px;color:var(--bt-ink-2);text-align:right} --.bt-set-bot{flex:1;display:flex;align-items:center;gap:8px;min-width:0} --.bt-set-paste{flex-direction:column;align-items:stretch;gap:8px} --.bt-chevron{color:var(--bt-ink-3);display:inline-flex;flex:none} -- --/* Settings → Connectors. */ --.bt-connector{display:flex;flex-direction:column;gap:10px;padding:12px} --.bt-connector-head{display:flex;align-items:center;gap:12px;min-width:0} --.bt-connector-mark{flex:none;width:36px;height:36px;border-radius:10px;background:var(--bt-card);border:.5px solid var(--bt-line);display:flex;align-items:center;justify-content:center;color:var(--bt-ink)} --.bt-connector-text{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px} --.bt-connector-name{font-size:14px;line-height:20px;font-weight:500} --.bt-connector-status{font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-connector[data-state=ready] .bt-connector-status{color:var(--bt-ink-2)} --.bt-connector[data-state=error] .bt-connector-status{color:#e02135;white-space:normal} --.bt-connector-actions{flex:none;display:flex;gap:6px} --.bt-connector-form{display:flex;flex-direction:column;gap:8px;padding-left:48px;animation:bt-q-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} --.bt-connector-form-row{display:flex;align-items:center;gap:6px} --.bt-connector-link{flex:1;font-size:12px;color:var(--bt-ink-2)} --.bt-connector-error{padding-left:48px;font-size:12px;line-height:16px;color:#e02135} -- --/* Shell chrome reshaped for the team view. Selectors use stable data attributes where the -- shell offers them and CSS-module name suffixes elsewhere. */ --[class*="_logoRow"],[class*="_newSession"],nav[class*="_panelList"]{display:none!important} --[class*="_footArea"]{display:flex!important;flex-direction:row-reverse;align-items:center;gap:9px;padding:8px 6px 6px!important} --[class*="_footArea"]>[class*="_footerActions"]{flex:1 1 auto;min-width:0} --[class*="_footArea"]>[class*="_settingsArea"]{flex:none;width:auto!important} --[class*="_footArea"] button[aria-label="Settings"]{width:auto!important;padding:0!important;background:none!important;border-radius:50%!important;height:auto!important} --[class*="_widthHandle"]{display:none!important} +// src/client/sources.js +function createSource(initial) { + let value = initial; @@ -3510,87 +3512,62 @@ diff --git a/client.js b/client.js + return { ...state, [sessionId]: own }; +} --.bt-voice-pane{flex-direction:column;align-items:center;justify-content:center;animation:bt-fade .2s ease-out} --.bt-voice-stage{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:10px;padding:24px;max-width:560px;text-align:center} --.bt-voice-orb{position:relative;width:200px;height:200px;display:grid;place-items:center;margin-bottom:8px} --.bt-voice-ring{position:absolute;inset:34px;border-radius:50%;background:var(--bt-hover);transform:scale(calc(1 + var(--bt-level,0) * .55));transition:transform .08s linear} --.bt-voice-ring-2{inset:14px;background:none;box-shadow:inset 0 0 0 1px var(--bt-line-2);transform:scale(calc(.94 + var(--bt-level,0) * .3));opacity:.8} --.bt-voice-stage[data-phase=thinking] .bt-voice-ring{animation:bt-voice-breathe 1.6s ease-in-out infinite} --.bt-voice-stage[data-phase=speaking] .bt-voice-ring{animation:bt-voice-speak .9s ease-in-out infinite} --@keyframes bt-voice-breathe{0%,100%{transform:scale(1)}50%{transform:scale(1.08)}} --@keyframes bt-voice-speak{0%,100%{transform:scale(1.04)}30%{transform:scale(1.2)}60%{transform:scale(1.1)}} --.bt-voice-orb>.bt-mark{position:relative} --.bt-voice-name{font-size:16px;line-height:22px;font-weight:500} --.bt-voice-status{font-size:13px;line-height:18px;color:var(--bt-ink-2);min-height:18px} --.bt-voice-caption{min-height:44px;font-size:15px;line-height:22px;color:var(--bt-ink);animation:bt-blur-in .25s ease-out;display:-webkit-box;-webkit-line-clamp:4;-webkit-box-orient:vertical;overflow:hidden} --.bt-voice-note{font-size:12px;color:#e02135} --.bt-voice-setup{height:32px;padding:0 14px;border-radius:16px;border:0;background:var(--bt-hover);color:var(--bt-ink);font:inherit;font-size:13px;cursor:pointer;transition:background-color .15s ease} --.bt-voice-setup:hover{background:var(--bt-active)} --.bt-voice-bar{display:flex;gap:16px;padding:0 0 32px} --.bt-voice-btn{position:relative;width:52px;height:52px;border-radius:50%;border:0;background:var(--bt-hover);color:var(--bt-ink);display:grid;place-items:center;cursor:pointer;transition:background-color .15s ease,transform .12s ease} --.bt-voice-btn:hover{background:var(--bt-active)} --.bt-voice-btn:active{transform:scale(.94)} --.bt-voice-btn[aria-pressed=true]{background:var(--bt-user);color:var(--bt-user-ink)} --.bt-voice-slash{position:absolute;width:24px;height:2px;border-radius:1px;background:currentColor;transform:rotate(-45deg)} --.bt-voice-end{background:#ff3e51;color:#fff} --.bt-voice-end:hover{background:#e02135} --@keyframes bt-fade{from{opacity:0}to{opacity:1}} --@keyframes bt-blur-in{from{opacity:0;filter:blur(2px)}to{opacity:1;filter:blur(0)}} --@media (prefers-reduced-motion:reduce){.bt-voice-pane,.bt-voice-caption,.bt-voice-ring{animation:none!important}} --.bt-msg{display:flex;flex-direction:column;align-items:flex-start;max-width:min(80%,560px,calc(100% - 82px))} --/* The bubble's row: reactions hang below it, so the hover toolbar (and a group -- sender's avatar) line up with the bubble alone. */ --.bt-msg-line{position:relative;display:flex;align-items:flex-end;gap:8px;max-width:100%} --.bt-msg-line>.bt-bubble{max-width:none;min-width:0} --/* The same bubble width as beside an avatar column: 80% of (100% - 30px), plus the 30px. */ --.bt-astack[data-lead]>.bt-msg{max-width:min(calc(80% + 6px),590px,calc(100% - 52px))} --.bt-tools{position:absolute;top:50%;left:100%;margin-left:6px;transform:translateY(-50%);display:flex;gap:2px;opacity:0;visibility:hidden;transition:opacity .12s ease,visibility .12s} --.bt-tools::after{content:"";position:absolute;top:-8px;bottom:-8px;right:100%;width:128px;z-index:-1} --.bt-msg:hover>.bt-msg-line>.bt-tools,.bt-msg:focus-within>.bt-msg-line>.bt-tools,.bt-tools[data-open]{opacity:1;visibility:visible} --.bt-tool{width:24px;height:24px;border:0;padding:0;border-radius:6px;background:none;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;transition:background-color .12s ease,color .12s ease} --.bt-tool:hover,.bt-tool[aria-expanded=true]{background:var(--bt-hover);color:var(--bt-ink)} --.bt-tool:active{background:var(--bt-active)} --.bt-tool:focus-visible{outline:2px solid var(--bt-accent);outline-offset:-2px} --.bt-react-strip{position:fixed;z-index:60;pointer-events:auto;display:flex;gap:2px;padding:4px;border-radius:999px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 10px 20px -3px rgba(0,0,0,.08),0 4px 6px -4px rgba(0,0,0,.06);transform:translate(-50%,-100%);transform-origin:bottom center;animation:bt-pop-lift ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .14s ease-out} --.bt-react-strip button{width:32px;height:32px;border:0;border-radius:50%;background:none;font-size:18px;line-height:1;cursor:pointer;transition:background-color .12s ease,${spring(SPRING_POP, "transform")};animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} backwards} --.bt-react-strip button:nth-child(2){animation-delay:20ms} --.bt-react-strip button:nth-child(3){animation-delay:40ms} --.bt-react-strip button:nth-child(4){animation-delay:60ms} --.bt-react-strip button:nth-child(n+5){animation-delay:80ms} --.bt-react-strip button:hover{background:var(--bt-hover);transform:scale(1.15)} --.bt-react-strip button:active{transform:scale(.92)} --.bt-reacts{display:flex;gap:4px;margin-top:4px} --.bt-react{height:22px;min-width:30px;padding:0 6px;border-radius:999px;border:.5px solid var(--bt-line-2);background:var(--bt-main);font-size:13px;line-height:20px;cursor:pointer;animation:bt-react-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing};transition:background-color .12s ease,${spring(SPRING_TAP, "scale")}} --.bt-react:hover{background:var(--bt-hover)} --.bt-react:active{scale:.92} --@keyframes bt-react-pop{from{transform:scale(.6);opacity:0}} --.bt-bubble a[href^="${MENTION_ORIGIN}"] svg{display:none} --.bt-you{width:36px;height:36px;border-radius:50%;display:inline-flex;align-items:center;justify-content:center;background:color-mix(in srgb,var(--bt-ink) 5%,var(--bt-sidebar));color:var(--bt-ink-2);box-shadow:inset 0 0 0 1px var(--bt-line);transition:background-color .12s ease} --button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-sidebar))} --.bt-you-wrap{display:inline-flex;padding:0} --.bt-connect-foot{width:100%;height:36px} -+// src/client/mark.js -+var import_react = require("react"); -+var STATES = ["idle", "thinking", "searching", "working", "sending", "orbit", "alert", "done"]; -+var botState = (running, activity, alert) => running ? STATES.includes(activity) ? activity : "working" : alert ? "alert" : "idle"; -+var toolState = (name) => /^(message_bot|stop_bot|create_bot|update_bot|create_group|update_group|delete_group|post_to_group)$/.test(name) ? "sending" : /search|fetch|browse|read|grep|glob|list|recall/i.test(name) ? "searching" : "working"; -+function useGaze(ref, enabled) { -+ (0, import_react.useEffect)(() => { -+ if (!enabled) return void 0; -+ let frame = 0; -+ let point = null; -+ const place = () => { -+ frame = 0; -+ const node = ref.current; -+ if (!node || !point) return; -+ const box = node.getBoundingClientRect(); -+ const clamp = (value) => Math.max(-1, Math.min(1, value)); -+ node.style.setProperty("--bt-gx", clamp((point.x - box.left - box.width / 2) / 160).toFixed(2)); -+ node.style.setProperty("--bt-gy", clamp((point.y - box.top - box.height / 2) / 160).toFixed(2)); -+ }; -+ const onMove = (event) => { -+ point = { x: event.clientX, y: event.clientY }; -+ if (!frame) frame = requestAnimationFrame(place); +-.bt-panel{position:fixed;top:var(--dsh-frame-chrome-top,0px);right:0;bottom:0;width:var(--bt-panel-w,320px);pointer-events:auto;z-index:40;background:var(--bt-main);border-left:.5px solid var(--bt-line-2);display:flex;flex-direction:column;color:var(--bt-ink);font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;box-sizing:border-box;animation:bt-pane-in .3s cubic-bezier(.2,0,0,1);transition:width ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} +-.bt-panel[data-leaving]{transform:translateX(100%);transition:transform .3s cubic-bezier(.2,0,0,1);pointer-events:none} +-.bt-panel[data-instant]{transition:none} +-@keyframes bt-pane-in{from{transform:translateX(100%)}} +-[class*="_centerCol"]{transition:margin-right ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} +-.bt-panel-grip{position:absolute;left:-5px;top:0;bottom:0;width:8px;cursor:col-resize;z-index:3;touch-action:none} +-.bt-panel-grip:hover,.bt-panel[data-dragging] .bt-panel-grip{background:linear-gradient(to right,transparent 4px,var(--bt-line-2) 4px,var(--bt-line-2) 6px,transparent 6px)} +-.bt-drag-shield{position:fixed;inset:0;z-index:45;cursor:col-resize} +-.bt-panel-view{flex:1;min-height:0;display:flex;flex-direction:column} +-.bt-drawer-top{display:flex;justify-content:flex-end;gap:8px;padding:12px 17px 6px 12px} +-.bt-drawer-id{display:flex;flex-direction:column;align-items:center;padding:14px 16px 0} +-.bt-drawer-id>.bt-mark,.bt-drawer-id>.bt-cluster{margin-bottom:16px} +-.bt-drawer-name{font-size:17px;line-height:24px;font-weight:500;border:0;background:none;color:inherit;cursor:text;padding:0 6px;border-radius:6px;max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-drawer-name:hover{background:var(--bt-hover)} +-.bt-drawer-name-input{font-size:17px;line-height:24px;text-align:center;border:.5px solid var(--bt-line-2);border-radius:6px;padding:0 6px;background:var(--bt-main);color:var(--bt-ink);outline:none;font-weight:500} +-.bt-drawer-role{font-size:12px;line-height:16px;color:var(--bt-ink-3);margin-top:6px;text-align:center} +-.bt-tabs{position:relative;display:flex;justify-content:center;gap:2px;margin:16px 16px 0} +-.bt-tab{position:relative;z-index:1;border:0;background:none;border-radius:9999px;padding:4px 8px;font-size:13px;line-height:20px;color:var(--bt-ink-2);cursor:pointer;white-space:nowrap} +-.bt-tab:hover{color:var(--bt-ink)} +-.bt-tab[aria-selected=true]{background:var(--bt-hover);color:var(--bt-ink)} +-.bt-tabs>.bt-thumb{top:0;bottom:0;border-radius:9999px;background:var(--bt-hover)} +-.bt-tabs[data-glide] .bt-tab[aria-selected=true]{background:transparent} +-.bt-drawer-body{flex:1;overflow-y:auto;padding:20px 16px 16px;font-size:13px;line-height:18px;display:flex;flex-direction:column;gap:16px} +-.bt-empty{text-align:center;color:var(--bt-ink-3);font-size:13px;line-height:18px;padding:8px 12px} +-.bt-section-title{font-size:12px;color:var(--bt-ink-2);margin-bottom:6px} +-.bt-muted{color:var(--bt-ink-2)} +-.bt-swatches{display:flex;flex-wrap:wrap;gap:6px} +-.bt-swatch{width:22px;height:22px;border-radius:50%;border:2px solid transparent;cursor:pointer;padding:0;box-shadow:inset 0 0 0 1px var(--bt-line-2)} +-.bt-swatch[aria-pressed=true]{border-color:var(--bt-ink)} +-.bt-textarea{width:100%;box-sizing:border-box;min-height:120px;border:1px solid var(--bt-line);border-radius:8px;padding:8px;background:var(--bt-card);color:var(--bt-ink);font:inherit;resize:vertical} +-.bt-actions{display:flex;gap:8px;flex-wrap:wrap;align-items:center} +-.bt-kv{display:flex;justify-content:space-between;gap:8px;font-size:12px;line-height:20px;color:var(--bt-ink-2)} +-.bt-kv span:last-child{color:var(--bt-ink);font-variant-numeric:tabular-nums} +-.bt-danger{color:#e02135} ++// src/client/mark.js ++var import_react = require("react"); ++var STATES = ["idle", "thinking", "searching", "working", "sending", "orbit", "alert", "done"]; ++var botState = (running, activity, alert) => running ? STATES.includes(activity) ? activity : "working" : alert ? "alert" : "idle"; ++var toolState = (name) => /^(message_bot|stop_bot|create_bot|update_bot|create_group|update_group|delete_group|post_to_group)$/.test(name) ? "sending" : /search|fetch|browse|read|grep|glob|list|recall/i.test(name) ? "searching" : "working"; ++function useGaze(ref, enabled) { ++ (0, import_react.useEffect)(() => { ++ if (!enabled) return void 0; ++ let frame = 0; ++ let point = null; ++ const place = () => { ++ frame = 0; ++ const node = ref.current; ++ if (!node || !point) return; ++ const box = node.getBoundingClientRect(); ++ const clamp = (value) => Math.max(-1, Math.min(1, value)); ++ node.style.setProperty("--bt-gx", clamp((point.x - box.left - box.width / 2) / 160).toFixed(2)); ++ node.style.setProperty("--bt-gy", clamp((point.y - box.top - box.height / 2) / 160).toFixed(2)); ++ }; ++ const onMove = (event) => { ++ point = { x: event.clientX, y: event.clientY }; ++ if (!frame) frame = requestAnimationFrame(place); + }; + const onLeave = () => { + point = null; @@ -3790,113 +3767,56 @@ diff --git a/client.js b/client.js + ); +} --.bt-menu{position:fixed;pointer-events:auto;z-index:60;min-width:200px;padding:6px;border-radius:12px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 10px 20px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1),0 0 0 1px rgba(228,228,228,.04);display:flex;flex-direction:column;gap:2px;transform-origin:var(--bt-origin,top left);animation:bt-pop-drop ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .14s ease-out;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;box-sizing:border-box} --.bt-menu button{display:flex;align-items:center;gap:4px;width:100%;min-height:30px;text-align:left;border:0;background:none;border-radius:6px;padding:6px 8px;font:inherit;font-size:13px;line-height:18px;color:var(--bt-ink);cursor:pointer;box-sizing:border-box} --.bt-menu button:hover{background:var(--bt-hover)} --.bt-menu button svg{flex:none;width:16px;height:16px;margin:0 1px} --.bt-menu .bt-danger{color:#c21d2e} --.bt-menu-sep{height:.5px;flex:none;background:var(--bt-line-2);margin:4px 8px} --.bt-menu-up{--bt-origin:bottom left;animation-name:bt-pop-lift,bt-veil-in} --.bt-menu[data-leaving]{pointer-events:none;animation:bt-pop-out .12s cubic-bezier(.4,0,1,1) forwards} --.bt-menu-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-menu-hint{flex:none;color:var(--bt-ink-3);font-size:12px;font-variant-numeric:tabular-nums} --.bt-palette-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:70;pointer-events:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} --.bt-backdrop{position:absolute;inset:0;background:rgba(0,0,0,.46);animation:bt-fade .22s ease-out} --.bt-palette{position:absolute;top:50%;left:50%;width:min(560px,92vw);transform:translate(-50%,-50%);display:flex;flex-direction:column;border-radius:12px;background:var(--bt-main);border:1px solid var(--bt-line-2);box-shadow:0 24px 48px -12px rgba(0,0,0,.25);overflow:hidden;color:var(--bt-ink);animation:bt-palette-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} --.bt-palette-layer[data-leaving]{pointer-events:none} --.bt-palette-layer[data-leaving] .bt-backdrop{opacity:0;transition:opacity .16s ease-in} --.bt-palette-layer[data-leaving] .bt-palette{animation:bt-dialog-sink .16s cubic-bezier(.4,0,1,1) forwards} --@keyframes bt-palette-in{from{translate:0 -10px;scale:.96}} --.bt-palette-head{display:flex;align-items:center;gap:4px;padding:14px 10px 14px 14px;border-bottom:.5px solid var(--bt-line-2)} --.bt-palette-glyph{display:inline-flex;width:18px;height:18px;align-items:center;justify-content:center;color:var(--bt-ink-3);margin-right:4px} --.bt-palette-head input{flex:1;min-width:0;border:0;outline:none;background:none;color:var(--bt-ink);font:inherit;font-size:15px;line-height:22px;padding:0} --.bt-palette-head input::placeholder{color:var(--bt-ink-3)} --.bt-palette-clear{width:18px;height:18px;border:0;padding:0;border-radius:6px;background:none;color:var(--bt-ink-3);display:inline-flex;align-items:center;justify-content:center;cursor:pointer} --.bt-palette-clear:hover{color:var(--bt-ink)} --.bt-palette-clear svg{width:12px;height:12px} --.bt-palette-list{position:relative;height:402px;overflow-y:auto;padding:8px;display:flex;flex-direction:column;gap:2px;box-sizing:border-box} --.bt-palette-list>.bt-thumb,.bt-drop-list>.bt-thumb{left:0;right:0;border-radius:8px;background:var(--bt-active)} --.bt-palette-list>.bt-thumb{left:8px;right:8px} --:is(.bt-palette-list,.bt-drop-list)[data-glide] [aria-selected=true]{background:transparent} --:is(.bt-palette-row,.bt-palette-section,.bt-drop-list>.bt-option){position:relative;z-index:1} --.bt-palette-section{padding:8px 8px 4px;font-size:12px;line-height:16px;color:var(--bt-ink-3);flex:none} --.bt-palette-section:first-of-type{padding-top:0} --.bt-palette-row{flex:none;display:flex;align-items:center;gap:8px;height:49px;padding:6px 10px 6px 8px;border:0;border-radius:8px;background:none;color:inherit;font:inherit;text-align:left;cursor:pointer;box-sizing:border-box;width:100%} --.bt-palette-row[aria-selected=true]{background:var(--bt-active)} --.bt-palette-lead{flex:none;width:24px;height:24px;display:inline-flex;align-items:center;justify-content:center} --.bt-palette-cmd{width:24px;height:24px;border-radius:50%;background:var(--bt-hover);display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink-2)} --.bt-palette-cmd svg{width:14px;height:14px} --.bt-palette-agent{width:24px;height:24px;border-radius:50%;background:var(--bt-hover);display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink)} --.bt-palette-text{flex:1;min-width:0;display:flex;flex-direction:column;gap:1px} --.bt-palette-title{font-size:14px;line-height:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-palette-sub{font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-palette-badge{flex:none;font-size:11px;line-height:16px;padding:0 6px;border-radius:4px;background:var(--bt-tag-bg);color:var(--bt-tag-ink)} --.bt-palette-empty{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:8px;padding:0 16px;text-align:center;animation:bt-veil-in .22s ease-out} --.bt-palette-empty-icon{color:var(--bt-line-2)} --.bt-palette-empty-icon svg{width:32px;height:32px} --.bt-palette-empty-label{font-size:14px;font-weight:500;color:var(--bt-ink-2)} --.bt-palette-empty-hint{font-size:13px;line-height:16px;color:var(--bt-ink-3)} --@media (prefers-reduced-motion:reduce){.bt-palette{animation:bt-fade .1s ease-out}} --.bt-account-menu{width:224px} --.bt-account{flex:none;width:36px;height:36px;border:0;padding:0;background:none;border-radius:50%;cursor:pointer;display:inline-flex} --.bt-account:hover .bt-you,.bt-account[aria-expanded=true] .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-sidebar))} --/* Popover keyframes move translate and scale, which compose with a transform the popover -- already has. */ --@keyframes bt-pop-drop{from{translate:0 -4px;scale:.96}} --@keyframes bt-pop-lift{from{translate:0 4px;scale:.96}} --@keyframes bt-pop-out{to{opacity:0;scale:.97;filter:blur(2px)}} --@keyframes bt-veil-in{from{opacity:0;filter:blur(6px)}} --@keyframes bt-check-pop{from{opacity:0;scale:.4}} --@media (prefers-reduced-motion:reduce){.bt-menu,.bt-avedit,.bt-react-strip{animation:bt-fade .1s ease-out}.bt-react-strip button,.bt-q-check,.bt-color[aria-pressed=true] span{animation:none}} --.bt-brand:hover{background:var(--bt-hover)} --.bt-drop-list{position:relative;display:flex;flex-direction:column;gap:2px} --.bt-grid{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:4px} --.bt-pick{display:flex;flex-direction:column;align-items:center;gap:4px;padding:7px 2px 6px;border-radius:10px;border:1px solid transparent;background:none;color:var(--bt-ink);cursor:pointer;font:inherit;font-size:11px;line-height:14px;min-width:0} --.bt-pick:hover{background:var(--bt-hover)} --.bt-pick[aria-pressed=true]{border-color:var(--bt-line-2);background:var(--bt-hover)} --.bt-pick>span:last-child:not(.bt-mark){max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-pick:hover .bt-mark[data-state=idle] .bt-eye{animation:bt-blink .5s linear 1} --.bt-select{width:100%;height:34px;box-sizing:border-box;border-radius:8px;border:1px solid var(--bt-line);background:var(--bt-card);color:var(--bt-ink);padding:0 8px;font:inherit;font-size:13px} --.bt-note{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin-top:6px} --.bt-swatch-sep{width:1px;height:22px;background:var(--bt-line-2);margin:0 2px} --.bt-swatch-custom{position:relative;overflow:hidden;background:conic-gradient(#ff3e51,#ffaf38,#00c972,#1cc3b0,#2a92fe,#a97efe,#ff5eb1,#ff3e51);box-sizing:border-box} --.bt-swatch-custom[data-on=true]{border-color:var(--bt-ink)} --.bt-swatch-custom input{position:absolute;inset:-4px;width:calc(100% + 8px);height:calc(100% + 8px);opacity:0;cursor:pointer;border:0;padding:0} --.bt-swatch-default{background:linear-gradient(135deg,var(--bt-card) 0 46%,var(--bt-line-2) 46% 54%,var(--bt-card) 54%);box-shadow:inset 0 0 0 1px var(--bt-line-2)} --.bt-states{display:flex;flex-wrap:wrap;gap:4px} --.bt-state{border:1px solid var(--bt-line);background:none;border-radius:999px;font:inherit;font-size:11px;line-height:16px;padding:2px 8px;color:var(--bt-ink-2);cursor:pointer} --.bt-state:hover{color:var(--bt-ink)} --.bt-state[aria-pressed=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink)} --.bt-theme-chip{position:relative;width:46px;height:30px;border-radius:8px;box-shadow:inset 0 0 0 1px var(--bt-line-2);background:linear-gradient(90deg,var(--ls) 0 36%,var(--lb) 36%);overflow:hidden} --.bt-theme-chip i{position:absolute;right:7px;bottom:7px;width:10px;height:10px;border-radius:50%;background:var(--la)} --body[data-ds-dark-theme] .bt-theme-chip{background:linear-gradient(90deg,var(--ds) 0 36%,var(--db) 36%)} --body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} --.bt-tabs{flex-wrap:wrap} --.bt-soft:disabled{opacity:.4;cursor:default} --.bt-group-role{margin-left:6px;font-size:11px;line-height:14px;padding:1px 5px;border-radius:4px;background:var(--bt-tag-bg);color:var(--bt-tag-ink);vertical-align:1px} --.bt-members{display:flex;flex-direction:column;gap:1px} --.bt-member{display:flex;align-items:center;gap:4px;min-height:40px;padding:0 4px 0 6px;border-radius:8px;animation:bt-rise .18s ease-out} --.bt-member:hover{background:var(--bt-hover)} --.bt-member-name{flex:1;min-width:0;display:flex;align-items:center;gap:10px;border:0;background:none;padding:6px 0;color:var(--bt-ink);font:inherit;font-size:14px;line-height:20px;cursor:pointer;text-align:left} --.bt-member-name>span:last-child{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-chip-admin{background:var(--bt-tag-bg);color:var(--bt-tag-ink);border-color:transparent} --.bt-mini{flex:none;border:0;background:none;border-radius:6px;padding:2px 6px;font:inherit;font-size:12px;line-height:18px;color:var(--bt-ink-2);cursor:pointer} --.bt-mini:hover{background:var(--bt-active);color:var(--bt-ink)} --.bt-member .bt-mini,.bt-member .bt-x{opacity:0;transition:opacity .15s ease} --.bt-member:hover .bt-mini,.bt-member:hover .bt-x,.bt-member .bt-mini:focus-visible,.bt-member .bt-x:focus-visible{opacity:1} --.bt-add{color:var(--bt-ink-2);margin-top:2px} --.bt-add:hover,.bt-addlist .bt-option:hover{background:var(--bt-hover);color:var(--bt-ink)} --.bt-addlist{display:flex;flex-direction:column;margin-top:4px;padding:4px;border:1px solid var(--bt-line);border-radius:10px;background:var(--bt-card);animation:bt-rise .16s ease-out} --.bt-seg{position:relative;display:flex;gap:2px;padding:2px;border-radius:10px;background:var(--bt-hover)} --.bt-motion-seg{width:216px} --.bt-seg button{position:relative;z-index:1;flex:1;height:30px;border:0;border-radius:8px;background:none;font:inherit;font-size:13px;color:var(--bt-ink-2);cursor:pointer;transition:background-color .15s ease,color .15s ease,box-shadow .15s ease,${spring(SPRING_TAP, "scale")}} --.bt-seg button[aria-pressed=true]{background:var(--bt-card);color:var(--bt-ink);box-shadow:0 1px 3px rgba(0,0,0,.08)} --.bt-seg button:disabled{opacity:.4;cursor:default} --.bt-seg button:active:not(:disabled){scale:.96} --.bt-seg>.bt-thumb{top:2px;bottom:2px;border-radius:8px;background:var(--bt-card);box-shadow:0 1px 3px rgba(0,0,0,.08)} --.bt-seg[data-glide] button[aria-pressed=true]{background:transparent;box-shadow:none} --@keyframes bt-rise{from{opacity:0;transform:translateY(-3px)}to{opacity:1;transform:none}} --@media (prefers-reduced-motion:reduce){.bt-member,.bt-addlist{animation:none}} +-/* Bot settings: fields, the avatar editor popover, and the details-pane sub-view. */ +-.bt-field{display:flex;flex-direction:column;gap:6px} +-.bt-field-label{font-size:13px;line-height:18px;font-weight:500} +-.bt-input{width:100%;box-sizing:border-box;height:36px;border:1px solid var(--bt-line);border-radius:8px;padding:0 10px;background:var(--bt-card);color:var(--bt-ink);font:inherit;font-size:13px;outline:none} +-.bt-input:focus{border-color:var(--bt-line-2)} +-.bt-input-area{height:auto;min-height:96px;padding:8px 10px;line-height:18px;resize:vertical} +-.bt-note{font-size:12px;line-height:16px;color:var(--bt-ink-3)} +-.bt-soft-sm{height:28px;padding:0 12px;font-size:12px} +-.bt-set-avatar{display:flex;justify-content:center;padding:4px 0} +-.bt-avatar-anchor{position:relative} +-.bt-avatar-trigger{position:relative;width:64px;height:64px;border:0;border-radius:50%;background:none;cursor:pointer;padding:0} +-.bt-avatar-pencil{position:absolute;right:-2px;bottom:-2px;width:22px;height:22px;border-radius:50%;background:var(--bt-main);border:1px solid var(--bt-line-2);color:var(--bt-ink-2);display:flex;align-items:center;justify-content:center;box-shadow:0 1px 4px rgba(0,0,0,.12)} +-.bt-avedit{position:absolute;top:calc(100% + 8px);left:50%;transform:translateX(-50%);width:300px;background:var(--bt-main);border:1px solid var(--bt-line);border-radius:12px;box-shadow:0 12px 40px rgba(0,0,0,.18);padding:10px;z-index:70;display:flex;flex-direction:column;gap:10px;color:var(--bt-ink);transform-origin:top center;animation:bt-pop-drop ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out} +-.bt-bs .bt-avedit{transform-origin:32px 0} +-.bt-avedit-top{display:flex;align-items:center;justify-content:space-between} +-.bt-avedit-tabs{position:relative;display:flex;gap:2px;background:var(--bt-hover);border-radius:999px;padding:2px} +-.bt-avedit-tab{position:relative;z-index:1;border:0;background:none;border-radius:999px;padding:3px 10px;font-size:12px;line-height:16px;color:var(--bt-ink-2);cursor:pointer} +-.bt-avedit-tab[aria-selected=true]{background:var(--bt-main);color:var(--bt-ink)} +-.bt-avedit-tabs>.bt-thumb{top:2px;bottom:2px;border-radius:999px;background:var(--bt-main);box-shadow:0 1px 2px rgba(0,0,0,.06)} +-.bt-avedit-tabs[data-glide] .bt-avedit-tab[aria-selected=true]{background:transparent} +-.bt-avedit-reset{color:var(--bt-ink-3)} +-.bt-avedit-reset:hover{color:var(--bt-ink)} +-.bt-shapes{display:flex;flex-direction:column;gap:2px} +-.bt-shape-row{display:grid;grid-template-columns:repeat(6,1fr);gap:2px} +-.bt-shape{position:relative;aspect-ratio:1;border:0;border-radius:8px;background:none;color:var(--bt-ink);cursor:pointer;display:flex;align-items:center;justify-content:center;padding:0} +-.bt-shape:hover{background:var(--bt-hover)} +-.bt-shape .bt-ring{position:absolute;left:50%;top:50%;width:36px;height:36px;translate:-50% -50%;overflow:visible;opacity:0;scale:.82;pointer-events:none;transition:opacity .14s ease,${spring(SPRING_POP, "scale")}} +-.bt-shape[aria-pressed=true] .bt-ring{opacity:1;scale:1} +-.bt-colors{display:flex;justify-content:space-between} +-.bt-color{width:22px;height:22px;border-radius:50%;border:2px solid transparent;padding:2px;background:none;cursor:pointer;box-sizing:border-box;transition:border-color .14s ease,${spring(SPRING_TAP, "scale")}} +-.bt-color[aria-pressed=true] span{animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} +-.bt-color span{display:block;width:100%;height:100%;border-radius:50%} +-.bt-color[aria-pressed=true]{border-color:var(--bt-ink)} +-.bt-dropzone{border:1.5px dashed var(--bt-line-2);border-radius:10px;padding:18px 12px;display:flex;flex-direction:column;align-items:center;gap:8px;color:var(--bt-ink-2);font-size:12px;line-height:16px;text-align:center} +-.bt-dropzone[data-over]{border-color:var(--bt-accent);color:var(--bt-ink)} +-.bt-dropzone img{width:64px;height:64px;border-radius:50%;object-fit:cover} +-.bt-set-actions{display:flex;gap:8px;flex-wrap:wrap;align-items:center} +-.bt-about{white-space:pre-wrap;display:-webkit-box;-webkit-line-clamp:5;-webkit-box-orient:vertical;overflow:hidden} +-.bt-about[data-open]{display:block;-webkit-line-clamp:unset} +-.bt-more{border:0;background:none;color:var(--bt-ink-3);font-size:12px;line-height:16px;cursor:pointer;padding:2px 0} +-.bt-more:hover{color:var(--bt-ink)} +-.bt-subhead{display:flex;align-items:center;gap:4px;padding:10px 12px 4px} +-.bt-subhead-title{flex:1;font-size:15px;line-height:24px;font-weight:600;padding-left:4px} +-.bt-icon-btn{width:28px;height:28px;border-radius:50%;border:0;background:none;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;padding:0} +-.bt-icon-btn:hover{background:var(--bt-hover);color:var(--bt-ink)} +-.bt-set-body{gap:20px} +-.bt-drawer-model{display:flex;flex-direction:column} +-.bt-drawer-model .bt-note{margin-top:6px} +-.bt-drawer-permission{display:flex;flex-direction:column} +-.bt-seg button.bt-perm-danger,.bt-seg button.bt-perm-danger[aria-pressed=true]{color:#e02135} +// src/client/room-invite-preview.js +var INVITE_PREVIEW_NAME_MAX = 60; +function stripInviteMarkers(text2) { @@ -3937,29 +3857,29 @@ diff --git a/client.js b/client.js + const total = Math.max(1, Math.ceil(left / 1e3)); + return `${Math.floor(total / 60)}:${String(total % 60).padStart(2, "0")} left to join`; +} -+function RoomInvitePreview({ h: h50, preview, kind = "face-link-preview", busy = false, joinLabel = "Join", clearLabel = "Clear", showClear = true, onJoin, onClear, now } = {}) { -+ if (!preview || typeof h50 !== "function") return null; ++function RoomInvitePreview({ h: h53, preview, kind = "face-link-preview", busy = false, joinLabel = "Join", clearLabel = "Clear", showClear = true, onJoin, onClear, now } = {}) { ++ if (!preview || typeof h53 !== "function") return null; + const at = `${kind}`; + const child = (name) => `${at}-${name}`; + const countdown = now === void 0 ? inviteCountdown(preview.expiresAt, preview.clockOffsetMs) : inviteCountdownAt(preview.expiresAt, preview.clockOffsetMs, now); -+ return h50( ++ return h53( + "div", + { className: "fs-preview", "data-flybot": at, role: "status" }, -+ h50("div", { className: "fs-preview-name", "data-flybot": child("name") }, preview.name || "Face-to-face room"), -+ preview.lead ? h50("div", { className: "fs-preview-meta", "data-flybot": child("lead") }, `Lead: ${preview.lead}`) : null, -+ preview.people ? h50("div", { className: "fs-preview-meta", "data-flybot": child("members") }, preview.people) : null, -+ preview.expiresAt ? h50("div", { className: "fs-preview-meta", "data-flybot": child("expiry") }, countdown) : null, -+ onJoin || onClear ? h50( ++ h53("div", { className: "fs-preview-name", "data-flybot": child("name") }, preview.name || "Face-to-face room"), ++ preview.lead ? h53("div", { className: "fs-preview-meta", "data-flybot": child("lead") }, `Lead: ${preview.lead}`) : null, ++ preview.people ? h53("div", { className: "fs-preview-meta", "data-flybot": child("members") }, preview.people) : null, ++ preview.expiresAt ? h53("div", { className: "fs-preview-meta", "data-flybot": child("expiry") }, countdown) : null, ++ onJoin || onClear ? h53( + "div", + { className: "fs-preview-foot", "data-flybot": child("foot") }, -+ showClear && onClear ? h50("button", { ++ showClear && onClear ? h53("button", { + type: "button", + className: "fs-btn fs-btn-sm", + "data-flybot": child("clear"), + disabled: !!busy, + onClick: onClear + }, clearLabel) : null, -+ onJoin ? h50("button", { ++ onJoin ? h53("button", { + type: "button", + className: "fs-btn fs-btn-sm fs-btn-primary", + "data-flybot": child("join"), @@ -3978,91 +3898,65 @@ diff --git a/client.js b/client.js + return `${Math.floor(total / 60)}:${String(total % 60).padStart(2, "0")} left to join`; +} --/* Memory dialog: a summary of every entry, the entries behind the menu, "Ask or update" below. */ --.bt-mem-row{display:flex;align-items:center;gap:8px;width:100%;height:36px;padding:0 8px 0 10px;border:.5px solid var(--bt-line-2);border-radius:10px;background:var(--bt-card);color:var(--bt-ink);font:inherit;font-size:13px;cursor:pointer;box-sizing:border-box;transition:background-color .12s ease} --.bt-mem-row:hover{background:var(--bt-hover)} --.bt-mem-row>svg{flex:none;color:var(--bt-ink-2)} --.bt-mem-row-copy{flex:1;text-align:left} --.bt-mem-row-go{display:inline-flex;align-items:center;gap:2px;color:var(--bt-ink-3);font-size:12px} --.bt-mem-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:61;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} --.bt-mem-scrim{animation:bt-fade .2s ease-out} --.bt-mem{position:relative;width:min(680px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} --.bt-mem-head{position:relative;display:flex;align-items:center;gap:8px;height:60px;flex:none;padding:0 14px 0 24px;border-bottom:.5px solid var(--bt-line);box-sizing:border-box} --.bt-mem-head .bt-icon-btn{width:32px;height:32px;flex:none} --.bt-mem-head [aria-haspopup] svg{width:18px;height:18px;stroke-width:2.6} --.bt-mem-head>.bt-icon-btn:first-child{margin-left:-10px} --.bt-mem-head h2{margin:0;font-size:17px;line-height:24px;font-weight:600;white-space:nowrap} --.bt-mem-status{font-size:13px;line-height:18px;color:var(--bt-ink-3);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;min-width:0;font-variant-numeric:tabular-nums} --.bt-mem-head-gap{flex:1} --.bt-mem-menu{position:absolute;top:52px;right:50px;min-width:220px;--bt-origin:top right} --.bt-mem-menu button:disabled{opacity:.4;cursor:default;background:none} --.bt-mem-body{flex:1;overflow-y:auto;padding:22px 28px 24px;scrollbar-width:thin;display:flex;flex-direction:column;gap:12px} --.bt-mem-summary{transition:opacity .3s ease} --.bt-mem-summary[data-stale]{opacity:.55} --.bt-mem-summary h3{margin:20px 0 6px;font-size:17px;line-height:26px;font-weight:600} --.bt-mem-summary h3:first-child{margin-top:0} --.bt-mem-summary p{margin:0;font-size:15px;line-height:26px} --.bt-mem-summary>*{animation:bt-mem-line .45s cubic-bezier(.16,1,.3,1) both} --.bt-mem-summary>:nth-child(2){animation-delay:.03s} --.bt-mem-summary>:nth-child(3){animation-delay:.06s} --.bt-mem-summary>:nth-child(4){animation-delay:.09s} --.bt-mem-summary>:nth-child(5){animation-delay:.12s} --.bt-mem-summary>:nth-child(6){animation-delay:.15s} --.bt-mem-summary>:nth-child(n+7){animation-delay:.18s} --@keyframes bt-mem-line{from{opacity:0;transform:translateY(4px)}} --.bt-mem-skel{display:flex;flex-direction:column;gap:24px} --.bt-mem-skel-block{display:flex;flex-direction:column;gap:10px} --.bt-mem-skel-block span{display:block;height:12px;border-radius:6px;background:linear-gradient(90deg,var(--bt-hover) 25%,var(--bt-active) 50%,var(--bt-hover) 75%);background-size:200% 100%;animation:bt-mem-skel 1.4s ease-in-out infinite} --.bt-mem-skel-block .bt-mem-skel-head{width:30%;height:16px;margin-bottom:2px} --@keyframes bt-mem-skel{from{background-position:150% 0}to{background-position:-50% 0}} --.bt-mem-skel-label{font-size:13px;line-height:18px;color:var(--bt-ink-3)} --.bt-mem-empty{margin:auto;max-width:400px;display:flex;flex-direction:column;align-items:center;gap:8px;text-align:center;padding:24px 0;animation:bt-mem-line .45s cubic-bezier(.16,1,.3,1) both} --.bt-mem-empty-mark{width:48px;height:48px;border-radius:50%;background:var(--bt-hover);display:flex;align-items:center;justify-content:center;color:var(--bt-ink-2);margin-bottom:4px} --.bt-mem-empty-mark svg{width:22px;height:22px} --.bt-mem-empty-title{font-size:15px;line-height:22px;font-weight:600} --.bt-mem-empty-text{font-size:13px;line-height:20px;color:var(--bt-ink-2)} --.bt-mem-failed{display:flex;align-items:center;gap:12px;padding:10px 12px;border-radius:12px;background:var(--bt-hover);font-size:13px;line-height:18px;color:var(--bt-ink-2)} --.bt-mem-failed>span{flex:1;min-width:0;overflow-wrap:anywhere} --.bt-mem-entries{display:flex;flex-direction:column;gap:28px;animation:bt-page-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .22s ease-out} --.bt-mem-section-head{display:flex;align-items:baseline;gap:8px;margin-bottom:4px} --.bt-mem-section-head h3{margin:0;font-size:15px;line-height:22px;font-weight:600} --.bt-mem-section-head span{font-size:12px;line-height:16px;color:var(--bt-ink-3)} --.bt-mem-section-head .bt-mem-size{margin-left:auto;font-variant-numeric:tabular-nums;white-space:nowrap} --.bt-mem-topic{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin:14px 0 2px 4px;font-weight:500} --.bt-mem-list{list-style:none;margin:0;padding:0;display:flex;flex-direction:column} --.bt-mem-entry{display:flex;align-items:center;gap:10px;padding:9px 4px;border-bottom:.5px solid var(--bt-line);transition:opacity .2s ease} --.bt-mem-entry[data-busy]{opacity:.4} --.bt-mem-entry-copy{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px} --.bt-mem-entry-text{font-size:14px;line-height:20px;overflow-wrap:anywhere} --.bt-mem-entry-meta{font-size:12px;line-height:16px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums} --.bt-mem-remove{flex:none;height:28px;min-width:28px;border-radius:999px;border:0;background:none;color:var(--bt-ink-3);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;padding:0 6px;font:inherit;font-size:12px;opacity:0;transition:opacity .12s ease,background-color .12s ease,color .12s ease} --.bt-mem-entry:hover .bt-mem-remove,.bt-mem-remove:focus-visible,.bt-mem-remove[data-confirm]{opacity:1} --.bt-mem-remove:hover{background:var(--bt-hover);color:var(--bt-ink)} --.bt-mem-remove[data-confirm]{background:rgba(224,33,53,.1);color:#e02135;padding:0 10px} --@media (hover:none){.bt-mem-remove{opacity:1}} --.bt-mem-none{font-size:13px;line-height:18px;color:var(--bt-ink-3);padding:8px 4px} --.bt-mem-foot{flex:none;padding:8px 20px 20px;display:flex;flex-direction:column;gap:10px} --.bt-mem-reply{border-radius:16px;background:var(--bt-hover);padding:8px 8px 12px 16px;display:flex;flex-direction:column;gap:6px;max-height:36vh;overflow-y:auto;scrollbar-width:thin;transform-origin:50% 100%;animation:bt-pop-lift ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} --.bt-mem-reply-head{display:flex;align-items:center;gap:8px;min-height:24px} --.bt-mem-reply-asked{flex:1;min-width:0;font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-mem-reply .bt-icon-btn{width:24px;height:24px;flex:none} --.bt-mem-reply-text{font-size:14px;line-height:21px;padding-right:8px;overflow-wrap:anywhere} --.bt-mem-changes{list-style:none;margin:2px 0 0;padding:0 8px 0 0;display:flex;flex-direction:column;gap:4px} --.bt-mem-changes li{display:flex;align-items:flex-start;gap:6px;font-size:13px;line-height:18px;color:var(--bt-ink-2);overflow-wrap:anywhere} --.bt-mem-changes li svg{flex:none;margin-top:1px;color:#e02135;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} .12s backwards} --.bt-mem-changes li[data-ok] svg{color:var(--bt-green)} --.bt-mem-ask{display:flex;align-items:center;gap:8px;height:52px;padding:0 8px 0 22px;border-radius:999px;border:.5px solid var(--bt-line-2);background:var(--bt-card);box-shadow:0 4px 16px rgba(0,0,0,.06);box-sizing:border-box;transition:border-color .15s ease,box-shadow .15s ease} --.bt-mem-ask:focus-within{border-color:var(--bt-ink-3);box-shadow:0 4px 20px rgba(0,0,0,.1)} --.bt-mem-input{flex:1;min-width:0;border:0;background:none;outline:none;color:var(--bt-ink);font:inherit;font-size:15px;line-height:22px;padding:0} --.bt-mem-input::placeholder{color:var(--bt-ink-3)} --.bt-mem-send{flex:none;width:36px;height:36px;border-radius:50%;border:0;background:var(--bt-ink);color:var(--bt-main);display:flex;align-items:center;justify-content:center;cursor:pointer;padding:0;transition:opacity .15s ease,${spring(SPRING_TAP, "scale")}} --.bt-mem-send:disabled{opacity:.22;cursor:default} --.bt-mem-send:not(:disabled):active{scale:.92} --.bt-mem-send>*{animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} --.bt-mem-spin{width:14px;height:14px;border-radius:50%;border:2px solid currentColor;border-right-color:transparent;box-sizing:border-box;animation:bt-mem-spin .7s linear infinite} --@keyframes bt-mem-spin{to{transform:rotate(360deg)}} --@media (max-width:640px){.bt-mem{width:100vw;height:100%;border-radius:0;border:0}.bt-mem-body{padding:18px 18px 20px}.bt-mem-foot{padding:8px 12px 12px}} --@media (prefers-reduced-motion:reduce){.bt-mem,.bt-mem-scrim,.bt-mem-summary>*,.bt-mem-empty,.bt-mem-reply,.bt-mem-skel-block span,.bt-mem-entries,.bt-mem-send>*,.bt-mem-changes li svg{animation:none}} +-/* Settings dialog: a 198px page list beside the page. */ +-.bt-settings-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:60;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} +-.bt-scrim{position:absolute;inset:0;background:rgba(0,0,0,.32);animation:bt-fade .22s ease-out} +-body[data-ds-dark-theme] .bt-scrim{background:rgba(0,0,0,.5)} +-.bt-settings{--bt-set-w:min(800px,calc(100vw - 48px));--bt-set-h:min(620px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));position:relative;width:var(--bt-set-w);height:var(--bt-set-h);background:var(--bt-main);border-radius:16px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;overflow:hidden;color:var(--bt-ink);transition:${spring(SPRING_SHAPE, "width", "height")};animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} +-.bt-settings[data-wide]{--bt-set-w:min(1100px,calc(100vw - 48px));--bt-set-h:min(780px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))))} +-:is(.bt-settings-layer,.bt-mem-layer)[data-leaving]{pointer-events:none} +-:is(.bt-settings-layer,.bt-mem-layer)[data-leaving] .bt-scrim{opacity:0;transition:opacity .16s ease-in} +-:is(.bt-settings-layer,.bt-mem-layer)[data-leaving]>[role=dialog]{animation:bt-dialog-sink .16s cubic-bezier(.4,0,1,1) forwards} +-@keyframes bt-dialog-rise{from{transform:translateY(12px) scale(.96)}} +-@keyframes bt-dialog-sink{to{opacity:0;transform:translateY(6px) scale(.975);filter:blur(3px)}} +-@media (prefers-reduced-motion:reduce){.bt-settings{transition:none}.bt-settings,.bt-scrim,.bt-settings-page>*{animation:bt-fade .12s ease-out!important}} +-.bt-settings-nav{position:relative;width:198px;flex:none;padding:16px 8px;border-right:.5px solid var(--bt-line);display:flex;flex-direction:column;gap:2px;background:var(--bt-sidebar);box-sizing:border-box} +-.bt-settings-item{position:relative;z-index:1;display:flex;align-items:center;gap:8px;padding:6px 8px;border:0;border-radius:8px;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;line-height:20px;cursor:pointer;text-align:left;transition:background-color .12s ease,color .12s ease} +-.bt-settings-item:hover{color:var(--bt-ink);background:var(--bt-hover)} +-.bt-settings-item[aria-current=page]{background:var(--bt-active);color:var(--bt-ink)} +-.bt-settings-nav>.bt-thumb{left:8px;right:8px;border-radius:8px;background:var(--bt-active)} +-.bt-settings-nav[data-glide] .bt-settings-item[aria-current=page]{background:transparent} +-.bt-settings-shell{margin-top:auto} +-/* Usage while another page is open: out of the flow at Usage's own width, so it keeps +- its layout, and not rendered. */ +-.bt-settings-usage[data-off]{position:absolute;top:0;left:198px;width:calc(min(1100px,calc(100vw - 48px)) - 198px);height:100%;box-sizing:border-box;content-visibility:hidden;pointer-events:none} +-/* The page column takes the dialog's final size at once, so while the dialog resizes +- only its edge moves and the page does not lay out again every frame. */ +-.bt-settings-main{flex:none;display:flex;flex-direction:column;min-width:0;width:calc(var(--bt-set-w) - 198px);height:var(--bt-set-h)} +-.bt-settings-head{display:flex;align-items:center;gap:6px;padding:16px 56px 4px 20px} +-.bt-settings-head h2{margin:0;font-size:15px;line-height:24px;font-weight:600;animation:bt-veil-in .2s ease-out} +-.bt-settings-head>.bt-icon-btn{animation:bt-back-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out} +-@keyframes bt-back-in{from{translate:6px 0;scale:.8}} +-.bt-settings-scroll{flex:1;overflow-y:auto;padding:12px 20px 24px;display:flex;flex-direction:column;gap:20px;scrollbar-width:thin} +-.bt-settings-page>:not(.bt-us){animation:bt-page-up ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .22s ease-out backwards} +-.bt-settings-page[data-move=in]>:not(.bt-us){animation-name:bt-page-in,bt-veil-in} +-.bt-settings-page[data-move=out]>:not(.bt-us){animation-name:bt-page-out,bt-veil-in} +-.bt-settings-page>:nth-child(2){animation-delay:30ms} +-.bt-settings-page>:nth-child(3){animation-delay:60ms} +-.bt-settings-page>:nth-child(4){animation-delay:90ms} +-.bt-settings-page>:nth-child(n+5){animation-delay:120ms} +-@keyframes bt-page-up{from{transform:translateY(10px)}} +-@keyframes bt-page-in{from{transform:translateX(18px)}} +-@keyframes bt-page-out{from{transform:translateX(-18px)}} +-.bt-settings-close{position:absolute;top:12px;right:12px;width:32px;height:32px;border-radius:50%;border:0;background:var(--bt-hover);color:var(--bt-ink-2);display:flex;align-items:center;justify-content:center;cursor:pointer;padding:0} +-.bt-settings-close:hover{background:var(--bt-active);color:var(--bt-ink)} +-.bt-settings-form{display:flex;flex-direction:column;gap:16px} +-.bt-set-section h3{font-size:13px;line-height:18px;font-weight:600;margin:0 0 8px;padding:0 4px} +-.bt-set-card{border:1px solid var(--bt-line);border-radius:12px;background:var(--bt-card);display:flex;flex-direction:column} +-.bt-set-card>*+*{border-top:.5px solid var(--bt-line)} +-.bt-set-row{display:flex;align-items:center;gap:12px;padding:10px 12px;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;line-height:18px;text-align:left;width:100%;box-sizing:border-box;border-radius:0} +-button.bt-set-row{cursor:pointer} +-button.bt-set-row:hover{background:var(--bt-hover)} +-.bt-set-card>.bt-set-row+.bt-set-row{border-top:.5px solid var(--bt-line)} +-.bt-set-row:first-child{border-top-left-radius:12px;border-top-right-radius:12px} +-.bt-set-row:last-child{border-bottom-left-radius:12px;border-bottom-right-radius:12px} +-.bt-set-copy{flex:1;display:flex;flex-direction:column;gap:2px;min-width:0} +-.bt-set-hint{font-size:12px;line-height:16px;color:color-mix(in srgb,var(--bt-ink-2) 50%,var(--bt-ink-3))} +-.bt-set-control{flex:none;display:flex;align-items:center;gap:6px} +-.bt-set-value{font-size:13px;color:var(--bt-ink-2);text-align:right} +-.bt-set-bot{flex:1;display:flex;align-items:center;gap:8px;min-width:0} +-.bt-set-paste{flex-direction:column;align-items:stretch;gap:8px} +-.bt-chevron{color:var(--bt-ink-3);display:inline-flex;flex:none} +// src/client/approval-claims.js +var claims = /* @__PURE__ */ new Map(); +var claimListeners = /* @__PURE__ */ new Set(); @@ -4089,113 +3983,34 @@ diff --git a/client.js b/client.js + }; +} --.bt-thumb{position:absolute;left:0;top:0;z-index:0;pointer-events:none;transition:opacity .14s ease} --.bt-thumb[data-hidden]{opacity:0} --[data-morph]{overflow:hidden!important} --.bt-veil{animation:bt-veil-in .22s ease-out} --.bt-with-icon{display:inline-flex;align-items:center;gap:4px} --.bt-with-icon svg{width:14px;height:14px} --.bt-tag-admin{display:inline-flex;align-items:center;gap:4px} --.bt-create-inline{padding:18px 16px;border:1px solid var(--bt-line);border-radius:12px;background:var(--bt-card)} --.bt-create-inline .bt-create-card{max-width:none} --.bt-panel-view>[data-move=in]{animation:bt-page-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .2s ease-out backwards} --.bt-panel-view>[data-move=out]{animation:bt-page-out ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .2s ease-out backwards} --.bt-panel-view>:is([data-move=in],[data-move=out]):nth-child(2){animation-delay:25ms} --.bt-panel-view>:is([data-move=in],[data-move=out]):nth-child(n+3){animation-delay:50ms} --.bt-panel-view>.bt-drawer-body[data-move=tab]{animation:bt-veil-in .2s ease-out} --.bt-drawer-name-input{animation:bt-veil-in .16s ease-out} --.bt-pop-in{display:inline-flex;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} --:is(.bt-soft,.bt-send,.bt-icon-btn,.bt-settings-close,.bt-mini,.bt-tab,.bt-nc-send,.bt-avedit-tab,.bt-shape,.bt-pick,.bt-swatch,.bt-palette-clear){transition:background-color .12s ease,color .12s ease,border-color .12s ease,opacity .12s ease,${spring(SPRING_TAP, "scale")}} --:is(.bt-icon-btn,.bt-settings-close,.bt-nc-send,.bt-shape,.bt-swatch,.bt-color,.bt-x,.bt-q-x,.bt-palette-clear):active:not(:disabled){scale:.9} --:is(.bt-soft,.bt-send,.bt-mini,.bt-tab,.bt-avedit-tab,.bt-pick,.bt-q-submit,.bt-q-btn):active:not(:disabled){scale:.96} --@media (prefers-reduced-motion:reduce){.bt-thumb{transition:none}.bt-panel-view>[data-move],.bt-drawer-name-input,.bt-veil,.bt-pop-in,.bt-token,.bt-drop,.bt-newchat,.bt-option-hint,.bt-connector-form,.bt-settings-head>*{animation:none}} --`; --var CONVERSATION_CSS = ` --.bt-think{font-size:13px;line-height:18px;color:var(--bt-ink-2);margin:2px 0 4px;max-width:min(560px,78%)} --.bt-think summary{cursor:pointer;list-style:none;display:inline-flex;align-items:center;gap:6px} --.bt-think summary::-webkit-details-marker{display:none} --.bt-think-text{white-space:pre-wrap;margin-top:6px;padding-left:10px;border-left:2px solid var(--bt-line-2)} --.bt-event{display:flex;justify-content:center;align-items:center;gap:2px;min-height:24px;margin:2px 0;font-size:12px;line-height:16px;color:var(--bt-ink-2);flex-wrap:wrap} --.bt-event>span{padding:0 2px} --.bt-event button{border:0;background:none;color:inherit;font:inherit;display:inline-flex;align-items:center;gap:4px;cursor:pointer;height:24px;padding:4px 6px 4px 4px;border-radius:999px;box-sizing:border-box;transition:background-color .12s ease} --.bt-event button:hover{background:var(--bt-hover)} --.bt-event button:active{background:var(--bt-active)} --.bt-event button.bt-event-whole{min-width:0;max-width:100%;padding:4px 6px 4px 8px} --.bt-event-whole>*{flex:none} --.bt-event-whole>span:first-child{margin-right:2px} --/* One button cannot wrap like separate parts, so a long name is cut to fit the chat. */ --.bt-event-whole>.bt-event-name{flex:0 1 auto;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-time-sep{display:flex;justify-content:center;align-items:center;height:28px;margin:14px 0 8px;font-size:12px;line-height:16px;color:var(--bt-ink-2);white-space:nowrap} --[class*="_scroll"]>[class*="_column"]::before{content:var(--bt-first-sep,none);display:block;flex:none;height:28px;margin:17px 0 12px;font-size:12px;line-height:28px;text-align:center;color:var(--bt-ink-2);white-space:nowrap} --.bt-activity{display:flex;align-items:center;gap:10px;margin:8px 0 4px 2px;font-size:14px;color:var(--bt-ink-2)} --.bt-group-replies{display:contents} --/* A Bot chat is flat in every work-details mode, without changing the user's mode -- (it is a DSH-wide setting): step groups lose their header and stay open, and what a -- mode folds away in a finished turn stays shown. TurnProcessCell also opens that -- fold; these rules cover the first frame before it does. */ --[data-step-process]>div:first-child{display:none!important} --[data-step-process]>[data-step-process-body]{display:block!important;content-visibility:visible!important;max-height:none!important;overflow:visible!important;mask-image:none!important;scrollbar-gutter:auto!important} --:is([data-step-process],[data-turn-process-hidden])[hidden]{content-visibility:visible!important} --[class*="_flowItem"]:has(> [data-slot="conversation.chat.node"]:empty){display:none!important} --[class*="_header"]:has(.bt-head){border-bottom-color:transparent!important;box-shadow:none!important} --/* The transcript runs under a floating header pill. */ --header[class*="_header"]:has(.bt-head){position:absolute!important;top:0;left:0;right:0;z-index:8;display:flex!important;padding:10px 0 0!important;background:transparent!important;pointer-events:none;justify-content:center} --header[class*="_header"]:has(.bt-head)::before{content:"";position:absolute;inset:0 0 auto;height:60px;background:linear-gradient(to bottom,var(--bt-main),color-mix(in srgb,var(--bt-main) 0%,transparent));pointer-events:none;z-index:-1} --header[class*="_header"]:has(.bt-head)>[class*="_headerLeading"]{position:absolute;left:12px;top:10px;pointer-events:auto} --header[class*="_header"] .bt-head{flex:1 1 auto;width:100%} --[class*="_body"]:has(> [class*="_scrollBody"]){--dsh-chat-content-width:min(960px,100%)} --/* DSH's turn tail keeps what plugins put in it (delivered files, the Bot's separators), -- without its copy and branch row; a tail with nothing in it takes no room. */ --[data-turn-tail]>:not([data-slot="conversation.chat.turnTail"]){display:none!important} --[class*="_flowItem"][data-chat-flow-kind="turn-tail"]:not(:has([data-slot="conversation.chat.turnTail"]:not(:empty))){display:none!important} --/* Every team Session belongs to a Bot or a group, so a blank one is an empty chat, not -- the shell's new-session hero: no headline, no workspace or mode picker, and the -- composer stays docked at the bottom. */ --[data-content-phase=hero] [class*="_scrollBody"]{justify-content:flex-end!important} --[data-content-phase=hero] [class*="_composerHero"]{align-self:stretch!important;width:auto!important;padding-bottom:0!important} --[data-content-phase=hero] [class*="_composerHero"]>[class$="_root"],[data-content-phase=hero] [class*="_heroWorkspaceRow"]{display:none!important} --[data-content-phase=hero] [class*="_composerHero"] [class*="_input"]{min-height:0!important} --/* The right sides give back the scrollbar gutter so both edges sit 16px from the column. */ --[class*="_scroll"]:has(> [class*="_column"]){padding:60px 11px 16px 16px!important} --/* The shell's running status only hosts the activity row (.bt-typing). */ --[data-chat-running]{display:block!important;width:100%;min-height:0!important;margin:0!important;padding:0!important} --[data-chat-running]>span:not([role=status]){display:none!important} --[data-chat-running]:has(> .bt-typing){margin-top:var(--dsh-chat-flow-gap,12px)!important} --.bt-typing{display:flex;align-items:center;gap:12px;height:36px;min-width:0;padding-inline-start:8px;transform-origin:0 50%;animation:bt-typing-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing} backwards} --.bt-typing[data-exiting]{animation:bt-typing-out .14s cubic-bezier(.22,1,.36,1) forwards} --.bt-typing>.bt-mark,.bt-typing>.bt-cluster{flex-shrink:0} --.bt-typing>.bt-mark{cursor:pointer;transition:filter .16s ease-out} --.bt-typing>.bt-mark:hover{filter:drop-shadow(0 2px 4px rgba(0,0,0,.18))} --.bt-typing>.bt-mark .bt-eyes{transition:scale .28s cubic-bezier(.4,.06,.18,1)} --.bt-typing>.bt-mark:hover .bt-eyes{scale:1.18} --.bt-typing-text{display:flex;align-items:center;flex:1 1 auto;min-width:0;animation:bt-typing-label .22s ease-out .2s backwards} --.bt-typing-label{display:inline-flex;align-items:center;gap:6px;min-width:0;animation:bt-typing-label .22s ease-out backwards} --.bt-typing-label>.bt-shimmer{font-size:14px;line-height:22px;font-weight:400;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-typing-time{flex-shrink:0;font-size:12px;line-height:22px;color:var(--bt-ink-3);white-space:nowrap} --@keyframes bt-typing-in{from{opacity:0;transform:scale(.9)}} --@keyframes bt-typing-out{from{opacity:1;transform:scale(1)}to{opacity:0;transform:scale(.92);filter:blur(3px)}} --@keyframes bt-typing-label{from{opacity:0;filter:blur(5px);transform:translateY(3px)}} --/* Shimmer: a stepped sweep clipped to the text. */ --.bt-shimmer{color:transparent;background:linear-gradient(90deg,var(--bt-shimmer-base) 0%,var(--bt-shimmer-base) 25%,var(--bt-ink) 60%,var(--bt-shimmer-base) 75%,var(--bt-shimmer-base) 100%);background-size:200% 100%;-webkit-background-clip:text;background-clip:text;animation:bt-shimmer 2.2s steps(60) infinite;--bt-shimmer-base:color-mix(in srgb,var(--bt-ink) 40%,transparent)} --@keyframes bt-shimmer{from{background-position:200% 0}to{background-position:-200% 0}} --/* New rows slide up; a reply that replaces the activity row grows out of its corner. */ --[data-bt-enter="new"]{animation:bt-row-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} --[data-bt-enter="after-collapse"]{transform-origin:0 100%;animation:bt-row-after .24s cubic-bezier(.23,1,.32,1) .38s backwards} --@keyframes bt-row-in{from{transform:translateY(12px)}to{transform:none}} --@keyframes bt-row-after{0%{opacity:0;transform:translateY(12px) scale(.94)}55%{opacity:1}100%{opacity:1;transform:none}} --@media (prefers-reduced-motion:reduce){ --.bt-typing,.bt-typing[data-exiting]{animation-name:bt-fade-in;animation-duration:.12s;transform:none} --.bt-typing[data-exiting]{animation-name:bt-fade-out} --.bt-typing-text,.bt-typing-label{animation-name:bt-fade-in;animation-delay:0s} --.bt-shimmer{animation:none;background:none;color:var(--bt-ink-2)} --[data-bt-enter="new"]{animation:none} --[data-bt-enter="after-collapse"]{animation:bt-fade-in .12s ease-out} +-/* Settings → Connectors. */ +-.bt-connector{display:flex;flex-direction:column;gap:10px;padding:12px} +-.bt-connector-head{display:flex;align-items:center;gap:12px;min-width:0} +-.bt-connector-mark{flex:none;width:36px;height:36px;border-radius:10px;background:var(--bt-card);border:.5px solid var(--bt-line);display:flex;align-items:center;justify-content:center;color:var(--bt-ink)} +-.bt-connector-text{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px} +-.bt-connector-name{font-size:14px;line-height:20px;font-weight:500} +-.bt-connector-status{font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-connector[data-state=ready] .bt-connector-status{color:var(--bt-ink-2)} +-.bt-connector[data-state=error] .bt-connector-status{color:#e02135;white-space:normal} +-.bt-connector-actions{flex:none;display:flex;gap:6px} +-.bt-connector-form{display:flex;flex-direction:column;gap:8px;padding-left:48px;animation:bt-q-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} +-.bt-connector-form-row{display:flex;align-items:center;gap:6px} +-.bt-connector-link{flex:1;font-size:12px;color:var(--bt-ink-2)} +-.bt-connector-error{padding-left:48px;font-size:12px;line-height:16px;color:#e02135} +// src/shared/approval-waiting.js +var WAITING_STATUSES = Object.freeze(["pending", "pending_approval"]); +function isApprovalWaiting(status) { + return WAITING_STATUSES.includes(status); +} -+ + +-/* Shell chrome reshaped for the team view. Selectors use stable data attributes where the +- shell offers them and CSS-module name suffixes elsewhere. */ +-[class*="_logoRow"],[class*="_newSession"],nav[class*="_panelList"]{display:none!important} +-[class*="_footArea"]{display:flex!important;flex-direction:row-reverse;align-items:center;gap:9px;padding:8px 6px 6px!important} +-[class*="_footArea"]>[class*="_footerActions"]{flex:1 1 auto;min-width:0} +-[class*="_footArea"]>[class*="_settingsArea"]{flex:none;width:auto!important} +-[class*="_footArea"] button[aria-label="Settings"]{width:auto!important;padding:0!important;background:none!important;border-radius:50%!important;height:auto!important} +-[class*="_widthHandle"]{display:none!important} +// src/shared/held-retry.js +var TERMINAL = [ + // A friend's Bot that is gone or no longer shared (plugins/social/src/social.js: botGoneError / notSharedError). @@ -4215,36 +4030,202 @@ diff --git a/client.js b/client.js + const said = `${record.error ?? ""} ${record.code ?? ""}`; + return !TERMINAL.some((reason) => reason.test(said)); +}; -+ -+// src/client/reason-line.js -+var REASON_POINTS = 200; -+var reasonLine = (reason) => { -+ if (typeof reason !== "string" || reason.trim() === "") return null; -+ const full2 = reason.toWellFormed(); -+ return { text: fits(full2, REASON_POINTS) ? full2 : [...full2].slice(0, REASON_POINTS).join("") + "…", title: full2 }; -+}; -+ -+// src/shared/face-title.js -+var MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; -+function isGenericFaceTitle(name) { -+ const n = String(name ?? "").trim(); -+ return !n || n === "Face-to-face room"; -+} -+function formatFaceWhen(value) { -+ const date = value instanceof Date ? value : new Date(value); -+ if (!Number.isFinite(date.getTime())) return ""; -+ const hh = String(date.getHours()).padStart(2, "0"); -+ const mm = String(date.getMinutes()).padStart(2, "0"); -+ return `${MONTHS[date.getMonth()]} ${date.getDate()} ${hh}:${mm}`; -+} -+function isAutoFaceTitle(name) { -+ const n = String(name ?? "").trim(); -+ return isGenericFaceTitle(n) || n.startsWith("Face-to-face · "); -+} -+function ownersFromMembers(members) { -+ const rows = []; -+ const seen = /* @__PURE__ */ new Set(); -+ for (const member of members ?? []) { + +-.bt-voice-pane{flex-direction:column;align-items:center;justify-content:center;animation:bt-fade .2s ease-out} +-.bt-voice-stage{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:10px;padding:24px;max-width:560px;text-align:center} +-.bt-voice-orb{position:relative;width:200px;height:200px;display:grid;place-items:center;margin-bottom:8px} +-.bt-voice-ring{position:absolute;inset:34px;border-radius:50%;background:var(--bt-hover);transform:scale(calc(1 + var(--bt-level,0) * .55));transition:transform .08s linear} +-.bt-voice-ring-2{inset:14px;background:none;box-shadow:inset 0 0 0 1px var(--bt-line-2);transform:scale(calc(.94 + var(--bt-level,0) * .3));opacity:.8} +-.bt-voice-stage[data-phase=thinking] .bt-voice-ring{animation:bt-voice-breathe 1.6s ease-in-out infinite} +-.bt-voice-stage[data-phase=speaking] .bt-voice-ring{animation:bt-voice-speak .9s ease-in-out infinite} +-@keyframes bt-voice-breathe{0%,100%{transform:scale(1)}50%{transform:scale(1.08)}} +-@keyframes bt-voice-speak{0%,100%{transform:scale(1.04)}30%{transform:scale(1.2)}60%{transform:scale(1.1)}} +-.bt-voice-orb>.bt-mark{position:relative} +-.bt-voice-name{font-size:16px;line-height:22px;font-weight:500} +-.bt-voice-status{font-size:13px;line-height:18px;color:var(--bt-ink-2);min-height:18px} +-.bt-voice-caption{min-height:44px;font-size:15px;line-height:22px;color:var(--bt-ink);animation:bt-blur-in .25s ease-out;display:-webkit-box;-webkit-line-clamp:4;-webkit-box-orient:vertical;overflow:hidden} +-.bt-voice-note{font-size:12px;color:#e02135} +-.bt-voice-setup{height:32px;padding:0 14px;border-radius:16px;border:0;background:var(--bt-hover);color:var(--bt-ink);font:inherit;font-size:13px;cursor:pointer;transition:background-color .15s ease} +-.bt-voice-setup:hover{background:var(--bt-active)} +-.bt-voice-bar{display:flex;gap:16px;padding:0 0 32px} +-.bt-voice-btn{position:relative;width:52px;height:52px;border-radius:50%;border:0;background:var(--bt-hover);color:var(--bt-ink);display:grid;place-items:center;cursor:pointer;transition:background-color .15s ease,transform .12s ease} +-.bt-voice-btn:hover{background:var(--bt-active)} +-.bt-voice-btn:active{transform:scale(.94)} +-.bt-voice-btn[aria-pressed=true]{background:var(--bt-user);color:var(--bt-user-ink)} +-.bt-voice-slash{position:absolute;width:24px;height:2px;border-radius:1px;background:currentColor;transform:rotate(-45deg)} +-.bt-voice-end{background:#ff3e51;color:#fff} +-.bt-voice-end:hover{background:#e02135} +-@keyframes bt-fade{from{opacity:0}to{opacity:1}} +-@keyframes bt-blur-in{from{opacity:0;filter:blur(2px)}to{opacity:1;filter:blur(0)}} +-@media (prefers-reduced-motion:reduce){.bt-voice-pane,.bt-voice-caption,.bt-voice-ring{animation:none!important}} +-.bt-msg{display:flex;flex-direction:column;align-items:flex-start;max-width:min(80%,560px,calc(100% - 82px))} +-/* The bubble's row: reactions hang below it, so the hover toolbar (and a group +- sender's avatar) line up with the bubble alone. */ +-.bt-msg-line{position:relative;display:flex;align-items:flex-end;gap:8px;max-width:100%} +-.bt-msg-line>.bt-bubble{max-width:none;min-width:0} +-/* The same bubble width as beside an avatar column: 80% of (100% - 30px), plus the 30px. */ +-.bt-astack[data-lead]>.bt-msg{max-width:min(calc(80% + 6px),590px,calc(100% - 52px))} +-.bt-tools{position:absolute;top:50%;left:100%;margin-left:6px;transform:translateY(-50%);display:flex;gap:2px;opacity:0;visibility:hidden;transition:opacity .12s ease,visibility .12s} +-.bt-tools::after{content:"";position:absolute;top:-8px;bottom:-8px;right:100%;width:128px;z-index:-1} +-.bt-msg:hover>.bt-msg-line>.bt-tools,.bt-msg:focus-within>.bt-msg-line>.bt-tools,.bt-tools[data-open]{opacity:1;visibility:visible} +-.bt-tool{width:24px;height:24px;border:0;padding:0;border-radius:6px;background:none;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;transition:background-color .12s ease,color .12s ease} +-.bt-tool:hover,.bt-tool[aria-expanded=true]{background:var(--bt-hover);color:var(--bt-ink)} +-.bt-tool:active{background:var(--bt-active)} +-.bt-tool:focus-visible{outline:2px solid var(--bt-accent);outline-offset:-2px} +-.bt-react-strip{position:fixed;z-index:60;pointer-events:auto;display:flex;gap:2px;padding:4px;border-radius:999px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 10px 20px -3px rgba(0,0,0,.08),0 4px 6px -4px rgba(0,0,0,.06);transform:translate(-50%,-100%);transform-origin:bottom center;animation:bt-pop-lift ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .14s ease-out} +-.bt-react-strip button{width:32px;height:32px;border:0;border-radius:50%;background:none;font-size:18px;line-height:1;cursor:pointer;transition:background-color .12s ease,${spring(SPRING_POP, "transform")};animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} backwards} +-.bt-react-strip button:nth-child(2){animation-delay:20ms} +-.bt-react-strip button:nth-child(3){animation-delay:40ms} +-.bt-react-strip button:nth-child(4){animation-delay:60ms} +-.bt-react-strip button:nth-child(n+5){animation-delay:80ms} +-.bt-react-strip button:hover{background:var(--bt-hover);transform:scale(1.15)} +-.bt-react-strip button:active{transform:scale(.92)} +-.bt-reacts{display:flex;gap:4px;margin-top:4px} +-.bt-react{height:22px;min-width:30px;padding:0 6px;border-radius:999px;border:.5px solid var(--bt-line-2);background:var(--bt-main);font-size:13px;line-height:20px;cursor:pointer;animation:bt-react-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing};transition:background-color .12s ease,${spring(SPRING_TAP, "scale")}} +-.bt-react:hover{background:var(--bt-hover)} +-.bt-react:active{scale:.92} +-@keyframes bt-react-pop{from{transform:scale(.6);opacity:0}} +-.bt-bubble a[href^="${MENTION_ORIGIN}"] svg{display:none} +-.bt-you{width:36px;height:36px;border-radius:50%;display:inline-flex;align-items:center;justify-content:center;background:color-mix(in srgb,var(--bt-ink) 5%,var(--bt-sidebar));color:var(--bt-ink-2);box-shadow:inset 0 0 0 1px var(--bt-line);transition:background-color .12s ease} +-button:hover .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-sidebar))} +-.bt-you-wrap{display:inline-flex;padding:0} +-.bt-connect-foot{width:100%;height:36px} ++// src/client/reason-line.js ++var REASON_POINTS = 200; ++var reasonLine = (reason) => { ++ if (typeof reason !== "string" || reason.trim() === "") return null; ++ const full2 = reason.toWellFormed(); ++ return { text: fits(full2, REASON_POINTS) ? full2 : [...full2].slice(0, REASON_POINTS).join("") + "…", title: full2 }; ++}; + +-.bt-menu{position:fixed;pointer-events:auto;z-index:60;min-width:200px;padding:6px;border-radius:12px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 10px 20px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1),0 0 0 1px rgba(228,228,228,.04);display:flex;flex-direction:column;gap:2px;transform-origin:var(--bt-origin,top left);animation:bt-pop-drop ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .14s ease-out;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;box-sizing:border-box} +-.bt-menu button{display:flex;align-items:center;gap:4px;width:100%;min-height:30px;text-align:left;border:0;background:none;border-radius:6px;padding:6px 8px;font:inherit;font-size:13px;line-height:18px;color:var(--bt-ink);cursor:pointer;box-sizing:border-box} +-.bt-menu button:hover{background:var(--bt-hover)} +-.bt-menu button svg{flex:none;width:16px;height:16px;margin:0 1px} +-.bt-menu .bt-danger{color:#c21d2e} +-.bt-menu-sep{height:.5px;flex:none;background:var(--bt-line-2);margin:4px 8px} +-.bt-menu-up{--bt-origin:bottom left;animation-name:bt-pop-lift,bt-veil-in} +-.bt-menu[data-leaving]{pointer-events:none;animation:bt-pop-out .12s cubic-bezier(.4,0,1,1) forwards} +-.bt-menu-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-menu-hint{flex:none;color:var(--bt-ink-3);font-size:12px;font-variant-numeric:tabular-nums} +-.bt-palette-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:70;pointer-events:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} +-.bt-backdrop{position:absolute;inset:0;background:rgba(0,0,0,.46);animation:bt-fade .22s ease-out} +-.bt-palette{position:absolute;top:50%;left:50%;width:min(560px,92vw);transform:translate(-50%,-50%);display:flex;flex-direction:column;border-radius:12px;background:var(--bt-main);border:1px solid var(--bt-line-2);box-shadow:0 24px 48px -12px rgba(0,0,0,.25);overflow:hidden;color:var(--bt-ink);animation:bt-palette-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} +-.bt-palette-layer[data-leaving]{pointer-events:none} +-.bt-palette-layer[data-leaving] .bt-backdrop{opacity:0;transition:opacity .16s ease-in} +-.bt-palette-layer[data-leaving] .bt-palette{animation:bt-dialog-sink .16s cubic-bezier(.4,0,1,1) forwards} +-@keyframes bt-palette-in{from{translate:0 -10px;scale:.96}} +-.bt-palette-head{display:flex;align-items:center;gap:4px;padding:14px 10px 14px 14px;border-bottom:.5px solid var(--bt-line-2)} +-.bt-palette-glyph{display:inline-flex;width:18px;height:18px;align-items:center;justify-content:center;color:var(--bt-ink-3);margin-right:4px} +-.bt-palette-head input{flex:1;min-width:0;border:0;outline:none;background:none;color:var(--bt-ink);font:inherit;font-size:15px;line-height:22px;padding:0} +-.bt-palette-head input::placeholder{color:var(--bt-ink-3)} +-.bt-palette-clear{width:18px;height:18px;border:0;padding:0;border-radius:6px;background:none;color:var(--bt-ink-3);display:inline-flex;align-items:center;justify-content:center;cursor:pointer} +-.bt-palette-clear:hover{color:var(--bt-ink)} +-.bt-palette-clear svg{width:12px;height:12px} +-.bt-palette-list{position:relative;height:402px;overflow-y:auto;padding:8px;display:flex;flex-direction:column;gap:2px;box-sizing:border-box} +-.bt-palette-list>.bt-thumb,.bt-drop-list>.bt-thumb{left:0;right:0;border-radius:8px;background:var(--bt-active)} +-.bt-palette-list>.bt-thumb{left:8px;right:8px} +-:is(.bt-palette-list,.bt-drop-list)[data-glide] [aria-selected=true]{background:transparent} +-:is(.bt-palette-row,.bt-palette-section,.bt-drop-list>.bt-option){position:relative;z-index:1} +-.bt-palette-section{padding:8px 8px 4px;font-size:12px;line-height:16px;color:var(--bt-ink-3);flex:none} +-.bt-palette-section:first-of-type{padding-top:0} +-.bt-palette-row{flex:none;display:flex;align-items:center;gap:8px;height:49px;padding:6px 10px 6px 8px;border:0;border-radius:8px;background:none;color:inherit;font:inherit;text-align:left;cursor:pointer;box-sizing:border-box;width:100%} +-.bt-palette-row[aria-selected=true]{background:var(--bt-active)} +-.bt-palette-lead{flex:none;width:24px;height:24px;display:inline-flex;align-items:center;justify-content:center} +-.bt-palette-cmd{width:24px;height:24px;border-radius:50%;background:var(--bt-hover);display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink-2)} +-.bt-palette-cmd svg{width:14px;height:14px} +-.bt-palette-agent{width:24px;height:24px;border-radius:50%;background:var(--bt-hover);display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink)} +-.bt-palette-text{flex:1;min-width:0;display:flex;flex-direction:column;gap:1px} +-.bt-palette-title{font-size:14px;line-height:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-palette-sub{font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-palette-badge{flex:none;font-size:11px;line-height:16px;padding:0 6px;border-radius:4px;background:var(--bt-tag-bg);color:var(--bt-tag-ink)} +-.bt-palette-empty{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:8px;padding:0 16px;text-align:center;animation:bt-veil-in .22s ease-out} +-.bt-palette-empty-icon{color:var(--bt-line-2)} +-.bt-palette-empty-icon svg{width:32px;height:32px} +-.bt-palette-empty-label{font-size:14px;font-weight:500;color:var(--bt-ink-2)} +-.bt-palette-empty-hint{font-size:13px;line-height:16px;color:var(--bt-ink-3)} +-@media (prefers-reduced-motion:reduce){.bt-palette{animation:bt-fade .1s ease-out}} +-.bt-account-menu{width:224px} +-.bt-account{flex:none;width:36px;height:36px;border:0;padding:0;background:none;border-radius:50%;cursor:pointer;display:inline-flex} +-.bt-account:hover .bt-you,.bt-account[aria-expanded=true] .bt-you{background:color-mix(in srgb,var(--bt-ink) 9%,var(--bt-sidebar))} +-/* Popover keyframes move translate and scale, which compose with a transform the popover +- already has. */ +-@keyframes bt-pop-drop{from{translate:0 -4px;scale:.96}} +-@keyframes bt-pop-lift{from{translate:0 4px;scale:.96}} +-@keyframes bt-pop-out{to{opacity:0;scale:.97;filter:blur(2px)}} +-@keyframes bt-veil-in{from{opacity:0;filter:blur(6px)}} +-@keyframes bt-check-pop{from{opacity:0;scale:.4}} +-@media (prefers-reduced-motion:reduce){.bt-menu,.bt-avedit,.bt-react-strip{animation:bt-fade .1s ease-out}.bt-react-strip button,.bt-q-check,.bt-color[aria-pressed=true] span{animation:none}} +-.bt-brand:hover{background:var(--bt-hover)} +-.bt-drop-list{position:relative;display:flex;flex-direction:column;gap:2px} +-.bt-grid{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:4px} +-.bt-pick{display:flex;flex-direction:column;align-items:center;gap:4px;padding:7px 2px 6px;border-radius:10px;border:1px solid transparent;background:none;color:var(--bt-ink);cursor:pointer;font:inherit;font-size:11px;line-height:14px;min-width:0} +-.bt-pick:hover{background:var(--bt-hover)} +-.bt-pick[aria-pressed=true]{border-color:var(--bt-line-2);background:var(--bt-hover)} +-.bt-pick>span:last-child:not(.bt-mark){max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-pick:hover .bt-mark[data-state=idle] .bt-eye{animation:bt-blink .5s linear 1} +-.bt-select{width:100%;height:34px;box-sizing:border-box;border-radius:8px;border:1px solid var(--bt-line);background:var(--bt-card);color:var(--bt-ink);padding:0 8px;font:inherit;font-size:13px} +-.bt-note{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin-top:6px} +-.bt-swatch-sep{width:1px;height:22px;background:var(--bt-line-2);margin:0 2px} +-.bt-swatch-custom{position:relative;overflow:hidden;background:conic-gradient(#ff3e51,#ffaf38,#00c972,#1cc3b0,#2a92fe,#a97efe,#ff5eb1,#ff3e51);box-sizing:border-box} +-.bt-swatch-custom[data-on=true]{border-color:var(--bt-ink)} +-.bt-swatch-custom input{position:absolute;inset:-4px;width:calc(100% + 8px);height:calc(100% + 8px);opacity:0;cursor:pointer;border:0;padding:0} +-.bt-swatch-default{background:linear-gradient(135deg,var(--bt-card) 0 46%,var(--bt-line-2) 46% 54%,var(--bt-card) 54%);box-shadow:inset 0 0 0 1px var(--bt-line-2)} +-.bt-states{display:flex;flex-wrap:wrap;gap:4px} +-.bt-state{border:1px solid var(--bt-line);background:none;border-radius:999px;font:inherit;font-size:11px;line-height:16px;padding:2px 8px;color:var(--bt-ink-2);cursor:pointer} +-.bt-state:hover{color:var(--bt-ink)} +-.bt-state[aria-pressed=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink)} +-.bt-theme-chip{position:relative;width:46px;height:30px;border-radius:8px;box-shadow:inset 0 0 0 1px var(--bt-line-2);background:linear-gradient(90deg,var(--ls) 0 36%,var(--lb) 36%);overflow:hidden} +-.bt-theme-chip i{position:absolute;right:7px;bottom:7px;width:10px;height:10px;border-radius:50%;background:var(--la)} +-body[data-ds-dark-theme] .bt-theme-chip{background:linear-gradient(90deg,var(--ds) 0 36%,var(--db) 36%)} +-body[data-ds-dark-theme] .bt-theme-chip i{background:var(--da)} +-.bt-tabs{flex-wrap:wrap} +-.bt-soft:disabled{opacity:.4;cursor:default} +-.bt-group-role{margin-left:6px;font-size:11px;line-height:14px;padding:1px 5px;border-radius:4px;background:var(--bt-tag-bg);color:var(--bt-tag-ink);vertical-align:1px} +-.bt-members{display:flex;flex-direction:column;gap:1px} +-.bt-member{display:flex;align-items:center;gap:4px;min-height:40px;padding:0 4px 0 6px;border-radius:8px;animation:bt-rise .18s ease-out} +-.bt-member:hover{background:var(--bt-hover)} +-.bt-member-name{flex:1;min-width:0;display:flex;align-items:center;gap:10px;border:0;background:none;padding:6px 0;color:var(--bt-ink);font:inherit;font-size:14px;line-height:20px;cursor:pointer;text-align:left} +-.bt-member-name>span:last-child{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-chip-admin{background:var(--bt-tag-bg);color:var(--bt-tag-ink);border-color:transparent} +-.bt-mini{flex:none;border:0;background:none;border-radius:6px;padding:2px 6px;font:inherit;font-size:12px;line-height:18px;color:var(--bt-ink-2);cursor:pointer} +-.bt-mini:hover{background:var(--bt-active);color:var(--bt-ink)} +-.bt-member .bt-mini,.bt-member .bt-x{opacity:0;transition:opacity .15s ease} +-.bt-member:hover .bt-mini,.bt-member:hover .bt-x,.bt-member .bt-mini:focus-visible,.bt-member .bt-x:focus-visible{opacity:1} +-.bt-add{color:var(--bt-ink-2);margin-top:2px} +-.bt-add:hover,.bt-addlist .bt-option:hover{background:var(--bt-hover);color:var(--bt-ink)} +-.bt-addlist{display:flex;flex-direction:column;margin-top:4px;padding:4px;border:1px solid var(--bt-line);border-radius:10px;background:var(--bt-card);animation:bt-rise .16s ease-out} +-.bt-seg{position:relative;display:flex;gap:2px;padding:2px;border-radius:10px;background:var(--bt-hover)} +-.bt-motion-seg{width:216px} +-.bt-seg button{position:relative;z-index:1;flex:1;height:30px;border:0;border-radius:8px;background:none;font:inherit;font-size:13px;color:var(--bt-ink-2);cursor:pointer;transition:background-color .15s ease,color .15s ease,box-shadow .15s ease,${spring(SPRING_TAP, "scale")}} +-.bt-seg button[aria-pressed=true]{background:var(--bt-card);color:var(--bt-ink);box-shadow:0 1px 3px rgba(0,0,0,.08)} +-.bt-seg button:disabled{opacity:.4;cursor:default} +-.bt-seg button:active:not(:disabled){scale:.96} +-.bt-seg>.bt-thumb{top:2px;bottom:2px;border-radius:8px;background:var(--bt-card);box-shadow:0 1px 3px rgba(0,0,0,.08)} +-.bt-seg[data-glide] button[aria-pressed=true]{background:transparent;box-shadow:none} +-@keyframes bt-rise{from{opacity:0;transform:translateY(-3px)}to{opacity:1;transform:none}} +-@media (prefers-reduced-motion:reduce){.bt-member,.bt-addlist{animation:none}} ++// src/shared/face-title.js ++var MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; ++function isGenericFaceTitle(name) { ++ const n = String(name ?? "").trim(); ++ return !n || n === "Face-to-face room"; ++} ++function formatFaceWhen(value) { ++ const date = value instanceof Date ? value : new Date(value); ++ if (!Number.isFinite(date.getTime())) return ""; ++ const hh = String(date.getHours()).padStart(2, "0"); ++ const mm = String(date.getMinutes()).padStart(2, "0"); ++ return `${MONTHS[date.getMonth()]} ${date.getDate()} ${hh}:${mm}`; ++} ++function isAutoFaceTitle(name) { ++ const n = String(name ?? "").trim(); ++ return isGenericFaceTitle(n) || n.startsWith("Face-to-face · "); ++} ++function ownersFromMembers(members) { ++ const rows = []; ++ const seen = /* @__PURE__ */ new Set(); ++ for (const member of members ?? []) { + const owner = String(member?.ownerName ?? member?.owner_name ?? "").trim(); + const key = owner.toLowerCase(); + if (!owner || seen.has(key)) continue; @@ -4289,66 +4270,151 @@ diff --git a/client.js b/client.js + bits.push(join.length === 6 ? join : when3); + return bits.join(" · "); +} -+ -+// src/client/brand.js -+var FLYBOT_WING = "M150 238 C 96 200, 40 196, 22 214 C 8 230, 40 262, 150 300 Z"; -+var FLYBOT_WING_LOW = "M150 318 C 104 300, 62 306, 54 322 C 48 338, 84 352, 150 352 Z"; -+var FLYBOT_BODY = "M196 132 H316 A80 80 0 0 1 396 212 V300 A80 80 0 0 1 316 380 H250 L188 432 V374 A80 80 0 0 1 116 300 V212 A80 80 0 0 1 196 132 Z"; -+function flybotMarkSvg({ wing = "#8FB2FF", brand = "#3B5BFD", face = "#FFFFFF" } = {}) { -+ return ``; -+} -+function brandTitle(title) { -+ const text2 = String(title ?? ""); -+ if (text2 === "DeepSeek Harness" || text2 === "DS Bot") return "FlyBot"; -+ if (text2.endsWith(" — DeepSeek Harness")) return `${text2.slice(0, -" — DeepSeek Harness".length)} — FlyBot`; -+ if (/\bDS Bot\b/.test(text2)) return text2.replace(/\bDS Bot\b/g, "FlyBot"); -+ return text2; -+} -+function sessionTabLabel(roster, sessionId) { -+ if (!roster || !sessionId) return ""; -+ const bot = roster.byId?.[sessionId]; -+ const room2 = roster.roomsById?.[sessionId]; -+ if (bot?.remote) { -+ return friendBotTitle(bot); -+ } -+ if (room2 && room2.origin === "face-to-face" && (room2.face?.status === "closed" || room2.face?.status === "left") && isAutoFaceTitle(room2.name)) return "Face-to-face · closed"; -+ if (room2?.origin === "face-to-face") return faceRowTitle(roomTitle(room2)); -+ if (room2) return roomTitle(room2); -+ return bot?.name || ""; -+} -+function installTabTitle(sessions, roster, doc = globalThis.document) { -+ if (!doc || !sessions || !roster) return () => { -+ }; -+ const sync = () => { -+ const row = Object.values(sessions.getSnapshot().byId ?? {}).find((session) => (session?.retainedBy?.mainView ?? 0) > 0); -+ const label = sessionTabLabel(roster.getSnapshot(), row?.id); -+ if (!label) return; -+ const next = brandTitle(`${label} — FlyBot`); -+ if (doc.title !== next) doc.title = next; -+ }; -+ sync(); -+ const offSessions = sessions.subscribe(sync); -+ const offRoster = roster.subscribe(sync); -+ return () => { -+ offSessions?.(); -+ offRoster?.(); -+ }; -+} -+function installBrandChrome() { -+ if (typeof document === "undefined") return () => { -+ }; -+ const href = `data:image/svg+xml,${encodeURIComponent(flybotMarkSvg())}`; -+ let link = document.getElementById("flybot-favicon"); -+ if (!link) { -+ link = document.createElement("link"); -+ link.id = "flybot-favicon"; -+ link.rel = "icon"; -+ link.type = "image/svg+xml"; -+ document.head.appendChild(link); -+ } -+ link.href = href; -+ const retitle = () => { -+ const next = brandTitle(document.title); + +-/* Memory dialog: a summary of every entry, the entries behind the menu, "Ask or update" below. */ +-.bt-mem-row{display:flex;align-items:center;gap:8px;width:100%;height:36px;padding:0 8px 0 10px;border:.5px solid var(--bt-line-2);border-radius:10px;background:var(--bt-card);color:var(--bt-ink);font:inherit;font-size:13px;cursor:pointer;box-sizing:border-box;transition:background-color .12s ease} +-.bt-mem-row:hover{background:var(--bt-hover)} +-.bt-mem-row>svg{flex:none;color:var(--bt-ink-2)} +-.bt-mem-row-copy{flex:1;text-align:left} +-.bt-mem-row-go{display:inline-flex;align-items:center;gap:2px;color:var(--bt-ink-3);font-size:12px} +-.bt-mem-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:61;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} +-.bt-mem-scrim{animation:bt-fade .2s ease-out} +-.bt-mem{position:relative;width:min(680px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} +-.bt-mem-head{position:relative;display:flex;align-items:center;gap:8px;height:60px;flex:none;padding:0 14px 0 24px;border-bottom:.5px solid var(--bt-line);box-sizing:border-box} +-.bt-mem-head .bt-icon-btn{width:32px;height:32px;flex:none} +-.bt-mem-head [aria-haspopup] svg{width:18px;height:18px;stroke-width:2.6} +-.bt-mem-head>.bt-icon-btn:first-child{margin-left:-10px} +-.bt-mem-head h2{margin:0;font-size:17px;line-height:24px;font-weight:600;white-space:nowrap} +-.bt-mem-status{font-size:13px;line-height:18px;color:var(--bt-ink-3);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;min-width:0;font-variant-numeric:tabular-nums} +-.bt-mem-head-gap{flex:1} +-.bt-mem-menu{position:absolute;top:52px;right:50px;min-width:220px;--bt-origin:top right} +-.bt-mem-menu button:disabled{opacity:.4;cursor:default;background:none} +-.bt-mem-body{flex:1;overflow-y:auto;padding:22px 28px 24px;scrollbar-width:thin;display:flex;flex-direction:column;gap:12px} +-.bt-mem-summary{transition:opacity .3s ease} +-.bt-mem-summary[data-stale]{opacity:.55} +-.bt-mem-summary h3{margin:20px 0 6px;font-size:17px;line-height:26px;font-weight:600} +-.bt-mem-summary h3:first-child{margin-top:0} +-.bt-mem-summary p{margin:0;font-size:15px;line-height:26px} +-.bt-mem-summary>*{animation:bt-mem-line .45s cubic-bezier(.16,1,.3,1) both} +-.bt-mem-summary>:nth-child(2){animation-delay:.03s} +-.bt-mem-summary>:nth-child(3){animation-delay:.06s} +-.bt-mem-summary>:nth-child(4){animation-delay:.09s} +-.bt-mem-summary>:nth-child(5){animation-delay:.12s} +-.bt-mem-summary>:nth-child(6){animation-delay:.15s} +-.bt-mem-summary>:nth-child(n+7){animation-delay:.18s} +-@keyframes bt-mem-line{from{opacity:0;transform:translateY(4px)}} +-.bt-mem-skel{display:flex;flex-direction:column;gap:24px} +-.bt-mem-skel-block{display:flex;flex-direction:column;gap:10px} +-.bt-mem-skel-block span{display:block;height:12px;border-radius:6px;background:linear-gradient(90deg,var(--bt-hover) 25%,var(--bt-active) 50%,var(--bt-hover) 75%);background-size:200% 100%;animation:bt-mem-skel 1.4s ease-in-out infinite} +-.bt-mem-skel-block .bt-mem-skel-head{width:30%;height:16px;margin-bottom:2px} +-@keyframes bt-mem-skel{from{background-position:150% 0}to{background-position:-50% 0}} +-.bt-mem-skel-label{font-size:13px;line-height:18px;color:var(--bt-ink-3)} +-.bt-mem-empty{margin:auto;max-width:400px;display:flex;flex-direction:column;align-items:center;gap:8px;text-align:center;padding:24px 0;animation:bt-mem-line .45s cubic-bezier(.16,1,.3,1) both} +-.bt-mem-empty-mark{width:48px;height:48px;border-radius:50%;background:var(--bt-hover);display:flex;align-items:center;justify-content:center;color:var(--bt-ink-2);margin-bottom:4px} +-.bt-mem-empty-mark svg{width:22px;height:22px} +-.bt-mem-empty-title{font-size:15px;line-height:22px;font-weight:600} +-.bt-mem-empty-text{font-size:13px;line-height:20px;color:var(--bt-ink-2)} +-.bt-mem-failed{display:flex;align-items:center;gap:12px;padding:10px 12px;border-radius:12px;background:var(--bt-hover);font-size:13px;line-height:18px;color:var(--bt-ink-2)} +-.bt-mem-failed>span{flex:1;min-width:0;overflow-wrap:anywhere} +-.bt-mem-entries{display:flex;flex-direction:column;gap:28px;animation:bt-page-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .22s ease-out} +-.bt-mem-section-head{display:flex;align-items:baseline;gap:8px;margin-bottom:4px} +-.bt-mem-section-head h3{margin:0;font-size:15px;line-height:22px;font-weight:600} +-.bt-mem-section-head span{font-size:12px;line-height:16px;color:var(--bt-ink-3)} +-.bt-mem-section-head .bt-mem-size{margin-left:auto;font-variant-numeric:tabular-nums;white-space:nowrap} +-.bt-mem-topic{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin:14px 0 2px 4px;font-weight:500} +-.bt-mem-list{list-style:none;margin:0;padding:0;display:flex;flex-direction:column} +-.bt-mem-entry{display:flex;align-items:center;gap:10px;padding:9px 4px;border-bottom:.5px solid var(--bt-line);transition:opacity .2s ease} +-.bt-mem-entry[data-busy]{opacity:.4} +-.bt-mem-entry-copy{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px} +-.bt-mem-entry-text{font-size:14px;line-height:20px;overflow-wrap:anywhere} +-.bt-mem-entry-meta{font-size:12px;line-height:16px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums} +-.bt-mem-remove{flex:none;height:28px;min-width:28px;border-radius:999px;border:0;background:none;color:var(--bt-ink-3);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;padding:0 6px;font:inherit;font-size:12px;opacity:0;transition:opacity .12s ease,background-color .12s ease,color .12s ease} +-.bt-mem-entry:hover .bt-mem-remove,.bt-mem-remove:focus-visible,.bt-mem-remove[data-confirm]{opacity:1} +-.bt-mem-remove:hover{background:var(--bt-hover);color:var(--bt-ink)} +-.bt-mem-remove[data-confirm]{background:rgba(224,33,53,.1);color:#e02135;padding:0 10px} +-@media (hover:none){.bt-mem-remove{opacity:1}} +-.bt-mem-none{font-size:13px;line-height:18px;color:var(--bt-ink-3);padding:8px 4px} +-.bt-mem-foot{flex:none;padding:8px 20px 20px;display:flex;flex-direction:column;gap:10px} +-.bt-mem-reply{border-radius:16px;background:var(--bt-hover);padding:8px 8px 12px 16px;display:flex;flex-direction:column;gap:6px;max-height:36vh;overflow-y:auto;scrollbar-width:thin;transform-origin:50% 100%;animation:bt-pop-lift ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} +-.bt-mem-reply-head{display:flex;align-items:center;gap:8px;min-height:24px} +-.bt-mem-reply-asked{flex:1;min-width:0;font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-mem-reply .bt-icon-btn{width:24px;height:24px;flex:none} +-.bt-mem-reply-text{font-size:14px;line-height:21px;padding-right:8px;overflow-wrap:anywhere} +-.bt-mem-changes{list-style:none;margin:2px 0 0;padding:0 8px 0 0;display:flex;flex-direction:column;gap:4px} +-.bt-mem-changes li{display:flex;align-items:flex-start;gap:6px;font-size:13px;line-height:18px;color:var(--bt-ink-2);overflow-wrap:anywhere} +-.bt-mem-changes li svg{flex:none;margin-top:1px;color:#e02135;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} .12s backwards} +-.bt-mem-changes li[data-ok] svg{color:var(--bt-green)} +-.bt-mem-ask{display:flex;align-items:center;gap:8px;height:52px;padding:0 8px 0 22px;border-radius:999px;border:.5px solid var(--bt-line-2);background:var(--bt-card);box-shadow:0 4px 16px rgba(0,0,0,.06);box-sizing:border-box;transition:border-color .15s ease,box-shadow .15s ease} +-.bt-mem-ask:focus-within{border-color:var(--bt-ink-3);box-shadow:0 4px 20px rgba(0,0,0,.1)} +-.bt-mem-input{flex:1;min-width:0;border:0;background:none;outline:none;color:var(--bt-ink);font:inherit;font-size:15px;line-height:22px;padding:0} +-.bt-mem-input::placeholder{color:var(--bt-ink-3)} +-.bt-mem-send{flex:none;width:36px;height:36px;border-radius:50%;border:0;background:var(--bt-ink);color:var(--bt-main);display:flex;align-items:center;justify-content:center;cursor:pointer;padding:0;transition:opacity .15s ease,${spring(SPRING_TAP, "scale")}} +-.bt-mem-send:disabled{opacity:.22;cursor:default} +-.bt-mem-send:not(:disabled):active{scale:.92} +-.bt-mem-send>*{animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} +-.bt-mem-spin{width:14px;height:14px;border-radius:50%;border:2px solid currentColor;border-right-color:transparent;box-sizing:border-box;animation:bt-mem-spin .7s linear infinite} +-@keyframes bt-mem-spin{to{transform:rotate(360deg)}} +-@media (max-width:640px){.bt-mem{width:100vw;height:100%;border-radius:0;border:0}.bt-mem-body{padding:18px 18px 20px}.bt-mem-foot{padding:8px 12px 12px}} +-@media (prefers-reduced-motion:reduce){.bt-mem,.bt-mem-scrim,.bt-mem-summary>*,.bt-mem-empty,.bt-mem-reply,.bt-mem-skel-block span,.bt-mem-entries,.bt-mem-send>*,.bt-mem-changes li svg{animation:none}} ++// src/client/brand.js ++var FLYBOT_WING = "M150 238 C 96 200, 40 196, 22 214 C 8 230, 40 262, 150 300 Z"; ++var FLYBOT_WING_LOW = "M150 318 C 104 300, 62 306, 54 322 C 48 338, 84 352, 150 352 Z"; ++var FLYBOT_BODY = "M196 132 H316 A80 80 0 0 1 396 212 V300 A80 80 0 0 1 316 380 H250 L188 432 V374 A80 80 0 0 1 116 300 V212 A80 80 0 0 1 196 132 Z"; ++function flybotMarkSvg({ wing = "#8FB2FF", brand = "#3B5BFD", face = "#FFFFFF" } = {}) { ++ return ``; ++} ++function brandTitle(title) { ++ const text2 = String(title ?? ""); ++ if (text2 === "DeepSeek Harness" || text2 === "DS Bot") return "FlyBot"; ++ if (text2.endsWith(" — DeepSeek Harness")) return `${text2.slice(0, -" — DeepSeek Harness".length)} — FlyBot`; ++ if (/\bDS Bot\b/.test(text2)) return text2.replace(/\bDS Bot\b/g, "FlyBot"); ++ return text2; ++} ++function sessionTabLabel(roster, sessionId) { ++ if (!roster || !sessionId) return ""; ++ const bot = roster.byId?.[sessionId]; ++ const room2 = roster.roomsById?.[sessionId]; ++ if (bot?.remote) { ++ return friendBotTitle(bot); ++ } ++ if (room2 && room2.origin === "face-to-face" && (room2.face?.status === "closed" || room2.face?.status === "left") && isAutoFaceTitle(room2.name)) return "Face-to-face · closed"; ++ if (room2?.origin === "face-to-face") return faceRowTitle(roomTitle(room2)); ++ if (room2) return roomTitle(room2); ++ return bot?.name || ""; ++} ++function installTabTitle(sessions, roster, doc = globalThis.document) { ++ if (!doc || !sessions || !roster) return () => { ++ }; ++ const sync = () => { ++ const row = Object.values(sessions.getSnapshot().byId ?? {}).find((session) => (session?.retainedBy?.mainView ?? 0) > 0); ++ const label = sessionTabLabel(roster.getSnapshot(), row?.id); ++ if (!label) return; ++ const next = brandTitle(`${label} — FlyBot`); ++ if (doc.title !== next) doc.title = next; ++ }; ++ sync(); ++ const offSessions = sessions.subscribe(sync); ++ const offRoster = roster.subscribe(sync); ++ return () => { ++ offSessions?.(); ++ offRoster?.(); ++ }; ++} ++function installBrandChrome() { ++ if (typeof document === "undefined") return () => { ++ }; ++ const href = `data:image/svg+xml,${encodeURIComponent(flybotMarkSvg())}`; ++ let link = document.getElementById("flybot-favicon"); ++ if (!link) { ++ link = document.createElement("link"); ++ link.id = "flybot-favicon"; ++ link.rel = "icon"; ++ link.type = "image/svg+xml"; ++ document.head.appendChild(link); ++ } ++ link.href = href; ++ const retitle = () => { ++ const next = brandTitle(document.title); + if (next !== document.title) document.title = next; + }; + retitle(); @@ -4360,7 +4426,108 @@ diff --git a/client.js b/client.js + link.remove(); + }; +} -+ + +-.bt-thumb{position:absolute;left:0;top:0;z-index:0;pointer-events:none;transition:opacity .14s ease} +-.bt-thumb[data-hidden]{opacity:0} +-[data-morph]{overflow:hidden!important} +-.bt-veil{animation:bt-veil-in .22s ease-out} +-.bt-with-icon{display:inline-flex;align-items:center;gap:4px} +-.bt-with-icon svg{width:14px;height:14px} +-.bt-tag-admin{display:inline-flex;align-items:center;gap:4px} +-.bt-create-inline{padding:18px 16px;border:1px solid var(--bt-line);border-radius:12px;background:var(--bt-card)} +-.bt-create-inline .bt-create-card{max-width:none} +-.bt-panel-view>[data-move=in]{animation:bt-page-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .2s ease-out backwards} +-.bt-panel-view>[data-move=out]{animation:bt-page-out ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .2s ease-out backwards} +-.bt-panel-view>:is([data-move=in],[data-move=out]):nth-child(2){animation-delay:25ms} +-.bt-panel-view>:is([data-move=in],[data-move=out]):nth-child(n+3){animation-delay:50ms} +-.bt-panel-view>.bt-drawer-body[data-move=tab]{animation:bt-veil-in .2s ease-out} +-.bt-drawer-name-input{animation:bt-veil-in .16s ease-out} +-.bt-pop-in{display:inline-flex;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing}} +-:is(.bt-soft,.bt-send,.bt-icon-btn,.bt-settings-close,.bt-mini,.bt-tab,.bt-nc-send,.bt-avedit-tab,.bt-shape,.bt-pick,.bt-swatch,.bt-palette-clear){transition:background-color .12s ease,color .12s ease,border-color .12s ease,opacity .12s ease,${spring(SPRING_TAP, "scale")}} +-:is(.bt-icon-btn,.bt-settings-close,.bt-nc-send,.bt-shape,.bt-swatch,.bt-color,.bt-x,.bt-q-x,.bt-palette-clear):active:not(:disabled){scale:.9} +-:is(.bt-soft,.bt-send,.bt-mini,.bt-tab,.bt-avedit-tab,.bt-pick,.bt-q-submit,.bt-q-btn):active:not(:disabled){scale:.96} +-@media (prefers-reduced-motion:reduce){.bt-thumb{transition:none}.bt-panel-view>[data-move],.bt-drawer-name-input,.bt-veil,.bt-pop-in,.bt-token,.bt-drop,.bt-newchat,.bt-option-hint,.bt-connector-form,.bt-settings-head>*{animation:none}} +-`; +-var CONVERSATION_CSS = ` +-.bt-think{font-size:13px;line-height:18px;color:var(--bt-ink-2);margin:2px 0 4px;max-width:min(560px,78%)} +-.bt-think summary{cursor:pointer;list-style:none;display:inline-flex;align-items:center;gap:6px} +-.bt-think summary::-webkit-details-marker{display:none} +-.bt-think-text{white-space:pre-wrap;margin-top:6px;padding-left:10px;border-left:2px solid var(--bt-line-2)} +-.bt-event{display:flex;justify-content:center;align-items:center;gap:2px;min-height:24px;margin:2px 0;font-size:12px;line-height:16px;color:var(--bt-ink-2);flex-wrap:wrap} +-.bt-event>span{padding:0 2px} +-.bt-event button{border:0;background:none;color:inherit;font:inherit;display:inline-flex;align-items:center;gap:4px;cursor:pointer;height:24px;padding:4px 6px 4px 4px;border-radius:999px;box-sizing:border-box;transition:background-color .12s ease} +-.bt-event button:hover{background:var(--bt-hover)} +-.bt-event button:active{background:var(--bt-active)} +-.bt-event button.bt-event-whole{min-width:0;max-width:100%;padding:4px 6px 4px 8px} +-.bt-event-whole>*{flex:none} +-.bt-event-whole>span:first-child{margin-right:2px} +-/* One button cannot wrap like separate parts, so a long name is cut to fit the chat. */ +-.bt-event-whole>.bt-event-name{flex:0 1 auto;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-time-sep{display:flex;justify-content:center;align-items:center;height:28px;margin:14px 0 8px;font-size:12px;line-height:16px;color:var(--bt-ink-2);white-space:nowrap} +-[class*="_scroll"]>[class*="_column"]::before{content:var(--bt-first-sep,none);display:block;flex:none;height:28px;margin:17px 0 12px;font-size:12px;line-height:28px;text-align:center;color:var(--bt-ink-2);white-space:nowrap} +-.bt-activity{display:flex;align-items:center;gap:10px;margin:8px 0 4px 2px;font-size:14px;color:var(--bt-ink-2)} +-.bt-group-replies{display:contents} +-/* A Bot chat is flat in every work-details mode, without changing the user's mode +- (it is a DSH-wide setting): step groups lose their header and stay open, and what a +- mode folds away in a finished turn stays shown. TurnProcessCell also opens that +- fold; these rules cover the first frame before it does. */ +-[data-step-process]>div:first-child{display:none!important} +-[data-step-process]>[data-step-process-body]{display:block!important;content-visibility:visible!important;max-height:none!important;overflow:visible!important;mask-image:none!important;scrollbar-gutter:auto!important} +-:is([data-step-process],[data-turn-process-hidden])[hidden]{content-visibility:visible!important} +-[class*="_flowItem"]:has(> [data-slot="conversation.chat.node"]:empty){display:none!important} +-[class*="_header"]:has(.bt-head){border-bottom-color:transparent!important;box-shadow:none!important} +-/* The transcript runs under a floating header pill. */ +-header[class*="_header"]:has(.bt-head){position:absolute!important;top:0;left:0;right:0;z-index:8;display:flex!important;padding:10px 0 0!important;background:transparent!important;pointer-events:none;justify-content:center} +-header[class*="_header"]:has(.bt-head)::before{content:"";position:absolute;inset:0 0 auto;height:60px;background:linear-gradient(to bottom,var(--bt-main),color-mix(in srgb,var(--bt-main) 0%,transparent));pointer-events:none;z-index:-1} +-header[class*="_header"]:has(.bt-head)>[class*="_headerLeading"]{position:absolute;left:12px;top:10px;pointer-events:auto} +-header[class*="_header"] .bt-head{flex:1 1 auto;width:100%} +-[class*="_body"]:has(> [class*="_scrollBody"]){--dsh-chat-content-width:min(960px,100%)} +-/* DSH's turn tail keeps what plugins put in it (delivered files, the Bot's separators), +- without its copy and branch row; a tail with nothing in it takes no room. */ +-[data-turn-tail]>:not([data-slot="conversation.chat.turnTail"]){display:none!important} +-[class*="_flowItem"][data-chat-flow-kind="turn-tail"]:not(:has([data-slot="conversation.chat.turnTail"]:not(:empty))){display:none!important} +-/* Every team Session belongs to a Bot or a group, so a blank one is an empty chat, not +- the shell's new-session hero: no headline, no workspace or mode picker, and the +- composer stays docked at the bottom. */ +-[data-content-phase=hero] [class*="_scrollBody"]{justify-content:flex-end!important} +-[data-content-phase=hero] [class*="_composerHero"]{align-self:stretch!important;width:auto!important;padding-bottom:0!important} +-[data-content-phase=hero] [class*="_composerHero"]>[class$="_root"],[data-content-phase=hero] [class*="_heroWorkspaceRow"]{display:none!important} +-[data-content-phase=hero] [class*="_composerHero"] [class*="_input"]{min-height:0!important} +-/* The right sides give back the scrollbar gutter so both edges sit 16px from the column. */ +-[class*="_scroll"]:has(> [class*="_column"]){padding:60px 11px 16px 16px!important} +-/* The shell's running status only hosts the activity row (.bt-typing). */ +-[data-chat-running]{display:block!important;width:100%;min-height:0!important;margin:0!important;padding:0!important} +-[data-chat-running]>span:not([role=status]){display:none!important} +-[data-chat-running]:has(> .bt-typing){margin-top:var(--dsh-chat-flow-gap,12px)!important} +-.bt-typing{display:flex;align-items:center;gap:12px;height:36px;min-width:0;padding-inline-start:8px;transform-origin:0 50%;animation:bt-typing-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing} backwards} +-.bt-typing[data-exiting]{animation:bt-typing-out .14s cubic-bezier(.22,1,.36,1) forwards} +-.bt-typing>.bt-mark,.bt-typing>.bt-cluster{flex-shrink:0} +-.bt-typing>.bt-mark{cursor:pointer;transition:filter .16s ease-out} +-.bt-typing>.bt-mark:hover{filter:drop-shadow(0 2px 4px rgba(0,0,0,.18))} +-.bt-typing>.bt-mark .bt-eyes{transition:scale .28s cubic-bezier(.4,.06,.18,1)} +-.bt-typing>.bt-mark:hover .bt-eyes{scale:1.18} +-.bt-typing-text{display:flex;align-items:center;flex:1 1 auto;min-width:0;animation:bt-typing-label .22s ease-out .2s backwards} +-.bt-typing-label{display:inline-flex;align-items:center;gap:6px;min-width:0;animation:bt-typing-label .22s ease-out backwards} +-.bt-typing-label>.bt-shimmer{font-size:14px;line-height:22px;font-weight:400;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-typing-time{flex-shrink:0;font-size:12px;line-height:22px;color:var(--bt-ink-3);white-space:nowrap} +-@keyframes bt-typing-in{from{opacity:0;transform:scale(.9)}} +-@keyframes bt-typing-out{from{opacity:1;transform:scale(1)}to{opacity:0;transform:scale(.92);filter:blur(3px)}} +-@keyframes bt-typing-label{from{opacity:0;filter:blur(5px);transform:translateY(3px)}} +-/* Shimmer: a stepped sweep clipped to the text. */ +-.bt-shimmer{color:transparent;background:linear-gradient(90deg,var(--bt-shimmer-base) 0%,var(--bt-shimmer-base) 25%,var(--bt-ink) 60%,var(--bt-shimmer-base) 75%,var(--bt-shimmer-base) 100%);background-size:200% 100%;-webkit-background-clip:text;background-clip:text;animation:bt-shimmer 2.2s steps(60) infinite;--bt-shimmer-base:color-mix(in srgb,var(--bt-ink) 40%,transparent)} +-@keyframes bt-shimmer{from{background-position:200% 0}to{background-position:-200% 0}} +-/* New rows slide up; a reply that replaces the activity row grows out of its corner. */ +-[data-bt-enter="new"]{animation:bt-row-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} +-[data-bt-enter="after-collapse"]{transform-origin:0 100%;animation:bt-row-after .24s cubic-bezier(.23,1,.32,1) .38s backwards} +-@keyframes bt-row-in{from{transform:translateY(12px)}to{transform:none}} +-@keyframes bt-row-after{0%{opacity:0;transform:translateY(12px) scale(.94)}55%{opacity:1}100%{opacity:1;transform:none}} +-@media (prefers-reduced-motion:reduce){ +-.bt-typing,.bt-typing[data-exiting]{animation-name:bt-fade-in;animation-duration:.12s;transform:none} +-.bt-typing[data-exiting]{animation-name:bt-fade-out} +-.bt-typing-text,.bt-typing-label{animation-name:bt-fade-in;animation-delay:0s} +-.bt-shimmer{animation:none;background:none;color:var(--bt-ink-2)} +-[data-bt-enter="new"]{animation:none} +-[data-bt-enter="after-collapse"]{animation:bt-fade-in .12s ease-out} +// src/client/icons.js +var import_react2 = require("react"); +function PlusIcon() { @@ -4527,12 +4694,12 @@ diff --git a/client.js b/client.js + const dt = Math.min(0.5, Math.max(1e-3, (now - last) / 1e3)); + last = now; + const steps = Math.ceil(dt * 240); -+ const h50 = dt / steps; ++ const h53 = dt / steps; + let moving = false; + for (const value of values.values()) { + for (let index = 0; index < steps; index += 1) { -+ value.v += (-value.k * (value.x - value.to) - value.c * value.v) * h50; -+ value.x += value.v * h50; ++ value.v += (-value.k * (value.x - value.to) - value.c * value.v) * h53; ++ value.x += value.v * h53; + } + if (Math.abs(value.x - value.to) < 0.05 && Math.abs(value.v) < 1) { + value.x = value.to; @@ -4739,6 +4906,69 @@ diff --git a/client.js b/client.js +} +var schedulesReadFailure = (failure) => typeof failure === "string" && failure !== "" ? t("The scheduled tasks could not be read: {reason}", { reason: failure }) : null; +var localZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone; ++function timeZoneOptions(current) { ++ const supported = typeof Intl.supportedValuesOf === "function" ? Intl.supportedValuesOf("timeZone") : []; ++ const zone = String(current ?? "").trim(); ++ const list = supported.length ? ["UTC", ...supported] : ["UTC", "Asia/Shanghai"]; ++ if (zone) list.unshift(zone); ++ return [...new Set(list.filter(Boolean))]; ++} ++function zoneParts(ms, timeZone) { ++ const parts = new Intl.DateTimeFormat("en-US", { ++ timeZone: timeZone || "UTC", ++ hourCycle: "h23", ++ year: "numeric", ++ month: "2-digit", ++ day: "2-digit", ++ hour: "2-digit", ++ minute: "2-digit", ++ second: "2-digit" ++ }).formatToParts(new Date(ms)); ++ const value = (type) => Number(parts.find((part) => part.type === type)?.value); ++ return Date.UTC(value("year"), value("month") - 1, value("day"), value("hour"), value("minute"), value("second")); ++} ++function wallClockInput(ms, timeZone) { ++ const at = Number(ms); ++ if (!Number.isFinite(at)) return ""; ++ const zone = String(timeZone ?? "").trim() || localZone(); ++ const parts = new Intl.DateTimeFormat("en-US", { ++ timeZone: zone, ++ hourCycle: "h23", ++ year: "numeric", ++ month: "2-digit", ++ day: "2-digit", ++ hour: "2-digit", ++ minute: "2-digit" ++ }).formatToParts(new Date(at)); ++ const value = (type) => parts.find((part) => part.type === type)?.value; ++ if (!value("year")) return ""; ++ return `${value("year")}-${value("month")}-${value("day")}T${value("hour")}:${value("minute")}`; ++} ++function instantFromWallClock(wall, timeZone) { ++ const match = String(wall ?? "").match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?$/); ++ if (!match) throw new Error("Pick a date and time"); ++ const asUtc = Date.UTC( ++ Number(match[1]), ++ Number(match[2]) - 1, ++ Number(match[3]), ++ Number(match[4]), ++ Number(match[5]), ++ Number(match[6] ?? 0) ++ ); ++ const zone = String(timeZone ?? "").trim() || "UTC"; ++ let instant2 = asUtc; ++ for (let step = 0; step < 3; step += 1) { ++ const shown = zoneParts(instant2, zone); ++ const delta = shown - asUtc; ++ if (delta === 0) break; ++ instant2 -= delta; ++ } ++ if (zoneParts(instant2, zone) === asUtc) return new Date(instant2).toISOString(); ++ for (const probe of [instant2 - 36e5, instant2 + 36e5, instant2 - 72e5, instant2 + 72e5]) { ++ if (zoneParts(probe, zone) === asUtc) return new Date(probe).toISOString(); ++ } ++ throw new Error("Pick a date and time"); ++} +var clock2 = (time) => String(time ?? "").slice(0, 5); +var when = (ms, options) => new Intl.DateTimeFormat(dateLocale(), options).format(ms); +function dayAndTime(ms) { @@ -4913,10 +5143,6 @@ diff --git a/client.js b/client.js +} +var KINDS = [["at", "Once"], ["daily", "Every day"], ["weekly", "Every week"], ["every", "Repeat"]]; +var UNITS = [["seconds", 1, "second", "seconds"], ["minutes", 60, "minute", "minutes"], ["hours", 3600, "hour", "hours"], ["days", 86400, "day", "days"]]; -+function localInput(ms) { -+ const date = new Date(ms); -+ return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(date.getMinutes())}`; -+} +function formStart(task) { + const seconds = task?.kind === "every" ? Number(task.everySeconds) : 3600; + const [unit, size] = seconds % 86400 === 0 ? ["days", 86400] : seconds % 3600 === 0 ? ["hours", 3600] : seconds % 60 === 0 ? ["minutes", 60] : ["seconds", 1]; @@ -4925,7 +5151,7 @@ diff --git a/client.js b/client.js + title: task?.title ?? "", + prompt: task?.prompt ?? "", + kind: once ? "at" : task?.kind ?? "daily", -+ at: once && !Number.isNaN(Date.parse(task.scheduledAt)) ? localInput(Date.parse(task.scheduledAt)) : inAnHour(), ++ at: once && !Number.isNaN(Date.parse(task.scheduledAt)) ? wallClockInput(Date.parse(task.scheduledAt), task?.timeZone || localZone()) : inAnHour(), + time: task?.time ? clock2(task.time) : "09:00", + weekdays: task?.kind === "weekly" && Array.isArray(task.weekdays) ? task.weekdays : [1, 2, 3, 4, 5], + count: Math.max(1, Math.round(seconds / size)), @@ -4933,6 +5159,13 @@ diff --git a/client.js b/client.js + timeZone: task?.timeZone || localZone() + }; +} ++function whenFromForm({ kind, at, time, weekdays, timeZone, count, unit } = {}) { ++ const zone = String(timeZone ?? "").trim() || localZone(); ++ if (kind === "cron") return { kind: "keep" }; ++ if (kind === "at") return { kind, at: instantFromWallClock(at, zone), timeZone: zone }; ++ if (kind === "every") return { kind, seconds: Math.round(Number(count) * UNITS.find(([id]) => id === unit)[1]) }; ++ return { kind, time, timeZone: zone, ...kind === "weekly" ? { weekdays } : {} }; ++} +function TaskForm({ roster, actions, start, task, onDone, onCancel }) { + const first = formStart(task); + const [target, setTarget] = (0, import_react4.useState)(task ? task.botId ?? task.roomId : start ?? ""); @@ -4944,14 +5177,10 @@ diff --git a/client.js b/client.js + const [weekdays, setWeekdays] = (0, import_react4.useState)(first.weekdays); + const [count, setCount] = (0, import_react4.useState)(first.count); + const [unit, setUnit] = (0, import_react4.useState)(first.unit); ++ const [timeZone, setTimeZone] = (0, import_react4.useState)(first.timeZone); + const [busy, setBusy] = (0, import_react4.useState)(false); + const [error, setError] = (0, import_react4.useState)(""); -+ const timing = () => { -+ if (kind === "cron") return { kind: "keep" }; -+ if (kind === "at") return { kind, at: new Date(at).toISOString(), timeZone: first.timeZone }; -+ if (kind === "every") return { kind, seconds: Math.round(Number(count) * UNITS.find(([id]) => id === unit)[1]) }; -+ return { kind, time, timeZone: first.timeZone, ...kind === "weekly" ? { weekdays } : {} }; -+ }; ++ const timing = () => whenFromForm({ kind, at, time, weekdays, timeZone, count, unit }); + const submit = (event) => { + event.preventDefault(); + if (busy || target === "") return; @@ -5030,7 +5259,21 @@ diff --git a/client.js b/client.js + ) : null + ) + ), -+ error ? (0, import_react4.createElement)("div", { className: "bt-set-row" }, (0, import_react4.createElement)("span", { className: "bt-danger bt-set-hint", role: "alert" }, error)) : null, ++ // Visible, and submitted, only when the engine uses a zone (#3110). A repeat-every interval ++ // has none; a cron rule is kept as stored unless the kind changes. ++ kind === "at" || kind === "daily" || kind === "weekly" ? (0, import_react4.createElement)( ++ "label", ++ { className: "bt-set-row bt-bs-row" }, ++ (0, import_react4.createElement)("span", { className: "bt-set-copy" }, (0, import_react4.createElement)("span", { className: "bt-bs-label" }, t("Time zone"))), ++ (0, import_react4.createElement)("select", { ++ className: "bt-select bt-task-timezone", ++ "data-flybot": "task-timezone", ++ value: timeZone, ++ "aria-label": t("Time zone"), ++ onChange: (event) => setTimeZone(event.target.value) ++ }, timeZoneOptions(timeZone).map((zone) => (0, import_react4.createElement)("option", { key: zone, value: zone }, zone))) ++ ) : null, ++ error ? (0, import_react4.createElement)("div", { className: "bt-set-row" }, (0, import_react4.createElement)("span", { className: "bt-danger bt-set-hint", role: "alert" }, error)) : null, + (0, import_react4.createElement)( + "div", + { className: "bt-set-row bt-task-foot" }, @@ -5767,6 +6010,13 @@ diff --git a/client.js b/client.js + label: "Moonlight", + light: { bg: "#f7f9fc", sidebar: "#eef2f8", bubble: "#e5ebf5", card: "#ffffff", text: "#121826", user: "#1e3a8a", userText: "#ffffff", accent: "#1e86ff" }, + dark: { bg: "#0b1020", sidebar: "#10172a", bubble: "#1a2340", card: "#141c33", text: "#e8edf7", user: "#3b6fd8", userText: "#ffffff", accent: "#4f9dff" } ++ }, ++ grove: { ++ label: "Grove", ++ light: { bg: "#f4f7f5", sidebar: "#e8eee9", bubble: "#dfe8e2", card: "#ffffff", text: "#171c19", user: "#235039", userText: "#f4f7f5", accent: "#1f7a54" }, ++ dark: { bg: "#171c19", sidebar: "#141916", bubble: "#2a332d", card: "#272e2b", text: "#e8eee9", user: "#235039", userText: "#f4f7f5", accent: "#3d9a6e" }, ++ // #235039 is the measured selected fill from the visual reference Instant-mode sample. ++ css: "html body{--bt-selected:color-mix(in srgb,var(--bt-accent) 18%,var(--bt-sidebar))}html body[data-ds-dark-theme]{--bt-selected:#235039}" + } +}; +var rgba = (hex, alpha) => `rgba(${[1, 3, 5].map((index) => parseInt(hex.slice(index, index + 2), 16)).join(",")},${alpha})`; @@ -5849,6 +6099,230 @@ diff --git a/client.js b/client.js + }; +} +var allThemes = () => ({ ...THEMES, ...customThemes }); ++var DEFAULT_THEME = "grove"; ++function resolveThemeId(prefs, themes = allThemes()) { ++ const id = prefs?.theme; ++ return themes[id] ? id : DEFAULT_THEME; ++} ++function themePrefsRecord(prefs = {}) { ++ return { ++ theme: prefs.theme, ++ accent: prefs.accent, ++ motion: prefs.motion, ++ appearance: prefs.appearance, ++ sendKey: prefs.sendKey, ++ folding: prefs.folding ++ }; ++} ++ ++// src/client/appearance.js ++var APPEARANCE_MODES = ["light", "dark", "auto", "system"]; ++var AUTO_KINDS = ["sun", "custom"]; ++var SEND_KEYS = ["enter", "shift-enter"]; ++var DEFAULT_APPEARANCE = { mode: "system", auto: "sun", from: "19:00", to: "07:00" }; ++var DEFAULT_SEND_KEY = "enter"; ++var DEFAULT_LATITUDE = 40; ++var TIME = /^([01]\d|2[0-3]):[0-5]\d$/; ++var TZ_LATITUDE = { ++ "Asia/Shanghai": 31.23, ++ "Asia/Chongqing": 29.56, ++ "Asia/Hong_Kong": 22.32, ++ "Asia/Taipei": 25.03, ++ "Asia/Tokyo": 35.68, ++ "Asia/Seoul": 37.57, ++ "Asia/Singapore": 1.35, ++ "Asia/Kolkata": 28.61, ++ "Europe/London": 51.51, ++ "Europe/Paris": 48.86, ++ "Europe/Berlin": 52.52, ++ "America/New_York": 40.71, ++ "America/Chicago": 41.88, ++ "America/Denver": 39.74, ++ "America/Los_Angeles": 34.05, ++ "America/Sao_Paulo": -23.55, ++ "Australia/Sydney": -33.87, ++ UTC: 0 ++}; ++function timezoneOf(date = /* @__PURE__ */ new Date(), timeZone) { ++ if (typeof timeZone === "string" && timeZone) return timeZone; ++ try { ++ return Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC"; ++ } catch { ++ return "UTC"; ++ } ++} ++function latitudeForZone(timeZone) { ++ return TZ_LATITUDE[timeZone] ?? DEFAULT_LATITUDE; ++} ++function parseClock(value) { ++ if (typeof value !== "string" || !TIME.test(value)) return null; ++ const [hours, minutes] = value.split(":").map(Number); ++ return hours * 60 + minutes; ++} ++function formatClock(minutes) { ++ const wrapped = (Math.round(minutes) % 1440 + 1440) % 1440; ++ const hours = Math.floor(wrapped / 60); ++ const mins = wrapped % 60; ++ return `${String(hours).padStart(2, "0")}:${String(mins).padStart(2, "0")}`; ++} ++function localMinutes(date, timeZone) { ++ const zone = timezoneOf(date, timeZone); ++ const parts = new Intl.DateTimeFormat("en-US", { ++ timeZone: zone, ++ hour: "2-digit", ++ minute: "2-digit", ++ hourCycle: "h23" ++ }).formatToParts(date); ++ const hour = Number(parts.find((part) => part.type === "hour")?.value ?? 0); ++ const minute = Number(parts.find((part) => part.type === "minute")?.value ?? 0); ++ return hour * 60 + minute; ++} ++function dayOfYear(date, timeZone) { ++ const zone = timezoneOf(date, timeZone); ++ const parts = new Intl.DateTimeFormat("en-US", { ++ timeZone: zone, ++ year: "numeric", ++ month: "numeric", ++ day: "numeric" ++ }).formatToParts(date); ++ const year = Number(parts.find((part) => part.type === "year")?.value); ++ const month = Number(parts.find((part) => part.type === "month")?.value); ++ const day = Number(parts.find((part) => part.type === "day")?.value); ++ const utc = Date.UTC(year, month - 1, day); ++ const start = Date.UTC(year, 0, 0); ++ return Math.round((utc - start) / 864e5); ++} ++function sunMinutes(date, { latitude, timeZone } = {}) { ++ const zone = timezoneOf(date, timeZone); ++ const latDeg = Number.isFinite(latitude) ? latitude : latitudeForZone(zone); ++ const decl = -23.44 * Math.cos(2 * Math.PI / 365 * (dayOfYear(date, zone) + 10)) * (Math.PI / 180); ++ const lat = latDeg * (Math.PI / 180); ++ const cosHa = -Math.tan(lat) * Math.tan(decl); ++ if (cosHa >= 1) return { sunrise: 12 * 60, sunset: 12 * 60, alwaysDark: true }; ++ if (cosHa <= -1) return { sunrise: 0, sunset: 24 * 60, alwaysDark: false, alwaysLight: true }; ++ const minutesFromNoon = Math.acos(cosHa) * 180 / Math.PI / 15 * 60; ++ const noon = 12 * 60; ++ return { sunrise: noon - minutesFromNoon, sunset: noon + minutesFromNoon }; ++} ++function afterSunset(date, options) { ++ const sun = sunMinutes(date, options); ++ if (sun.alwaysDark) return true; ++ if (sun.alwaysLight) return false; ++ const now = localMinutes(date, options?.timeZone); ++ return now >= sun.sunset || now < sun.sunrise; ++} ++function inNightWindow(date, from, to, timeZone) { ++ const start = parseClock(from); ++ const end = parseClock(to); ++ if (start === null || end === null || start === end) return false; ++ const now = localMinutes(date, timeZone); ++ return start < end ? now >= start && now < end : now >= start || now < end; ++} ++function normalizeAppearance(value) { ++ const mode = APPEARANCE_MODES.includes(value?.mode) ? value.mode : DEFAULT_APPEARANCE.mode; ++ const auto = AUTO_KINDS.includes(value?.auto) ? value.auto : DEFAULT_APPEARANCE.auto; ++ const from = parseClock(value?.from) !== null ? value.from : DEFAULT_APPEARANCE.from; ++ const to = parseClock(value?.to) !== null ? value.to : DEFAULT_APPEARANCE.to; ++ return { mode, auto, from, to }; ++} ++function appearanceOf(prefs) { ++ return normalizeAppearance(prefs?.appearance); ++} ++function normalizeSendKey(value) { ++ return SEND_KEYS.includes(value) ? value : DEFAULT_SEND_KEY; ++} ++function sendKeyOf(prefs) { ++ return normalizeSendKey(prefs?.sendKey); ++} ++function systemDark(media = globalThis.matchMedia) { ++ try { ++ return typeof media === "function" ? Boolean(media.call(globalThis, "(prefers-color-scheme: dark)")?.matches) : false; ++ } catch { ++ return false; ++ } ++} ++function isDarkAppearance(prefs, now = /* @__PURE__ */ new Date(), darkSystem = systemDark(), options = {}) { ++ const appearance = appearanceOf(prefs); ++ if (appearance.mode === "light") return false; ++ if (appearance.mode === "dark") return true; ++ if (appearance.mode === "system") return Boolean(darkSystem); ++ const zone = options.timeZone; ++ if (appearance.auto === "custom") return inNightWindow(now, appearance.from, appearance.to, zone); ++ return afterSunset(now, { timeZone: zone, latitude: options.latitude }); ++} ++function applyAppearanceAttribute(dark, root) { ++ const doc = root?.ownerDocument ?? root ?? (typeof document === "undefined" ? null : document); ++ if (!doc?.documentElement) return dark ? "dark" : "light"; ++ const body = doc.body ?? doc.documentElement; ++ if (dark) body.setAttribute("data-ds-dark-theme", ""); ++ else body.removeAttribute("data-ds-dark-theme"); ++ return dark ? "dark" : "light"; ++} ++function appearanceRecord(appearance, { clear = false } = {}) { ++ if (clear || appearance == null) return null; ++ const next = normalizeAppearance(appearance); ++ if (next.mode === DEFAULT_APPEARANCE.mode && next.auto === DEFAULT_APPEARANCE.auto && next.from === DEFAULT_APPEARANCE.from && next.to === DEFAULT_APPEARANCE.to) return null; ++ return next; ++} ++function shouldSendOnKey(event, sendKey) { ++ if (!event || event.key !== "Enter" || event.metaKey || event.ctrlKey || event.altKey || event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229 || event.which === 229) return false; ++ return normalizeSendKey(sendKey) === "shift-enter" ? event.shiftKey === true : event.shiftKey !== true; ++} ++function shouldBreakOnKey(event, sendKey) { ++ if (!event || event.key !== "Enter" || event.metaKey || event.ctrlKey || event.altKey || event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229 || event.which === 229) return false; ++ return normalizeSendKey(sendKey) === "shift-enter" ? event.shiftKey !== true : event.shiftKey === true; ++} ++function handleComposerSendKey(event, sendKey, { send, insertNewline } = {}) { ++ const key = normalizeSendKey(sendKey); ++ if (key === DEFAULT_SEND_KEY) return false; ++ if (shouldSendOnKey(event, key)) { ++ event.preventDefault(); ++ event.stopPropagation(); ++ send?.(); ++ return "send"; ++ } ++ if (shouldBreakOnKey(event, key)) { ++ event.preventDefault(); ++ event.stopPropagation(); ++ insertNewline?.(event); ++ return "break"; ++ } ++ return false; ++} ++function composerCardOf(node) { ++ return node instanceof Element ? node.closest("[data-composer-card]") : null; ++} ++function composerFieldOf(event) { ++ const target = event?.target; ++ if (!(target instanceof Element)) return null; ++ return target.closest('[data-composer-input], textarea, [contenteditable="true"]'); ++} ++function findSendButton(card) { ++ if (!card) return null; ++ const named = card.querySelector("button[type=submit], button[data-send], [data-composer-send]"); ++ if (named) return named; ++ return [...card.querySelectorAll("button")].find((button) => { ++ const label = `${button.getAttribute("aria-label") ?? ""} ${button.getAttribute("title") ?? ""} ${button.textContent ?? ""}`; ++ return /send|发送/i.test(label) && !/dictate|mic|voice|add|plus|录音|听写|添加/i.test(label); ++ }) ?? null; ++} ++function insertComposerNewline(field) { ++ if (!field) return; ++ if (typeof field.value === "string" && typeof field.selectionStart === "number") { ++ const start = field.selectionStart; ++ const end = field.selectionEnd ?? start; ++ const value = field.value; ++ field.value = `${value.slice(0, start)} ++${value.slice(end)}`; ++ field.selectionStart = field.selectionEnd = start + 1; ++ field.dispatchEvent(new Event("input", { bubbles: true })); ++ return; ++ } ++ if (field.isContentEditable || field.getAttribute?.("contenteditable") === "true") { ++ const doc = field.ownerDocument ?? document; ++ if (typeof doc.execCommand === "function") doc.execCommand("insertText", false, "\n"); ++ } ++} + +// src/shared/look-image.js +var LOOK_IMAGE_MAX = 65536; @@ -5903,6 +6377,9 @@ diff --git a/client.js b/client.js + +// src/client/styles.js +var SHELL_CSS = ` ++.bt-palette.bt-history-view{max-height:85vh;display:flex;flex-direction:column;width:min(760px,calc(100vw - 24px))}.bt-history-view h2{font-size:16px;margin:0;flex:1}.bt-history-disclaimer{padding:8px 16px;margin:0;color:var(--bt-ink-2)}.bt-history-content{overflow:auto;min-height:80px;padding:8px 16px;overflow-wrap:anywhere}.bt-history-entry{border-top:1px solid var(--bt-line);padding:8px 0}.bt-history-entry[data-hit]{border-left:3px solid var(--bt-accent);padding-left:10px}.bt-history-entry h3{font-size:12px;color:var(--bt-ink-2);font-weight:500}.bt-history-entry pre{white-space:pre-wrap;overflow-wrap:anywhere;font:inherit;margin:8px 0}.bt-history-foot{display:flex;flex-wrap:wrap;gap:8px;padding:12px 16px;border-top:1px solid var(--bt-line)} ++ ++.bt-palette-history{padding:8px 16px;border-bottom:1px solid var(--bt-line);font-size:12px;color:var(--bt-ink-2);overflow-wrap:anywhere}.bt-palette-scope{margin:0 0 4px}.bt-palette-history button{margin:4px 0;display:block} +body{--bt-ink:#141414;--bt-ink-2:rgba(20,20,20,.6);--bt-ink-3:rgba(20,20,20,.36);--bt-bubble:#eeeeee;--bt-sidebar:#f7f7f7;--bt-main:#fcfcfc;--bt-line:rgba(20,20,20,.08);--bt-line-2:rgba(20,20,20,.15);--bt-line-weak:rgba(20,20,20,.1);--bt-hover:rgba(119,119,119,.09);--bt-active:rgba(119,119,119,.17);--bt-card:#ffffff;--bt-accent:#4d6bfe;--bt-green:#00c972;--bt-star:#ff9800;--bt-user:#070707;--bt-user-ink:#fcfcfc;--bt-tag-bg:rgba(20,20,20,.06);--bt-tag-ink:rgba(20,20,20,.56)} +body[data-ds-dark-theme]{--bt-ink:#f2f2f2;--bt-ink-2:rgba(242,242,242,.6);--bt-ink-3:rgba(242,242,242,.36);--bt-bubble:#262626;--bt-sidebar:#1b1b1b;--bt-main:#141414;--bt-line:rgba(255,255,255,.08);--bt-line-2:rgba(255,255,255,.15);--bt-line-weak:rgba(255,255,255,.1);--bt-hover:rgba(160,160,160,.12);--bt-active:rgba(160,160,160,.2);--bt-card:#1f1f1f;--bt-user:#f2f2f2;--bt-user-ink:#141414;--bt-tag-bg:rgba(255,255,255,.09);--bt-tag-ink:rgba(242,242,242,.62)} +${Object.entries(INKS).map(([name, [light]]) => `body{--bt-ink-${name}:${light}}`).join("")} @@ -6059,6 +6536,11 @@ diff --git a/client.js b/client.js +@media (prefers-reduced-motion:reduce){} + +.bt-head{position:relative;display:flex;justify-content:center;align-items:center;height:40px;flex:none;pointer-events:none} ++.bt-head-actions{position:absolute;right:8px;top:50%;transform:translateY(-50%);display:flex;align-items:center;gap:4px;pointer-events:auto;z-index:2} ++.bt-head-more{display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px;padding:0;border:0;border-radius:50%;background:var(--bt-main);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2);cursor:pointer;box-shadow:0 1px 2px rgba(0,0,0,.04)} ++.bt-head-more:hover{background:var(--bt-hover);color:var(--bt-ink)} ++.bt-head-more svg{width:16px;height:16px} ++.bt-head-menu{position:fixed;min-width:220px;z-index:40} +.bt-pill{pointer-events:auto;display:inline-flex;align-items:center;gap:8px;height:40px;padding:7.5px 13.5px 7.5px 7.5px;border-radius:999px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 2px 8px -1px rgba(0,0,0,.06),0 1px 2px rgba(0,0,0,.04);color:var(--bt-ink);font-family:inherit;font-size:14px;line-height:20px;cursor:pointer;max-width:70%;box-sizing:border-box;transition:background-color .12s ease,transform ${SPRING_TAP.duration}ms ${SPRING_TAP.easing}} +.bt-pill:hover{background:color-mix(in srgb,var(--bt-main),#777 9%)} +.bt-pill:active{transform:scale(.965)} @@ -6093,6 +6575,25 @@ diff --git a/client.js b/client.js +.bt-bubble [class*="_markdown"]{color:inherit!important;font-size:inherit!important;line-height:inherit!important} +.bt-bubble p{margin:0} +.bt-bubble p + p{margin-top:6px} ++.bt-fold{display:flex;flex-direction:column;gap:6px;min-width:0} ++.bt-fold-toggle{align-self:flex-start;margin:2px 0 0;border:0;background:none;padding:0;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:16px;font-weight:600;cursor:pointer} ++.bt-fold-toggle:hover{color:var(--bt-ink);text-decoration:underline;text-underline-offset:2px} ++.bt-fold[data-folded] .bt-bubble,[data-folded].bt-fold{position:relative} ++.bt-doc-card{display:flex;align-items:center;gap:12px;width:min(100%,440px);box-sizing:border-box;margin:0;padding:12px 14px;border:.5px solid var(--bt-line-2);border-radius:14px;background:var(--bt-card);color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer} ++.bt-doc-card:hover{background:var(--bt-hover)} ++.bt-doc-card-icon{flex:none;display:inline-flex;align-items:center;justify-content:center;width:36px;height:36px;border-radius:9px;background:var(--bt-tag-bg);color:var(--bt-ink-2)} ++.bt-doc-card-copy{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px} ++.bt-doc-card-title{font-size:14px;line-height:20px;font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} ++.bt-doc-card-meta{font-size:12px;line-height:16px;color:var(--bt-ink-3)} ++.bt-doc-card-go{flex:none;font-size:12px;line-height:16px;color:var(--bt-ink-2);white-space:nowrap} ++.bt-umsg .bt-doc-card{width:min(100%,320px)} ++.bt-doc-pane{display:flex;flex-direction:column;min-height:0;height:100%;background:var(--bt-main);color:var(--bt-ink)} ++.bt-doc-pane-head{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;flex:none;padding:16px 16px 12px;border-bottom:.5px solid var(--bt-line)} ++.bt-doc-pane-copy{min-width:0} ++.bt-doc-pane-title{margin:0;font-size:16px;line-height:22px;font-weight:600;overflow:hidden;text-overflow:ellipsis} ++.bt-doc-pane-hint{margin:4px 0 0;font-size:12px;line-height:16px;color:var(--bt-ink-3);overflow-wrap:anywhere} ++.bt-doc-pane-body{flex:1;min-height:0;overflow:auto;padding:16px;font-size:var(--dsh-content-font-size,14px);line-height:calc(var(--dsh-content-font-size,14px) + 8px);overflow-wrap:anywhere} ++.bt-doc-pane-body [class*="_markdown"]{color:inherit} +.bt-bubble ul,.bt-bubble ol{margin:4px 0;padding-left:20px} +.bt-bubble a[href^="${MENTION_ORIGIN}"]{text-decoration:none;font-weight:400;cursor:pointer;white-space:nowrap} +.bt-bubble a[href^="${MENTION_ORIGIN}"]::before{content:"";display:inline-block;width:16px;height:16px;margin-right:3px;vertical-align:-3px;background:currentColor;-webkit-mask:${DEFAULT_MASK} center/contain no-repeat;mask:${DEFAULT_MASK} center/contain no-repeat} @@ -6181,6 +6682,7 @@ diff --git a/client.js b/client.js + +.bt-newchat{flex:1;display:flex;flex-direction:column;min-width:0;position:relative;animation:bt-veil-in .18s ease-out} +.bt-pane[data-menu]{background:transparent}.bt-pane[data-menu] .bt-newchat{flex:none;align-self:flex-start;width:min(280px,calc(100% - 16px));max-height:calc(100% - 16px);margin:8px;overflow:auto;background:var(--bt-card);border:1px solid var(--bt-line-2);border-radius:12px;box-shadow:0 10px 30px rgba(0,0,0,.14),0 2px 6px rgba(0,0,0,.06)}.bt-newchat[data-menu] .bt-drop{position:relative;top:0;left:0;width:auto;max-height:none;margin:0;box-shadow:none;border:0;max-width:none} ++.bt-nc-name{margin:8px 16px 0} +.bt-to{display:flex;align-items:center;flex-wrap:wrap;gap:6px;min-height:48px;padding:6px 12px;border-bottom:1px solid var(--bt-line);font-size:14px;box-sizing:border-box} +.bt-to-label{color:var(--bt-ink-2)} +.bt-to input{flex:1;min-width:120px;border:0;outline:none;background:none;color:var(--bt-ink);font-size:14px;height:26px} @@ -6578,6 +7080,10 @@ diff --git a/client.js b/client.js +.bt-menu[data-leaving]{pointer-events:none;animation:bt-pop-out .12s cubic-bezier(.4,0,1,1) forwards} +.bt-menu-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-menu-hint{flex:none;color:var(--bt-ink-3);font-size:12px;font-variant-numeric:tabular-nums} ++.bt-document-message{min-width:0;max-width:100%} ++.bt-message-note{white-space:normal;overflow-wrap:anywhere;padding:6px 8px;max-width:220px} ++.bt-menu-reacts{display:flex;gap:2px;padding:2px 4px} ++.bt-menu-reacts button{width:32px;min-width:32px;height:32px;padding:0;justify-content:center;font-size:18px;line-height:1} +.bt-palette-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:140;isolation:isolate;pointer-events:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} +.bt-backdrop{position:absolute;inset:0;background:rgba(0,0,0,.46);animation:bt-fade .22s ease-out} +.bt-palette{position:absolute;top:50%;left:50%;width:min(560px,92vw);transform:translate(-50%,-50%);display:flex;flex-direction:column;border-radius:12px;background:var(--bt-main);border:1px solid var(--bt-line-2);box-shadow:0 24px 48px -12px rgba(0,0,0,.25);overflow:hidden;color:var(--bt-ink);animation:bt-palette-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} @@ -6592,6 +7098,9 @@ diff --git a/client.js b/client.js +.bt-palette-clear{width:18px;height:18px;border:0;padding:0;border-radius:6px;background:none;color:var(--bt-ink-3);display:inline-flex;align-items:center;justify-content:center;cursor:pointer} +.bt-palette-clear:hover{color:var(--bt-ink)} +.bt-palette-clear svg{width:12px;height:12px} ++.bt-palette-filters{display:flex;flex-wrap:wrap;gap:0;padding:0 10px;border-bottom:.5px solid var(--bt-line-2);flex:none} ++.bt-palette-filter{height:36px;padding:0 12px;border:0;border-bottom:2px solid transparent;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;cursor:pointer} ++.bt-palette-filter[aria-selected=true]{color:var(--bt-ink);border-bottom-color:var(--bt-accent);font-weight:600} +.bt-palette-list{position:relative;height:402px;overflow-y:auto;padding:8px;display:flex;flex-direction:column;gap:2px;box-sizing:border-box} +.bt-palette-list>.bt-thumb,.bt-drop-list>.bt-thumb{left:0;right:0;border-radius:8px;background:var(--bt-active)} +.bt-palette-list>.bt-thumb{left:8px;right:8px} @@ -6668,6 +7177,20 @@ diff --git a/client.js b/client.js +.bt-addlist{display:flex;flex-direction:column;margin-top:4px;padding:4px;border:1px solid var(--bt-line);border-radius:10px;background:var(--bt-card);animation:bt-rise .16s ease-out} +.bt-seg{position:relative;display:flex;gap:2px;padding:2px;border-radius:10px;background:var(--bt-hover)} +.bt-motion-seg{width:216px} ++.bt-appearance-seg{width:min(100%,360px)} ++.bt-appearance-seg button{font-size:12px;padding:6px 8px} ++.bt-time-field{display:inline-flex;align-items:center;gap:8px;font-size:12px;color:var(--bt-ink-2)} ++.bt-time-field .bt-input{width:auto} ++.bt-fold-modes{display:flex;flex-direction:column;width:100%} ++.bt-fold-lead{margin:0;padding:10px 16px 4px;font-size:12px;line-height:16px;color:var(--bt-ink-2)} ++.bt-fold-mode{display:flex;align-items:flex-start;gap:12px;width:100%;margin:0;padding:12px 16px;border:0;border-top:.5px solid var(--bt-line);background:none;color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer;box-sizing:border-box} ++.bt-fold-mode:hover{background:var(--bt-hover)} ++.bt-fold-radio{flex:none;width:16px;height:16px;margin-top:2px;border:1.5px solid var(--bt-ink-3);border-radius:50%;box-sizing:border-box;background:transparent;position:relative} ++.bt-fold-mode[aria-checked=true] .bt-fold-radio{border-color:var(--bt-accent)} ++.bt-fold-mode[aria-checked=true] .bt-fold-radio::after{content:"";position:absolute;inset:3px;border-radius:50%;background:var(--bt-accent)} ++.bt-fold-mode-copy{display:flex;flex-direction:column;gap:2px;min-width:0} ++.bt-fold-mode-label{font-size:14px;line-height:20px;font-weight:600} ++.bt-set-card .bt-fold-modes + .bt-set-row,.bt-set-card > .bt-switch{border-top:.5px solid var(--bt-line)} +.bt-seg button{position:relative;z-index:1;flex:1;height:30px;border:0;border-radius:8px;background:none;font:inherit;font-size:13px;color:var(--bt-ink-2);cursor:pointer;transition:background-color .15s ease,color .15s ease,box-shadow .15s ease,${spring(SPRING_TAP, "scale")}} +.bt-seg button[aria-pressed=true]{background:var(--bt-card);color:var(--bt-ink);box-shadow:0 1px 3px rgba(0,0,0,.08)} +.bt-seg button:disabled{opacity:.4;cursor:default} @@ -6685,7 +7208,7 @@ diff --git a/client.js b/client.js +.bt-mem-row-go{display:inline-flex;align-items:center;gap:2px;color:var(--bt-ink-3);font-size:12px} +.bt-mem-layer{position:fixed;inset:var(--dsh-frame-chrome-top,0px) 0 0;z-index:121;isolation:isolate;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} +.bt-mem-scrim{animation:bt-fade .2s ease-out} -+.bt-mem{position:relative;width:min(680px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} ++.bt-mem{position:relative;width:min(880px,calc(100vw - 48px));height:min(760px,calc(100vh - 2*max(32px,var(--dsh-frame-overlay-top,32px))));background:var(--bt-main);border-radius:20px;border:.5px solid var(--bt-line-2);box-shadow:0 24px 80px rgba(0,0,0,.24);display:flex;flex-direction:column;overflow:hidden;color:var(--bt-ink);animation:bt-dialog-rise ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing},bt-veil-in .2s ease-out} +.bt-mem-head{position:relative;display:flex;align-items:center;gap:8px;height:60px;flex:none;padding:0 14px 0 24px;border-bottom:.5px solid var(--bt-line);box-sizing:border-box} +.bt-mem-head .bt-icon-btn{width:32px;height:32px;flex:none} +.bt-mem-head [aria-haspopup] svg{width:18px;height:18px;stroke-width:2.6} @@ -6695,7 +7218,23 @@ diff --git a/client.js b/client.js +.bt-mem-head-gap{flex:1} +.bt-mem-menu{position:absolute;top:52px;right:50px;min-width:220px;--bt-origin:top right} +.bt-mem-menu button:disabled{opacity:.4;cursor:default;background:none} ++.bt-mem-shell{flex:1;min-height:0;display:flex} ++.bt-mem-main{flex:1;min-width:0;display:flex;flex-direction:column} ++.bt-mem-nav{flex:none;width:228px;display:flex;flex-direction:column;gap:10px;padding:12px 10px 16px;border-right:.5px solid var(--bt-line);background:var(--bt-sidebar);min-height:0} ++.bt-mem-search{display:flex;align-items:center;gap:8px;margin:0 4px;padding:0 8px;height:32px;border-radius:8px;background:var(--bt-main);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2)} ++.bt-mem-search svg{flex:none;width:14px;height:14px} ++.bt-mem-search-input{flex:1;min-width:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;outline:none} ++.bt-mem-nav-list{display:flex;flex-direction:column;gap:2px;min-height:0;overflow:auto;padding:0 2px} ++.bt-mem-nav-group{display:flex;flex-direction:column;gap:2px;margin-top:10px} ++.bt-mem-nav-heading{padding:4px 8px 2px;font-size:11px;line-height:14px;font-weight:600;color:var(--bt-ink-3);text-transform:uppercase;letter-spacing:.04em} ++.bt-mem-nav-item{display:flex;align-items:center;gap:8px;width:100%;margin:0;padding:6px 8px;border:0;border-radius:8px;background:none;color:var(--bt-ink);font:inherit;font-size:13px;line-height:18px;text-align:left;cursor:pointer} ++.bt-mem-nav-item:hover{background:var(--bt-hover)} ++.bt-mem-nav-item[aria-current=page]{background:var(--bt-selected,var(--bt-active));font-weight:600} ++.bt-mem-nav-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} ++.bt-mem-nav-count{flex:none;font-size:11px;line-height:14px;color:var(--bt-ink-3);font-variant-numeric:tabular-nums} ++.bt-mem[data-nav=hidden] .bt-mem-shell{display:flex} +.bt-mem-body{flex:1;overflow-y:auto;padding:22px 28px 24px;scrollbar-width:thin;display:flex;flex-direction:column;gap:12px} ++@media (max-width:640px){.bt-mem-nav{width:180px}} +.bt-mem-summary{transition:opacity .3s ease} +.bt-mem-summary[data-stale]{opacity:.55} +.bt-mem-summary h3{margin:20px 0 6px;font-size:17px;line-height:26px;font-weight:600} @@ -6939,7 +7478,11 @@ diff --git a/client.js b/client.js +.bt-plus:active{scale:.9} +.bt-plus svg{width:14px;height:14px;transition:${spring(SPRING_POP, "rotate")}} +.bt-plus[aria-expanded=true] svg{rotate:45deg} -+.bt-plus-menu{min-width:180px} ++.bt-plus-menu{min-width:220px} ++.bt-plus-group{display:flex;flex-direction:column} ++.bt-plus-group + .bt-plus-group{border-top:.5px solid var(--bt-line);margin-top:4px;padding-top:4px} ++.bt-plus-menu .bt-menu-hint,.bt-head-menu .bt-menu-hint{display:block;padding:2px 12px 8px 36px;font-size:11px;line-height:15px;color:var(--bt-ink-3);white-space:normal;max-width:240px} ++.bt-plus-menu button:disabled{opacity:.55;cursor:default} +[data-composer-card] [class*="_tools"]{gap:0!important} +[data-composer-card] [class*="_modes"]:empty{display:none!important} +[data-composer-card] [class*="_activity"]:not(:has([data-slot] > *)){display:none!important} @@ -7098,15 +7641,281 @@ diff --git a/client.js b/client.js + }; +} + -+// src/client/questions.js ++// src/client/parity-shell.js ++var ICON_RAIL_WIDTH = 72; ++var CHAT_LIST_WIDTH = 360; ++var SHELL_LEFT_WIDTH = ICON_RAIL_WIDTH + CHAT_LIST_WIDTH; ++var COMPOSER_HEIGHT = 86; ++var HEADER_HEIGHT = 56; ++var PARITY_SHELL_CSS = ` ++.bt-side.bt-side-split{display:flex;flex-direction:row;align-items:stretch;min-height:100%;background:var(--bt-sidebar);min-width:0} ++.bt-icon-rail{flex:none;width:72px;display:flex;flex-direction:column;align-items:center;gap:6px;padding:16px 8px 12px;box-sizing:border-box;border-right:1px solid var(--bt-line);background:color-mix(in srgb,var(--bt-sidebar) 92%,#000 8%)} ++.bt-brand-rail{display:flex;align-items:center;justify-content:center;width:40px;height:40px;flex:none} ++.bt-brand-rail .bt-mark,.bt-brand-rail .bt-mark svg{width:28px;height:28px} ++.bt-rail-btn{width:40px;height:40px;border:0;border-radius:12px;padding:0;background:transparent;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;transition:background-color .12s ease,color .12s ease,opacity .12s ease} ++.bt-rail-btn svg{width:20px;height:20px} ++.bt-rail-btn:hover{background:var(--bt-hover);color:var(--bt-ink)} ++.bt-rail-btn[aria-current=page],.bt-icon-rail .bt-row[aria-current=page]{background:var(--bt-selected,color-mix(in srgb,var(--bt-accent) 28%,transparent));color:var(--bt-ink)} ++.bt-rail-btn:disabled{opacity:.4;cursor:not-allowed} ++.bt-rail-btn:focus-visible,.bt-brand-rail:focus-visible,.bt-icon-rail .bt-row:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px} ++.bt-chat-col{flex:1 1 auto;min-width:0;display:flex;flex-direction:column;background:var(--bt-sidebar)} ++.bt-side.bt-side-split .bt-side-top{display:flex;align-items:center;padding:10px 12px 8px;gap:8px} ++.bt-side.bt-side-split .bt-brand{align-items:center} ++.bt-side.bt-side-split .bt-row{min-height:48px;padding:8px 10px;border-radius:12px;align-items:center} ++.bt-side.bt-side-split .bt-row:hover{background:var(--bt-hover)} ++.bt-side.bt-side-split .bt-row[aria-current=page]{background:var(--bt-selected,color-mix(in srgb,var(--bt-accent) 22%,transparent))} ++.bt-side.bt-side-split .bt-row-name{font-size:14px;line-height:20px;font-weight:500;color:var(--bt-ink)} ++.bt-side.bt-side-split .bt-row[aria-current=page] .bt-row-name{font-weight:600} ++.bt-side.bt-side-split .bt-row-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0} ++.bt-side.bt-side-split .bt-row-preview{font-size:12px;line-height:16px;font-weight:400;color:var(--bt-ink-2);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} ++.bt-side.bt-side-split .bt-list{flex:1 1 auto;min-height:0;overflow-x:hidden;overflow-y:auto;scrollbar-width:thin;padding:4px 8px 12px} ++.bt-side.bt-side-split .bt-hint{margin:24px 12px;padding:0;text-align:center;color:var(--bt-ink-3);font-size:13px;line-height:18px} ++.bt-plus-menu{border-radius:16px;border:1px solid var(--bt-line-2);background:var(--bt-card);padding:8px} ++ ++@media (min-width:1025px){ ++[class*="_sidebar"]:has(.bt-side-split),[class*="Sidebar"]:has(.bt-side-split){width:432px;min-width:432px;max-width:432px;flex:none} ++.bt-chat-col{width:360px;max-width:360px} ++} ++ ++@media (min-width:641px){ ++[class*="_header"]:has(.bt-head){min-height:56px;margin:8px 12px 0;padding:0 12px;border-radius:16px;background:var(--bt-card);border:1px solid var(--bt-line);box-sizing:border-box;display:flex;align-items:center} ++[data-composer-card]{min-height:86px!important;border-radius:20px!important;padding:10px 14px!important;background:var(--bt-bubble)!important;border:1px solid color-mix(in srgb,var(--bt-ink) 22%,transparent)!important;box-shadow:none!important;align-items:center!important} ++[data-composer-card]:has(> [data-slot="conversation.input.attachments"] *),[data-composer-card]:has([data-composer-input] br + *),[data-composer-card]:has([data-composer-input] > :nth-child(2)){border-radius:16px!important;align-items:flex-end!important} ++[class*="_root"]:has(> [data-composer-card]){padding:8px 16px 12px!important} ++[data-composer-card] [class*="_tools"]{order:1;flex:none;align-self:center;margin:0;gap:6px!important} ++[data-composer-card]>[data-input-scroll]{order:2;flex:1 1 0;min-width:0;min-height:44px;padding:6px 12px!important;margin:0!important} ++[data-composer-card] [class*="_trailing"]{order:3;flex:none;align-self:center;margin:0;gap:8px} ++[data-composer-card] [data-composer-input]{min-height:44px;padding:8px 0!important;font-size:14px;line-height:20px} ++[data-composer-card] [data-composer-placeholder]::after{font-size:14px;line-height:20px;color:var(--bt-ink-3)} ++[data-composer-card] .bt-plus,.bt-mic,.bt-voice,[data-composer-card] button[class*="_primary"]{width:32px!important;height:32px!important} ++[data-composer-card] .bt-plus svg,.bt-mic svg,.bt-voice svg,[data-composer-card] button[class*="_primary"] svg{width:18px;height:18px} ++[data-composer-card] .bt-plus:disabled,.bt-mic:disabled,.bt-voice:disabled,[data-composer-card] button:disabled{opacity:.4;cursor:not-allowed} ++[data-composer-card] .bt-plus:focus-visible,.bt-mic:focus-visible,.bt-voice:focus-visible,[data-composer-card] button:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px} ++} ++`; ++ ++// src/shared/message-actions.js ++var MESSAGE_REACTIONS = ["👍", "❤️", "😂", "😮", "😢", "🙏"]; ++function hasMessageText(text2) { ++ return String(text2 ?? "").trim() !== ""; ++} ++function isLockedRoster(roster) { ++ return typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; ++} ++function userMessageReactKey(sessionId, node) { ++ if (sessionId == null || sessionId === "") return void 0; ++ const location2 = node?.location; ++ const rawTurn = location2 && (location2.kind === "turn" || location2.kind === "step" || location2.turn != null) ? location2.turn : node?.data?.turn; ++ const turn = typeof rawTurn === "object" ? rawTurn?.turn : rawTurn; ++ if (!Number.isInteger(turn) || turn < 0) return void 0; ++ return `${sessionId}:${turn}:user`; ++} ++function messageActionIds({ ++ text: text2, ++ sessionId, ++ canReact = false, ++ canReply = false, ++ locked = false ++} = {}) { ++ const ids = []; ++ if (canReact) ids.push("react"); ++ if (canReply && sessionId && !locked && hasMessageText(text2)) ids.push("reply"); ++ if (hasMessageText(text2)) { ++ ids.push("copy"); ++ ids.push("download"); ++ } ++ return ids; ++} ++function hasMessageActions(flags) { ++ return messageActionIds(flags).length > 0; ++} ++ ++// src/client/message-tools.js +var import_react7 = require("react"); ++var import_react_dom = require("react-dom"); ++function useDismiss(open, close, refs) { ++ (0, import_react7.useEffect)(() => { ++ if (!open) return void 0; ++ const onDown = (event) => { ++ if (refs.some((ref) => ref.current?.contains(event.target))) return; ++ close(); ++ }; ++ const onKey = (event) => { ++ if (event.key === "Escape") { ++ event.stopPropagation(); ++ close(); ++ } ++ }; ++ window.addEventListener("mousedown", onDown); ++ window.addEventListener("keydown", onKey, true); ++ return () => { ++ window.removeEventListener("mousedown", onDown); ++ window.removeEventListener("keydown", onKey, true); ++ }; ++ }, [open, close]); ++} ++function downloadMessage(text2, name) { ++ const url = URL.createObjectURL(new Blob([text2], { type: "text/markdown" })); ++ const link = Object.assign(document.createElement("a"), { href: url, download: `${name}-message.md` }); ++ link.click(); ++ setTimeout(() => URL.revokeObjectURL(url), 1e3); ++} ++function MessageTools({ ++ text: text2, ++ name, ++ sessionId, ++ react, ++ actions, ++ roster, ++ contextAt, ++ className = "bt-tools" ++}) { ++ const [panel, setPanel] = (0, import_react7.useState)(null); ++ const [place, setPlace] = (0, import_react7.useState)(null); ++ const [copied, setCopied] = (0, import_react7.useState)(false); ++ const tools = (0, import_react7.useRef)(null); ++ const pop = (0, import_react7.useRef)(null); ++ const locked = isLockedRoster(roster); ++ const ids = messageActionIds({ ++ text: text2, ++ sessionId, ++ canReact: typeof react === "function", ++ canReply: typeof actions?.quote === "function", ++ locked ++ }); ++ const [dismissed, setDismissed] = (0, import_react7.useState)(null); ++ const [note, setNote] = (0, import_react7.useState)(""); ++ const close = () => { ++ setDismissed(contextAt?.token ?? dismissed); ++ setPanel(null); ++ }; ++ const cursorPlace = (at) => { ++ if (!at) return null; ++ const width = typeof window === "undefined" ? 1400 : window.innerWidth; ++ const height = typeof window === "undefined" ? 800 : window.innerHeight; ++ const below = at.y + 220 < height; ++ return { ++ left: Math.max(8, Math.min(at.x, width - 228)), ++ ...below ? { top: at.y } : { bottom: height - at.y + 4, "--bt-origin": "bottom left" } ++ }; ++ }; ++ const openFromContext = Boolean(contextAt?.token && contextAt.token !== dismissed && ids.length > 0); ++ const shown = openFromContext ? "more" : panel; ++ const menuPlace = openFromContext ? cursorPlace(contextAt) : place; ++ const openAt = (kind, event, { cursor = false } = {}) => { ++ if (!cursor && panel === kind) { ++ close(); ++ return; ++ } ++ setDismissed(contextAt?.token ?? dismissed); ++ const width = typeof window === "undefined" ? 1400 : window.innerWidth; ++ const height = typeof window === "undefined" ? 800 : window.innerHeight; ++ const rect = event?.currentTarget?.getBoundingClientRect?.(); ++ const below = cursor ? event.clientY + 220 < height : rect && rect.bottom + 220 < height; ++ const left = cursor ? Math.min(event.clientX, width - 228) : Math.min(rect.left, width - 228); ++ setPlace(kind === "react" && !cursor ? { left: rect.left + rect.width / 2, top: rect.top - 6, "--bt-origin": "bottom center" } : { left: Math.max(8, left), ...below ? { top: cursor ? event.clientY : rect.bottom + 4 } : { bottom: height - (cursor ? event.clientY : rect.top) + 4, "--bt-origin": "bottom left" } }); ++ setPanel(kind); ++ }; ++ useDismiss(shown !== null, close, [tools, pop]); ++ (0, import_react7.useEffect)(() => { ++ if (shown) pop.current?.querySelector?.("button")?.focus?.(); ++ }, [shown, contextAt?.token]); ++ const copy2 = async () => { ++ try { ++ if (typeof navigator.clipboard?.writeText !== "function") { ++ setNote(t("Clipboard unavailable")); ++ return; ++ } ++ await navigator.clipboard.writeText(text2); ++ setCopied(true); ++ setNote(t("Copied")); ++ setTimeout(() => setCopied(false), 1e3); ++ } catch { ++ setNote(t("Could not copy message")); ++ } ++ }; ++ const download2 = () => { ++ try { ++ downloadMessage(text2, name); ++ close(); ++ } catch { ++ setNote(t("Could not download message")); ++ } ++ }; ++ const reply = () => actions.quote(sessionId, text2); ++ const item = (label, Icon, run, keepOpen = false) => (0, import_react7.createElement)("button", { key: label, type: "button", role: "menuitem", onClick: () => { ++ if (!keepOpen) close(); ++ run(); ++ } }, (0, import_react7.createElement)(Icon), label); ++ const menuItems = []; ++ if (ids.includes("reply")) menuItems.push(item(t("Reply"), ReplyIcon, reply)); ++ if (ids.includes("copy")) menuItems.push(item(copied ? t("Copied") : t("Copy"), copied ? CheckIcon : CopyIcon, copy2, true)); ++ if (ids.includes("download")) menuItems.push(item(t("Download"), DownloadIcon, download2, true)); ++ if (ids.length === 0) return null; ++ return (0, import_react7.createElement)( ++ "div", ++ { ref: tools, className, "data-open": shown !== null || void 0 }, ++ ids.includes("react") ? (0, import_react7.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Add reaction"), title: t("Add reaction"), "aria-expanded": shown === "react", onClick: (event) => openAt("react", event) }, (0, import_react7.createElement)(SmileIcon)) : null, ++ ids.includes("reply") ? (0, import_react7.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Reply"), title: t("Reply"), onClick: reply }, (0, import_react7.createElement)(ReplyIcon)) : null, ++ menuItems.length > 0 || ids.includes("react") ? (0, import_react7.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("More message actions"), title: t("More"), "aria-haspopup": "menu", "aria-expanded": shown === "more", onClick: (event) => openAt("more", event) }, copied ? (0, import_react7.createElement)(CheckIcon) : (0, import_react7.createElement)(DotsIcon)) : null, ++ shown === "react" ? (0, import_react_dom.createPortal)((0, import_react7.createElement)( ++ "div", ++ { ref: pop, className: "bt-react-strip", role: "menu", "aria-label": t("Reactions"), style: menuPlace }, ++ MESSAGE_REACTIONS.map((emoji) => (0, import_react7.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => { ++ close(); ++ react(emoji); ++ } }, emoji)) ++ ), document.body) : null, ++ shown === "more" ? (0, import_react_dom.createPortal)((0, import_react7.createElement)( ++ "div", ++ { ++ ref: pop, ++ className: "bt-menu", ++ role: "menu", ++ "aria-label": t("Message actions"), ++ style: menuPlace, ++ onKeyDown: (event) => { ++ if (!["ArrowDown", "ArrowUp", "Home", "End"].includes(event.key)) return; ++ const buttons = [...pop.current?.querySelectorAll?.("button:not(:disabled)") ?? []]; ++ if (!buttons.length) return; ++ event.preventDefault(); ++ const at = buttons.indexOf(document.activeElement); ++ const next = event.key === "Home" ? 0 : event.key === "End" ? buttons.length - 1 : (at + (event.key === "ArrowDown" ? 1 : -1) + buttons.length) % buttons.length; ++ buttons[next].focus(); ++ } ++ }, ++ ids.includes("react") ? (0, import_react7.createElement)( ++ "div", ++ { key: "reacts", className: "bt-menu-reacts", role: "group", "aria-label": t("Reactions") }, ++ MESSAGE_REACTIONS.map((emoji) => (0, import_react7.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => { ++ close(); ++ react(emoji); ++ } }, emoji)) ++ ) : null, ++ ids.includes("react") && menuItems.length > 0 ? (0, import_react7.createElement)("div", { key: "sep", className: "bt-menu-sep", role: "separator" }) : null, ++ ...menuItems, ++ note ? (0, import_react7.createElement)("div", { role: "status", "aria-live": "polite", className: "bt-menu-hint bt-message-note" }, note) : null ++ ), document.body) : null ++ ); ++} ++var contextToken = 0; ++function onMessageContextMenu(event, setContextAt, { live = false } = {}) { ++ if (live) return; ++ if (event.target?.closest?.('a[href], input, textarea, [role="menu"]')) return; ++ event.preventDefault(); ++ event.stopPropagation(); ++ setContextAt({ x: event.clientX, y: event.clientY, token: ++contextToken }); ++} ++ ++// src/client/questions.js ++var import_react8 = require("react"); +var keyLetter = (index) => String.fromCharCode(65 + index); +var optionsOf = (question) => (question?.options ?? []).map((option) => typeof option === "string" ? { label: option } : option); +var isTypingTarget = (node) => node instanceof HTMLInputElement || node instanceof HTMLTextAreaElement || node instanceof HTMLSelectElement || node instanceof HTMLElement && node.isContentEditable; +function useOptionKeys(count, onPick, ownRef) { -+ const pick2 = (0, import_react7.useRef)(onPick); ++ const pick2 = (0, import_react8.useRef)(onPick); + pick2.current = onPick; -+ (0, import_react7.useEffect)(() => { ++ (0, import_react8.useEffect)(() => { + if (count === 0) return void 0; + const onKey = (event) => { + if (event.defaultPrevented || event.metaKey || event.ctrlKey || event.altKey || event.shiftKey || event.key.length !== 1) return; @@ -7126,10 +7935,10 @@ diff --git a/client.js b/client.js + }, [count, ownRef]); +} +function QuestionView({ question, onAnswer, onDismiss, ownAnswer = false, raised = false, locked = false }) { -+ const [own, setOwn] = (0, import_react7.useState)(""); -+ const [picked, setPicked] = (0, import_react7.useState)([]); -+ const ownRef = (0, import_react7.useRef)(null); -+ const titleId = (0, import_react7.useId)(); ++ const [own, setOwn] = (0, import_react8.useState)(""); ++ const [picked, setPicked] = (0, import_react8.useState)([]); ++ const ownRef = (0, import_react8.useRef)(null); ++ const titleId = (0, import_react8.useId)(); + const options = optionsOf(question); + const multi = question.multiSelect === true; + const custom = own.trim(); @@ -7147,7 +7956,7 @@ diff --git a/client.js b/client.js + }; + useOptionKeys(locked ? 0 : options.length, (index) => choose(options[index].label), ownRef); + const ownLetter = options.length > 0 ? keyLetter(options.length) : void 0; -+ const field = ownAnswer && !locked ? (0, import_react7.createElement)("textarea", { ++ const field = ownAnswer && !locked ? (0, import_react8.createElement)("textarea", { + ref: ownRef, + rows: 1, + value: own, @@ -7167,16 +7976,16 @@ diff --git a/client.js b/client.js + const rows = options.map((option, optionIndex) => { + const selected = multi && picked.includes(option.label); + const body = [ -+ (0, import_react7.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)), -+ (0, import_react7.createElement)( ++ (0, import_react8.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)), ++ (0, import_react8.createElement)( + "span", + { className: "bt-q-body" }, -+ (0, import_react7.createElement)("span", { className: "bt-q-label" }, option.label), -+ option.description ? (0, import_react7.createElement)("span", { className: "bt-q-desc" }, option.description) : null ++ (0, import_react8.createElement)("span", { className: "bt-q-label" }, option.label), ++ option.description ? (0, import_react8.createElement)("span", { className: "bt-q-desc" }, option.description) : null + ), -+ selected && !raised ? (0, import_react7.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react7.createElement)(CheckIcon)) : null ++ selected && !raised ? (0, import_react8.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react8.createElement)(CheckIcon)) : null + ]; -+ return locked ? (0, import_react7.createElement)("div", { key: option.label, className: "bt-q-opt" }, ...body) : (0, import_react7.createElement)("button", { ++ return locked ? (0, import_react8.createElement)("div", { key: option.label, className: "bt-q-opt" }, ...body) : (0, import_react8.createElement)("button", { + key: option.label, + type: "button", + className: "bt-q-opt", @@ -7186,25 +7995,25 @@ diff --git a/client.js b/client.js + }, ...body); + }); + if (raised && field) { -+ rows.push((0, import_react7.createElement)( ++ rows.push((0, import_react8.createElement)( + "label", + { key: "own", className: "bt-q-opt bt-q-ownrow", "data-filled": custom !== "" ? "" : void 0 }, -+ ownLetter ? (0, import_react7.createElement)("span", { className: "bt-key", "aria-hidden": true }, ownLetter) : null, -+ (0, import_react7.createElement)("span", { className: "bt-q-body" }, field) ++ ownLetter ? (0, import_react8.createElement)("span", { className: "bt-key", "aria-hidden": true }, ownLetter) : null, ++ (0, import_react8.createElement)("span", { className: "bt-q-body" }, field) + )); + } + let foot = null; + if (!locked && raised && multi) { -+ foot = (0, import_react7.createElement)( ++ foot = (0, import_react8.createElement)( + "div", + { className: "bt-q-foot" }, -+ (0, import_react7.createElement)("button", { type: "button", className: "bt-q-btn", onClick: onDismiss }, t("Skip")), -+ (0, import_react7.createElement)("button", { type: "submit", className: "bt-q-submit", disabled: !canSubmit }, t("Submit")) ++ (0, import_react8.createElement)("button", { type: "button", className: "bt-q-btn", onClick: onDismiss }, t("Skip")), ++ (0, import_react8.createElement)("button", { type: "submit", className: "bt-q-submit", disabled: !canSubmit }, t("Submit")) + ); + } else if (!locked && (raised || multi) && canSubmit) { -+ foot = (0, import_react7.createElement)("div", { className: "bt-q-foot" }, (0, import_react7.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit"))); ++ foot = (0, import_react8.createElement)("div", { className: "bt-q-foot" }, (0, import_react8.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit"))); + } -+ return (0, import_react7.createElement)( ++ return (0, import_react8.createElement)( + locked ? "div" : "form", + { + className: raised ? "bt-q bt-q-raised" : "bt-q", @@ -7214,24 +8023,24 @@ diff --git a/client.js b/client.js + submit(); + } } + }, -+ (0, import_react7.createElement)( ++ (0, import_react8.createElement)( + "div", + { className: "bt-q-head" }, -+ (0, import_react7.createElement)( ++ (0, import_react8.createElement)( + "div", + { className: "bt-q-text" }, -+ (0, import_react7.createElement)("p", { className: "bt-q-title", id: titleId }, question.header ? `${question.header} · ` : "", question.question), -+ question.detail ? (0, import_react7.createElement)("div", { className: "bt-q-detail" }, question.detail) : null, -+ raised && multi ? (0, import_react7.createElement)("div", { className: "bt-q-detail" }, t("Choose all that apply")) : null ++ (0, import_react8.createElement)("p", { className: "bt-q-title", id: titleId }, question.header ? `${question.header} · ` : "", question.question), ++ question.detail ? (0, import_react8.createElement)("div", { className: "bt-q-detail" }, question.detail) : null, ++ raised && multi ? (0, import_react8.createElement)("div", { className: "bt-q-detail" }, t("Choose all that apply")) : null + ), -+ locked ? null : (0, import_react7.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Dismiss question"), title: t("Dismiss"), onClick: onDismiss }, (0, import_react7.createElement)(CloseIcon)) ++ locked ? null : (0, import_react8.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Dismiss question"), title: t("Dismiss"), onClick: onDismiss }, (0, import_react8.createElement)(CloseIcon)) + ), -+ rows.length > 0 ? (0, import_react7.createElement)("div", { className: "bt-q-list", role: "group" }, rows) : null, -+ field && !raised ? (0, import_react7.createElement)( ++ rows.length > 0 ? (0, import_react8.createElement)("div", { className: "bt-q-list", role: "group" }, rows) : null, ++ field && !raised ? (0, import_react8.createElement)( + "div", + { className: "bt-q-custom" }, -+ (0, import_react7.createElement)("label", { className: "bt-q-field" }, field), -+ !multi && canSubmit ? (0, import_react7.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit")) : null ++ (0, import_react8.createElement)("label", { className: "bt-q-field" }, field), ++ !multi && canSubmit ? (0, import_react8.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit")) : null + ) : null, + foot + ); @@ -7241,29 +8050,29 @@ diff --git a/client.js b/client.js + const prompt = question?.question ?? ""; + const chosen = [...answer.selected ?? [], ...answer.custom ? [answer.custom] : []]; + if (chosen.length === 0) { -+ return (0, import_react7.createElement)( ++ return (0, import_react8.createElement)( + "div", + { className: "bt-q bt-q-settled bt-q-dismissed", role: "group", "aria-label": prompt }, -+ (0, import_react7.createElement)( ++ (0, import_react8.createElement)( + "div", + { className: "bt-q-head" }, -+ (0, import_react7.createElement)("div", { className: "bt-q-text" }, (0, import_react7.createElement)("p", { className: "bt-q-title" }, prompt)), -+ (0, import_react7.createElement)("span", { className: "bt-q-badge" }, t("Dismissed")) ++ (0, import_react8.createElement)("div", { className: "bt-q-text" }, (0, import_react8.createElement)("p", { className: "bt-q-title" }, prompt)), ++ (0, import_react8.createElement)("span", { className: "bt-q-badge" }, t("Dismissed")) + ) + ); + } -+ return (0, import_react7.createElement)( ++ return (0, import_react8.createElement)( + "div", + { className: "bt-q bt-q-settled", role: "group", "aria-label": prompt }, -+ prompt ? (0, import_react7.createElement)("div", { className: "bt-q-head" }, (0, import_react7.createElement)("div", { className: "bt-q-text" }, (0, import_react7.createElement)("p", { className: "bt-q-title" }, prompt))) : null, -+ (0, import_react7.createElement)("div", { className: "bt-q-list", role: "group", "aria-label": t("Your answer") }, chosen.map((label, index) => { ++ prompt ? (0, import_react8.createElement)("div", { className: "bt-q-head" }, (0, import_react8.createElement)("div", { className: "bt-q-text" }, (0, import_react8.createElement)("p", { className: "bt-q-title" }, prompt))) : null, ++ (0, import_react8.createElement)("div", { className: "bt-q-list", role: "group", "aria-label": t("Your answer") }, chosen.map((label, index) => { + const optionIndex = options.findIndex((option) => option.label === label); -+ return (0, import_react7.createElement)( ++ return (0, import_react8.createElement)( + "div", + { key: `${label}-${index}`, className: "bt-q-opt" }, -+ optionIndex >= 0 ? (0, import_react7.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)) : null, -+ (0, import_react7.createElement)("span", { className: "bt-q-body" }, (0, import_react7.createElement)("span", { className: "bt-q-label" }, label)), -+ (0, import_react7.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react7.createElement)(CheckIcon)) ++ optionIndex >= 0 ? (0, import_react8.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)) : null, ++ (0, import_react8.createElement)("span", { className: "bt-q-body" }, (0, import_react8.createElement)("span", { className: "bt-q-label" }, label)), ++ (0, import_react8.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react8.createElement)(CheckIcon)) + ); + })) + ); @@ -7271,8 +8080,8 @@ diff --git a/client.js b/client.js +function QuestionCard({ matched }) { + const pending = matched; + const questions = pending.questions ?? []; -+ const [index, setIndex] = (0, import_react7.useState)(0); -+ const [answers, setAnswers] = (0, import_react7.useState)([]); ++ const [index, setIndex] = (0, import_react8.useState)(0); ++ const [answers, setAnswers] = (0, import_react8.useState)([]); + const question = questions[index]; + if (question === void 0) return null; + const onAnswer = (answer) => { @@ -7284,10 +8093,10 @@ diff --git a/client.js b/client.js + } + pending.answer({ answers: next }); + }; -+ return (0, import_react7.createElement)(QuestionView, { key: index, question, onAnswer, onDismiss: () => pending.dismiss(), ownAnswer: true, raised: true }); ++ return (0, import_react8.createElement)(QuestionView, { key: index, question, onAnswer, onDismiss: () => pending.dismiss(), ownAnswer: true, raised: true }); +} +function PendingQuestion({ sessionId, question, actions, roster, inline }) { -+ const [answered, setAnswered] = (0, import_react7.useState)(null); ++ const [answered, setAnswered] = (0, import_react8.useState)(null); + if (answered === question.id) return null; + const locked = lockedWindow(roster); + const onAnswer = (answer) => { @@ -7298,11 +8107,11 @@ diff --git a/client.js b/client.js + setAnswered(question.id); + void actions.dismissQuestion(sessionId); + }; -+ return (0, import_react7.createElement)( ++ return (0, import_react8.createElement)( + "div", + { className: inline ? "bt-q-inline" : "bt-q-dock" }, -+ ...locked ? [(0, import_react7.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly))] : [], -+ (0, import_react7.createElement)(QuestionView, { key: question.id, question, onAnswer, onDismiss, ownAnswer: question.allowCustom === true, raised: !inline, locked }) ++ ...locked ? [(0, import_react8.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly))] : [], ++ (0, import_react8.createElement)(QuestionView, { key: question.id, question, onAnswer, onDismiss, ownAnswer: question.allowCustom === true, raised: !inline, locked }) + ); +} +function QuestionDock({ sessionId, useRoster, useCards, useSession, actions }) { @@ -7311,16 +8120,16 @@ diff --git a/client.js b/client.js + const drawn = useCards?.((state) => state[sessionId]?.[question?.callId] > 0) === true; + const loading = useSession?.(historyLoading) === true; + if (question === void 0 || question.callId && (drawn || loading)) return null; -+ return (0, import_react7.createElement)(PendingQuestion, { sessionId, question, actions, roster, inline: false }); ++ return (0, import_react8.createElement)(PendingQuestion, { sessionId, question, actions, roster, inline: false }); +} +function AnsweredCell({ node }) { + const data = node.data ?? {}; + const questions = Array.isArray(data.questions) ? data.questions : []; + if (questions.length === 0) { -+ return data.text ? (0, import_react7.createElement)("div", { className: "bt-urow" }, (0, import_react7.createElement)("div", { className: "bt-ububble" }, data.text)) : null; ++ return data.text ? (0, import_react8.createElement)("div", { className: "bt-urow" }, (0, import_react8.createElement)("div", { className: "bt-ububble" }, data.text)) : null; + } + const answers = Array.isArray(data.answers) ? data.answers : []; -+ return (0, import_react7.createElement)("div", { className: "bt-q-inline" }, questions.map((question) => (0, import_react7.createElement)(SettledQuestion, { ++ return (0, import_react8.createElement)("div", { className: "bt-q-inline" }, questions.map((question) => (0, import_react8.createElement)(SettledQuestion, { + key: question.id, + question, + answer: answers.find((answer) => answer.id === question.id) ?? { selected: [] } @@ -7328,26 +8137,26 @@ diff --git a/client.js b/client.js +} + +// src/client/secret-card.js -+var import_react8 = require("react"); ++var import_react9 = require("react"); +var MIN_VALUE = 4; +var NONE = {}; -+var KeyIcon = () => (0, import_react8.createElement)( ++var KeyIcon = () => (0, import_react9.createElement)( + "svg", + { width: 15, height: 15, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -+ (0, import_react8.createElement)("path", { d: "M7 9.5a3.5 3.5 0 1 1 0 .01z" }), -+ (0, import_react8.createElement)("path", { d: "M10.4 10.6L17 10.6M14.5 10.6v2.4M16.6 10.6v1.8" }) ++ (0, import_react9.createElement)("path", { d: "M7 9.5a3.5 3.5 0 1 1 0 .01z" }), ++ (0, import_react9.createElement)("path", { d: "M10.4 10.6L17 10.6M14.5 10.6v2.4M16.6 10.6v1.8" }) +); -+var LockIcon = () => (0, import_react8.createElement)( ++var LockIcon = () => (0, import_react9.createElement)( + "svg", + { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -+ (0, import_react8.createElement)("path", { d: "M6.5 9V7a3.5 3.5 0 0 1 7 0v2" }), -+ (0, import_react8.createElement)("rect", { x: 4.5, y: 9, width: 11, height: 8, rx: 2 }) ++ (0, import_react9.createElement)("path", { d: "M6.5 9V7a3.5 3.5 0 0 1 7 0v2" }), ++ (0, import_react9.createElement)("rect", { x: 4.5, y: 9, width: 11, height: 8, rx: 2 }) +); -+var WarnIcon = () => (0, import_react8.createElement)( ++var WarnIcon = () => (0, import_react9.createElement)( + "svg", + { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -+ (0, import_react8.createElement)("path", { d: "M10 3.5l7 12.5H3z" }), -+ (0, import_react8.createElement)("path", { d: "M10 8.5v3.5M10 14.2h.01" }) ++ (0, import_react9.createElement)("path", { d: "M10 3.5l7 12.5H3z" }), ++ (0, import_react9.createElement)("path", { d: "M10 8.5v3.5M10 14.2h.01" }) +); +var MASK_BY_CSS = typeof CSS !== "undefined" && typeof CSS.supports === "function" && CSS.supports("-webkit-text-security", "disc"); +var insecure = () => typeof location !== "undefined" && location.protocol === "http:" && !/^(localhost|127(?:\.\d{1,3}){3}|\[::1\])$/.test(location.hostname); @@ -7358,7 +8167,7 @@ diff --git a/client.js b/client.js +}; +var when2 = (time) => Number.isFinite(time) ? new Date(time).toLocaleString(dateLocale(), { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" }) : ""; +function MaskedInput({ value, onChange, onEnter, label, autoFocus = false }) { -+ return (0, import_react8.createElement)("input", { ++ return (0, import_react9.createElement)("input", { + className: "bt-secret-input", + type: MASK_BY_CSS ? "text" : "password", + "data-masked": MASK_BY_CSS ? "" : void 0, @@ -7384,11 +8193,11 @@ diff --git a/client.js b/client.js +} +function ScopeSwitch({ value, onChange, bot }) { + const options = [["all", t("All my Bots")], ["bot", t("Only {name}", { name: bot.name })]]; -+ return (0, import_react8.createElement)( ++ return (0, import_react9.createElement)( + "div", + { className: "bt-secret-scope", role: "radiogroup", "aria-label": t("Who may use it") }, -+ (0, import_react8.createElement)("span", { className: "bt-secret-glide", "data-at": value === "all" ? 0 : 1, "aria-hidden": true }), -+ options.map(([id, text2]) => (0, import_react8.createElement)("button", { ++ (0, import_react9.createElement)("span", { className: "bt-secret-glide", "data-at": value === "all" ? 0 : 1, "aria-hidden": true }), ++ options.map(([id, text2]) => (0, import_react9.createElement)("button", { + key: id, + type: "button", + role: "radio", @@ -7399,26 +8208,26 @@ diff --git a/client.js b/client.js + ); +} +function SecretHead({ bot, title, detail, name, onClose }) { -+ return (0, import_react8.createElement)( ++ return (0, import_react9.createElement)( + "div", + { className: "bt-q-head bt-secret-head" }, -+ (0, import_react8.createElement)("span", { className: "bt-secret-who" }, (0, import_react8.createElement)(BotMark, { bot, size: 28 }), (0, import_react8.createElement)("span", { className: "bt-secret-lock" }, (0, import_react8.createElement)(LockIcon))), -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)("span", { className: "bt-secret-who" }, (0, import_react9.createElement)(BotMark, { bot, size: 28 }), (0, import_react9.createElement)("span", { className: "bt-secret-lock" }, (0, import_react9.createElement)(LockIcon))), ++ (0, import_react9.createElement)( + "div", + { className: "bt-q-text" }, -+ (0, import_react8.createElement)("p", { className: "bt-q-title" }, title), -+ (0, import_react8.createElement)("div", { className: "bt-q-detail" }, (0, import_react8.createElement)("code", { className: "bt-secret-name" }, name), detail ? ` · ${detail}` : "") ++ (0, import_react9.createElement)("p", { className: "bt-q-title" }, title), ++ (0, import_react9.createElement)("div", { className: "bt-q-detail" }, (0, import_react9.createElement)("code", { className: "bt-secret-name" }, name), detail ? ` · ${detail}` : "") + ), -+ onClose ? (0, import_react8.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Cancel the request"), title: t("Cancel"), onClick: onClose }, (0, import_react8.createElement)(CloseIcon)) : null ++ onClose ? (0, import_react9.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Cancel the request"), title: t("Cancel"), onClick: onClose }, (0, import_react9.createElement)(CloseIcon)) : null + ); +} +function SecretCard({ bot, request, roster, actions }) { -+ const [value, setValue] = (0, import_react8.useState)(""); -+ const [scope, setScope] = (0, import_react8.useState)("all"); -+ const [replacing, setReplacing] = (0, import_react8.useState)(false); -+ const [busy, setBusy] = (0, import_react8.useState)(false); -+ const [error, setError] = (0, import_react8.useState)(""); -+ const noteId = (0, import_react8.useId)(); ++ const [value, setValue] = (0, import_react9.useState)(""); ++ const [scope, setScope] = (0, import_react9.useState)("all"); ++ const [replacing, setReplacing] = (0, import_react9.useState)(false); ++ const [busy, setBusy] = (0, import_react9.useState)(false); ++ const [error, setError] = (0, import_react9.useState)(""); ++ const noteId = (0, import_react9.useId)(); + const secret = (roster.secrets ?? []).find((entry) => entry.name === request.name); + const run = (promise) => { + setBusy(true); @@ -7434,73 +8243,73 @@ diff --git a/client.js b/client.js + if (!busy) void run(actions.secretAllow(request.id)); + }; + const filling = request.kind === "fill" || replacing; -+ const warn = insecure() ? (0, import_react8.createElement)("div", { className: "bt-secret-warn", role: "note" }, (0, import_react8.createElement)(WarnIcon), t("This page is not on HTTPS: the key crosses the network unencrypted.")) : null; -+ return (0, import_react8.createElement)( ++ const warn = insecure() ? (0, import_react9.createElement)("div", { className: "bt-secret-warn", role: "note" }, (0, import_react9.createElement)(WarnIcon), t("This page is not on HTTPS: the key crosses the network unencrypted.")) : null; ++ return (0, import_react9.createElement)( + "div", + { className: "bt-q bt-secret", role: "group", "aria-describedby": noteId, "data-kind": request.kind }, -+ (0, import_react8.createElement)(SecretHead, { ++ (0, import_react9.createElement)(SecretHead, { + bot, + title: request.kind === "allow" ? t("Let {bot} use {name}?", { bot: bot.name, name: request.name }) : t("{name} needs a key", { name: bot.name }), + detail: request.purpose, + name: request.name, + onClose: busy ? void 0 : cancel + }), -+ request.kind === "allow" ? (0, import_react8.createElement)("div", { className: "bt-secret-saved" }, (0, import_react8.createElement)(KeyIcon), t("Saved for {scope}", { scope: scopeLabel(secret?.scope, roster) })) : null, -+ filling ? (0, import_react8.createElement)( ++ request.kind === "allow" ? (0, import_react9.createElement)("div", { className: "bt-secret-saved" }, (0, import_react9.createElement)(KeyIcon), t("Saved for {scope}", { scope: scopeLabel(secret?.scope, roster) })) : null, ++ filling ? (0, import_react9.createElement)( + "div", + { className: "bt-secret-body" }, -+ (0, import_react8.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react8.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value of {name}", { name: request.name }), autoFocus: replacing })), -+ request.kind === "fill" ? (0, import_react8.createElement)(ScopeSwitch, { value: scope, onChange: setScope, bot }) : null ++ (0, import_react9.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react9.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value of {name}", { name: request.name }), autoFocus: replacing })), ++ request.kind === "fill" ? (0, import_react9.createElement)(ScopeSwitch, { value: scope, onChange: setScope, bot }) : null + ) : null, -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + "div", + { className: "bt-secret-note", id: noteId }, + t("{bot} never sees the value. It reaches {bot}'s shell as ", { bot: bot.name }), -+ (0, import_react8.createElement)("code", null, `$DSH_SECRET_${request.name}`), ++ (0, import_react9.createElement)("code", null, `$DSH_SECRET_${request.name}`), + ".", + filling && value !== "" && !long ? t(" At least {count} characters.", { count: MIN_VALUE }) : "" + ), + warn, -+ error ? (0, import_react8.createElement)("div", { className: "bt-secret-error", role: "alert" }, error) : null, -+ (0, import_react8.createElement)( ++ error ? (0, import_react9.createElement)("div", { className: "bt-secret-error", role: "alert" }, error) : null, ++ (0, import_react9.createElement)( + "div", + { className: "bt-q-foot" }, -+ request.kind === "allow" && !replacing ? (0, import_react8.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => setReplacing(true) }, t("Replace value")) : null, -+ (0, import_react8.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: cancel }, t("Cancel")), -+ filling ? (0, import_react8.createElement)("button", { type: "button", className: "bt-q-submit", disabled: !long || busy, onClick: save }, busy ? t("Saving…") : t("Save")) : (0, import_react8.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: allow }, busy ? t("Allowing…") : t("Allow")) ++ request.kind === "allow" && !replacing ? (0, import_react9.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => setReplacing(true) }, t("Replace value")) : null, ++ (0, import_react9.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: cancel }, t("Cancel")), ++ filling ? (0, import_react9.createElement)("button", { type: "button", className: "bt-q-submit", disabled: !long || busy, onClick: save }, busy ? t("Saving…") : t("Save")) : (0, import_react9.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: allow }, busy ? t("Allowing…") : t("Allow")) + ) + ); +} +function SettledSecret({ bot, request, roster }) { + const canceled = request.status === "canceled"; + const text2 = canceled ? t("{bot} asked for {name}", { bot: bot.name, name: request.name }) : request.status === "allowed" ? t("Allowed {bot} to use {name}", { bot: bot.name, name: request.name }) : t("Saved {name}", { name: request.name }); -+ return (0, import_react8.createElement)( ++ return (0, import_react9.createElement)( + "div", + { className: "bt-q bt-q-settled bt-secret bt-secret-done", role: "group", "aria-label": text2, "data-status": request.status }, -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + "div", + { className: "bt-q-head" }, -+ (0, import_react8.createElement)("span", { className: "bt-secret-who" }, (0, import_react8.createElement)(BotMark, { bot, size: 22 })), -+ (0, import_react8.createElement)("div", { className: "bt-q-text" }, (0, import_react8.createElement)( ++ (0, import_react9.createElement)("span", { className: "bt-secret-who" }, (0, import_react9.createElement)(BotMark, { bot, size: 22 })), ++ (0, import_react9.createElement)("div", { className: "bt-q-text" }, (0, import_react9.createElement)( + "p", + { className: "bt-q-title" }, + text2, -+ canceled ? null : (0, import_react8.createElement)("span", { className: "bt-secret-scope-tag" }, ` · ${scopeLabel(request.scope, roster)}`) ++ canceled ? null : (0, import_react9.createElement)("span", { className: "bt-secret-scope-tag" }, ` · ${scopeLabel(request.scope, roster)}`) + )), -+ canceled ? (0, import_react8.createElement)("span", { className: "bt-q-badge" }, t("Canceled")) : (0, import_react8.createElement)("span", { className: "bt-q-check bt-secret-check", title: t("Done") }, (0, import_react8.createElement)(CheckIcon)) ++ canceled ? (0, import_react9.createElement)("span", { className: "bt-q-badge" }, t("Canceled")) : (0, import_react9.createElement)("span", { className: "bt-q-check bt-secret-check", title: t("Done") }, (0, import_react9.createElement)(CheckIcon)) + ) + ); +} +function RequestView({ bot, request, roster, actions }) { -+ return request.status === "pending" ? (0, import_react8.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }) : (0, import_react8.createElement)(SettledSecret, { bot, request, roster }); ++ return request.status === "pending" ? (0, import_react9.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }) : (0, import_react9.createElement)(SettledSecret, { bot, request, roster }); +} +function SecretToolCell({ sessionId, callId, name, done, content, roster, actions }) { + const bot = roster.byId[sessionId]; + if (!bot) return null; + const request = (roster.secretRequests?.[bot.id] ?? []).find((entry) => entry.callId === callId && (entry.sessionId ?? sessionId) === sessionId); -+ if (request) return (0, import_react8.createElement)("div", { className: "bt-q-inline" }, (0, import_react8.createElement)(RequestView, { bot, request, roster, actions })); ++ if (request) return (0, import_react9.createElement)("div", { className: "bt-q-inline" }, (0, import_react9.createElement)(RequestView, { bot, request, roster, actions })); + if (done && /already saved/.test(contentText(content))) { -+ return (0, import_react8.createElement)("div", { className: "bt-event" }, (0, import_react8.createElement)("span", { className: "bt-secret-event" }, (0, import_react8.createElement)(KeyIcon), t("{bot} is using {name}", { bot: bot.name, name: name ?? t("a saved key") }))); ++ return (0, import_react9.createElement)("div", { className: "bt-event" }, (0, import_react9.createElement)("span", { className: "bt-secret-event" }, (0, import_react9.createElement)(KeyIcon), t("{bot} is using {name}", { bot: bot.name, name: name ?? t("a saved key") }))); + } + return null; +} @@ -7513,46 +8322,46 @@ diff --git a/client.js b/client.js + const drawn = (entry) => entry.callId && entry.sessionId === sessionId && (loading || shown[entry.callId] > 0); + const waiting = (roster.secretRequests?.[bot.id] ?? []).filter((entry) => entry.status === "pending" && !drawn(entry)); + if (waiting.length === 0) return null; -+ return (0, import_react8.createElement)("div", { className: "bt-q-dock bt-secret-dock" }, waiting.map((request) => (0, import_react8.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }))); ++ return (0, import_react9.createElement)("div", { className: "bt-q-dock bt-secret-dock" }, waiting.map((request) => (0, import_react9.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }))); +} +var scopeMode = (scope) => scope === "all" ? "all" : scope.length === 0 ? "none" : "some"; +function ScopeEditor({ secret, roster, onSave }) { -+ const [mode, setMode] = (0, import_react8.useState)(scopeMode(secret.scope)); -+ const [picked, setPicked] = (0, import_react8.useState)(secret.scope === "all" ? [] : secret.scope); ++ const [mode, setMode] = (0, import_react9.useState)(scopeMode(secret.scope)); ++ const [picked, setPicked] = (0, import_react9.useState)(secret.scope === "all" ? [] : secret.scope); + const toggle = (id) => setPicked((list) => list.includes(id) ? list.filter((item) => item !== id) : [...list, id]); + const next = mode === "all" ? "all" : mode === "none" ? [] : picked; + const same2 = next === "all" ? secret.scope === "all" : secret.scope !== "all" && [...next].sort().join() === [...secret.scope].sort().join(); -+ return (0, import_react8.createElement)( ++ return (0, import_react9.createElement)( + "div", + { className: "bt-secret-edit-block" }, -+ (0, import_react8.createElement)("div", { className: "bt-secret-edit-label" }, t("Who may use it")), -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)("div", { className: "bt-secret-edit-label" }, t("Who may use it")), ++ (0, import_react9.createElement)( + "div", + { className: "bt-secret-radios", role: "radiogroup", "aria-label": t("Who may use {name}", { name: secret.name }) }, -+ [["all", t("All my Bots")], ["some", t("Chosen Bots")], ["none", t("No Bot")]].map(([id, text2]) => (0, import_react8.createElement)( ++ [["all", t("All my Bots")], ["some", t("Chosen Bots")], ["none", t("No Bot")]].map(([id, text2]) => (0, import_react9.createElement)( + "label", + { key: id, className: "bt-secret-radio" }, -+ (0, import_react8.createElement)("input", { type: "radio", name: `scope-${secret.name}`, checked: mode === id, onChange: () => setMode(id) }), ++ (0, import_react9.createElement)("input", { type: "radio", name: `scope-${secret.name}`, checked: mode === id, onChange: () => setMode(id) }), + text2 + )) + ), -+ mode === "some" ? (0, import_react8.createElement)("div", { className: "bt-secret-bots" }, roster.bots.map((bot) => (0, import_react8.createElement)("button", { ++ mode === "some" ? (0, import_react9.createElement)("div", { className: "bt-secret-bots" }, roster.bots.map((bot) => (0, import_react9.createElement)("button", { + key: bot.id, + type: "button", + className: "bt-secret-bot", + "aria-pressed": picked.includes(bot.id), + onClick: () => toggle(bot.id) -+ }, (0, import_react8.createElement)(BotAvatar, { bot, size: 20, badge: false, live: false }), bot.name, picked.includes(bot.id) ? (0, import_react8.createElement)(CheckIcon) : null))) : null, -+ (0, import_react8.createElement)( ++ }, (0, import_react9.createElement)(BotAvatar, { bot, size: 20, badge: false, live: false }), bot.name, picked.includes(bot.id) ? (0, import_react9.createElement)(CheckIcon) : null))) : null, ++ (0, import_react9.createElement)( + "div", + { className: "bt-secret-row-actions" }, -+ (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: same2, onClick: () => onSave(next) }, t("Save access")) ++ (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: same2, onClick: () => onSave(next) }, t("Save access")) + ) + ); +} +function ValueEditor({ secret, onSave }) { -+ const [value, setValue] = (0, import_react8.useState)(""); -+ const [replaced, setReplaced] = (0, import_react8.useState)(false); ++ const [value, setValue] = (0, import_react9.useState)(""); ++ const [replaced, setReplaced] = (0, import_react9.useState)(false); + const long = value.trim().length >= MIN_VALUE; + const save = () => { + if (!long) return; @@ -7567,173 +8376,66 @@ diff --git a/client.js b/client.js + setValue(next); + setReplaced(false); + }; -+ return (0, import_react8.createElement)( ++ return (0, import_react9.createElement)( + "div", + { className: "bt-secret-edit-block" }, -+ (0, import_react8.createElement)("div", { className: "bt-secret-edit-label" }, t("Replace the value")), -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)("div", { className: "bt-secret-edit-label" }, t("Replace the value")), ++ (0, import_react9.createElement)( + "div", + { className: "bt-secret-inline" }, -+ (0, import_react8.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react8.createElement)(MaskedInput, { value, onChange: edit, onEnter: save, label: t("New value of {name}", { name: secret.name }) })), -+ (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !long, onClick: save }, t("Replace")) ++ (0, import_react9.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react9.createElement)(MaskedInput, { value, onChange: edit, onEnter: save, label: t("New value of {name}", { name: secret.name }) })), ++ (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !long, onClick: save }, t("Replace")) + ), -+ value !== "" && !long ? (0, import_react8.createElement)("div", { className: "bt-set-hint" }, t("At least {count} characters.", { count: MIN_VALUE })) : replaced ? (0, import_react8.createElement)("div", { className: "bt-set-hint bt-secret-ok", role: "status" }, (0, import_react8.createElement)(CheckIcon), t("Replaced. Bots get the new value from their next command.")) : null ++ value !== "" && !long ? (0, import_react9.createElement)("div", { className: "bt-set-hint" }, t("At least {count} characters.", { count: MIN_VALUE })) : replaced ? (0, import_react9.createElement)("div", { className: "bt-set-hint bt-secret-ok", role: "status" }, (0, import_react9.createElement)(CheckIcon), t("Replaced. Bots get the new value from their next command.")) : null + ); +} +function SecretRow({ secret, roster, actions, run, open, onToggle }) { -+ const [confirm, setConfirm] = (0, import_react8.useState)(false); -+ (0, import_react8.useEffect)(() => { ++ const [confirm, setConfirm] = (0, import_react9.useState)(false); ++ (0, import_react9.useEffect)(() => { + if (!open) setConfirm(false); + }, [open]); + const asker = secret.requestedBy ? roster.byId[secret.requestedBy]?.name ?? t("a deleted Bot") : t("you"); + const allowed = secret.scope === "all" ? [] : secret.scope.map((id) => roster.byId[id]).filter(Boolean); + const meta = [t("Asked by {name}", { name: asker }), t("added {time}", { time: when2(secret.createdAt) }), secret.lastUsedAt ? t("last used {time}", { time: when2(secret.lastUsedAt) }) : t("not used yet")].join(" · "); -+ return (0, import_react8.createElement)( ++ return (0, import_react9.createElement)( + "div", + { className: "bt-secret-item", "data-open": open ? "" : void 0 }, -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + "button", + { type: "button", className: "bt-set-row bt-secret-summary", "aria-expanded": open, onClick: onToggle }, -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + "span", + { className: "bt-set-copy" }, -+ (0, import_react8.createElement)("span", { className: "bt-secret-title" }, (0, import_react8.createElement)(KeyIcon), (0, import_react8.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react8.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), -+ (0, import_react8.createElement)("span", { className: "bt-set-hint" }, meta) ++ (0, import_react9.createElement)("span", { className: "bt-secret-title" }, (0, import_react9.createElement)(KeyIcon), (0, import_react9.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react9.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), ++ (0, import_react9.createElement)("span", { className: "bt-set-hint" }, meta) + ), -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + "span", + { className: "bt-set-control" }, -+ secret.scope === "all" ? (0, import_react8.createElement)("span", { className: "bt-tag" }, t("All my Bots")) : allowed.length === 0 ? (0, import_react8.createElement)("span", { className: "bt-tag" }, t("No Bot")) : (0, import_react8.createElement)("span", { className: "bt-secret-faces", title: allowed.map((bot) => bot.name).join(", ") }, allowed.slice(0, 5).map((bot) => (0, import_react8.createElement)(BotAvatar, { key: bot.id, bot, size: 20, badge: false, live: false }))) ++ secret.scope === "all" ? (0, import_react9.createElement)("span", { className: "bt-tag" }, t("All my Bots")) : allowed.length === 0 ? (0, import_react9.createElement)("span", { className: "bt-tag" }, t("No Bot")) : (0, import_react9.createElement)("span", { className: "bt-secret-faces", title: allowed.map((bot) => bot.name).join(", ") }, allowed.slice(0, 5).map((bot) => (0, import_react9.createElement)(BotAvatar, { key: bot.id, bot, size: 20, badge: false, live: false }))) + ) + ), -+ open ? (0, import_react8.createElement)( ++ open ? (0, import_react9.createElement)( + "div", + { className: "bt-secret-edit" }, -+ (0, import_react8.createElement)(ScopeEditor, { key: JSON.stringify(secret.scope), secret, roster, onSave: (scope) => run(actions.secretUpdate(secret.name, scope)) }), -+ (0, import_react8.createElement)(ValueEditor, { secret, onSave: (value) => run(actions.secretSet({ name: secret.name, value })) }), -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)(ScopeEditor, { key: JSON.stringify(secret.scope), secret, roster, onSave: (scope) => run(actions.secretUpdate(secret.name, scope)) }), ++ (0, import_react9.createElement)(ValueEditor, { secret, onSave: (value) => run(actions.secretSet({ name: secret.name, value })) }), ++ (0, import_react9.createElement)( + "div", + { className: "bt-secret-row-actions" }, + confirm ? [ -+ (0, import_react8.createElement)("span", { key: "q", className: "bt-set-hint" }, t("Delete {name}? Bots lose it at once.", { name: secret.name })), -+ (0, import_react8.createElement)("button", { key: "no", type: "button", className: "bt-soft bt-soft-sm", onClick: () => setConfirm(false) }, t("Keep")), -+ (0, import_react8.createElement)("button", { key: "yes", type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => run(actions.secretDelete(secret.name)) }, t("Delete")) -+ ] : (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => setConfirm(true) }, (0, import_react8.createElement)(TrashIcon), t("Delete")) ++ (0, import_react9.createElement)("span", { key: "q", className: "bt-set-hint" }, t("Delete {name}? Bots lose it at once.", { name: secret.name })), ++ (0, import_react9.createElement)("button", { key: "no", type: "button", className: "bt-soft bt-soft-sm", onClick: () => setConfirm(false) }, t("Keep")), ++ (0, import_react9.createElement)("button", { key: "yes", type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => run(actions.secretDelete(secret.name)) }, t("Delete")) ++ ] : (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => setConfirm(true) }, (0, import_react9.createElement)(TrashIcon), t("Delete")) + ) + ) : null + ); - } --@keyframes bt-fade-in{from{opacity:0}to{opacity:1}} --@keyframes bt-fade-out{from{opacity:1}to{opacity:0}} --[data-composer-card]{display:flex!important;flex-direction:row;flex-wrap:wrap;align-items:center;gap:0!important;min-height:44px;border-radius:22px!important;padding:7.5px!important;box-sizing:border-box;background:var(--bt-main)!important;border:.5px solid var(--bt-line-2)!important;box-shadow:0 2px 8px -1px rgba(0,0,0,.05),0 1px 2px rgba(0,0,0,.03),0 0 0 1px rgba(228,228,228,.04)!important;transition:border-color .15s ease,background-color .15s ease,${spring(SPRING_SHAPE, "border-radius")}!important} --[data-composer-card]:hover,[data-composer-card]:focus-within{border-color:color-mix(in srgb,var(--bt-ink) 30%,transparent)!important} --[data-composer-card]:has(> [data-slot="conversation.input.attachments"] *),[data-composer-card]:has([data-composer-input] br + *),[data-composer-card]:has([data-composer-input] > :nth-child(2)){border-radius:18px!important} --[class*="_root"]:has(> [data-composer-card]){padding:0 11px 13px 16px!important} --[class*="_root"]:has(> [data-composer-card])>[data-composer-card]{max-width:min(992px,100%)!important} --[data-composer-card]>[class*="_row"]{display:contents!important} --[data-composer-card] [class*="_tools"]{order:1;flex:none;align-self:flex-end;margin:0} --[data-composer-card]>[data-input-scroll]{order:2;flex:1 1 0;min-width:0;padding:0 8px!important;margin:0!important} --[data-composer-card] [class*="_trailing"]{order:3;flex:none;align-self:flex-end;margin:0} --[data-composer-card]>[data-slot="conversation.input.attachments"]{order:0;flex-basis:100%} --[data-composer-card] [data-composer-input]{min-height:24px;padding:2px 0!important} --[data-composer-card] [data-composer-placeholder]{left:0!important;top:2px!important} --[data-composer-placeholder]{font-size:0!important;line-height:0!important} --[data-composer-placeholder]::after{content:var(--bt-placeholder,"Message");display:block;font-size:14px;line-height:24px;color:color-mix(in srgb,var(--bt-ink) 36%,transparent)} --/* The team's "+" (ComposerPlus) takes the seat of the shell's command-menu button. */ --[data-composer-card] button[class*="_add"]{display:none!important} --.bt-plus{flex:none;width:28px;height:28px;padding:0;border:0;border-radius:50%;display:inline-flex;align-items:center;justify-content:center;background:color-mix(in srgb,var(--bt-ink) 5%,transparent);box-shadow:inset 0 0 0 .5px var(--bt-line);color:var(--bt-ink-2);cursor:pointer;transition:background-color .15s ease,color .15s ease,${spring(SPRING_TAP, "scale")}} --.bt-plus:hover,.bt-plus[aria-expanded=true]{background:color-mix(in srgb,var(--bt-ink) 10%,transparent);color:var(--bt-ink)} --.bt-plus:active{scale:.9} --.bt-plus svg{width:14px;height:14px;transition:${spring(SPRING_POP, "rotate")}} --.bt-plus[aria-expanded=true] svg{rotate:45deg} --.bt-plus-menu{min-width:180px} --[data-composer-card] [class*="_tools"]{gap:0!important} --[data-composer-card] [class*="_modes"]:empty{display:none!important} --[data-composer-card] [class*="_activity"]:not(:has([data-slot] > *)){display:none!important} --[data-composer-card] [class*="_trailing"]{gap:8px} --[data-composer-card] [class*="_standardControls"]{display:flex;align-items:center;gap:8px} --[data-composer-card] button[class*="_primary"]{width:28px!important;height:28px!important;background:var(--bt-accent)!important;color:var(--bt-accent-ink,#fff)!important;border-radius:50%!important;transition:opacity .15s ease,${spring(SPRING_TAP, "scale")};animation:bt-icon-swap ${SPRING_POP.duration}ms ${SPRING_POP.easing}} --[data-composer-card] button[class*="_primary"]:hover:not(:disabled){opacity:.9} --[data-composer-card] button[class*="_primary"]:active:not(:disabled){scale:.9} --@keyframes bt-icon-swap{from{opacity:0;transform:scale(.5) rotate(-30deg)}} --[data-composer-card] button[class*="_primary"] svg{width:14px;height:14px} --[data-composer-card] button[class*="_primary"]:disabled{display:none!important} --[data-composer-dock]{display:none!important} --.bt-mic,.bt-voice{flex:none;width:28px;height:28px;border-radius:50%;border:0;padding:0;display:inline-grid;place-items:center;cursor:pointer;transition:background-color .15s ease,color .15s ease,${spring(SPRING_TAP, "scale")}} --.bt-mic{background:color-mix(in srgb,var(--bt-ink) 5%,transparent);box-shadow:inset 0 0 0 .5px var(--bt-line);color:var(--bt-ink-2)} --.bt-mic:hover{background:color-mix(in srgb,var(--bt-ink) 10%,transparent);color:var(--bt-ink)} --.bt-mic[aria-pressed=true]{background:#ff3e51;color:#fff;animation:bt-mic-pulse 1.4s ease-in-out infinite} --@keyframes bt-mic-pulse{0%,100%{box-shadow:0 0 0 0 rgba(255,62,81,.35)}50%{box-shadow:0 0 0 5px rgba(255,62,81,0)}} --.bt-voice{display:none;background:var(--bt-accent);color:var(--bt-accent-ink,#fff);animation:bt-icon-swap ${SPRING_POP.duration}ms ${SPRING_POP.easing}} --.bt-voice:hover{opacity:.9} --.bt-mic:active,.bt-voice:active{scale:.9} --[data-composer-card]:has(button[class*="_primary"]:disabled) .bt-voice{display:inline-grid} --body[data-bt-room] .bt-voice{display:none!important} --body[data-bt-room] [data-composer-card]:has(button[class*="_primary"]:disabled) .bt-mic:not([aria-pressed=true]){background:var(--bt-accent);color:var(--bt-accent-ink,#fff)} --.bt-mic-note{position:absolute;right:12px;bottom:calc(100% + 8px);padding:5px 10px;border-radius:8px;background:var(--bt-user);color:var(--bt-user-ink);font-size:12px;line-height:16px;white-space:nowrap;pointer-events:none;animation:bt-rise .16s ease-out} --[data-chain-overlay-fallback="conversation.composer"]:has(~ .bt-q){display:block!important;order:2} --.bt-q{order:1} --div:has(> nav [class*="_marks"]){display:none!important} --/* Every user-side bubble (sent, steering mid-turn, not yet admitted, question replies) -- takes its surface and its text from the one --bt-user pair: a skin that repaints -- the host's bubble surface alone would otherwise leave the text unreadable. */ --[class*="_userRow"] [class*="_bubble"],[data-chat-flow-kind=question-reply] [class*="_bubble"],[data-chat-flow-kind=command-input] [class*="_bubble"]{background:var(--bt-user)!important;color:var(--bt-user-ink)!important;border-radius:18px!important;padding:7px 12px!important;font-size:var(--dsh-content-font-size,14px)!important;line-height:calc(var(--dsh-content-font-size,14px) + 8px)!important} --[class*="_userRow"] [class*="_bubble"] [class*="_markdown"],[class*="_userRow"] [class*="_bubble"] a{color:inherit} --/* Sent messages get the hover toolbar below; steering and unsent bubbles keep none. */ --[class*="_userRow"] [class*="_actions"]{display:none!important} --[data-chat-flow-kind=user] [class*="_userRow"]{flex-direction:row-reverse;align-items:center;justify-content:flex-start} --[data-chat-flow-kind=user] [class*="_actions"]{display:flex!important;height:24px!important;gap:2px!important;opacity:0!important;visibility:hidden;transition:opacity .12s ease,visibility .12s!important;flex:none} --[data-chat-flow-kind=user] [class*="_userRow"]:hover [class*="_actions"],[data-chat-flow-kind=user] [class*="_userRow"]:focus-within [class*="_actions"]{opacity:1!important;visibility:visible} --[data-chat-flow-kind=user] [class*="_actions"] [class*="_timeStart"]{display:none} --[data-chat-flow-kind=user] [class*="_actions"] button{width:24px;height:24px;border-radius:6px;color:var(--bt-ink-2)} --[data-chat-flow-kind=user] [class*="_actions"] button:hover{background:var(--bt-hover);color:var(--bt-ink)} --[data-chat-flow-kind=user] [class*="_actions"] svg{width:15px;height:15px} --.bt-q-inline{display:flex;margin:4px 0 6px} --[data-chat-flow-kind=assistant-step]+[data-step-process]:has(.bt-q-inline){margin-top:0!important} --[data-chat-flow-kind=question-reply]:has(.bt-q-inline),[data-chat-group-key]:has([data-chat-flow-kind=question-reply] .bt-q-inline),[data-chat-group-key]:has(.bt-q-gone){margin-top:0!important} --.bt-q-inline .bt-q{margin:0;max-width:min(550px,86%);order:0} --.bt-q-dock{width:100%;display:flex;justify-content:center} --.bt-q-dock .bt-q{margin:0 auto 8px} --[class*="_toBottomSlot"]{justify-content:center!important;padding-right:0!important} --[data-conversation-scroll] [class*="_toBottomSlot"]{bottom:calc(var(--dsh-composer-height,152px) + 8px)!important} --[class*="_toBottomSlot"]>button{width:36px!important;height:36px!important;margin-top:-36px!important;background:var(--bt-main)!important;color:var(--bt-ink)!important;box-shadow:0 0 0 .5px var(--bt-line-2),0 2px 8px -2px rgba(0,0,0,.12)!important;animation:bt-tobottom-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out;transition:background-color .12s ease,${spring(SPRING_TAP, "scale")}} --[class*="_toBottomSlot"]>button:active{scale:.9} --[class*="_toBottomSlot"]>button:hover{background:color-mix(in srgb,var(--bt-ink) 4%,var(--bt-main))!important} --[class*="_toBottomSlot"]>button svg{display:none} --[class*="_toBottomSlot"]>button::before{content:"";width:20px;height:20px;background:currentColor;-webkit-mask:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='none' stroke='black' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M10 4v12M5 11l5 5 5-5'/%3E%3C/svg%3E") center/contain no-repeat;mask:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='none' stroke='black' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M10 4v12M5 11l5 5 5-5'/%3E%3C/svg%3E") center/contain no-repeat} --@keyframes bt-tobottom-in{from{translate:0 8px;scale:.8}} --[data-bt-news] [class*="_toBottomSlot"]>button{visibility:hidden!important;pointer-events:none!important} --.bt-news{position:fixed;z-index:30;transform:translateX(-50%);display:inline-flex;align-items:center;overflow:hidden;border-radius:999px;background:#0c64c1;color:#fcfcfc;box-shadow:inset 0 0 0 1px rgba(20,20,20,.05),0 1px 3px 0 rgba(0,0,0,.12);font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;animation:bt-news-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out} --@keyframes bt-news-in{from{translate:0 8px;scale:.9}} --.bt-news[data-direction=up]{animation-name:bt-news-in-up,bt-veil-in} --@keyframes bt-news-in-up{from{translate:0 -8px;scale:.9}} --.bt-news-jump{display:inline-flex;align-items:center;gap:2px;margin:0;padding:4px 26px 4px 4px;border:0;border-radius:0;background:transparent;color:inherit;font:inherit;font-size:13px;line-height:18px;white-space:nowrap;cursor:pointer;outline:none} --.bt-news-ico{flex:none;display:inline-flex;align-items:center;justify-content:center;width:20px;height:20px} --.bt-news-ico svg{width:16px;height:16px} --.bt-news-x{position:absolute;right:4px;top:50%;z-index:1;transform:translateY(-50%);width:20px;height:20px;padding:0;border:0;border-radius:999px;background:transparent;color:inherit;opacity:.75;display:inline-flex;align-items:center;justify-content:center;cursor:pointer} --.bt-news-x svg{width:12px;height:12px} --.bt-news-x:hover{opacity:1;background:rgba(20,20,20,.5)} --@media (prefers-reduced-motion:reduce){.bt-news,[class*="_toBottomSlot"]>button{animation:none}} --.bt-new-sep{display:flex;align-items:center;gap:8px;margin:14px 0 8px;padding:2px 0;font-size:11px;line-height:14px;font-weight:500;letter-spacing:.02em;text-transform:uppercase;color:#0c64c1;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} --.bt-new-sep::before,.bt-new-sep::after{content:"";flex:1;height:1px;background:color-mix(in srgb,#0c64c1 20%,transparent)} --.bt-open-new{display:flex;flex-direction:column} --.bt-open-new .bt-new-sep{margin:18px 0 0} --.bt-open-new .bt-time-sep{height:16px;margin:32px 0 2px} --.bt-earlier{display:flex;flex-direction:column;gap:6px} --.bt-earlier-top{display:flex;justify-content:center;align-items:center;height:34px;flex:none} --.bt-earlier-top .bt-soft{height:28px;font-size:12px;padding:0 12px} --.bt-urow{display:flex;justify-content:flex-end} --.bt-ububble{max-width:min(560px,78%);background:var(--bt-user);color:var(--bt-user-ink);border-radius:18px;padding:7px 12px;font-size:14px;line-height:20px;box-sizing:border-box;overflow-wrap:anywhere} --.bt-ububble [class*="_markdown"],.bt-ububble a{color:inherit!important} --.bt-ububble p{margin:0;line-height:22px} --.bt-uimages{display:block;font-size:12px;opacity:.7} --.bt-earlier .bt-event{margin:4px 0} --.bt-part-line{display:flex;align-items:center;gap:10px;margin:10px 0 6px;font-size:11px;line-height:14px;color:var(--bt-ink-3)} --.bt-part-line::before,.bt-part-line::after{content:"";flex:1;height:1px;background:var(--bt-line)} ++} +function AddSecret({ actions, run, onDone }) { -+ const [name, setName] = (0, import_react8.useState)(""); -+ const [purpose, setPurpose] = (0, import_react8.useState)(""); -+ const [value, setValue] = (0, import_react8.useState)(""); ++ const [name, setName] = (0, import_react9.useState)(""); ++ const [purpose, setPurpose] = (0, import_react9.useState)(""); ++ const [value, setValue] = (0, import_react9.useState)(""); + const ready = /^[A-Za-z][\w-]{0,63}$/.test(name.trim()) && value.trim().length >= MIN_VALUE; + const save = () => { + if (!ready) return; @@ -7744,70 +8446,70 @@ diff --git a/client.js b/client.js + } + }); + }; -+ return (0, import_react8.createElement)( ++ return (0, import_react9.createElement)( + "div", + { className: "bt-set-row bt-set-paste bt-secret-add" }, -+ (0, import_react8.createElement)("input", { className: "bt-input", "aria-label": t("Key name"), placeholder: t("NAME, e.g. GITHUB_TOKEN"), value: name, spellCheck: false, autoComplete: "off", autoFocus: true, onChange: (event) => setName(event.target.value.toUpperCase()) }), -+ (0, import_react8.createElement)("input", { className: "bt-input", "aria-label": t("What it is for"), placeholder: t("What it is for"), value: purpose, autoComplete: "off", onChange: (event) => setPurpose(event.target.value) }), -+ (0, import_react8.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react8.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value") })), -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)("input", { className: "bt-input", "aria-label": t("Key name"), placeholder: t("NAME, e.g. GITHUB_TOKEN"), value: name, spellCheck: false, autoComplete: "off", autoFocus: true, onChange: (event) => setName(event.target.value.toUpperCase()) }), ++ (0, import_react9.createElement)("input", { className: "bt-input", "aria-label": t("What it is for"), placeholder: t("What it is for"), value: purpose, autoComplete: "off", onChange: (event) => setPurpose(event.target.value) }), ++ (0, import_react9.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react9.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value") })), ++ (0, import_react9.createElement)( + "div", + { className: "bt-secret-row-actions" }, -+ (0, import_react8.createElement)("span", { className: "bt-set-hint" }, t("New keys are for all your Bots; change who may use it afterwards.")), -+ (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDone }, t("Cancel")), -+ (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !ready, onClick: save }, t("Save key")) ++ (0, import_react9.createElement)("span", { className: "bt-set-hint" }, t("New keys are for all your Bots; change who may use it afterwards.")), ++ (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDone }, t("Cancel")), ++ (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !ready, onClick: save }, t("Save key")) + ) + ); +} +function SecretsPage({ roster, actions, run, Section }) { -+ const [open, setOpen] = (0, import_react8.useState)(null); -+ const [adding, setAdding] = (0, import_react8.useState)(false); ++ const [open, setOpen] = (0, import_react9.useState)(null); ++ const [adding, setAdding] = (0, import_react9.useState)(false); + const secrets = roster.secrets ?? []; + if (lockedWindow(roster)) { + return [ -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + "p", + { key: "about", className: "bt-secret-about" }, + t("Keys your Bots asked for. Bots never see the values: they use them as "), -+ (0, import_react8.createElement)("code", null, "$DSH_SECRET_NAME"), ++ (0, import_react9.createElement)("code", null, "$DSH_SECRET_NAME"), + t(" in their shell, and every value is replaced by "), -+ (0, import_react8.createElement)("code", null, "[secret:NAME]"), ++ (0, import_react9.createElement)("code", null, "[secret:NAME]"), + t(" before anything goes to a model.") + ), -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + Section, + { key: "list", title: t("Secrets · {count}", { count: secrets.length }) }, -+ secrets.length === 0 ? (0, import_react8.createElement)("div", { className: "bt-set-row" }, (0, import_react8.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : secrets.map((secret) => (0, import_react8.createElement)( ++ secrets.length === 0 ? (0, import_react9.createElement)("div", { className: "bt-set-row" }, (0, import_react9.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : secrets.map((secret) => (0, import_react9.createElement)( + "div", + { key: secret.name, className: "bt-set-row" }, -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + "span", + { className: "bt-set-copy" }, -+ (0, import_react8.createElement)("span", { className: "bt-secret-title" }, (0, import_react8.createElement)(KeyIcon), (0, import_react8.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react8.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), -+ (0, import_react8.createElement)("span", { className: "bt-set-hint" }, scopeLabel(secret.scope, roster)) ++ (0, import_react9.createElement)("span", { className: "bt-secret-title" }, (0, import_react9.createElement)(KeyIcon), (0, import_react9.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react9.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), ++ (0, import_react9.createElement)("span", { className: "bt-set-hint" }, scopeLabel(secret.scope, roster)) + ) + )) + ) + ]; + } + return [ -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + "p", + { key: "about", className: "bt-secret-about" }, + t("Keys your Bots asked for. Bots never see the values: they use them as "), -+ (0, import_react8.createElement)("code", null, "$DSH_SECRET_NAME"), ++ (0, import_react9.createElement)("code", null, "$DSH_SECRET_NAME"), + t(" in their shell, and every value is replaced by "), -+ (0, import_react8.createElement)("code", null, "[secret:NAME]"), ++ (0, import_react9.createElement)("code", null, "[secret:NAME]"), + t(" before anything goes to a model.") + ), -+ (0, import_react8.createElement)( ++ (0, import_react9.createElement)( + Section, + { key: "list", title: t("Secrets · {count}", { count: secrets.length }) }, -+ secrets.length === 0 && !adding ? (0, import_react8.createElement)("div", { className: "bt-set-row" }, (0, import_react8.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : null, -+ secrets.map((secret) => (0, import_react8.createElement)(SecretRow, { key: secret.name, secret, roster, actions, run, open: open === secret.name, onToggle: () => setOpen(open === secret.name ? null : secret.name) })), -+ adding ? (0, import_react8.createElement)(AddSecret, { actions, run, onDone: () => setAdding(false) }) : null ++ secrets.length === 0 && !adding ? (0, import_react9.createElement)("div", { className: "bt-set-row" }, (0, import_react9.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : null, ++ secrets.map((secret) => (0, import_react9.createElement)(SecretRow, { key: secret.name, secret, roster, actions, run, open: open === secret.name, onToggle: () => setOpen(open === secret.name ? null : secret.name) })), ++ adding ? (0, import_react9.createElement)(AddSecret, { actions, run, onDone: () => setAdding(false) }) : null + ), -+ adding ? null : (0, import_react8.createElement)("div", { key: "add", className: "bt-actions" }, (0, import_react8.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setAdding(true) }, t("Add a key"))) ++ adding ? null : (0, import_react9.createElement)("div", { key: "add", className: "bt-actions" }, (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setAdding(true) }, t("Add a key"))) + ]; +} +var SECRET_CSS = ` @@ -7872,13 +8574,7 @@ diff --git a/client.js b/client.js +.bt-secret-danger svg{width:13px;height:13px} +.bt-secret-add .bt-input{height:34px} +@media (prefers-reduced-motion:reduce){.bt-secret-glide{transition:none}.bt-secret-check,.bt-secret-done,.bt-secret-ok,.bt-secret-edit{animation:none}} - `; --function installStyles(text, tag) { -- const style = document.createElement("style"); -- style.dataset.dshBot = tag; -- style.textContent = text; -- document.head.appendChild(style); -- return style; ++`; + +// src/client/face-seats.js +function faceSeats(room2, roster, { left = false } = {}) { @@ -7934,24 +8630,16 @@ diff --git a/client.js b/client.js + people2.push({ key, name: seat.person || (seat.mine ? cleanPeerName(roster.self?.displayName, "") : "") || t("Someone"), mine: seat.mine, seats: [seat] }); + } + return [...people2.filter((person) => person.mine), ...people2.filter((person) => !person.mine)]; - } --var FRAGMENT_SELECTOR = /\[class\*="(_[\w-]+)"\]/g; --var CLASS_TOKEN = /\.((?:\\.|[\w-])+)/g; --function sheetClassNames(sheet) { -- const names = []; -- const visit = (rules) => { -- for (const rule of rules) { -- if (rule.selectorText) for (const match of rule.selectorText.matchAll(CLASS_TOKEN)) names.push(match[1]); -- if (rule.cssRules) visit(rule.cssRules); ++} +function facePersonLabel(person) { + return person.mine ? t("{name} (you)", { name: person.name }) : person.name; +} + +// src/client/held-reply.js -+var import_react9 = require("react"); ++var import_react10 = require("react"); +var call3 = (endpoint, payload) => call(`flybot/${endpoint}`, payload); +var Boundary; -+var boundary = () => Boundary ??= class HeldReplyBoundary extends import_react9.Component { ++var boundary = () => Boundary ??= class HeldReplyBoundary extends import_react10.Component { + constructor(props) { + super(props); + this.state = { failed: false }; @@ -7968,18 +8656,18 @@ diff --git a/client.js b/client.js +}; +function useInlineEntry(policy) { + const slots = registry(); -+ const [, setVersion] = (0, import_react9.useState)(0); -+ (0, import_react9.useEffect)(() => slots.subscribe(() => setVersion(slots.version())), [slots]); ++ const [, setVersion] = (0, import_react10.useState)(0); ++ (0, import_react10.useEffect)(() => slots.subscribe(() => setVersion(slots.version())), [slots]); + return slots.entries("flybot.approvals").find((entry) => entry.inline === true && entry.policy === policy); +} +function HeldReplyActions({ held, actions, roster }) { + const locked = lockedWindow(roster); -+ const readOnlyLine2 = () => (0, import_react9.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)); ++ const readOnlyLine2 = () => (0, import_react10.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)); + const custom = useInlineEntry(held?.by); -+ const [busy, setBusy] = (0, import_react9.useState)(false); -+ const [error, setError] = (0, import_react9.useState)(""); ++ const [busy, setBusy] = (0, import_react10.useState)(false); ++ const [error, setError] = (0, import_react10.useState)(""); + const waiting = isApprovalWaiting(held?.status); -+ (0, import_react9.useEffect)(() => { ++ (0, import_react10.useEffect)(() => { + if (!waiting) return void 0; + claimApprovals(`held-reply:${held.id}`, [held.id]); + return () => claimApprovals(`held-reply:${held.id}`, []); @@ -7994,86 +8682,295 @@ diff --git a/client.js b/client.js + setError(failure?.message ?? String(failure)); + } finally { + setBusy(false); - } - }; -- try { -- visit(sheet.cssRules); -- } catch { ++ } ++ }; + if (!waiting) { + const failed = held.status === "failed"; -+ return (0, import_react9.createElement)( ++ return (0, import_react10.createElement)( + "div", + { className: "bt-held-note", "data-state": held.status, title: failed && held.error ? held.error : void 0 }, -+ (0, import_react9.createElement)("span", null, held.status === "approved" ? t("Sent to {to}", { to: held.toName }) : held.status === "auto" ? t("Auto-sent to {to}", { to: held.toName }) : failed ? t("Not sent: delivery failed") : t("Not sent")), ++ (0, import_react10.createElement)("span", null, held.status === "approved" ? t("Sent to {to}", { to: held.toName }) : held.status === "auto" ? t("Auto-sent to {to}", { to: held.toName }) : failed ? t("Not sent: delivery failed") : t("Not sent")), + // #968: the terminal answer comes from one predicate, not from `status === 'failed'` here and a + // different field elsewhere. A failure that can never succeed draws no button on any surface. -+ failed && canRetry(held) ? locked ? readOnlyLine2() : (0, import_react9.createElement)("button", { type: "button", className: "bt-held-retry", disabled: busy, onClick: () => decide("retry") }, t("Retry")) : null, -+ error ? (0, import_react9.createElement)("span", { className: "bt-flybot-approval-error", role: "alert" }, error) : null ++ failed && canRetry(held) ? locked ? readOnlyLine2() : (0, import_react10.createElement)("button", { type: "button", className: "bt-held-retry", disabled: busy, onClick: () => decide("retry") }, t("Retry")) : null, ++ error ? (0, import_react10.createElement)("span", { className: "bt-flybot-approval-error", role: "alert" }, error) : null + ); - } -- return names; ++ } + const at = typeof held.createdAt === "number" ? held.createdAt : Date.parse(held.createdAt); + const age = Number.isFinite(at) && at > 0 ? ` · ${relativeShort(at)}` : null; + const reason = reasonLine(held.reason); -+ const plain = (0, import_react9.createElement)( ++ const plain = (0, import_react10.createElement)( + "div", + { className: "bt-held-card", role: "region", "aria-label": t("Waiting for your approval") }, -+ (0, import_react9.createElement)("div", { className: "bt-held-head" }, t("Waiting for your approval"), age), -+ (0, import_react9.createElement)("div", { className: "bt-flybot-approval-origin" }, t("{from} → {to}", { from: held.from ?? t("A Bot"), to: held.toName })), -+ reason ? (0, import_react9.createElement)("div", { className: "bt-flybot-approval-reason", title: reason.title }, reason.text) : null, -+ locked ? readOnlyLine2() : (0, import_react9.createElement)( ++ (0, import_react10.createElement)("div", { className: "bt-held-head" }, t("Waiting for your approval"), age), ++ (0, import_react10.createElement)("div", { className: "bt-flybot-approval-origin" }, t("{from} → {to}", { from: held.from ?? t("A Bot"), to: held.toName })), ++ reason ? (0, import_react10.createElement)("div", { className: "bt-flybot-approval-reason", title: reason.title }, reason.text) : null, ++ locked ? readOnlyLine2() : (0, import_react10.createElement)( + "div", + { className: "bt-flybot-approval-actions" }, -+ (0, import_react9.createElement)("button", { type: "button", disabled: busy, onClick: () => decide("reject") }, t("Reject")), -+ (0, import_react9.createElement)("button", { type: "button", className: "bt-flybot-approve", disabled: busy, onClick: () => decide("approve") }, t("Approve")) ++ (0, import_react10.createElement)("button", { type: "button", disabled: busy, onClick: () => decide("reject") }, t("Reject")), ++ (0, import_react10.createElement)("button", { type: "button", className: "bt-flybot-approve", disabled: busy, onClick: () => decide("approve") }, t("Approve")) + ), -+ error ? (0, import_react9.createElement)("div", { className: "bt-flybot-approval-error", role: "alert" }, error) : null ++ error ? (0, import_react10.createElement)("div", { className: "bt-flybot-approval-error", role: "alert" }, error) : null + ); -+ return (0, import_react9.createElement)( ++ return (0, import_react10.createElement)( + "div", + { className: "bt-held-actions", "data-flybot": "held-reply-actions" }, -+ custom ? (0, import_react9.createElement)(boundary(), { id: custom.id, fallback: plain }, (0, import_react9.createElement)(custom.component, { held, decide, call: call3, actions, readOnly: locked === true })) : plain ++ custom ? (0, import_react10.createElement)(boundary(), { id: custom.id, fallback: plain }, (0, import_react10.createElement)(custom.component, { held, decide, call: call3, actions, readOnly: locked === true })) : plain + ); - } --function compileFragmentSelectors(text, names) { -- const compiled = /* @__PURE__ */ new Map(); -- return text.replace(FRAGMENT_SELECTOR, (whole, fragment) => { -- if (!compiled.has(fragment)) { -- const exact = []; -- for (const name of names) if (name.includes(fragment)) exact.push(`.${name}`); -- compiled.set(fragment, exact.length ? `:is(${exact.join(",")})` : whole); -- } -- return compiled.get(fragment); -- }); ++} + +// src/client/turn-reasoning.js +function turnReasoning(steps, current) { + const members = steps.length ? steps : [current]; + if (members.find((step) => stepReasoning(step) !== "")?.step !== current.step) return ""; + return members.filter((step) => !thinkingLive(step)).map(stepReasoning).filter(Boolean).join("\n\n"); - } --function installCompiledStyles(text, tag) { -- const style = installStyles("", tag); -- const cache = /* @__PURE__ */ new WeakMap(); -- const render = () => { -- const names = /* @__PURE__ */ new Set(); -- for (const sheet of document.styleSheets) { -- if (sheet.ownerNode?.dataset?.dshBot) continue; -- let list = cache.get(sheet); -- if (!list) { -- list = sheetClassNames(sheet); -- cache.set(sheet, list); -- } -- for (const name of list) names.add(name); ++} +var texts = (step) => step.blocks.filter((block) => block.kind === "text" && block.text.trim() !== ""); +var thinkingLive = (step) => step.status === "running" && texts(step).length === 0 && step.blocks.some((block) => block.kind === "reasoning"); +var stepReasoning = (step) => step.blocks.filter((block) => block.kind === "reasoning").map((block) => block.text).join("\n").trim(); + -+// src/client/cells.js -+var import_react10 = require("react"); -+var import_react_dom = require("react-dom"); ++// src/shared/message-fold-prefs.js ++var MODES = /* @__PURE__ */ new Set(["compact", "standard", "none"]); ++var DEFAULT_FOLDING = { mode: "standard", documentCards: true }; ++function readFolding(body, current) { ++ if (body === null) return void 0; ++ if (typeof body !== "object" || Array.isArray(body)) return false; ++ const mode = body.mode === void 0 ? current?.mode ?? DEFAULT_FOLDING.mode : body.mode; ++ if (!MODES.has(mode)) return false; ++ const documentCards = body.documentCards === void 0 ? current?.documentCards ?? DEFAULT_FOLDING.documentCards : body.documentCards; ++ if (typeof documentCards !== "boolean") return false; ++ return { mode, documentCards }; ++} ++ ++// src/shared/message-fold.js ++var FOLD_MODES = ["compact", "standard", "none"]; ++var FOLD_THRESHOLDS = { ++ compact: { lines: 4, chars: 240 }, ++ standard: { lines: 12, chars: 800 } ++}; ++var DOCUMENT_MIN_HEADINGS = 2; ++var DOCUMENT_MIN_BREAKS = 3; ++var MODE_SET = new Set(FOLD_MODES); ++function foldingOf(prefs) { ++ const raw = prefs?.folding; ++ if (!raw || typeof raw !== "object" || Array.isArray(raw)) return { ...DEFAULT_FOLDING }; ++ const mode = MODE_SET.has(raw.mode) ? raw.mode : DEFAULT_FOLDING.mode; ++ const documentCards = typeof raw.documentCards === "boolean" ? raw.documentCards : DEFAULT_FOLDING.documentCards; ++ return { mode, documentCards }; ++} ++function clipWord(line2, max) { ++ if (line2.length <= max) return line2; ++ const slice = line2.slice(0, max); ++ let breakAt = -1; ++ for (const mark of [" ", " ", ",", "。", "、", ";", ":", ",", ".", ";", ":", "!", "?", "!", "?"]) { ++ breakAt = Math.max(breakAt, slice.lastIndexOf(mark)); ++ } ++ if (breakAt >= Math.min(8, Math.floor(max * 0.4))) return slice.slice(0, breakAt); ++ return slice; ++} ++function closeFences(preview) { ++ let fence = null; ++ let offset = 0; ++ for (const line2 of preview.split("\n")) { ++ const match = line2.match(/^ {0,3}(`{3,}|~{3,})(.*)$/); ++ if (match) { ++ const mark = match[1]; ++ if (!fence) fence = { char: mark[0], length: mark.length, offset }; ++ else if (mark[0] === fence.char && mark.length >= fence.length && match[2].trim() === "") fence = null; ++ } ++ offset += line2.length + 1; ++ } ++ if (!fence) return preview; ++ if (preview.slice(0, fence.offset).trim()) return preview.slice(0, fence.offset).trimEnd(); ++ return `${preview} ++${fence.char.repeat(fence.length)}`; ++} ++function proseLines(text2) { ++ let fence = null; ++ return String(text2 ?? "").split("\n").filter((line2) => { ++ const match = line2.match(/^ {0,3}(`{3,}|~{3,})(.*)$/); ++ if (match) { ++ if (!fence) fence = match[1]; ++ else if (match[1][0] === fence[0] && match[1].length >= fence.length && !match[2].trim()) fence = null; ++ return false; ++ } ++ return !fence; ++ }); ++} ++function exceedsThreshold(text2, cap) { ++ if (!cap) return false; ++ const raw = String(text2 ?? ""); ++ if (raw.length > cap.chars) return true; ++ return raw.split("\n").length > cap.lines; ++} ++function previewOf2(text2, mode) { ++ const cap = FOLD_THRESHOLDS[mode]; ++ const raw = String(text2 ?? ""); ++ if (!cap) return raw; ++ const lines = raw.split("\n"); ++ const out = []; ++ let chars = 0; ++ for (let i = 0; i < lines.length && out.length < cap.lines; i++) { ++ const line2 = lines[i]; ++ const extra = (out.length === 0 ? 0 : 1) + line2.length; ++ if (out.length === 0 && line2.length > cap.chars) { ++ out.push(clipWord(line2, cap.chars)); ++ break; ++ } ++ if (out.length > 0 && chars + extra > cap.chars) { ++ const budget = cap.chars - chars - 1; ++ if (budget > 0) out.push(clipWord(line2, budget)); ++ break; ++ } ++ out.push(line2); ++ chars += extra; ++ } ++ return closeFences(out.join("\n")); ++} ++function shouldFold(text2, mode) { ++ const cap = FOLD_THRESHOLDS[mode]; ++ if (!cap) return false; ++ const raw = String(text2 ?? ""); ++ if (!exceedsThreshold(raw, cap)) return false; ++ return previewOf2(raw, mode) !== raw; ++} ++function documentHeadings(text2) { ++ const heads = []; ++ for (const line2 of proseLines(text2)) { ++ const match = line2.match(/^(#{1,6})\s+(.+?)\s*$/); ++ if (match) heads.push({ level: match[1].length, title: match[2] }); ++ } ++ return heads; ++} ++function isLongDocument(text2) { ++ if (!exceedsThreshold(text2, FOLD_THRESHOLDS.standard)) return false; ++ if (documentHeadings(text2).length >= DOCUMENT_MIN_HEADINGS) return true; ++ const sections = proseLines(text2).join("\n").split(/^\s*---\s*$/m).filter((part) => part.trim() !== ""); ++ return sections.length >= DOCUMENT_MIN_BREAKS; ++} ++function documentTitle(text2) { ++ const first = documentHeadings(text2)[0]?.title; ++ if (first) return first; ++ const line2 = String(text2 ?? "").split("\n").find((item) => item.trim() !== "") ?? ""; ++ const plain = line2.replace(/^#{1,6}\s+/, "").trim(); ++ return plain.length > 80 ? `${plain.slice(0, 80).trim()}…` : plain; ++} ++function showsDocumentCard(text2, folding, { streaming = false } = {}) { ++ if (streaming || folding?.mode === "none") return false; ++ return Boolean(folding?.documentCards) && isLongDocument(text2); ++} ++ ++// src/client/message-fold.js ++var import_react11 = require("react"); +var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives"); ++function FoldedContent({ text: text2, folding, streaming = false, actions, sessionId, children }) { ++ const [open, setOpen] = (0, import_react11.useState)(false); ++ const mode = folding?.mode ?? DEFAULT_FOLDING.mode; ++ const cards = folding?.documentCards === true || folding?.documentCards !== false && DEFAULT_FOLDING.documentCards; ++ (0, import_react11.useEffect)(() => { ++ setOpen(false); ++ }, [mode, cards, text2]); ++ const render = typeof children === "function" ? children : Array.isArray(children) && children.length === 1 && typeof children[0] === "function" ? children[0] : null; ++ const raw = String(text2 ?? ""); ++ if (streaming) return render ? render(raw) : null; ++ if (mode !== "none" && showsDocumentCard(raw, { ...folding, documentCards: cards })) { ++ const title = documentTitle(raw) || t("Document"); ++ const count = Math.max(documentHeadings(raw).length, 1); ++ return (0, import_react11.createElement)( ++ "div", ++ { className: "bt-document-message" }, ++ (0, import_react11.createElement)(DocumentCard, { title, count, onOpen: () => actions?.openDocument?.({ title, text: raw, sessionId }) }), ++ (0, import_react11.createElement)("button", { ++ type: "button", ++ className: "bt-fold-toggle", ++ "aria-expanded": open, ++ onClick: () => setOpen((value) => !value) ++ }, t(open ? "Hide message text" : "Show message text")), ++ open ? render ? render(raw) : (0, import_react11.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: raw, labels: mdLabels(), variant: "compact" }) : null ++ ); ++ } ++ if (!shouldFold(raw, mode)) return render ? render(raw) : null; ++ const shown = open ? raw : previewOf2(raw, mode); ++ return (0, import_react11.createElement)( ++ "div", ++ { className: "bt-fold", "data-folded": open ? void 0 : "" }, ++ render ? render(shown) : null, ++ (0, import_react11.createElement)("button", { ++ type: "button", ++ className: "bt-fold-toggle", ++ "aria-expanded": open, ++ onClick: (event) => { ++ event.preventDefault(); ++ event.stopPropagation(); ++ setOpen((value) => !value); ++ } ++ }, t(open ? "Show less" : "Show more")) ++ ); ++} ++function DocumentCard({ title, count, onOpen }) { ++ const sections = t("{count} sections", { count }); ++ return (0, import_react11.createElement)( ++ "button", ++ { ++ type: "button", ++ className: "bt-doc-card", ++ onClick: (event) => { ++ event.preventDefault(); ++ event.stopPropagation(); ++ onOpen?.(); ++ }, ++ "aria-label": `${title}. ${sections}. ${t("Open beside the conversation")}` ++ }, ++ (0, import_react11.createElement)("span", { className: "bt-doc-card-icon", "aria-hidden": true }, (0, import_react11.createElement)(DocIcon)), ++ (0, import_react11.createElement)( ++ "span", ++ { className: "bt-doc-card-copy" }, ++ (0, import_react11.createElement)("span", { className: "bt-doc-card-title" }, title), ++ (0, import_react11.createElement)("span", { className: "bt-doc-card-meta" }, sections) ++ ), ++ (0, import_react11.createElement)("span", { className: "bt-doc-card-go" }, t("Open beside the conversation")) ++ ); ++} ++function DocIcon() { ++ return (0, import_react11.createElement)( ++ "svg", ++ { width: 22, height: 22, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, ++ (0, import_react11.createElement)("path", { d: "M7 3.5h7l5 5V20a1.5 1.5 0 0 1-1.5 1.5h-10.5A1.5 1.5 0 0 1 5.5 20V5A1.5 1.5 0 0 1 7 3.5z" }), ++ (0, import_react11.createElement)("path", { d: "M14 3.5V9h5.5" }), ++ (0, import_react11.createElement)("path", { d: "M8.5 13h7M8.5 16.5h5" }) ++ ); ++} +var mdLabels = () => ({ code: { copyLabel: t("Copy"), copiedLabel: t("Copied") }, footnotes: t("Footnotes") }); ++function DocumentPane({ document: document2, onClose }) { ++ const title = document2?.title || t("Document"); ++ const text2 = String(document2?.text ?? ""); ++ return (0, import_react11.createElement)( ++ "div", ++ { className: "bt-doc-pane", "aria-label": title }, ++ (0, import_react11.createElement)( ++ "div", ++ { className: "bt-doc-pane-head" }, ++ (0, import_react11.createElement)( ++ "div", ++ { className: "bt-doc-pane-copy" }, ++ (0, import_react11.createElement)("h2", { className: "bt-doc-pane-title" }, title), ++ (0, import_react11.createElement)("p", { className: "bt-doc-pane-hint" }, t("Opened beside the conversation.")) ++ ), ++ (0, import_react11.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close document"), onClick: onClose }, (0, import_react11.createElement)(CloseIcon)) ++ ), ++ (0, import_react11.createElement)( ++ "div", ++ { className: "bt-doc-pane-body" }, ++ (0, import_react11.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: text2, labels: mdLabels(), variant: "compact" }) ++ ) ++ ); ++} ++ ++// src/client/cells.js ++var import_react12 = require("react"); ++var import_dsh_client_ui_primitives2 = require("@deepseek-ai/dsh-client-ui-primitives"); ++var mdLabels2 = () => ({ code: { copyLabel: t("Copy"), copiedLabel: t("Copied") }, footnotes: t("Footnotes") }); +function bubbleLinkClick({ actions, subject }) { + return (event) => { + if (!event || event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return false; @@ -8087,29 +8984,22 @@ diff --git a/client.js b/client.js + if (tabId !== void 0 && tabId !== null && typeof actions.browserNavigate === "function") { + void actions.browserNavigate(tabId, href); + return true; - } -- const next = compileFragmentSelectors(text, names); -- if (style.textContent !== next) style.textContent = next; -- }; -- render(); -- let timer; -- const schedule = () => { -- clearTimeout(timer); -- timer = setTimeout(render, 120); -- }; -- const onLoad = (event) => { -- if (event.target instanceof HTMLLinkElement) schedule(); ++ } + if (typeof window !== "undefined" && typeof window.open === "function") window.open(href, "_blank", "noopener,noreferrer"); + return true; - }; -- const observer = new MutationObserver(schedule); -- observer.observe(document.head, { childList: true }); -- document.addEventListener("load", onLoad, true); -- return () => { -- observer.disconnect(); -- document.removeEventListener("load", onLoad, true); -- clearTimeout(timer); -- style.remove(); ++ }; ++} ++function bubbleBody({ text: text2, roster, selfId, live, mentions, actions, sessionId }) { ++ const folding = foldingOf(roster?.prefs); ++ const render = (shown) => (0, import_react12.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: linkMentions(shown, roster.bots, selfId), streaming: live, labels: mdLabels2(), variant: "compact", fileMentions: mentions }); ++ if (!live && showsDocumentCard(text2, folding)) { ++ return (0, import_react12.createElement)(FoldedContent, { text: text2, folding, actions, sessionId }); ++ } ++ return (0, import_react12.createElement)( ++ "div", ++ { className: "bt-bubble" }, ++ (0, import_react12.createElement)(FoldedContent, { text: text2, folding, streaming: live, actions, sessionId }, render) ++ ); +} +function Bubbles({ texts: texts2, roster, selfId, actions, streaming, sessionId, msgKey, msgKeys, useUi, lead, mentions }) { + const openLink = bubbleLinkClick({ actions, subject: selfId ?? sessionId }); @@ -8120,13 +9010,14 @@ diff --git a/client.js b/client.js + event.preventDefault(); + event.stopPropagation(); + actions.openSession(target); - }; ++ }; + const reactions = useUi ? useUi((state) => msgKey || msgKeys ? msgKeys ? state.reactions ?? null : state.reactions?.[msgKey] ?? null : null) : null; + const reactKey = (index) => msgKeys ? msgKeys[index] : msgKey; + const reactIndex = (index) => msgKeys ? 0 : index; ++ const [contextAt, setContextAt] = (0, import_react12.useState)(null); + const shown = (texts2 ?? []).filter((text2) => String(text2 ?? "").trim() !== ""); + if (shown.length === 0) return null; -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { className: "bt-astack", "data-lead": lead ? "" : void 0, onClickCapture: onClick }, + shown.map((text2, index) => { @@ -8134,21 +9025,25 @@ diff --git a/client.js b/client.js + const picked = key ? (msgKeys ? reactions?.[key] : reactions)?.[reactIndex(index)] ?? [] : []; + const last = index === shown.length - 1; + const live = streaming && last; -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", -+ { key: index, className: "bt-msg" }, -+ (0, import_react10.createElement)( ++ { key: index, className: "bt-msg", onContextMenu: (event) => onMessageContextMenu(event, (at) => setContextAt({ ...at, index }), { live }) }, ++ (0, import_react12.createElement)( + "div", + { className: "bt-msg-line" }, + lead && last ? lead : null, -+ (0, import_react10.createElement)( -+ "div", -+ { className: "bt-bubble" }, -+ (0, import_react10.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: linkMentions(text2, roster.bots, selfId), streaming: live, labels: mdLabels(), variant: "compact", fileMentions: mentions }) -+ ), -+ live ? null : (0, import_react10.createElement)(MessageTools, { text: text2, name: roster.byId[selfId]?.name ?? t("Bot"), sessionId, react: key ? (emoji) => actions.toggleReaction(key, reactIndex(index), emoji) : void 0, actions }) ++ bubbleBody({ text: text2, roster, selfId, live, mentions, actions, sessionId }), ++ live ? null : (0, import_react12.createElement)(MessageTools, { ++ text: text2, ++ name: roster.byId[selfId]?.name ?? t("Bot"), ++ sessionId, ++ react: key ? (emoji) => actions.toggleReaction(key, reactIndex(index), emoji) : void 0, ++ actions, ++ roster, ++ contextAt: contextAt?.index === index ? contextAt : null ++ }) + ), -+ picked.length ? (0, import_react10.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react10.createElement)("button", { ++ picked.length ? (0, import_react12.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react12.createElement)("button", { + key: emoji, + type: "button", + className: "bt-react", @@ -8158,32 +9053,8 @@ diff --git a/client.js b/client.js + ); + }) + ); - } -- --// src/client/mark.js --var import_react2 = require("react"); --var STATES = ["idle", "thinking", "searching", "working", "sending", "orbit", "alert", "done"]; --var botState = (running, activity, alert) => running ? STATES.includes(activity) ? activity : "working" : alert ? "alert" : "idle"; --var toolState = (name) => /^(message_bot|stop_bot|create_bot|update_bot|create_group|update_group|delete_group|post_to_group)$/.test(name) ? "sending" : /search|fetch|browse|read|grep|glob|list|recall/i.test(name) ? "searching" : "working"; --function useGaze(ref, enabled) { -- (0, import_react2.useEffect)(() => { -- if (!enabled) return void 0; -- let frame = 0; -- let point = null; -- const place = () => { -- frame = 0; -- const node = ref.current; -- if (!node || !point) return; -- const box = node.getBoundingClientRect(); -- const clamp = (value) => Math.max(-1, Math.min(1, value)); -- node.style.setProperty("--bt-gx", clamp((point.x - box.left - box.width / 2) / 160).toFixed(2)); -- node.style.setProperty("--bt-gy", clamp((point.y - box.top - box.height / 2) / 160).toFixed(2)); -- }; -- const onMove = (event) => { -- point = { x: event.clientX, y: event.clientY }; -- if (!frame) frame = requestAnimationFrame(place); ++} +var WAITING_OTHERS_NOTICE = "Waiting for the owner's approval"; -+var REACTIONS = ["👍", "❤️", "😂", "😮", "😢", "🙏"]; +function leaveNoticeCoveredByClose(room2, text2) { + if (room2?.origin !== "face-to-face" || room2.face?.status !== "closed") return false; + const match = String(text2 ?? "").trim().match(/^(.+) left(?: the room)?$/); @@ -8196,126 +9067,6 @@ diff --git a/client.js b/client.js + } + return false; +} -+function useDismiss(open, close, refs) { -+ (0, import_react10.useEffect)(() => { -+ if (!open) return void 0; -+ const onDown = (event) => { -+ if (refs.some((ref) => ref.current?.contains(event.target))) return; -+ close(); - }; -- const onLeave = () => { -- point = null; -- ref.current?.style.setProperty("--bt-gx", "0"); -- ref.current?.style.setProperty("--bt-gy", "0"); -+ const onKey = (event) => { -+ if (event.key === "Escape") { -+ event.stopPropagation(); -+ close(); -+ } - }; -- window.addEventListener("pointermove", onMove, { passive: true }); -- document.documentElement.addEventListener("pointerleave", onLeave); -+ window.addEventListener("mousedown", onDown); -+ window.addEventListener("keydown", onKey, true); - return () => { -- cancelAnimationFrame(frame); -- window.removeEventListener("pointermove", onMove); -- document.documentElement.removeEventListener("pointerleave", onLeave); -+ window.removeEventListener("mousedown", onDown); -+ window.removeEventListener("keydown", onKey, true); - }; -- }, [enabled]); -+ }, [open]); - } --var FIDGETS = ["hop", "sway", "stretch", "look"]; --function BotMark({ bot, look: given, size = 36, state = "idle", live = false, gaze = false, pokeable = false, label }) { -- const look = given ?? lookOf(bot); -- const ref = (0, import_react2.useRef)(null); -- const maskId = (0, import_react2.useRef)(""); -- if (maskId.current === "") maskId.current = `bt-mark-${nextMarkSerial()}`; -- const [poked, setPoked] = (0, import_react2.useState)(false); -- useGaze(ref, gaze); -- const common = { -- ref, -- className: poked ? "bt-mark bt-mark-poke" : "bt-mark", -- "data-shape": look.image ? "image" : shapeId(look.shape), -- "data-state": STATES.includes(state) ? state : "idle", -- "data-live": live ? "" : void 0, -- "data-fidget": live ? FIDGETS[fnv1a(`${bot?.id ?? ""}:fidget`) % FIDGETS.length] : void 0, -- "data-gaze": gaze ? "" : void 0, -- "data-poke": pokeable ? "" : void 0, -- style: { width: size, height: size, ...live ? { "--bt-delay": `${-(fnv1a(String(bot?.id ?? "")) % 5e3) / 1e3}s`, "--bt-fidget-delay": `${-(fnv1a(`${bot?.id ?? ""}:when`) % 9e3) / 1e3}s` } : {} }, -- role: label ? "img" : void 0, -- "aria-label": label, -- "aria-hidden": label ? void 0 : true, -- onClick: pokeable ? () => setPoked(true) : void 0, -- onAnimationEnd: poked ? (event) => { -- if (/^bt-poke/.test(event.animationName)) setPoked(false); -- } : void 0 -+function MessageTools({ text: text2, name, sessionId, react, actions }) { -+ const [panel, setPanel] = (0, import_react10.useState)(null); -+ const [place, setPlace] = (0, import_react10.useState)(null); -+ const [copied, setCopied] = (0, import_react10.useState)(false); -+ const tools = (0, import_react10.useRef)(null); -+ const pop = (0, import_react10.useRef)(null); -+ const close = () => setPanel(null); -+ useDismiss(panel !== null, close, [tools, pop]); -+ const open = (kind, event) => { -+ if (panel === kind) { -+ close(); -+ return; -+ } -+ const rect = event.currentTarget.getBoundingClientRect(); -+ const below = rect.bottom + 220 < window.innerHeight; -+ setPlace(kind === "react" ? { left: rect.left + rect.width / 2, top: rect.top - 6, "--bt-origin": "bottom center" } : { left: Math.min(rect.left, window.innerWidth - 208), ...below ? { top: rect.bottom + 4 } : { bottom: window.innerHeight - rect.top + 4, "--bt-origin": "bottom left" } }); -+ setPanel(kind); - }; -- if (look.image) return (0, import_react2.createElement)("span", common, (0, import_react2.createElement)("img", { className: "bt-mark-img", src: look.image, alt: "", draggable: false })); -- const box = shapeOf(look.shape).size; -- return (0, import_react2.createElement)("span", common, (0, import_react2.createElement)("svg", { viewBox: `0 0 ${box} ${box}`, dangerouslySetInnerHTML: { __html: characterMarkup(look.shape, look.color).replaceAll(MASK_ID, maskId.current) } })); -+ const copy2 = () => { -+ void navigator.clipboard?.writeText(text2).then(() => { -+ setCopied(true); -+ setTimeout(() => setCopied(false), 1e3); -+ }); -+ }; -+ const download2 = () => { -+ const url = URL.createObjectURL(new Blob([text2], { type: "text/markdown" })); -+ const link = Object.assign(document.createElement("a"), { href: url, download: `${name}-message.md` }); -+ link.click(); -+ setTimeout(() => URL.revokeObjectURL(url), 1e3); -+ }; -+ const item = (label, Icon, run) => (0, import_react10.createElement)("button", { key: label, type: "button", role: "menuitem", onClick: () => { -+ close(); -+ run(); -+ } }, (0, import_react10.createElement)(Icon), label); -+ return (0, import_react10.createElement)( -+ "div", -+ { ref: tools, className: "bt-tools", "data-open": panel !== null || void 0 }, -+ react ? (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Add reaction"), title: t("Add reaction"), "aria-expanded": panel === "react", onClick: (event) => open("react", event) }, (0, import_react10.createElement)(SmileIcon)) : null, -+ sessionId ? (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Reply"), title: t("Reply"), onClick: () => actions.quote(sessionId, text2) }, (0, import_react10.createElement)(ReplyIcon)) : null, -+ (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("More message actions"), title: t("More"), "aria-haspopup": "menu", "aria-expanded": panel === "more", onClick: (event) => open("more", event) }, copied ? (0, import_react10.createElement)(CheckIcon) : (0, import_react10.createElement)(DotsIcon)), -+ panel === "react" ? (0, import_react_dom.createPortal)((0, import_react10.createElement)( -+ "div", -+ { ref: pop, className: "bt-react-strip", role: "menu", "aria-label": t("Reactions"), style: place }, -+ REACTIONS.map((emoji) => (0, import_react10.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => { -+ close(); -+ react(emoji); -+ } }, emoji)) -+ ), document.body) : null, -+ panel === "more" ? (0, import_react_dom.createPortal)((0, import_react10.createElement)( -+ "div", -+ { ref: pop, className: "bt-menu", role: "menu", "aria-label": t("Message actions"), style: place }, -+ item(t("Copy"), CopyIcon, copy2), -+ item(t("Download"), DownloadIcon, download2) -+ ), document.body) : null -+ ); - } --function StarIcon({ size = 8 }) { -- return (0, import_react2.createElement)( -- "svg", -- { width: size, height: size, viewBox: "0 0 10 10", "aria-hidden": true }, -- (0, import_react2.createElement)("path", { d: "M5 .6l1.3 2.8 3 .3-2.3 2 .7 3L5 7.2 2.3 8.7l.7-3L.7 3.7l3-.3z", fill: "#fff" }) +var PEEK_MAX = 160; +var CUT = "…"; +var MARKUP = [/^\s{0,3}(?:`{3,}|~{3,})/, /^\s{0,3}([-*_])(?:\s*\1){2,}\s*$/]; @@ -8339,17 +9090,17 @@ diff --git a/client.js b/client.js +function ThinkingRow({ text: text2 }) { + if (typeof text2 !== "string" || text2.trim() === "") return null; + const peek = peekLine(text2); -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "details", + { className: "bt-think" }, -+ (0, import_react10.createElement)( ++ (0, import_react12.createElement)( + "summary", + null, -+ (0, import_react10.createElement)("span", { className: "bt-think-caret", "aria-hidden": true }, "›"), ++ (0, import_react12.createElement)("span", { className: "bt-think-caret", "aria-hidden": true }, "›"), + t("Thought it through"), -+ peek ? (0, import_react10.createElement)("span", { className: "bt-think-peek" }, peek) : null ++ peek ? (0, import_react12.createElement)("span", { className: "bt-think-peek" }, peek) : null + ), -+ (0, import_react10.createElement)("div", { className: "bt-think-text" }, text2) ++ (0, import_react12.createElement)("div", { className: "bt-think-text" }, text2) + ); +} +function useFileMentions({ node, openFile, fileMentions, useTurnData }) { @@ -8357,7 +9108,7 @@ diff --git a/client.js b/client.js + const location2 = node.location; + const turn = location2?.kind === "turn" || location2?.kind === "step" ? location2.turn : void 0; + const seq = node.data.finalNode?.seq; -+ return (0, import_react10.useMemo)(() => { ++ return (0, import_react12.useMemo)(() => { + if (typeof fileMentions !== "function" || turn?.status !== "closed" || seq === void 0) return void 0; + return tail?.closing?.finalNode.seq === seq ? fileMentions({ turn, seq, openFile }) : void 0; + }, [fileMentions, openFile, seq, tail, turn]); @@ -8371,7 +9122,7 @@ diff --git a/client.js b/client.js +function friendLead(bot, texts2) { + if (bot?.remote === void 0 || texts2.length === 0) return void 0; + if (texts2.every((text2) => /^Not sent:/.test(text2.trim()))) return void 0; -+ return (0, import_react10.createElement)("span", { className: "bt-lead", title: bot.name, "data-flybot": "friend-lead" }, (0, import_react10.createElement)(BotMark, { bot, size: 22 })); ++ return (0, import_react12.createElement)("span", { className: "bt-lead", title: bot.name, "data-flybot": "friend-lead" }, (0, import_react12.createElement)(BotMark, { bot, size: 22 })); +} +function AssistantCell({ node, groupPart, sessionId, openFile, fileMentions, useTurnData, useRoster, useUi, useTurnSteps, useTurnContext, actions }) { + const roster = useRoster((value) => value); @@ -8391,14 +9142,14 @@ diff --git a/client.js b/client.js + const relays = relayPart(data, groupPart) ? relaysBefore(contexts, steps, data) : []; + if (texts2.length === 0 && !reasoning && relays.length === 0) return null; + const selfId = roster.byId[sessionId]?.id ?? sessionId; -+ const bubbles = texts2.length ? person ? (0, import_react10.createElement)(PersonMessage, { name: person, texts: texts2, roster, selfId, actions, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi }) : (0, import_react10.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, streaming: running, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi, mentions, lead: friendLead(roster.byId[sessionId], texts2) }) : null; -+ return (0, import_react10.createElement)( -+ import_react10.Fragment, ++ const bubbles = texts2.length ? person ? (0, import_react12.createElement)(PersonMessage, { name: person, texts: texts2, roster, selfId, actions, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi }) : (0, import_react12.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, streaming: running, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi, mentions, lead: friendLead(roster.byId[sessionId], texts2) }) : null; ++ return (0, import_react12.createElement)( ++ import_react12.Fragment, + null, + relays.map((relay) => { + const source = relay.source; + const sender = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; -+ return (0, import_react10.createElement)(EventLine, { ++ return (0, import_react12.createElement)(EventLine, { + key: relay.seq, + prefix: source.role === "stopped" ? t("Stopped by") : source.role === "reply" ? t("Reply from") : t("Message from"), + bots: [sender], @@ -8408,103 +9159,179 @@ diff --git a/client.js b/client.js + whole: true + }); + }), -+ reasoning ? (0, import_react10.createElement)(ThinkingRow, { text: reasoning }) : null, -+ held && bubbles ? (0, import_react10.createElement)(HeldReply, { held, roster, sessionId, actions, closing }, bubbles) : bubbles - ); ++ reasoning ? (0, import_react12.createElement)(ThinkingRow, { text: reasoning }) : null, ++ held && bubbles ? (0, import_react12.createElement)(HeldReply, { held, roster, sessionId, actions, closing }, bubbles) : bubbles ++ ); } --function AdminStar() { -- return (0, import_react2.createElement)("span", { className: "bt-admin-star", role: "img", "aria-label": t("Admin") }, (0, import_react2.createElement)(StarIcon, { size: 7 })); --} --function MainStar() { -- return (0, import_react2.createElement)( -- "svg", -- { viewBox: "0 0 20 20", "aria-hidden": true }, -- (0, import_react2.createElement)("path", { d: "M10 2.4l2.29 5.04 5.51.63-4.09 3.74 1.11 5.42L10 14.5l-4.82 2.73 1.11-5.42L2.2 8.07l5.51-.63z" }) +-@keyframes bt-fade-in{from{opacity:0}to{opacity:1}} +-@keyframes bt-fade-out{from{opacity:1}to{opacity:0}} +-[data-composer-card]{display:flex!important;flex-direction:row;flex-wrap:wrap;align-items:center;gap:0!important;min-height:44px;border-radius:22px!important;padding:7.5px!important;box-sizing:border-box;background:var(--bt-main)!important;border:.5px solid var(--bt-line-2)!important;box-shadow:0 2px 8px -1px rgba(0,0,0,.05),0 1px 2px rgba(0,0,0,.03),0 0 0 1px rgba(228,228,228,.04)!important;transition:border-color .15s ease,background-color .15s ease,${spring(SPRING_SHAPE, "border-radius")}!important} +-[data-composer-card]:hover,[data-composer-card]:focus-within{border-color:color-mix(in srgb,var(--bt-ink) 30%,transparent)!important} +-[data-composer-card]:has(> [data-slot="conversation.input.attachments"] *),[data-composer-card]:has([data-composer-input] br + *),[data-composer-card]:has([data-composer-input] > :nth-child(2)){border-radius:18px!important} +-[class*="_root"]:has(> [data-composer-card]){padding:0 11px 13px 16px!important} +-[class*="_root"]:has(> [data-composer-card])>[data-composer-card]{max-width:min(992px,100%)!important} +-[data-composer-card]>[class*="_row"]{display:contents!important} +-[data-composer-card] [class*="_tools"]{order:1;flex:none;align-self:flex-end;margin:0} +-[data-composer-card]>[data-input-scroll]{order:2;flex:1 1 0;min-width:0;padding:0 8px!important;margin:0!important} +-[data-composer-card] [class*="_trailing"]{order:3;flex:none;align-self:flex-end;margin:0} +-[data-composer-card]>[data-slot="conversation.input.attachments"]{order:0;flex-basis:100%} +-[data-composer-card] [data-composer-input]{min-height:24px;padding:2px 0!important} +-[data-composer-card] [data-composer-placeholder]{left:0!important;top:2px!important} +-[data-composer-placeholder]{font-size:0!important;line-height:0!important} +-[data-composer-placeholder]::after{content:var(--bt-placeholder,"Message");display:block;font-size:14px;line-height:24px;color:color-mix(in srgb,var(--bt-ink) 36%,transparent)} +-/* The team's "+" (ComposerPlus) takes the seat of the shell's command-menu button. */ +-[data-composer-card] button[class*="_add"]{display:none!important} +-.bt-plus{flex:none;width:28px;height:28px;padding:0;border:0;border-radius:50%;display:inline-flex;align-items:center;justify-content:center;background:color-mix(in srgb,var(--bt-ink) 5%,transparent);box-shadow:inset 0 0 0 .5px var(--bt-line);color:var(--bt-ink-2);cursor:pointer;transition:background-color .15s ease,color .15s ease,${spring(SPRING_TAP, "scale")}} +-.bt-plus:hover,.bt-plus[aria-expanded=true]{background:color-mix(in srgb,var(--bt-ink) 10%,transparent);color:var(--bt-ink)} +-.bt-plus:active{scale:.9} +-.bt-plus svg{width:14px;height:14px;transition:${spring(SPRING_POP, "rotate")}} +-.bt-plus[aria-expanded=true] svg{rotate:45deg} +-.bt-plus-menu{min-width:180px} +-[data-composer-card] [class*="_tools"]{gap:0!important} +-[data-composer-card] [class*="_modes"]:empty{display:none!important} +-[data-composer-card] [class*="_activity"]:not(:has([data-slot] > *)){display:none!important} +-[data-composer-card] [class*="_trailing"]{gap:8px} +-[data-composer-card] [class*="_standardControls"]{display:flex;align-items:center;gap:8px} +-[data-composer-card] button[class*="_primary"]{width:28px!important;height:28px!important;background:var(--bt-accent)!important;color:var(--bt-accent-ink,#fff)!important;border-radius:50%!important;transition:opacity .15s ease,${spring(SPRING_TAP, "scale")};animation:bt-icon-swap ${SPRING_POP.duration}ms ${SPRING_POP.easing}} +-[data-composer-card] button[class*="_primary"]:hover:not(:disabled){opacity:.9} +-[data-composer-card] button[class*="_primary"]:active:not(:disabled){scale:.9} +-@keyframes bt-icon-swap{from{opacity:0;transform:scale(.5) rotate(-30deg)}} +-[data-composer-card] button[class*="_primary"] svg{width:14px;height:14px} +-[data-composer-card] button[class*="_primary"]:disabled{display:none!important} +-[data-composer-dock]{display:none!important} +-.bt-mic,.bt-voice{flex:none;width:28px;height:28px;border-radius:50%;border:0;padding:0;display:inline-grid;place-items:center;cursor:pointer;transition:background-color .15s ease,color .15s ease,${spring(SPRING_TAP, "scale")}} +-.bt-mic{background:color-mix(in srgb,var(--bt-ink) 5%,transparent);box-shadow:inset 0 0 0 .5px var(--bt-line);color:var(--bt-ink-2)} +-.bt-mic:hover{background:color-mix(in srgb,var(--bt-ink) 10%,transparent);color:var(--bt-ink)} +-.bt-mic[aria-pressed=true]{background:#ff3e51;color:#fff;animation:bt-mic-pulse 1.4s ease-in-out infinite} +-@keyframes bt-mic-pulse{0%,100%{box-shadow:0 0 0 0 rgba(255,62,81,.35)}50%{box-shadow:0 0 0 5px rgba(255,62,81,0)}} +-.bt-voice{display:none;background:var(--bt-accent);color:var(--bt-accent-ink,#fff);animation:bt-icon-swap ${SPRING_POP.duration}ms ${SPRING_POP.easing}} +-.bt-voice:hover{opacity:.9} +-.bt-mic:active,.bt-voice:active{scale:.9} +-[data-composer-card]:has(button[class*="_primary"]:disabled) .bt-voice{display:inline-grid} +-body[data-bt-room] .bt-voice{display:none!important} +-body[data-bt-room] [data-composer-card]:has(button[class*="_primary"]:disabled) .bt-mic:not([aria-pressed=true]){background:var(--bt-accent);color:var(--bt-accent-ink,#fff)} +-.bt-mic-note{position:absolute;right:12px;bottom:calc(100% + 8px);padding:5px 10px;border-radius:8px;background:var(--bt-user);color:var(--bt-user-ink);font-size:12px;line-height:16px;white-space:nowrap;pointer-events:none;animation:bt-rise .16s ease-out} +-[data-chain-overlay-fallback="conversation.composer"]:has(~ .bt-q){display:block!important;order:2} +-.bt-q{order:1} +-div:has(> nav [class*="_marks"]){display:none!important} +-/* Every user-side bubble (sent, steering mid-turn, not yet admitted, question replies) +- takes its surface and its text from the one --bt-user pair: a skin that repaints +- the host's bubble surface alone would otherwise leave the text unreadable. */ +-[class*="_userRow"] [class*="_bubble"],[data-chat-flow-kind=question-reply] [class*="_bubble"],[data-chat-flow-kind=command-input] [class*="_bubble"]{background:var(--bt-user)!important;color:var(--bt-user-ink)!important;border-radius:18px!important;padding:7px 12px!important;font-size:var(--dsh-content-font-size,14px)!important;line-height:calc(var(--dsh-content-font-size,14px) + 8px)!important} +-[class*="_userRow"] [class*="_bubble"] [class*="_markdown"],[class*="_userRow"] [class*="_bubble"] a{color:inherit} +-/* Sent messages get the hover toolbar below; steering and unsent bubbles keep none. */ +-[class*="_userRow"] [class*="_actions"]{display:none!important} +-[data-chat-flow-kind=user] [class*="_userRow"]{flex-direction:row-reverse;align-items:center;justify-content:flex-start} +-[data-chat-flow-kind=user] [class*="_actions"]{display:flex!important;height:24px!important;gap:2px!important;opacity:0!important;visibility:hidden;transition:opacity .12s ease,visibility .12s!important;flex:none} +-[data-chat-flow-kind=user] [class*="_userRow"]:hover [class*="_actions"],[data-chat-flow-kind=user] [class*="_userRow"]:focus-within [class*="_actions"]{opacity:1!important;visibility:visible} +-[data-chat-flow-kind=user] [class*="_actions"] [class*="_timeStart"]{display:none} +-[data-chat-flow-kind=user] [class*="_actions"] button{width:24px;height:24px;border-radius:6px;color:var(--bt-ink-2)} +-[data-chat-flow-kind=user] [class*="_actions"] button:hover{background:var(--bt-hover);color:var(--bt-ink)} +-[data-chat-flow-kind=user] [class*="_actions"] svg{width:15px;height:15px} +-.bt-q-inline{display:flex;margin:4px 0 6px} +-[data-chat-flow-kind=assistant-step]+[data-step-process]:has(.bt-q-inline){margin-top:0!important} +-[data-chat-flow-kind=question-reply]:has(.bt-q-inline),[data-chat-group-key]:has([data-chat-flow-kind=question-reply] .bt-q-inline),[data-chat-group-key]:has(.bt-q-gone){margin-top:0!important} +-.bt-q-inline .bt-q{margin:0;max-width:min(550px,86%);order:0} +-.bt-q-dock{width:100%;display:flex;justify-content:center} +-.bt-q-dock .bt-q{margin:0 auto 8px} +-[class*="_toBottomSlot"]{justify-content:center!important;padding-right:0!important} +-[data-conversation-scroll] [class*="_toBottomSlot"]{bottom:calc(var(--dsh-composer-height,152px) + 8px)!important} +-[class*="_toBottomSlot"]>button{width:36px!important;height:36px!important;margin-top:-36px!important;background:var(--bt-main)!important;color:var(--bt-ink)!important;box-shadow:0 0 0 .5px var(--bt-line-2),0 2px 8px -2px rgba(0,0,0,.12)!important;animation:bt-tobottom-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out;transition:background-color .12s ease,${spring(SPRING_TAP, "scale")}} +-[class*="_toBottomSlot"]>button:active{scale:.9} +-[class*="_toBottomSlot"]>button:hover{background:color-mix(in srgb,var(--bt-ink) 4%,var(--bt-main))!important} +-[class*="_toBottomSlot"]>button svg{display:none} +-[class*="_toBottomSlot"]>button::before{content:"";width:20px;height:20px;background:currentColor;-webkit-mask:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='none' stroke='black' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M10 4v12M5 11l5 5 5-5'/%3E%3C/svg%3E") center/contain no-repeat;mask:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='none' stroke='black' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M10 4v12M5 11l5 5 5-5'/%3E%3C/svg%3E") center/contain no-repeat} +-@keyframes bt-tobottom-in{from{translate:0 8px;scale:.8}} +-[data-bt-news] [class*="_toBottomSlot"]>button{visibility:hidden!important;pointer-events:none!important} +-.bt-news{position:fixed;z-index:30;transform:translateX(-50%);display:inline-flex;align-items:center;overflow:hidden;border-radius:999px;background:#0c64c1;color:#fcfcfc;box-shadow:inset 0 0 0 1px rgba(20,20,20,.05),0 1px 3px 0 rgba(0,0,0,.12);font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;animation:bt-news-in ${SPRING_TAP.duration}ms ${SPRING_TAP.easing},bt-veil-in .16s ease-out} +-@keyframes bt-news-in{from{translate:0 8px;scale:.9}} +-.bt-news[data-direction=up]{animation-name:bt-news-in-up,bt-veil-in} +-@keyframes bt-news-in-up{from{translate:0 -8px;scale:.9}} +-.bt-news-jump{display:inline-flex;align-items:center;gap:2px;margin:0;padding:4px 26px 4px 4px;border:0;border-radius:0;background:transparent;color:inherit;font:inherit;font-size:13px;line-height:18px;white-space:nowrap;cursor:pointer;outline:none} +-.bt-news-ico{flex:none;display:inline-flex;align-items:center;justify-content:center;width:20px;height:20px} +-.bt-news-ico svg{width:16px;height:16px} +-.bt-news-x{position:absolute;right:4px;top:50%;z-index:1;transform:translateY(-50%);width:20px;height:20px;padding:0;border:0;border-radius:999px;background:transparent;color:inherit;opacity:.75;display:inline-flex;align-items:center;justify-content:center;cursor:pointer} +-.bt-news-x svg{width:12px;height:12px} +-.bt-news-x:hover{opacity:1;background:rgba(20,20,20,.5)} +-@media (prefers-reduced-motion:reduce){.bt-news,[class*="_toBottomSlot"]>button{animation:none}} +-.bt-new-sep{display:flex;align-items:center;gap:8px;margin:14px 0 8px;padding:2px 0;font-size:11px;line-height:14px;font-weight:500;letter-spacing:.02em;text-transform:uppercase;color:#0c64c1;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} +-.bt-new-sep::before,.bt-new-sep::after{content:"";flex:1;height:1px;background:color-mix(in srgb,#0c64c1 20%,transparent)} +-.bt-open-new{display:flex;flex-direction:column} +-.bt-open-new .bt-new-sep{margin:18px 0 0} +-.bt-open-new .bt-time-sep{height:16px;margin:32px 0 2px} +-.bt-earlier{display:flex;flex-direction:column;gap:6px} +-.bt-earlier-top{display:flex;justify-content:center;align-items:center;height:34px;flex:none} +-.bt-earlier-top .bt-soft{height:28px;font-size:12px;padding:0 12px} +-.bt-urow{display:flex;justify-content:flex-end} +-.bt-ububble{max-width:min(560px,78%);background:var(--bt-user);color:var(--bt-user-ink);border-radius:18px;padding:7px 12px;font-size:14px;line-height:20px;box-sizing:border-box;overflow-wrap:anywhere} +-.bt-ububble [class*="_markdown"],.bt-ububble a{color:inherit!important} +-.bt-ububble p{margin:0;line-height:22px} +-.bt-uimages{display:block;font-size:12px;opacity:.7} +-.bt-earlier .bt-event{margin:4px 0} +-.bt-part-line{display:flex;align-items:center;gap:10px;margin:10px 0 6px;font-size:11px;line-height:14px;color:var(--bt-ink-3)} +-.bt-part-line::before,.bt-part-line::after{content:"";flex:1;height:1px;background:var(--bt-line)} +-`; +-function installStyles(text, tag) { +- const style = document.createElement("style"); +- style.dataset.dshBot = tag; +- style.textContent = text; +- document.head.appendChild(style); +- return style; +function HeldReply({ held, roster, sessionId, actions, closing, children }) { + const bot = roster.byId[sessionId]; + const chat = (roster.bots ?? []).find((item) => item.remote?.handle === held.to); + const toName = cleanPeerName(held.toOwner) || (chat ? friendBotOwner(chat) : ownerNameOf({ handle: held.to })) || held.to || t("a friend"); -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { className: "bt-held-reply", "data-state": held.status, "data-held": isApprovalWaiting(held.status) ? "" : void 0 }, + children, -+ closing ? (0, import_react10.createElement)(HeldReplyActions, { held: { ...held, toName, from: bot?.name }, actions, roster }) : null - ); ++ closing ? (0, import_react12.createElement)(HeldReplyActions, { held: { ...held, toName, from: bot?.name }, actions, roster }) : null ++ ); } --function useSettled(state) { -- const prev = (0, import_react2.useRef)(state); -- const [settled, setSettled] = (0, import_react2.useState)(false); -- (0, import_react2.useEffect)(() => { -- const was = prev.current; -- prev.current = state; -- if (state !== "idle") { -- setSettled(false); -- return void 0; -- } -- if (was === "idle" || was === "alert") return void 0; -- setSettled(true); -- const timer = setTimeout(() => setSettled(false), 1800); -- return () => clearTimeout(timer); -- }, [state]); -- return settled; --} --function BotAvatar({ bot, size, state = "idle", main, admin, badge = true, live = true, gaze = false, pokeable = false }) { -- const settled = useSettled(state); -- if (bot === void 0) return (0, import_react2.createElement)(BotMark, { size }); -- const badgeKind = !badge ? null : state === "alert" ? "alert" : state !== "idle" ? "working" : admin ? "admin" : main ? "main" : null; -- return (0, import_react2.createElement)( -- "span", -- { className: "bt-mark", style: { width: size, height: size, "--bt-size": `${size}px` } }, -- (0, import_react2.createElement)(BotMark, { bot, size, state: settled ? "done" : state, live, gaze, pokeable }), -- badgeKind === "working" ? (0, import_react2.createElement)("span", { className: "bt-badge bt-badge-working", "aria-label": t("Working"), role: "img" }) : null, -- badgeKind === "alert" ? (0, import_react2.createElement)("span", { className: "bt-badge bt-badge-alert", "aria-label": t("Waiting for your answer"), role: "img" }, "?") : null, -- badgeKind === "admin" ? (0, import_react2.createElement)("span", { className: "bt-badge bt-badge-admin", "aria-label": t("Admin"), role: "img" }, (0, import_react2.createElement)(StarIcon)) : null, -- badgeKind === "main" ? (0, import_react2.createElement)("span", { className: "bt-badge bt-badge-main", "aria-label": t("Main Bot"), role: "img" }, (0, import_react2.createElement)(MainStar)) : null +-var FRAGMENT_SELECTOR = /\[class\*="(_[\w-]+)"\]/g; +-var CLASS_TOKEN = /\.((?:\\.|[\w-])+)/g; +-function sheetClassNames(sheet) { +- const names = []; +- const visit = (rules) => { +- for (const rule of rules) { +- if (rule.selectorText) for (const match of rule.selectorText.matchAll(CLASS_TOKEN)) names.push(match[1]); +- if (rule.cssRules) visit(rule.cssRules); +function PersonMessage({ name, texts: texts2, roster, selfId, actions, sessionId, msgKey, useUi }) { + if (!(texts2 ?? []).some((text2) => String(text2 ?? "").trim() !== "")) return null; -+ const lead = (0, import_react10.createElement)("span", { className: "bt-lead", title: name }, (0, import_react10.createElement)(PersonMark, { name })); -+ return (0, import_react10.createElement)( ++ const lead = (0, import_react12.createElement)("span", { className: "bt-lead", title: name }, (0, import_react12.createElement)(PersonMark, { name })); ++ return (0, import_react12.createElement)( + "div", + { className: "bt-group-msg bt-person-msg", "data-person": name }, -+ (0, import_react10.createElement)("span", { className: "bt-group-name" }, name), -+ (0, import_react10.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, sessionId, msgKey, useUi, lead }) - ); - } --function clusterSeats(count, frame) { -- if (count === 1) return [[0, 0, frame]]; -- if (count === 2) return [[0, 0, frame * 2 / 3], [frame / 3, frame / 3, frame * 2 / 3]]; -- if (count === 3) { -- const size = frame * 5 / 9; -- const rest = frame - size; -- return [[rest / 2, 0, size], [0, rest, size], [rest, rest, size]]; ++ (0, import_react12.createElement)("span", { className: "bt-group-name" }, name), ++ (0, import_react12.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, sessionId, msgKey, useUi, lead }) ++ ); ++} +function EventLine({ prefix, bots, joiner = t("and"), onOpen, whole = false }) { + if (whole && bots.length === 1) { -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { className: "bt-event" }, -+ (0, import_react10.createElement)( ++ (0, import_react12.createElement)( + "button", + { type: "button", className: "bt-event-whole", title: bots[0].name, onClick: () => onOpen?.(bots[0]) }, -+ (0, import_react10.createElement)("span", null, prefix), -+ (0, import_react10.createElement)(BotMark, { bot: bots[0], size: 16 }), -+ (0, import_react10.createElement)("span", { className: "bt-event-name" }, bots[0].name) ++ (0, import_react12.createElement)("span", null, prefix), ++ (0, import_react12.createElement)(BotMark, { bot: bots[0], size: 16 }), ++ (0, import_react12.createElement)("span", { className: "bt-event-name" }, bots[0].name) + ) + ); - } -- const half = frame / 2; -- return [[0, 0, half], [half, 0, half], [0, half, half], [half, half, half]]; ++ } + const parts = []; -+ parts.push((0, import_react10.createElement)("span", { key: "p" }, prefix)); ++ parts.push((0, import_react12.createElement)("span", { key: "p" }, prefix)); + bots.forEach((bot, index) => { -+ if (index > 0) parts.push((0, import_react10.createElement)("span", { key: `j${index}` }, joiner)); -+ parts.push((0, import_react10.createElement)( ++ if (index > 0) parts.push((0, import_react12.createElement)("span", { key: `j${index}` }, joiner)); ++ parts.push((0, import_react12.createElement)( + "button", + { key: bot.id ?? index, type: "button", onClick: () => onOpen?.(bot) }, -+ (0, import_react10.createElement)(BotMark, { bot, size: 16 }), ++ (0, import_react12.createElement)(BotMark, { bot, size: 16 }), + bot.name + )); + }); -+ return (0, import_react10.createElement)("div", { className: "bt-event" }, parts); ++ return (0, import_react12.createElement)("div", { className: "bt-event" }, parts); +} +var heldForm = (text2) => String(text2 ?? "").replace(/\s+/g, " ").trim().replace(/^(to (the )?face[ -]?room|to the room)\s*:\s*/i, "").trim(); +var sameName = (a, b) => String(a ?? "").replace(/\s+/g, " ").trim().toLowerCase() === String(b ?? "").replace(/\s+/g, " ").trim().toLowerCase(); @@ -8518,18 +9345,7 @@ diff --git a/client.js b/client.js + const held = heldForm(item.text); + return held !== "" && (held === line2 || held.length >= 799 && line2.startsWith(held)); + }); - } --function RoomAvatar({ room: room2, roster, size = 36 }) { -- const members = room2.members.map((id) => roster.byId[id]).filter(Boolean); -- const people = members.length === 1 ? [members[0], null] : members; -- const seat = (bot, seatSize, key) => bot ? (0, import_react2.createElement)(BotMark, { key, bot, size: seatSize }) : (0, import_react2.createElement)("span", { key, className: "bt-cluster-you", style: { width: seatSize * 0.92, height: seatSize * 0.92, margin: seatSize * 0.04 } }); -- if (people.length === 0) return (0, import_react2.createElement)(BotMark, { size }); -- if (size <= 20 && people.length > 1) { -- return (0, import_react2.createElement)( -- "span", -- { className: "bt-stack", style: { "--bt-stack-size": `${size}px` } }, -- people.slice(0, 3).map((bot, index) => seat(bot, size, bot?.id ?? `you-${index}`)), -- people.length > 3 ? (0, import_react2.createElement)("span", { className: "bt-stack-more" }, `+${people.length - 3}`) : null ++} +var HELD_SENDING_MS = 6e4; +function heldLineState(room2, { seq, botId, text: text2 } = {}, now = Date.now()) { + if (room2?.origin !== "face-to-face" || !Array.isArray(room2.heldLines)) return void 0; @@ -8545,53 +9361,32 @@ diff --git a/client.js b/client.js + if (String(text2 ?? "").trim() === "") return null; + const held = heldLineState(room2, { seq, botId: bot.id, text: text2 }); + if (held === "rejected") { -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { className: "bt-event bt-not-sent", "data-flybot": "held-not-sent", role: "status" }, -+ (0, import_react10.createElement)(BotMark, { bot, size: 16 }), -+ (0, import_react10.createElement)("span", null, t("{name} · Not sent", { name: bot.name })) - ); - } -- const seats = clusterSeats(Math.min(people.length, 4), size); -- const overflow = people.length > 4 ? people.length - 3 : 0; -- const gap = size / 14; -- const rings = seats.map(([x, y, s]) => ({ cx: x + s / 2, cy: y + s / 2, r: s * 0.48 + gap })); -- return (0, import_react2.createElement)( ++ (0, import_react12.createElement)(BotMark, { bot, size: 16 }), ++ (0, import_react12.createElement)("span", null, t("{name} · Not sent", { name: bot.name })) ++ ); ++ } + if (held === "held" || isHeldLine(room2, text2, bot)) return null; -+ const lead = (0, import_react10.createElement)( ++ const lead = (0, import_react12.createElement)( + "button", + { type: "button", className: "bt-lead", "aria-label": t("Open {name}'s chat", { name: bot.name }), onClick: () => actions.openSession(bot.id) }, -+ (0, import_react10.createElement)(BotMark, { bot, size: 22 }) ++ (0, import_react12.createElement)(BotMark, { bot, size: 22 }) + ); -+ const name = (0, import_react10.createElement)( - "span", -- { className: "bt-cluster", style: { width: size, height: size } }, -- seats.map(([x, y, s], index) => { -- const holes2 = rings.slice(index + 1).filter((ring) => Math.hypot(ring.cx - x - s / 2, ring.cy - y - s / 2) < ring.r + s * 0.46).map((ring) => `radial-gradient(circle at ${ring.cx - x}px ${ring.cy - y}px,transparent ${ring.r}px,#000 ${ring.r + 0.5}px)`); -- const style = { left: x, top: y, width: s, height: s }; -- if (holes2.length > 0) Object.assign(style, { WebkitMaskImage: holes2.join(","), maskImage: holes2.join(","), WebkitMaskComposite: "source-in", maskComposite: "intersect" }); -- if (overflow > 0 && index === 3) { -- return (0, import_react2.createElement)("span", { key: "more", className: "bt-cluster-more", style: { ...style, width: s * 0.92, height: s * 0.92, margin: s * 0.04, fontSize: Math.max(8, Math.round(s * 0.36)) } }, `+${overflow}`); -- } -- const bot = people[index]; -- return (0, import_react2.createElement)("span", { key: bot?.id ?? "you", style }, seat(bot, s)); -- }) ++ const name = (0, import_react12.createElement)( ++ "span", + { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, + faceBotLabel(room2, roster, bot) ?? bot.name, -+ room2?.admin === bot.id ? (0, import_react10.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null ++ room2?.admin === bot.id ? (0, import_react12.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null + ); -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { className: "bt-group-msg" }, + name, -+ (0, import_react10.createElement)(Bubbles, { texts: [text2], roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead }) - ); - } -- --// src/client/icons.js --var import_react3 = require("react"); --function PlusIcon() { -- return (0, import_react3.createElement)("svg", { width: 18, height: 18, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M10 3.5v13M3.5 10h13", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round" })); ++ (0, import_react12.createElement)(Bubbles, { texts: [text2], roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead }) ++ ); ++} +function remoteSpeaker(source, roster, sessionId) { + const handle = source.remote.handle; + const member = (roster.remoteBots ?? []).find((bot2) => bot2.handle === handle); @@ -8633,70 +9428,53 @@ diff --git a/client.js b/client.js + if (String(words ?? "").trim() === "" && files.length === 0) return null; + const person = typeof source.remote.typedBy === "string" ? source.remote.typedBy : ""; + if (person) { -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { className: "bt-group-msg bt-person-msg bt-remote-msg", "data-person": person, "data-remote": handle }, + // One short header: the person, and the Bot that carried the line only when it is known (#275). -+ (0, import_react10.createElement)( ++ (0, import_react12.createElement)( + "span", + { className: "bt-group-name", title: handle }, + person, -+ carrier ? (0, import_react10.createElement)("span", { className: "bt-remote-handle" }, t("via {name}", { name: carrier })) : null ++ carrier ? (0, import_react12.createElement)("span", { className: "bt-remote-handle" }, t("via {name}", { name: carrier })) : null + ), -+ String(words ?? "").trim() === "" ? null : (0, import_react10.createElement)(Bubbles, { texts: [words], roster, selfId: bot.id, actions, sessionId, msgKey, useUi, lead: (0, import_react10.createElement)("span", { className: "bt-lead", title: person }, (0, import_react10.createElement)(PersonMark, { name: person })) }), -+ files.length ? (0, import_react10.createElement)(RemoteFiles, { files, plugin: member?.plugin ?? "social", botId: roster.byId[sessionId]?.id ?? sessionId }) : null ++ String(words ?? "").trim() === "" ? null : (0, import_react12.createElement)(Bubbles, { texts: [words], roster, selfId: bot.id, actions, sessionId, msgKey, useUi, lead: (0, import_react12.createElement)("span", { className: "bt-lead", title: person }, (0, import_react12.createElement)(PersonMark, { name: person })) }), ++ files.length ? (0, import_react12.createElement)(RemoteFiles, { files, plugin: member?.plugin ?? "social", botId: roster.byId[sessionId]?.id ?? sessionId }) : null + ); + } -+ const mark = (0, import_react10.createElement)(BotMark, { bot, size: 22 }); -+ const lead = chatId ? (0, import_react10.createElement)("button", { type: "button", className: "bt-lead", title: handle, "aria-label": t("Open {name}'s chat", { name }), onClick: () => actions.openSession(chatId) }, mark) : (0, import_react10.createElement)("span", { className: "bt-lead", title: handle }, mark); -+ return (0, import_react10.createElement)( ++ const mark = (0, import_react12.createElement)(BotMark, { bot, size: 22 }); ++ const lead = chatId ? (0, import_react12.createElement)("button", { type: "button", className: "bt-lead", title: handle, "aria-label": t("Open {name}'s chat", { name }), onClick: () => actions.openSession(chatId) }, mark) : (0, import_react12.createElement)("span", { className: "bt-lead", title: handle }, mark); ++ return (0, import_react12.createElement)( + "div", + { className: "bt-group-msg bt-remote-msg", "data-remote": handle }, + // A face room's header is the one name alone; the handle is on hover only (#457). -+ face ? (0, import_react10.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) }, title: handle }, name) : (0, import_react10.createElement)( ++ face ? (0, import_react12.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) }, title: handle }, name) : (0, import_react12.createElement)( + "span", + { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, + name, -+ (0, import_react10.createElement)("span", { className: "bt-remote-handle", title: source.remote.home ?? handle, "aria-label": t("Friend's Bot") }, (0, import_react10.createElement)(GlobeMark), handle) ++ (0, import_react12.createElement)("span", { className: "bt-remote-handle", title: source.remote.home ?? handle, "aria-label": t("Friend's Bot") }, (0, import_react12.createElement)(GlobeMark), handle) + ), -+ String(words ?? "").trim() === "" ? null : (0, import_react10.createElement)(Bubbles, { texts: [words], roster, selfId: bot.id, actions, sessionId, msgKey, useUi, lead }), -+ files.length ? (0, import_react10.createElement)(RemoteFiles, { files, plugin: member?.plugin ?? "social", botId: roster.byId[sessionId]?.id ?? sessionId }) : null ++ String(words ?? "").trim() === "" ? null : (0, import_react12.createElement)(Bubbles, { texts: [words], roster, selfId: bot.id, actions, sessionId, msgKey, useUi, lead }), ++ files.length ? (0, import_react12.createElement)(RemoteFiles, { files, plugin: member?.plugin ?? "social", botId: roster.byId[sessionId]?.id ?? sessionId }) : null + ); - } --function SearchIcon() { -- return (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("circle", { cx: 8.5, cy: 8.5, r: 5.5, stroke: "currentColor", strokeWidth: 1.6, fill: "none" }), (0, import_react3.createElement)("path", { d: "M13 13l4 4", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round" })); ++} +function FirstContact({ source, roster, sessionId }) { + const person = typeof source.remote.typedBy === "string" ? source.remote.typedBy : ""; + const who = person || remoteSpeaker(source, roster).name; + const bot = roster.byId[sessionId]?.name ?? t("your Bot"); -+ return (0, import_react10.createElement)("div", { className: "bt-event", "data-first-contact": source.remote.handle }, (0, import_react10.createElement)("span", null, t("{name} is talking to {bot} through Bot Social", { name: who, bot }))); - } --function PeopleIcon() { -- return (0, import_react3.createElement)( ++ return (0, import_react12.createElement)("div", { className: "bt-event", "data-first-contact": source.remote.handle }, (0, import_react12.createElement)("span", null, t("{name} is talking to {bot} through Bot Social", { name: who, bot }))); ++} +function GlobeMark() { -+ return (0, import_react10.createElement)( - "svg", -- { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", "aria-hidden": true }, -- (0, import_react3.createElement)("circle", { cx: 7.5, cy: 7, r: 3 }), -- (0, import_react3.createElement)("path", { d: "M2 16.5c.6-2.8 2.8-4.5 5.5-4.5s4.9 1.7 5.5 4.5" }), -- (0, import_react3.createElement)("path", { d: "M13 4.3a3 3 0 0 1 0 5.4M15 12.4c1.6.6 2.6 2 3 4.1" }) ++ return (0, import_react12.createElement)( ++ "svg", + { width: 10, height: 10, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", "aria-hidden": true }, -+ (0, import_react10.createElement)("circle", { cx: 12, cy: 12, r: 9 }), -+ (0, import_react10.createElement)("path", { d: "M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18" }) - ); - } --function ArrowUpIcon() { -- return (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M10 16V4M5 9l5-5 5 5", stroke: "currentColor", strokeWidth: 1.8, fill: "none", strokeLinecap: "round", strokeLinejoin: "round" })); --} --function MicIcon({ size = 16 }) { -- return (0, import_react3.createElement)( -- "svg", -- { width: size, height: size, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", "aria-hidden": true }, -- (0, import_react3.createElement)("rect", { x: 7, y: 2.5, width: 6, height: 10, rx: 3, fill: "currentColor", stroke: "none" }), -- (0, import_react3.createElement)("path", { d: "M4.5 9.5a5.5 5.5 0 0 0 11 0M10 15v2.5" }) ++ (0, import_react12.createElement)("circle", { cx: 12, cy: 12, r: 9 }), ++ (0, import_react12.createElement)("path", { d: "M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18" }) ++ ); ++} +function RemoteFiles({ files, plugin, botId }) { -+ const [busy, setBusy] = (0, import_react10.useState)(""); -+ const [error, setError] = (0, import_react10.useState)(""); ++ const [busy, setBusy] = (0, import_react12.useState)(""); ++ const [error, setError] = (0, import_react12.useState)(""); + const download2 = async (file) => { + setBusy(file.id); + setError(""); @@ -8714,35 +9492,25 @@ diff --git a/client.js b/client.js + setBusy(""); + } + }; -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { className: "bt-file-chips" }, -+ files.map((file) => (0, import_react10.createElement)( ++ files.map((file) => (0, import_react12.createElement)( + "button", + { key: file.id, type: "button", className: "bt-file-chip", disabled: busy === file.id, title: `Download ${file.name} (untrusted file from a remote Bot)`, onClick: () => download2(file) }, + `📎 ${file.name} · ${fileSize(file.size)}` + )), -+ error ? (0, import_react10.createElement)("span", { className: "bt-file-error", role: "alert" }, error) : null - ); - } --function WaveIcon({ size = 16 }) { -- return (0, import_react3.createElement)( -- "svg", -- { width: size, height: size, viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": true }, -- [[3, 7.5, 5], [6.5, 4.5, 11], [10, 2.5, 15], [13.5, 5.5, 9], [17, 8, 4]].map(([x, y, height]) => (0, import_react3.createElement)("rect", { key: x, x: x - 1, y, width: 2, height, rx: 1 })) ++ error ? (0, import_react12.createElement)("span", { className: "bt-file-error", role: "alert" }, error) : null ++ ); ++} +function GroupEvent({ prefix, room: room2, name, roster, actions }) { -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { className: "bt-event" }, -+ (0, import_react10.createElement)("span", null, prefix), -+ room2 ? (0, import_react10.createElement)("button", { type: "button", onClick: () => actions.openSession(room2.id) }, (0, import_react10.createElement)(RoomAvatar, { room: room2, roster, size: 16 }), room2.name) : name ? (0, import_react10.createElement)("span", null, name) : null - ); - } --function ShareIcon() { -- return (0, import_react3.createElement)( -- "svg", -- { width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -- (0, import_react3.createElement)("path", { d: "M10 12.5V3M6.5 6.5L10 3l3.5 3.5M4 11v4.5A1.5 1.5 0 0 0 5.5 17h9a1.5 1.5 0 0 0 1.5-1.5V11" }) ++ (0, import_react12.createElement)("span", null, prefix), ++ room2 ? (0, import_react12.createElement)("button", { type: "button", onClick: () => actions.openSession(room2.id) }, (0, import_react12.createElement)(RoomAvatar, { room: room2, roster, size: 16 }), room2.name) : name ? (0, import_react12.createElement)("span", null, name) : null ++ ); ++} +function MemoryEvent({ sessionId, scope, result, roster, actions, findBot }) { + if (!/^(Saved to|Updated in|Removed from) /.test(result)) return null; + const self = roster.byId[sessionId]; @@ -8751,71 +9519,27 @@ diff --git a/client.js b/client.js + const target = other && other.id !== self?.id ? other : self; + if (!target) return null; + const label = team ? t("Team memory updated") : target === self ? t("Memory updated") : t("Updated {name}'s memory", { name: target.name }); -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { className: "bt-event" }, -+ (0, import_react10.createElement)("button", { type: "button", title: result, onClick: () => actions.openMemory(target.id) }, (0, import_react10.createElement)(MemoryIcon), label) - ); - } --function CloseIcon() { -- return (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M5 5l10 10M15 5L5 15", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round" })); ++ (0, import_react12.createElement)("button", { type: "button", title: result, onClick: () => actions.openMemory(target.id) }, (0, import_react12.createElement)(MemoryIcon), label) ++ ); ++} +function PartLine({ time }) { -+ return (0, import_react10.createElement)("div", { className: "bt-part-line", role: "separator" }, Number.isFinite(time) ? (0, import_react10.createElement)("span", null, dayLabel(time)) : null); - } --var ChevronLeftIcon = () => (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M12.5 4.5L7 10l5.5 5.5" })); --var ChevronRightIcon = () => (0, import_react3.createElement)("svg", { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M7.5 4.5L13 10l-5.5 5.5" })); --var lineIcon = (paths) => function LineIcon() { -- return (0, import_react3.createElement)( -- "svg", -- { width: 15, height: 15, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -- paths.map((d, index) => (0, import_react3.createElement)("path", { key: index, d })) -- ); ++ return (0, import_react12.createElement)("div", { className: "bt-part-line", role: "separator" }, Number.isFinite(time) ? (0, import_react12.createElement)("span", null, dayLabel(time)) : null); ++} +var scrollParent = (node) => { + for (let at = node.parentElement; at; at = at.parentElement) { + if (/(auto|scroll)/.test(getComputedStyle(at).overflowY)) return at; + } + return null; - }; --var CLOUD = "M6.5 15.25H5.75a3.25 3.25 0 0 1-.55-6.45 4.75 4.75 0 0 1 9.2-1.1 3.75 3.75 0 0 1 .1 7.55H13.5"; --function CloudDownloadIcon({ done = false }) { -- return (0, import_react3.createElement)( -- "svg", -- { width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -- (0, import_react3.createElement)("path", { d: CLOUD }), -- done ? (0, import_react3.createElement)("path", { d: "M7.75 13.25l1.75 1.75 3-3.25" }) : (0, import_react3.createElement)("g", { className: "bt-cloud-arrow" }, (0, import_react3.createElement)("path", { d: "M10 9.75v7" }), (0, import_react3.createElement)("path", { d: "M7.75 14.5L10 16.75l2.25-2.25" })) -- ); --} --var SmileIcon = lineIcon(["M10 3.5a6.5 6.5 0 1 1 0 13 6.5 6.5 0 0 1 0-13z", "M7.3 11.6a3.4 3.4 0 0 0 5.4 0", "M7.75 8.25h.01M12.25 8.25h.01"]); --var ReplyIcon = lineIcon(["M8 5L4 9l4 4", "M4 9h7.5a4.5 4.5 0 0 1 4.5 4.5V15"]); --var DotsIcon = lineIcon(["M5 10h.01M10 10h.01M15 10h.01"]); --var CheckIcon = lineIcon(["M4.5 10.5l3.5 3.5 7.5-8"]); --var ArrowDownIcon = lineIcon(["M10 4v12", "M5 11l5 5 5-5"]); --var DownloadIcon = lineIcon(["M10 3.5v9", "M6.5 9.5L10 13l3.5-3.5", "M4 16h12"]); --var GaugeIcon = lineIcon(["M3.5 13.5a6.5 6.5 0 1 1 13 0", "M10 13.5l3-4", "M10 13.5h.01"]); --var PlugIcon = lineIcon(["M7 3v4M13 3v4", "M5 7h10v2.5a5 5 0 0 1-10 0z", "M10 14.5V17"]); --var CalendarIcon = lineIcon(["M5.5 5h9A1.5 1.5 0 0 1 16 6.5v8a1.5 1.5 0 0 1-1.5 1.5h-9A1.5 1.5 0 0 1 4 14.5v-8A1.5 1.5 0 0 1 5.5 5z", "M4 8.75h12", "M7.25 3.5v3M12.75 3.5v3"]); --var ConnectorIcon = lineIcon(["M7 10a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0z", "M18 10a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0z", "M7 10h6"]); --var SwitchIcon = lineIcon(["M4 7h9.5M10.5 3.5L14 7l-3.5 3.5", "M16 13H6.5M9.5 9.5L6 13l3.5 3.5"]); --var PaperclipIcon = lineIcon(["M15.5 9.5l-5.6 5.6a3.4 3.4 0 0 1-4.8-4.8l6.1-6.1a2.25 2.25 0 0 1 3.2 3.2l-6 6a1.1 1.1 0 0 1-1.6-1.6l5.5-5.5"]); --var ClockIcon = lineIcon(["M10 3.5a6.5 6.5 0 1 1 0 13 6.5 6.5 0 0 1 0-13z", "M10 6.5V10l2.5 1.5"]); --var GearIcon = lineIcon(["M10 7.4a2.6 2.6 0 1 1 0 5.2 2.6 2.6 0 0 1 0-5.2z", "M7.85 4.4l.29-1.87a7.7 7.7 0 0 1 3.72 0l.29 1.87a6 6 0 0 1 1.63.94l1.76-.69a7.7 7.7 0 0 1 1.86 3.23l-1.47 1.18a6 6 0 0 1 0 1.88l1.47 1.18a7.7 7.7 0 0 1-1.86 3.23l-1.76-.69a6 6 0 0 1-1.63.94l-.29 1.87a7.7 7.7 0 0 1-3.72 0l-.29-1.87a6 6 0 0 1-1.63-.94l-1.76.69a7.7 7.7 0 0 1-1.86-3.23l1.47-1.18a6 6 0 0 1 0-1.88L2.6 7.88a7.7 7.7 0 0 1 1.86-3.23l1.76.69a6 6 0 0 1 1.63-.94z"]); --var PinIcon = lineIcon(["M12.5 3l4.5 4.5-3 1.5-2.5 2.5.5 3.5-1.5 1.5L7 13 3.5 16.5", "M7 13l-3.5-3.5L5 8l3.5.5L11 6l1.5-3"]); --function PinMarkIcon() { -- return (0, import_react3.createElement)( -- "svg", -- { width: 12, height: 12, viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": true }, -- (0, import_react3.createElement)( -- "g", -- { transform: "rotate(45 10 10)" }, -- (0, import_react3.createElement)("path", { d: "M8 2.5h4a.9.9 0 0 1 0 1.8h-.4v4.1c0 1.4 1.1 2.6 2.6 3.1l.7.3v1.5H5.1v-1.5l.7-.3c1.5-.5 2.6-1.7 2.6-3.1V4.3H8a.9.9 0 0 1 0-1.8z" }), -- (0, import_react3.createElement)("path", { d: "M9.35 13.3h1.3v3.6L10 18l-.65-1.1z" }) -- ) ++}; +function EarlierParts({ sessionId, roster, actions, useUi }) { -+ const [view, setView] = (0, import_react10.useState)({ items: [], cursor: void 0, loading: true, failed: false, startedAt: null }); -+ const top = (0, import_react10.useRef)(null); -+ const busy = (0, import_react10.useRef)(false); -+ const alive = (0, import_react10.useRef)(true); -+ const restore = (0, import_react10.useRef)(null); ++ const [view, setView] = (0, import_react12.useState)({ items: [], cursor: void 0, loading: true, failed: false, startedAt: null }); ++ const top = (0, import_react12.useRef)(null); ++ const busy = (0, import_react12.useRef)(false); ++ const alive = (0, import_react12.useRef)(true); ++ const restore = (0, import_react12.useRef)(null); + const load = (cursor) => { + if (busy.current) return; + busy.current = true; @@ -8831,19 +9555,19 @@ diff --git a/client.js b/client.js + if (alive.current) setView((current) => ({ ...current, loading: false, failed: true })); + }); + }; -+ (0, import_react10.useEffect)(() => { ++ (0, import_react12.useEffect)(() => { + alive.current = true; + load(void 0); + return () => { + alive.current = false; + }; + }, [sessionId]); -+ (0, import_react10.useLayoutEffect)(() => { ++ (0, import_react12.useLayoutEffect)(() => { + const pending = restore.current; + restore.current = null; + if (pending) pending.scroller.scrollTop = pending.scroller.scrollHeight - pending.fromEnd; + }, [view.items]); -+ (0, import_react10.useEffect)(() => { ++ (0, import_react12.useEffect)(() => { + const node = top.current; + if (!node || view.loading || view.failed || !view.cursor || typeof IntersectionObserver !== "function") return void 0; + const observer = new IntersectionObserver((entries2) => { @@ -8864,38 +9588,43 @@ diff --git a/client.js b/client.js + last.msgKeys.push(keyOf(item)); + } else rows.push({ kind: "bot", texts: [item.text], msgKeys: [keyOf(item)] }); + continue; -+ } + } +- }; +- try { +- visit(sheet.cssRules); +- } catch { + rows.push(item); -+ } -+ return (0, import_react10.createElement)( + } +- return names; ++ return (0, import_react12.createElement)( + "div", + { className: "bt-earlier", role: "feed", "aria-label": t("Earlier messages"), "aria-busy": view.loading }, -+ (0, import_react10.createElement)( ++ (0, import_react12.createElement)( + "div", + { ref: top, className: "bt-earlier-top" }, -+ view.loading ? (0, import_react10.createElement)(Shimmer, null, t("Loading earlier messages…")) : view.failed ? (0, import_react10.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Couldn’t load earlier messages · Retry")) : view.cursor ? (0, import_react10.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Load earlier")) : null ++ 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 + ), + rows.map((row, index) => { + const key = rows.length - index; + switch (row.kind) { + case "divider": -+ return (0, import_react10.createElement)(PartLine, { key, time: row.time }); ++ return (0, import_react12.createElement)(PartLine, { key, time: row.time }); + case "user": -+ return (0, import_react10.createElement)("div", { key, className: "bt-urow", onClickCapture: bubbleLinkClick({ actions, subject: selfId ?? sessionId }) }, (0, import_react10.createElement)( ++ return (0, import_react12.createElement)("div", { key, className: "bt-urow", onClickCapture: bubbleLinkClick({ actions, subject: selfId ?? sessionId }) }, (0, import_react12.createElement)( + "div", + { className: "bt-ububble" }, -+ row.text ? (0, import_react10.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: row.text, labels: mdLabels(), variant: "compact" }) : null, -+ row.images ? (0, import_react10.createElement)("span", { className: "bt-uimages" }, row.images === 1 ? t("1 image") : t("{count} images", { count: row.images })) : null ++ row.text ? (0, import_react12.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: row.text, labels: mdLabels2(), variant: "compact" }) : null, ++ row.images ? (0, import_react12.createElement)("span", { className: "bt-uimages" }, row.images === 1 ? t("1 image") : t("{count} images", { count: row.images })) : null + )); + case "answer": -+ return (0, import_react10.createElement)(AnsweredCell, { key, node: { data: row } }); ++ return (0, import_react12.createElement)(AnsweredCell, { key, node: { data: row } }); + case "bot": -+ return (0, import_react10.createElement)(Bubbles, { key, texts: row.texts, msgKeys: row.msgKeys, roster, selfId, actions, sessionId, useUi }); ++ return (0, import_react12.createElement)(Bubbles, { key, texts: row.texts, msgKeys: row.msgKeys, roster, selfId, actions, sessionId, useUi }); + case "event": { -+ if (row.role === "report") return (0, import_react10.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_react12.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_react10.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => { ++ return (0, import_react12.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => { + if (selfId && other.id) actions.openExchange(selfId, other.id); + }, whole: true }); + } @@ -8903,44 +9632,16 @@ diff --git a/client.js b/client.js + return null; + } + }), -+ (0, import_react10.createElement)(PartLine, { time: view.startedAt }) - ); ++ (0, import_react12.createElement)(PartLine, { time: view.startedAt }) ++ ); } --var UnreadIcon = lineIcon(["M10 3.5a4.5 4.5 0 0 0-4.5 4.5v3L4 13.5h12L14.5 11V8", "M8.3 16a1.8 1.8 0 0 0 3.4 0", "M15.5 3.2a1.6 1.6 0 1 1 0 3.2 1.6 1.6 0 0 1 0-3.2z"]); --var PencilIcon = lineIcon(["M9 4H6a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-3", "M14.3 3.7a1.6 1.6 0 0 1 2.3 2.3L10.5 12l-3 .8.8-3z"]); --var InfoIcon = lineIcon(["M10 3.5a6.5 6.5 0 1 1 0 13 6.5 6.5 0 0 1 0-13z", "M10 9.25v4", "M10 6.6h.01"]); --var StarLineIcon = lineIcon(["M10 3l2.1 4.3 4.7.7-3.4 3.3.8 4.7L10 13.8 5.8 16l.8-4.7L3.2 8l4.7-.7z"]); --var CopyIcon = lineIcon(["M8.5 7h6A1.5 1.5 0 0 1 16 8.5v6a1.5 1.5 0 0 1-1.5 1.5h-6A1.5 1.5 0 0 1 7 14.5v-6A1.5 1.5 0 0 1 8.5 7z", "M4 12.5V5.5A1.5 1.5 0 0 1 5.5 4H13"]); --var HideIcon = lineIcon(["M3 3l14 14", "M8.6 5.2A7.6 7.6 0 0 1 10 5c4.5 0 7 5 7 5a12.6 12.6 0 0 1-2 2.6M12.2 14.5A6.8 6.8 0 0 1 10 15c-4.5 0-7-5-7-5a12.4 12.4 0 0 1 3-3.4", "M8.5 8.5a2 2 0 0 0 3 3"]); --var TrashIcon = lineIcon(["M3.5 5.5h13", "M8 5.5V4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v1.5", "M5 5.5l.7 10A1.5 1.5 0 0 0 7.2 17h5.6a1.5 1.5 0 0 0 1.5-1.5l.7-10", "M8.5 9v4.5M11.5 9v4.5"]); --var DuplicateIcon = lineIcon(["M7 7h8.5v9.5H7z", "M4.5 13V3.5H13", "M11.25 9.5v4.5M9 11.75h4.5"]); --var SlidersIcon = lineIcon(["M4 6.5h5M12.5 6.5H16M4 13.5h4M11.5 13.5H16", "M10.5 4.5v4M9.5 11.5v4"]); --var MemoryIcon = lineIcon(["M5.5 3.5h8A1.5 1.5 0 0 1 15 5v10a1.5 1.5 0 0 1-1.5 1.5h-8z", "M5.5 3.5v13", "M8.5 7.5h3.5M8.5 10.5h2.5", "M12 3.5v4l1-.8 1 .8"]); --var FolderIcon = lineIcon(["M3 6A1.5 1.5 0 0 1 4.5 4.5h3.2l1.8 2h6A1.5 1.5 0 0 1 17 8v6.5a1.5 1.5 0 0 1-1.5 1.5h-11A1.5 1.5 0 0 1 3 14.5z"]); --var ChatsIcon = lineIcon(["M3.5 5.5A1.5 1.5 0 0 1 5 4h7a1.5 1.5 0 0 1 1.5 1.5V10A1.5 1.5 0 0 1 12 11.5H8L5 14v-2.5A1.5 1.5 0 0 1 3.5 10z", "M13.5 7.5H15A1.5 1.5 0 0 1 16.5 9v4.5A1.5 1.5 0 0 1 15 15v2l-2.5-2h-3A1.5 1.5 0 0 1 8 13.5V13"]); --var SETTINGS_ICONS = { general: GearIcon, bots: PeopleIcon, groups: ChatsIcon, usage: GaugeIcon }; -- --// src/client/questions.js --var import_react4 = require("react"); --var keyLetter = (index) => String.fromCharCode(65 + index); --var optionsOf = (question) => (question?.options ?? []).map((option) => typeof option === "string" ? { label: option } : option); --var isTypingTarget = (node) => node instanceof HTMLInputElement || node instanceof HTMLTextAreaElement || node instanceof HTMLSelectElement || node instanceof HTMLElement && node.isContentEditable; --function useOptionKeys(count, onPick, ownRef) { -- const pick2 = (0, import_react4.useRef)(onPick); -- pick2.current = onPick; -- (0, import_react4.useEffect)(() => { -- if (count === 0) return void 0; -- const onKey = (event) => { -- if (event.defaultPrevented || event.metaKey || event.ctrlKey || event.altKey || event.shiftKey || event.key.length !== 1) return; -- if (isTypingTarget(event.target) || isTypingTarget(document.activeElement)) return; -- if (document.querySelector('[role="dialog"], [aria-modal="true"]') !== null) return; -- const index = event.key.toUpperCase().charCodeAt(0) - 65; -- if (index >= 0 && index < count) { -- event.preventDefault(); -- pick2.current(index); -- } else if (index === count && ownRef.current) { -- event.preventDefault(); -- ownRef.current.focus(); +-function compileFragmentSelectors(text, names) { +- const compiled = /* @__PURE__ */ new Map(); +- return text.replace(FRAGMENT_SELECTOR, (whole, fragment) => { +- if (!compiled.has(fragment)) { +- const exact = []; +- for (const name of names) if (name.includes(fragment)) exact.push(`.${name}`); +- compiled.set(fragment, exact.length ? `:is(${exact.join(",")})` : whole); +function TriggerCell({ node, sessionId, useRoster, useSessions, useTurnClock, useUi, actions }) { + const roster = useRoster((value) => value); + const data = node.data; @@ -8949,7 +9650,7 @@ diff --git a/client.js b/client.js + const deferred = source.kind === "bot" && source.deferred === true; + const relayed = isRelayContext(data); + const turn = node.location?.turn?.turn ?? data.turn; -+ (0, import_react10.useLayoutEffect)(() => { ++ (0, import_react12.useLayoutEffect)(() => { + if (relayed) actions.noteTurnPeer(sessionId, turn, source.senderSessionId); + }, [relayed, sessionId, turn, source.senderSessionId]); + const order = useSessions((list) => { @@ -8968,49 +9669,32 @@ diff --git a/client.js b/client.js + return first?.turn === turn && unseenSince(visit, first.start) ? clockLabel(first.start) : ""; + }); + const body = triggerBody(); -+ return unreadOpening ? (0, import_react10.createElement)(import_react10.Fragment, null, (0, import_react10.createElement)("div", { className: "bt-open-new" }, (0, import_react10.createElement)(NewDivider), (0, import_react10.createElement)("div", { className: "bt-time-sep", role: "separator" }, unreadOpening)), body) : body; ++ 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; + function triggerBody() { + if (source.form === "remote-chat") return null; + if (source.shown === true) return null; + if (source.remote?.handle) { -+ const message = (0, import_react10.createElement)(RemoteMessage, { source, text: remoteMessageText(stripHeader(contentText(data.content))), roster, actions, sessionId, msgKey: `${sessionId}:${data.turn}:remote`, useUi }); -+ return source.remote.firstContact === true ? (0, import_react10.createElement)(import_react10.Fragment, null, (0, import_react10.createElement)(FirstContact, { source, roster, sessionId }), message) : message; -+ } ++ const message = (0, import_react12.createElement)(RemoteMessage, { source, text: remoteMessageText(stripHeader(contentText(data.content))), roster, actions, sessionId, msgKey: `${sessionId}:${data.turn}:remote`, useUi }); ++ return source.remote.firstContact === true ? (0, import_react12.createElement)(import_react12.Fragment, null, (0, import_react12.createElement)(FirstContact, { source, roster, sessionId }), message) : message; + } +- return compiled.get(fragment); + if (source.kind === "bot") { -+ if (source.handoff === true) return roster.roomsById[sessionId] ? null : (0, import_react10.createElement)(EarlierParts, { sessionId, roster, actions, useUi }); ++ if (source.handoff === true) return roster.roomsById[sessionId] ? null : (0, import_react12.createElement)(EarlierParts, { sessionId, roster, actions, useUi }); + if (source.role === "room" || source.role === "kickoff") return null; -+ if (source.role === "mention") return (0, import_react10.createElement)("div", { className: "bt-event" }, (0, import_react10.createElement)("span", null, contentText(data.content))); ++ if (source.role === "mention") return (0, import_react12.createElement)("div", { className: "bt-event" }, (0, import_react12.createElement)("span", null, contentText(data.content))); + if (source.role === "secret" || deferred) return null; + if (source.role === "post") { + if (source.failed !== void 0 || source.resumed === true || source.stopped === true) return null; + if (source.notice === true || source.senderSessionId === "face-notice") return null; + const room2 = roster.roomsById[sessionId]; + const poster = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; -+ return (0, import_react10.createElement)(GroupMessage, { bot: poster, text: stripHeader(contentText(data.content)), room: room2, roster, actions, msgKey: `${sessionId}:${data.turn}:post`, useUi }); - } -- }; -- document.addEventListener("keydown", onKey, true); -- return () => document.removeEventListener("keydown", onKey, true); -- }, [count, ownRef]); --} --function QuestionView({ question, onAnswer, onDismiss, ownAnswer = false, raised = false }) { -- const [own, setOwn] = (0, import_react4.useState)(""); -- const [picked, setPicked] = (0, import_react4.useState)([]); -- const ownRef = (0, import_react4.useRef)(null); -- const titleId = (0, import_react4.useId)(); -- const options = optionsOf(question); -- const multi = question.multiSelect === true; -- const custom = own.trim(); -- const canSubmit = multi ? picked.length > 0 || custom !== "" : custom !== ""; -- const choose = (label) => { -- if (multi) { -- setPicked((current) => current.includes(label) ? current.filter((item) => item !== label) : [...current, label]); -- return; ++ return (0, import_react12.createElement)(GroupMessage, { bot: poster, text: stripHeader(contentText(data.content)), room: room2, roster, actions, msgKey: `${sessionId}:${data.turn}:post`, useUi }); ++ } + if (source.role === "report") { -+ return (0, import_react10.createElement)(GroupEvent, { prefix: t("Replies from"), room: roster.roomsById[source.roomId], name: t("a group chat"), roster, actions }); ++ return (0, import_react12.createElement)(GroupEvent, { prefix: t("Replies from"), room: roster.roomsById[source.roomId], name: t("a group chat"), roster, actions }); + } -+ if (source.role === "resume" || source.resumed === true) return (0, import_react10.createElement)("div", { className: "bt-event" }, t("Picked up its work after a restart")); -+ if (source.role === "retry" || source.retried === true) return (0, import_react10.createElement)("div", { className: "bt-event" }, t("Asked to make the tool call it wrote as text")); ++ if (source.role === "resume" || source.resumed === true) return (0, import_react12.createElement)("div", { className: "bt-event" }, t("Picked up its work after a restart")); ++ if (source.role === "retry" || source.retried === true) return (0, import_react12.createElement)("div", { className: "bt-event" }, t("Asked to make the tool call it wrote as text")); + const run = relayed ? commRunOf( + order.split(",").filter(Boolean).map(Number), + Object.fromEntries(peers.split(",").filter(Boolean).map((pair) => [Number(pair.slice(0, pair.indexOf(":"))), pair.slice(pair.indexOf(":") + 1)])), @@ -9024,93 +9708,41 @@ diff --git a/client.js b/client.js + for (const peer of (run?.peerIds ?? []).map((id) => roster.byId[id]).filter(Boolean)) { + if (!bots.some((bot) => bot.id === peer.id)) bots.push(peer); + } -+ return (0, import_react10.createElement)(EventLine, { ++ return (0, import_react12.createElement)(EventLine, { + prefix: source.role === "stopped" ? t("Stopped by") : count > 1 ? t("{count} messages with", { count }) : t("Message from"), + bots, + onOpen: (bot) => actions.openExchange(selfId, bot.id), + whole: true + }); - } -- onAnswer({ selected: [label] }); -- }; -- const submit = () => { -- if (!canSubmit) return; -- onAnswer({ selected: multi ? picked : [], ...custom ? { custom } : {} }); -- }; -- useOptionKeys(options.length, (index) => choose(options[index].label), ownRef); -- const ownLetter = options.length > 0 ? keyLetter(options.length) : void 0; -- const field = ownAnswer ? (0, import_react4.createElement)("textarea", { -- ref: ownRef, -- rows: 1, -- value: own, -- autoComplete: "off", -- spellCheck: false, -- className: "bt-q-input", -- "aria-label": t("Your own answer"), -- placeholder: t("Type your own answer"), -- "aria-keyshortcuts": ownLetter?.toLowerCase(), -- onChange: (event) => setOwn(event.target.value), -- onKeyDown: (event) => { -- if (event.key !== "Enter" || event.shiftKey || event.nativeEvent.isComposing) return; -- event.preventDefault(); -- submit(); ++ } + if (source.kind === "schedule") { + const prompts = reminderPrompts(contentText(data.content)); -+ return (0, import_react10.createElement)("div", { className: "bt-event" }, prompts.length > 0 ? t("Scheduled task: {text}", { text: cutText(prompts.join(" · "), 80) }) : t("Routine started")); - } -- }) : null; -- const rows = options.map((option, optionIndex) => { -- const selected = multi && picked.includes(option.label); -- return (0, import_react4.createElement)( -- "button", -- { -- key: option.label, -- type: "button", -- className: "bt-q-opt", -- "aria-pressed": multi ? selected : void 0, -- "aria-keyshortcuts": keyLetter(optionIndex).toLowerCase(), -- onClick: () => choose(option.label) -- }, -- (0, import_react4.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)), -- (0, import_react4.createElement)( -- "span", -- { className: "bt-q-body" }, -- (0, import_react4.createElement)("span", { className: "bt-q-label" }, option.label), -- option.description ? (0, import_react4.createElement)("span", { className: "bt-q-desc" }, option.description) : null -- ), -- selected && !raised ? (0, import_react4.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react4.createElement)(CheckIcon)) : null -- ); ++ return (0, import_react12.createElement)("div", { className: "bt-event" }, prompts.length > 0 ? t("Scheduled task: {text}", { text: cutText(prompts.join(" · "), 80) }) : t("Routine started")); ++ } + if (source.kind === "user-question-reply") return null; -+ return (0, import_react10.createElement)("div", { className: "bt-event" }, cutText(contentText(data.content), 80) || t("Update")); ++ return (0, import_react12.createElement)("div", { className: "bt-event" }, cutText(contentText(data.content), 80) || t("Update")); + } +} +function NewDivider() { -+ return (0, import_react10.createElement)("div", { className: "bt-new-sep", role: "separator", "aria-label": t("New messages") }, (0, import_react10.createElement)("span", null, t("New"))); ++ return (0, import_react12.createElement)("div", { className: "bt-new-sep", role: "separator", "aria-label": t("New messages") }, (0, import_react12.createElement)("span", null, t("New"))); +} +function TurnProcessCell({ node, sessionId, turnProcess, useRoster, useUi, useTurnClock, actions }) { + const open = turnProcess === void 0 || !turnProcess.foldable || turnProcess.open; -+ (0, import_react10.useEffect)(() => { ++ (0, import_react12.useEffect)(() => { + if (!open) turnProcess.setOpen(true); + }, [open, turnProcess]); + const turn = node?.location?.turn?.turn ?? node?.data?.turn; + const start = node?.location?.turn?.start?.time; + const hidden = useRoster((roster) => isHiddenTurn(roster, sessionId, turn)); -+ (0, import_react10.useEffect)(() => { ++ (0, import_react12.useEffect)(() => { + actions.noteTurnTime(sessionId, turn, "first", start); + }, [sessionId, turn, start]); + const visit = useUi((state) => state.visits?.[sessionId]); + const fresh = useTurnClock((state) => { + const own = state[sessionId]?.[turn]; + return !hidden && typeof visit?.seen === "number" && own?.first !== void 0 && own.first <= visit.seen && own.end !== void 0 && own.end > visit.seen && own.end <= visit.entered; - }); -- if (raised && field) { -- rows.push((0, import_react4.createElement)( -- "label", -- { key: "own", className: "bt-q-opt bt-q-ownrow", "data-filled": custom !== "" ? "" : void 0 }, -- ownLetter ? (0, import_react4.createElement)("span", { className: "bt-key", "aria-hidden": true }, ownLetter) : null, -- (0, import_react4.createElement)("span", { className: "bt-q-body" }, field) -- )); -+ return fresh ? (0, import_react10.createElement)(NewDivider) : null; ++ }); ++ return fresh ? (0, import_react12.createElement)(NewDivider) : null; +} +function Nothing() { + return null; @@ -9167,19 +9799,9 @@ diff --git a/client.js b/client.js + if (isHiddenNotice(block)) continue; + if (block?.type === "tool-removal" && block.toolName) parts.push(`Tool removed: ${block.toolName}`); + else if (block?.type === "tool-addition" && block.toolName) parts.push(`Tool added: ${block.toolName}`); - } -- let foot = null; -- if (raised && multi) { -- foot = (0, import_react4.createElement)( -- "div", -- { className: "bt-q-foot" }, -- (0, import_react4.createElement)("button", { type: "button", className: "bt-q-btn", onClick: onDismiss }, t("Skip")), -- (0, import_react4.createElement)("button", { type: "submit", className: "bt-q-submit", disabled: !canSubmit }, t("Submit")) -- ); -- } else if ((raised || multi) && canSubmit) { -- foot = (0, import_react4.createElement)("div", { className: "bt-q-foot" }, (0, import_react4.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit"))); ++ } + if (parts.length === 0) return null; -+ return (0, import_react10.createElement)("div", { className: "bt-event" }, parts.join(" · ")); ++ return (0, import_react12.createElement)("div", { className: "bt-event" }, parts.join(" · ")); +} +var SEPARATOR_GAP_MS = 30 * 60 * 1e3; +function clockLabel(time, now = Date.now()) { @@ -9197,55 +9819,9 @@ diff --git a/client.js b/client.js + for (const key in turns) { + const candidate = Number(key); + if (candidate > turn && turns[key].first !== void 0 && (next === void 0 || candidate < next)) next = candidate; - } -- return (0, import_react4.createElement)( -- "form", -- { -- className: raised ? "bt-q bt-q-raised" : "bt-q", -- "aria-labelledby": titleId, -- onSubmit: (event) => { -- event.preventDefault(); -- submit(); -- } -- }, -- (0, import_react4.createElement)( -- "div", -- { className: "bt-q-head" }, -- (0, import_react4.createElement)( -- "div", -- { className: "bt-q-text" }, -- (0, import_react4.createElement)("p", { className: "bt-q-title", id: titleId }, question.header ? `${question.header} · ` : "", question.question), -- question.detail ? (0, import_react4.createElement)("div", { className: "bt-q-detail" }, question.detail) : null, -- raised && multi ? (0, import_react4.createElement)("div", { className: "bt-q-detail" }, t("Choose all that apply")) : null -- ), -- (0, import_react4.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Dismiss question"), title: t("Dismiss"), onClick: onDismiss }, (0, import_react4.createElement)(CloseIcon)) -- ), -- rows.length > 0 ? (0, import_react4.createElement)("div", { className: "bt-q-list", role: "group" }, rows) : null, -- field && !raised ? (0, import_react4.createElement)( -- "div", -- { className: "bt-q-custom" }, -- (0, import_react4.createElement)("label", { className: "bt-q-field" }, field), -- !multi && canSubmit ? (0, import_react4.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit")) : null -- ) : null, -- foot -- ); ++ } + return next === void 0 ? void 0 : turns[next].first; - } --function SettledQuestion({ question, answer }) { -- const options = optionsOf(question); -- const prompt = question?.question ?? ""; -- const chosen = [...answer.selected ?? [], ...answer.custom ? [answer.custom] : []]; -- if (chosen.length === 0) { -- return (0, import_react4.createElement)( -- "div", -- { className: "bt-q bt-q-settled bt-q-dismissed", role: "group", "aria-label": prompt }, -- (0, import_react4.createElement)( -- "div", -- { className: "bt-q-head" }, -- (0, import_react4.createElement)("div", { className: "bt-q-text" }, (0, import_react4.createElement)("p", { className: "bt-q-title" }, prompt)), -- (0, import_react4.createElement)("span", { className: "bt-q-badge" }, t("Dismissed")) -- ) -- ); ++} +function openingTurn(turns, firstTurns, hiddenTurns) { + if (!turns || !firstTurns) return null; + const start = nextTurnStart(turns, -Infinity); @@ -9261,21 +9837,7 @@ diff --git a/client.js b/client.js + for (const key in turns ?? {}) { + if (hiddenTurns?.includes(Number(key))) continue; + if (turns[key].first !== void 0 && turns[key].first > visit.entered) return true; - } -- return (0, import_react4.createElement)( -- "div", -- { className: "bt-q bt-q-settled", role: "group", "aria-label": prompt }, -- prompt ? (0, import_react4.createElement)("div", { className: "bt-q-head" }, (0, import_react4.createElement)("div", { className: "bt-q-text" }, (0, import_react4.createElement)("p", { className: "bt-q-title" }, prompt))) : null, -- (0, import_react4.createElement)("div", { className: "bt-q-list", role: "group", "aria-label": t("Your answer") }, chosen.map((label, index) => { -- const optionIndex = options.findIndex((option) => option.label === label); -- return (0, import_react4.createElement)( -- "div", -- { key: `${label}-${index}`, className: "bt-q-opt" }, -- optionIndex >= 0 ? (0, import_react4.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)) : null, -- (0, import_react4.createElement)("span", { className: "bt-q-body" }, (0, import_react4.createElement)("span", { className: "bt-q-label" }, label)), -- (0, import_react4.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react4.createElement)(CheckIcon)) -- ); -- })) ++ } + return false; +} +var settledVisit = (visit) => typeof visit?.seen === "number" && visit.seen < visit.entered ? { ...visit, seen: visit.entered } : visit; @@ -9283,7 +9845,7 @@ diff --git a/client.js b/client.js +function TurnTailCell({ turn: location2, sessionId, useTurnClock, useUi, actions }) { + const turn = location2.turn; + const time = location2.end.time; -+ (0, import_react10.useEffect)(() => { ++ (0, import_react12.useEffect)(() => { + actions.noteTurnTime(sessionId, turn, "end", time); + }, [sessionId, turn, time]); + const label = useTurnClock((state) => { @@ -9295,30 +9857,17 @@ diff --git a/client.js b/client.js + if (typeof visit?.seen !== "number" || time > visit.seen) return false; + const start = nextTurnStart(state[sessionId] ?? {}, turn); + return start !== void 0 && start > visit.seen && start <= visit.entered; -+ }); + }); + if (!label && !fresh) return null; -+ return (0, import_react10.createElement)( -+ import_react10.Fragment, ++ return (0, import_react12.createElement)( ++ import_react12.Fragment, + null, -+ label ? (0, import_react10.createElement)("div", { className: "bt-time-sep", role: "separator" }, label) : null, -+ fresh ? (0, import_react10.createElement)(NewDivider) : null - ); - } --function QuestionCard({ matched }) { -- const pending = matched; -- const questions = pending.questions ?? []; -- const [index, setIndex] = (0, import_react4.useState)(0); -- const [answers, setAnswers] = (0, import_react4.useState)([]); -- const question = questions[index]; -- if (question === void 0) return null; -- const onAnswer = (answer) => { -- const next = [...answers, { id: question.id, ...answer }]; -- if (index + 1 < questions.length) { -- setAnswers(next); -- setIndex(index + 1); -- return; ++ label ? (0, import_react12.createElement)("div", { className: "bt-time-sep", role: "separator" }, label) : null, ++ fresh ? (0, import_react12.createElement)(NewDivider) : null ++ ); ++} +function Shimmer({ children }) { -+ return (0, import_react10.createElement)("span", { className: "bt-shimmer" }, children); ++ return (0, import_react12.createElement)("span", { className: "bt-shimmer" }, children); +} +var PHRASES = { + thinking: ["Thinking about it", "Weighing the options", "Working out a plan", "Sorting out the details"], @@ -9349,10 +9898,7 @@ diff --git a/client.js b/client.js + case "message_bot": { + const target = findBot(arg("to")); + return { label: target ? t("Asking {name}", { name: target.name }) : t("Asking another Bot"), state: "sending" }; - } -- pending.answer({ answers: next }); -- }; -- return (0, import_react4.createElement)(QuestionView, { key: index, question, onAnswer, onDismiss: () => pending.dismiss(), ownAnswer: true, raised: true }); ++ } + case "stop_bot": { + const target = findBot(arg("bot")); + return { label: target ? t("Stopping {name}", { name: target.name }) : t("Stopping another Bot"), state: "sending" }; @@ -9380,37 +9926,88 @@ diff --git a/client.js b/client.js + const phrase = TOOL_PHRASES.find(([pattern]) => pattern.test(name))?.[1]; + return { label: phrase ? t(phrase) : null, state: toolState(name) }; + } - } --function PendingQuestion({ sessionId, question, actions, inline }) { -- const [answered, setAnswered] = (0, import_react4.useState)(null); -- if (answered === question.id) return null; -- const onAnswer = (answer) => { -- setAnswered(question.id); -- void actions.answerQuestion(sessionId, question.id, { selected: answer.selected ?? [], custom: answer.custom ?? "" }).catch(() => setAnswered(null)); -- }; -- const onDismiss = () => { -- setAnswered(question.id); -- void actions.dismissQuestion(sessionId); -- }; -- return (0, import_react4.createElement)( ++} +function workPhrase(tool) { + if (!tool) return t("Thinking about it"); + return toolActivity(tool, () => void 0, () => void 0)?.label ?? t("Using {tool}", { tool }); -+} + } +-function installCompiledStyles(text, tag) { +- const style = installStyles("", tag); +- const cache = /* @__PURE__ */ new WeakMap(); +- const render = () => { +- const names = /* @__PURE__ */ new Set(); +- for (const sheet of document.styleSheets) { +- if (sheet.ownerNode?.dataset?.dshBot) continue; +- let list = cache.get(sheet); +- if (!list) { +- list = sheetClassNames(sheet); +- cache.set(sheet, list); +- } +- for (const name of list) names.add(name); +- } +- const next = compileFragmentSelectors(text, names); +- if (style.textContent !== next) style.textContent = next; +- }; +- render(); +- let timer; +- const schedule = () => { +- clearTimeout(timer); +- timer = setTimeout(render, 120); +- }; +- const onLoad = (event) => { +- if (event.target instanceof HTMLLinkElement) schedule(); +- }; +- const observer = new MutationObserver(schedule); +- observer.observe(document.head, { childList: true }); +- document.addEventListener("load", onLoad, true); +- return () => { +- observer.disconnect(); +- document.removeEventListener("load", onLoad, true); +- clearTimeout(timer); +- style.remove(); +- }; +function workText(tool, step) { + return step ? t("{action}: {detail}", { action: workPhrase(tool), detail: step }) : `${workPhrase(tool)}…`; -+} + } +- +-// src/client/mark.js +-var import_react2 = require("react"); +-var STATES = ["idle", "thinking", "searching", "working", "sending", "orbit", "alert", "done"]; +-var botState = (running, activity, alert) => running ? STATES.includes(activity) ? activity : "working" : alert ? "alert" : "idle"; +-var toolState = (name) => /^(message_bot|stop_bot|create_bot|update_bot|create_group|update_group|delete_group|post_to_group)$/.test(name) ? "sending" : /search|fetch|browse|read|grep|glob|list|recall/i.test(name) ? "searching" : "working"; +-function useGaze(ref, enabled) { +- (0, import_react2.useEffect)(() => { +- if (!enabled) return void 0; +- let frame = 0; +- let point = null; +- const place = () => { +- frame = 0; +- const node = ref.current; +- if (!node || !point) return; +- const box = node.getBoundingClientRect(); +- const clamp = (value) => Math.max(-1, Math.min(1, value)); +- node.style.setProperty("--bt-gx", clamp((point.x - box.left - box.width / 2) / 160).toFixed(2)); +- node.style.setProperty("--bt-gy", clamp((point.y - box.top - box.height / 2) / 160).toFixed(2)); +- }; +- const onMove = (event) => { +- point = { x: event.clientX, y: event.clientY }; +- if (!frame) frame = requestAnimationFrame(place); +- }; +- const onLeave = () => { +- point = null; +- ref.current?.style.setProperty("--bt-gx", "0"); +- ref.current?.style.setProperty("--bt-gy", "0"); +function useLiveNote(actions, sessionId, id, entry) { + const key = entry ? JSON.stringify(entry) : ""; -+ (0, import_react10.useEffect)(() => { ++ (0, import_react12.useEffect)(() => { + if (!key) return void 0; + actions.noteLive(sessionId, id, JSON.parse(key)); + return () => actions.noteLive(sessionId, id, null); + }, [sessionId, id, key]); +} +function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi }) { -+ const [live, setLive] = (0, import_react10.useState)({ replies: [] }); -+ (0, import_react10.useEffect)(() => { ++ const [live, setLive] = (0, import_react12.useState)({ replies: [] }); ++ (0, import_react12.useEffect)(() => { + if (done) return void 0; + let stop = false; + let timer; @@ -9425,12 +10022,54 @@ diff --git a/client.js b/client.js + setLive({ replies: entry.replies ?? [] }); + } + timer = setTimeout(tick, document.hidden ? 5e3 : 1e3); -+ }; + }; +- window.addEventListener("pointermove", onMove, { passive: true }); +- document.documentElement.addEventListener("pointerleave", onLeave); + void tick(); -+ return () => { + return () => { +- cancelAnimationFrame(frame); +- window.removeEventListener("pointermove", onMove); +- document.documentElement.removeEventListener("pointerleave", onLeave); + stop = true; + clearTimeout(timer); -+ }; + }; +- }, [enabled]); +-} +-var FIDGETS = ["hop", "sway", "stretch", "look"]; +-function BotMark({ bot, look: given, size = 36, state = "idle", live = false, gaze = false, pokeable = false, label }) { +- const look = given ?? lookOf(bot); +- const ref = (0, import_react2.useRef)(null); +- const maskId = (0, import_react2.useRef)(""); +- if (maskId.current === "") maskId.current = `bt-mark-${nextMarkSerial()}`; +- const [poked, setPoked] = (0, import_react2.useState)(false); +- useGaze(ref, gaze); +- const common = { +- ref, +- className: poked ? "bt-mark bt-mark-poke" : "bt-mark", +- "data-shape": look.image ? "image" : shapeId(look.shape), +- "data-state": STATES.includes(state) ? state : "idle", +- "data-live": live ? "" : void 0, +- "data-fidget": live ? FIDGETS[fnv1a(`${bot?.id ?? ""}:fidget`) % FIDGETS.length] : void 0, +- "data-gaze": gaze ? "" : void 0, +- "data-poke": pokeable ? "" : void 0, +- style: { width: size, height: size, ...live ? { "--bt-delay": `${-(fnv1a(String(bot?.id ?? "")) % 5e3) / 1e3}s`, "--bt-fidget-delay": `${-(fnv1a(`${bot?.id ?? ""}:when`) % 9e3) / 1e3}s` } : {} }, +- role: label ? "img" : void 0, +- "aria-label": label, +- "aria-hidden": label ? void 0 : true, +- onClick: pokeable ? () => setPoked(true) : void 0, +- onAnimationEnd: poked ? (event) => { +- if (/^bt-poke/.test(event.animationName)) setPoked(false); +- } : void 0 +- }; +- if (look.image) return (0, import_react2.createElement)("span", common, (0, import_react2.createElement)("img", { className: "bt-mark-img", src: look.image, alt: "", draggable: false })); +- const box = shapeOf(look.shape).size; +- return (0, import_react2.createElement)("span", common, (0, import_react2.createElement)("svg", { viewBox: `0 0 ${box} ${box}`, dangerouslySetInnerHTML: { __html: characterMarkup(look.shape, look.color).replaceAll(MASK_ID, maskId.current) } })); +-} +-function StarIcon({ size = 8 }) { +- return (0, import_react2.createElement)( +- "svg", +- { width: size, height: size, viewBox: "0 0 10 10", "aria-hidden": true }, +- (0, import_react2.createElement)("path", { d: "M5 .6l1.3 2.8 3 .3-2.3 2 .7 3L5 7.2 2.3 8.7l.7-3L.7 3.7l3-.3z", fill: "#fff" }) + }, [done, sessionId, callId]); + let replies = live.replies; + if (done) { @@ -9442,10 +10081,8 @@ diff --git a/client.js b/client.js + } + if (replies.length === 0) return null; + const room2 = roster.roomsById[sessionId]; -+ return (0, import_react10.createElement)( - "div", -- { className: inline ? "bt-q-inline" : "bt-q-dock" }, -- (0, import_react4.createElement)(QuestionView, { key: question.id, question, onAnswer, onDismiss, ownAnswer: question.allowCustom === true, raised: !inline }) ++ return (0, import_react12.createElement)( ++ "div", + { className: "bt-group-replies" }, + replies.map((reply, index) => { + const stored = roster.byId[reply.botId]; @@ -9454,66 +10091,66 @@ diff --git a/client.js b/client.js + if (reply.kind === "user") { + const who = reply.name && reply.name !== "User" ? reply.name : reply.authorId; + if (reply.other) { -+ return (0, import_react10.createElement)(PersonMessage, { key: `user-${index}`, name: who, texts: [remoteMessageText(reply.text)], roster, selfId: sessionId, actions, sessionId, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi }); ++ return (0, import_react12.createElement)(PersonMessage, { key: `user-${index}`, name: who, texts: [remoteMessageText(reply.text)], roster, selfId: sessionId, actions, sessionId, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi }); + } -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { key: `user-${index}`, className: "bt-urow", "data-author": reply.authorId, "data-author-name": who, onClickCapture: bubbleLinkClick({ actions, subject: sessionId }) }, -+ who ? (0, import_react10.createElement)("span", { className: "bt-uauthor" }, who) : null, -+ (0, import_react10.createElement)( ++ who ? (0, import_react12.createElement)("span", { className: "bt-uauthor" }, who) : null, ++ (0, import_react12.createElement)( + "div", + { className: "bt-ububble" }, -+ (0, import_react10.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: remoteMessageText(reply.text), labels: mdLabels(), variant: "compact" }) ++ (0, import_react12.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: remoteMessageText(reply.text), labels: mdLabels2(), variant: "compact" }) + ), -+ room2?.origin === "face-to-face" ? (0, import_react10.createElement)("span", { className: "bt-lead", title: who || void 0 }, (0, import_react10.createElement)(PersonMark, { name: who || void 0 })) : null ++ room2?.origin === "face-to-face" ? (0, import_react12.createElement)("span", { className: "bt-lead", title: who || void 0 }, (0, import_react12.createElement)(PersonMark, { name: who || void 0 })) : null + ); + } + if (reply.kind === "failed") { -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { key: `${reply.botId}-${index}`, className: "bt-event bt-event-error", role: "status" }, + t("{name} could not answer: {reason}", { name: bot.name, reason: failureLabel(reply.code, reply.text) }) + ); + } + if (reply.kind === "lookup") { -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { key: `${reply.botId}-${index}`, className: "bt-event" }, + reply.text ? t("{name} looked up its own chat for “{text}”", { name: bot.name, text: reply.text }) : t("{name} looked up its own chat", { name: bot.name }) + ); + } + if (reply.kind === "missed") { -+ return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name })); ++ return (0, import_react12.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name })); + } + if (reply.kind === "resumed") { -+ return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name })); ++ return (0, import_react12.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name })); + } + if (reply.kind === "cut") { -+ return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name })); ++ return (0, import_react12.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name })); + } + if (reply.kind === "approval" || reply.kind === "working") { -+ return (0, import_react10.createElement)( ++ return (0, import_react12.createElement)( + "div", + { key: `${reply.botId}-${index}`, className: "bt-event" }, -+ (0, import_react10.createElement)( ++ (0, import_react12.createElement)( + "button", + { type: "button", className: "bt-event-whole", onClick: () => actions.showDetails(sessionId) }, -+ (0, import_react10.createElement)(BotMark, { bot, size: 16 }), -+ (0, import_react10.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name })) ++ (0, import_react12.createElement)(BotMark, { bot, size: 16 }), ++ (0, import_react12.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name })) + ) + ); + } + if (reply.kind === "stopped") { -+ return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("You stopped {name}'s work", { name: bot.name })); ++ return (0, import_react12.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("You stopped {name}'s work", { name: bot.name })); + } + if (reply.kind === "notice" && room2?.origin === "face-to-face" && String(reply.text ?? "").trim() === WAITING_OTHERS_NOTICE) return null; + if ((reply.kind === "notice" || reply.kind === "left") && leaveNoticeCoveredByClose(room2, reply.text)) return null; + if (reply.kind === "notice" || reply.kind === "joined" || reply.kind === "left" || reply.kind === "started") { -+ return (0, import_react10.createElement)("div", { key: `notice-${index}`, className: "bt-event", "data-flybot": "face-notice" }, remoteMessageText(reply.text)); ++ return (0, import_react12.createElement)("div", { key: `notice-${index}`, className: "bt-event", "data-flybot": "face-notice" }, remoteMessageText(reply.text)); + } + const remote = reply.remote || reply.handle && !roster.byId[reply.botId]; + if (remote) { -+ return (0, import_react10.createElement)(RemoteMessage, { ++ return (0, import_react12.createElement)(RemoteMessage, { + key: `${reply.botId || reply.handle}-${index}`, + source: { remote: { handle: reply.handle || reply.botId }, senderName: reply.name || reply.who, senderSessionId: reply.botId }, + text: remoteMessageText(reply.text), @@ -9524,16 +10161,12 @@ diff --git a/client.js b/client.js + useUi + }); + } -+ return (0, import_react10.createElement)(GroupMessage, { key: `${reply.botId}-${index}`, bot, text: reply.text, room: room2, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi, seq: reply.seq }); ++ return (0, import_react12.createElement)(GroupMessage, { key: `${reply.botId}-${index}`, bot, text: reply.text, room: room2, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi, seq: reply.seq }); + }) ); } --function QuestionDock({ sessionId, useRoster, useCards, useSession, actions }) { -- const question = useRoster((value) => value.questions?.[sessionId]); -- const drawn = useCards?.((state) => state[sessionId]?.[question?.callId] > 0) === true; -- const loading = useSession?.(historyLoading) === true; -- if (question === void 0 || question.callId && (drawn || loading)) return null; -- return (0, import_react4.createElement)(PendingQuestion, { sessionId, question, actions, inline: false }); +-function AdminStar() { +- return (0, import_react2.createElement)("span", { className: "bt-admin-star", role: "img", "aria-label": t("Admin") }, (0, import_react2.createElement)(StarIcon, { size: 7 })); +var DRAWN = /* @__PURE__ */ new Set(["message_bot", "stop_bot", "create_bot", "update_bot", "group_relay", "create_group", "update_group", "delete_group", "post_to_group", "ask_user", "request_secret", "ask_user_question", "read_group_chat", "remember", "forget"]); +var CARDS = /* @__PURE__ */ new Set(["ask_user", "request_secret"]); +function callTree(root) { @@ -9549,80 +10182,30 @@ diff --git a/client.js b/client.js + visit(root); + return calls; } --function AnsweredCell({ node }) { -- const data = node.data ?? {}; -- const questions = Array.isArray(data.questions) ? data.questions : []; -- if (questions.length === 0) { -- return data.text ? (0, import_react4.createElement)("div", { className: "bt-urow" }, (0, import_react4.createElement)("div", { className: "bt-ububble" }, data.text)) : null; -- } -- const answers = Array.isArray(data.answers) ? data.answers : []; -- return (0, import_react4.createElement)("div", { className: "bt-q-inline" }, questions.map((question) => (0, import_react4.createElement)(SettledQuestion, { -- key: question.id, -- question, -- answer: answers.find((answer) => answer.id === question.id) ?? { selected: [] } -- }))); +-function MainStar() { +- return (0, import_react2.createElement)( +- "svg", +- { viewBox: "0 0 20 20", "aria-hidden": true }, +- (0, import_react2.createElement)("path", { d: "M10 2.4l2.29 5.04 5.51.63-4.09 3.74 1.11 5.42L10 14.5l-4.82 2.73 1.11-5.42L2.2 8.07l5.51-.63z" }) +- ); +function useShownCards(actions, sessionId, callIds) { + const key = JSON.stringify(callIds); -+ (0, import_react10.useLayoutEffect)(() => { ++ (0, import_react12.useLayoutEffect)(() => { + const ids = JSON.parse(key); + if (ids.length === 0 || !actions.noteCards) return void 0; + actions.noteCards(sessionId, ids, 1); + return () => actions.noteCards(sessionId, ids, -1); + }, [sessionId, key]); } -- --// src/client/secret-card.js --var import_react5 = require("react"); --var MIN_VALUE = 4; --var NONE = {}; --var KeyIcon = () => (0, import_react5.createElement)( -- "svg", -- { width: 15, height: 15, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -- (0, import_react5.createElement)("path", { d: "M7 9.5a3.5 3.5 0 1 1 0 .01z" }), -- (0, import_react5.createElement)("path", { d: "M10.4 10.6L17 10.6M14.5 10.6v2.4M16.6 10.6v1.8" }) --); --var LockIcon = () => (0, import_react5.createElement)( -- "svg", -- { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -- (0, import_react5.createElement)("path", { d: "M6.5 9V7a3.5 3.5 0 0 1 7 0v2" }), -- (0, import_react5.createElement)("rect", { x: 4.5, y: 9, width: 11, height: 8, rx: 2 }) --); --var WarnIcon = () => (0, import_react5.createElement)( -- "svg", -- { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -- (0, import_react5.createElement)("path", { d: "M10 3.5l7 12.5H3z" }), -- (0, import_react5.createElement)("path", { d: "M10 8.5v3.5M10 14.2h.01" }) --); --var MASK_BY_CSS = typeof CSS !== "undefined" && typeof CSS.supports === "function" && CSS.supports("-webkit-text-security", "disc"); --var insecure = () => typeof location !== "undefined" && location.protocol === "http:" && !/^(localhost|127(?:\.\d{1,3}){3}|\[::1\])$/.test(location.hostname); --var scopeLabel = (scope, roster) => { -- if (scope === "all") return t("All Bots"); -- const names = (scope ?? []).map((id) => roster.byId[id]?.name).filter(Boolean); -- return names.length === 0 ? t("No Bot") : names.join(t(" and ")); --}; --var when = (time) => Number.isFinite(time) ? new Date(time).toLocaleString(dateLocale(), { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" }) : ""; --function MaskedInput({ value, onChange, onEnter, label, autoFocus = false }) { -- return (0, import_react5.createElement)("input", { -- className: "bt-secret-input", -- type: MASK_BY_CSS ? "text" : "password", -- "data-masked": MASK_BY_CSS ? "" : void 0, -- value, -- autoFocus, -- autoComplete: MASK_BY_CSS ? "off" : "new-password", -- autoCorrect: "off", -- autoCapitalize: "off", -- spellCheck: false, -- "data-1p-ignore": "", -- "data-lpignore": "true", -- "data-bwignore": "", -- "data-form-type": "other", -- "aria-label": label, -- placeholder: t("Paste or type the key"), -- onChange: (event) => onChange(event.target.value), -- onKeyDown: (event) => { -- if (event.key !== "Enter" || event.nativeEvent.isComposing) return; -- event.preventDefault(); -- onEnter?.(); +-function useSettled(state) { +- const prev = (0, import_react2.useRef)(state); +- const [settled, setSettled] = (0, import_react2.useState)(false); +- (0, import_react2.useEffect)(() => { +- const was = prev.current; +- prev.current = state; +- if (state !== "idle") { +- setSettled(false); +- return void 0; +function renderCall(call4, { sessionId, roster, actions, useUi, findBot }) { + const tool = toolName(call4); + const done = call4.kind === "tool-result"; @@ -9631,26 +10214,53 @@ diff --git a/client.js b/client.js + switch (tool) { + case "message_bot": { + const target = findBot(arg("to")) ?? { name: arg("to") ?? "…", color: "gray" }; -+ if (done && call4.isError) return (0, import_react10.createElement)("div", { className: "bt-event" }, t("Couldn't message {name}", { name: target.name })); -+ return (0, import_react10.createElement)(EventLine, { prefix: t("Messaged"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); -+ } ++ if (done && call4.isError) return (0, import_react12.createElement)("div", { className: "bt-event" }, t("Couldn't message {name}", { name: target.name })); ++ return (0, import_react12.createElement)(EventLine, { prefix: t("Messaged"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); + } +- if (was === "idle" || was === "alert") return void 0; +- setSettled(true); +- const timer = setTimeout(() => setSettled(false), 1800); +- return () => clearTimeout(timer); +- }, [state]); +- return settled; +-} +-function BotAvatar({ bot, size, state = "idle", main, admin, badge = true, live = true, gaze = false, pokeable = false }) { +- const settled = useSettled(state); +- if (bot === void 0) return (0, import_react2.createElement)(BotMark, { size }); +- const badgeKind = !badge ? null : state === "alert" ? "alert" : state !== "idle" ? "working" : admin ? "admin" : main ? "main" : null; +- return (0, import_react2.createElement)( +- "span", +- { className: "bt-mark", style: { width: size, height: size, "--bt-size": `${size}px` } }, +- (0, import_react2.createElement)(BotMark, { bot, size, state: settled ? "done" : state, live, gaze, pokeable }), +- badgeKind === "working" ? (0, import_react2.createElement)("span", { className: "bt-badge bt-badge-working", "aria-label": t("Working"), role: "img" }) : null, +- badgeKind === "alert" ? (0, import_react2.createElement)("span", { className: "bt-badge bt-badge-alert", "aria-label": t("Waiting for your answer"), role: "img" }, "?") : null, +- badgeKind === "admin" ? (0, import_react2.createElement)("span", { className: "bt-badge bt-badge-admin", "aria-label": t("Admin"), role: "img" }, (0, import_react2.createElement)(StarIcon)) : null, +- badgeKind === "main" ? (0, import_react2.createElement)("span", { className: "bt-badge bt-badge-main", "aria-label": t("Main Bot"), role: "img" }, (0, import_react2.createElement)(MainStar)) : null +- ); +-} +-function clusterSeats(count, frame) { +- if (count === 1) return [[0, 0, frame]]; +- if (count === 2) return [[0, 0, frame * 2 / 3], [frame / 3, frame / 3, frame * 2 / 3]]; +- if (count === 3) { +- const size = frame * 5 / 9; +- const rest = frame - size; +- return [[rest / 2, 0, size], [0, rest, size], [rest, rest, size]]; + case "stop_bot": { + const target = findBot(arg("bot")) ?? { name: arg("bot") ?? "…", color: "gray" }; -+ if (done && call4.isError) return (0, import_react10.createElement)("div", { className: "bt-event" }, t("Couldn't stop {name}", { name: target.name })); -+ return (0, import_react10.createElement)(EventLine, { prefix: t("Stopped"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); ++ if (done && call4.isError) return (0, import_react12.createElement)("div", { className: "bt-event" }, t("Couldn't stop {name}", { name: target.name })); ++ return (0, import_react12.createElement)(EventLine, { prefix: t("Stopped"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); + } + case "create_bot": { + const created = findBot(arg("name")); + if (!done || created === void 0) return null; -+ return (0, import_react10.createElement)(EventLine, { prefix: t("Created"), bots: [created], onOpen: (bot) => actions.openSession(bot.id) }); - } -- }); ++ return (0, import_react12.createElement)(EventLine, { prefix: t("Created"), bots: [created], onOpen: (bot) => actions.openSession(bot.id) }); ++ } + case "update_bot": { + const target = findBot(arg("name")) ?? findBot(arg("bot")) ?? (arg("bot") ? void 0 : self); -+ return done && target ? (0, import_react10.createElement)(EventLine, { prefix: t("Updated"), bots: [target], onOpen: (bot) => actions.openSession(bot.id) }) : null; ++ return done && target ? (0, import_react12.createElement)(EventLine, { prefix: t("Updated"), bots: [target], onOpen: (bot) => actions.openSession(bot.id) }) : null; + } + case "group_relay": -+ return (0, import_react10.createElement)(GroupReplies, { sessionId, callId: call4.callId, done, content: call4.content, roster, actions, useUi }); ++ return (0, import_react12.createElement)(GroupReplies, { sessionId, callId: call4.callId, done, content: call4.content, roster, actions, useUi }); + case "create_group": + case "update_group": + case "delete_group": @@ -9664,18 +10274,18 @@ diff --git a/client.js b/client.js + if (!done) return null; + const result = contentText(call4.content); + const named = /^(Created group|Updated|Nothing changed in|Deleted|Posted in) "([^"]+)"/.exec(result); -+ if (call4.isError || !named) return (0, import_react10.createElement)("div", { className: "bt-event", title: result }, t(verbs[1])); ++ if (call4.isError || !named) return (0, import_react12.createElement)("div", { className: "bt-event", title: result }, t(verbs[1])); + const name = named[2]; + const room2 = roster.rooms.find((entry) => entry.name === name); -+ return (0, import_react10.createElement)(GroupEvent, { prefix: t(verbs[0]), room: tool === "delete_group" ? void 0 : room2, name, roster, actions }); ++ return (0, import_react12.createElement)(GroupEvent, { prefix: t(verbs[0]), room: tool === "delete_group" ? void 0 : room2, name, roster, actions }); + } + case "ask_user": { + const question = roster.questions?.[sessionId]; -+ if (!question || question.callId !== call4.callId) return (0, import_react10.createElement)("span", { className: "bt-q-gone", hidden: true }); -+ return (0, import_react10.createElement)(PendingQuestion, { sessionId, question, actions, roster, inline: true }); ++ if (!question || question.callId !== call4.callId) return (0, import_react12.createElement)("span", { className: "bt-q-gone", hidden: true }); ++ return (0, import_react12.createElement)(PendingQuestion, { sessionId, question, actions, roster, inline: true }); + } + case "request_secret": -+ return (0, import_react10.createElement)(SecretToolCell, { sessionId, callId: call4.callId, name: arg("name"), done, content: call4.content, roster, actions }); ++ return (0, import_react12.createElement)(SecretToolCell, { sessionId, callId: call4.callId, name: arg("name"), done, content: call4.content, roster, actions }); + case "ask_user_question": { + if (!done) return null; + let parsed = null; @@ -9687,34 +10297,52 @@ diff --git a/client.js b/client.js + const answer = parsed?.answers?.[0]; + const question = argValue("questions")?.[0]; + if (!answer) return null; -+ return (0, import_react10.createElement)("div", { className: "bt-q-inline" }, (0, import_react10.createElement)(SettledQuestion, { question, answer })); ++ return (0, import_react12.createElement)("div", { className: "bt-q-inline" }, (0, import_react12.createElement)(SettledQuestion, { question, answer })); + } + case "read_group_chat": { + if (!done) return null; + const room2 = roster.rooms.find((entry) => entry.name === arg("group")); -+ return room2 ? (0, import_react10.createElement)(GroupEvent, { prefix: t("Read"), room: room2, roster, actions }) : null; ++ return room2 ? (0, import_react12.createElement)(GroupEvent, { prefix: t("Read"), room: room2, roster, actions }) : null; + } + case "remember": + case "forget": -+ return done && !call4.isError ? (0, import_react10.createElement)(MemoryEvent, { sessionId, scope: arg("scope"), result: contentText(call4.content), roster, actions, findBot }) : null; ++ return done && !call4.isError ? (0, import_react12.createElement)(MemoryEvent, { sessionId, scope: arg("scope"), result: contentText(call4.content), roster, actions, findBot }) : null; + default: + return null; -+ } + } +- const half = frame / 2; +- return [[0, 0, half], [half, 0, half], [0, half, half], [half, half, half]]; } --function ScopeSwitch({ value, onChange, bot }) { -- const options = [["all", t("All Bots")], ["bot", t("Only {name}", { name: bot.name })]]; -- return (0, import_react5.createElement)( -- "div", -- { className: "bt-secret-scope", role: "radiogroup", "aria-label": t("Who may use it") }, -- (0, import_react5.createElement)("span", { className: "bt-secret-glide", "data-at": value === "all" ? 0 : 1, "aria-hidden": true }), -- options.map(([id, text]) => (0, import_react5.createElement)("button", { -- key: id, -- type: "button", -- role: "radio", -- "aria-checked": value === id, -- className: "bt-secret-seg", -- onClick: () => onChange(id) -- }, text)) +-function RoomAvatar({ room: room2, roster, size = 36 }) { +- const members = room2.members.map((id) => roster.byId[id]).filter(Boolean); +- const people = members.length === 1 ? [members[0], null] : members; +- const seat = (bot, seatSize, key) => bot ? (0, import_react2.createElement)(BotMark, { key, bot, size: seatSize }) : (0, import_react2.createElement)("span", { key, className: "bt-cluster-you", style: { width: seatSize * 0.92, height: seatSize * 0.92, margin: seatSize * 0.04 } }); +- if (people.length === 0) return (0, import_react2.createElement)(BotMark, { size }); +- if (size <= 20 && people.length > 1) { +- return (0, import_react2.createElement)( +- "span", +- { className: "bt-stack", style: { "--bt-stack-size": `${size}px` } }, +- people.slice(0, 3).map((bot, index) => seat(bot, size, bot?.id ?? `you-${index}`)), +- people.length > 3 ? (0, import_react2.createElement)("span", { className: "bt-stack-more" }, `+${people.length - 3}`) : null +- ); +- } +- const seats = clusterSeats(Math.min(people.length, 4), size); +- const overflow = people.length > 4 ? people.length - 3 : 0; +- const gap = size / 14; +- const rings = seats.map(([x, y, s]) => ({ cx: x + s / 2, cy: y + s / 2, r: s * 0.48 + gap })); +- return (0, import_react2.createElement)( +- "span", +- { className: "bt-cluster", style: { width: size, height: size } }, +- seats.map(([x, y, s], index) => { +- const holes2 = rings.slice(index + 1).filter((ring) => Math.hypot(ring.cx - x - s / 2, ring.cy - y - s / 2) < ring.r + s * 0.46).map((ring) => `radial-gradient(circle at ${ring.cx - x}px ${ring.cy - y}px,transparent ${ring.r}px,#000 ${ring.r + 0.5}px)`); +- const style = { left: x, top: y, width: s, height: s }; +- if (holes2.length > 0) Object.assign(style, { WebkitMaskImage: holes2.join(","), maskImage: holes2.join(","), WebkitMaskComposite: "source-in", maskComposite: "intersect" }); +- if (overflow > 0 && index === 3) { +- return (0, import_react2.createElement)("span", { key: "more", className: "bt-cluster-more", style: { ...style, width: s * 0.92, height: s * 0.92, margin: s * 0.04, fontSize: Math.max(8, Math.round(s * 0.36)) } }, `+${overflow}`); +- } +- const bot = people[index]; +- return (0, import_react2.createElement)("span", { key: bot?.id ?? "you", style }, seat(bot, s)); +- }) - ); +function ToolCell({ node, sessionId, useRoster, useUi, actions }) { + const roster = useRoster((value) => value); @@ -9730,22 +10358,28 @@ diff --git a/client.js b/client.js + useShownCards(actions, sessionId, drawn.filter((call4) => CARDS.has(toolName(call4)) && call4.callId).map((call4) => call4.callId)); + if (drawn.length === 0) return null; + const env = { sessionId, roster, actions, useUi, findBot }; -+ return (0, import_react10.createElement)(import_react10.Fragment, null, drawn.map((call4, index) => (0, import_react10.createElement)(import_react10.Fragment, { key: call4.callId ?? index }, renderCall(call4, env)))); ++ return (0, import_react12.createElement)(import_react12.Fragment, null, drawn.map((call4, index) => (0, import_react12.createElement)(import_react12.Fragment, { key: call4.callId ?? index }, renderCall(call4, env)))); } --function SecretHead({ bot, title, detail, name, onClose }) { -- return (0, import_react5.createElement)( -- "div", -- { className: "bt-q-head bt-secret-head" }, -- (0, import_react5.createElement)("span", { className: "bt-secret-who" }, (0, import_react5.createElement)(BotMark, { bot, size: 28 }), (0, import_react5.createElement)("span", { className: "bt-secret-lock" }, (0, import_react5.createElement)(LockIcon))), -- (0, import_react5.createElement)( -- "div", -- { className: "bt-q-text" }, -- (0, import_react5.createElement)("p", { className: "bt-q-title" }, title), -- (0, import_react5.createElement)("div", { className: "bt-q-detail" }, (0, import_react5.createElement)("code", { className: "bt-secret-name" }, name), detail ? ` · ${detail}` : "") -- ), -- onClose ? (0, import_react5.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Cancel the request"), title: t("Cancel"), onClick: onClose }, (0, import_react5.createElement)(CloseIcon)) : null + +-// src/client/icons.js +-var import_react3 = require("react"); +-function PlusIcon() { +- return (0, import_react3.createElement)("svg", { width: 18, height: 18, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M10 3.5v13M3.5 10h13", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round" })); +-} +-function SearchIcon() { +- return (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("circle", { cx: 8.5, cy: 8.5, r: 5.5, stroke: "currentColor", strokeWidth: 1.6, fill: "none" }), (0, import_react3.createElement)("path", { d: "M13 13l4 4", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round" })); +-} +-function PeopleIcon() { +- return (0, import_react3.createElement)( +- "svg", +- { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", "aria-hidden": true }, +- (0, import_react3.createElement)("circle", { cx: 7.5, cy: 7, r: 3 }), +- (0, import_react3.createElement)("path", { d: "M2 16.5c.6-2.8 2.8-4.5 5.5-4.5s4.9 1.7 5.5 4.5" }), +- (0, import_react3.createElement)("path", { d: "M13 4.3a3 3 0 0 1 0 5.4M15 12.4c1.6.6 2.6 2 3 4.1" }) - ); -+ +-} +-function ArrowUpIcon() { +- return (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M10 16V4M5 9l5-5 5 5", stroke: "currentColor", strokeWidth: 1.8, fill: "none", strokeLinecap: "round", strokeLinejoin: "round" })); +// src/client/awaiting.js +var AWAIT_REPLY_MS = 10 * 60 * 1e3; +function awaitingReply(roster, sessionId, now = Date.now()) { @@ -9753,63 +10387,12 @@ diff --git a/client.js b/client.js + if (typeof at !== "number" || roster?.byId?.[sessionId]?.remote === void 0) return false; + return now - at < AWAIT_REPLY_MS; } --function SecretCard({ bot, request, roster, actions }) { -- const [value, setValue] = (0, import_react5.useState)(""); -- const [scope, setScope] = (0, import_react5.useState)("all"); -- const [replacing, setReplacing] = (0, import_react5.useState)(false); -- const [busy, setBusy] = (0, import_react5.useState)(false); -- const [error, setError] = (0, import_react5.useState)(""); -- const noteId = (0, import_react5.useId)(); -- const secret = (roster.secrets ?? []).find((entry) => entry.name === request.name); -- const run = (promise) => { -- setBusy(true); -- setError(""); -- return Promise.resolve(promise).then(() => setValue(""), (failure) => setError(failure?.message ?? String(failure))).finally(() => setBusy(false)); -- }; -- const cancel = () => run(actions.secretCancel(request.id)); -- const long = value.trim().length >= MIN_VALUE; -- const save = () => { -- if (long && !busy) void run(actions.secretSet({ requestId: request.id, value, scope })); -- }; -- const allow = () => { -- if (!busy) void run(actions.secretAllow(request.id)); -- }; -- const filling = request.kind === "fill" || replacing; -- const warn = insecure() ? (0, import_react5.createElement)("div", { className: "bt-secret-warn", role: "note" }, (0, import_react5.createElement)(WarnIcon), t("This page is not on HTTPS: the key crosses the network unencrypted.")) : null; -- return (0, import_react5.createElement)( -- "div", -- { className: "bt-q bt-secret", role: "group", "aria-describedby": noteId, "data-kind": request.kind }, -- (0, import_react5.createElement)(SecretHead, { -- bot, -- title: request.kind === "allow" ? t("Let {bot} use {name}?", { bot: bot.name, name: request.name }) : t("{name} needs a key", { name: bot.name }), -- detail: request.purpose, -- name: request.name, -- onClose: busy ? void 0 : cancel -- }), -- request.kind === "allow" ? (0, import_react5.createElement)("div", { className: "bt-secret-saved" }, (0, import_react5.createElement)(KeyIcon), t("Saved for {scope}", { scope: scopeLabel(secret?.scope, roster) })) : null, -- filling ? (0, import_react5.createElement)( -- "div", -- { className: "bt-secret-body" }, -- (0, import_react5.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react5.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value of {name}", { name: request.name }), autoFocus: replacing })), -- request.kind === "fill" ? (0, import_react5.createElement)(ScopeSwitch, { value: scope, onChange: setScope, bot }) : null -- ) : null, -- (0, import_react5.createElement)( -- "div", -- { className: "bt-secret-note", id: noteId }, -- t("{bot} never sees the value. It reaches {bot}'s shell as ", { bot: bot.name }), -- (0, import_react5.createElement)("code", null, `$DSH_SECRET_${request.name}`), -- ".", -- filling && value !== "" && !long ? t(" At least {count} characters.", { count: MIN_VALUE }) : "" -- ), -- warn, -- error ? (0, import_react5.createElement)("div", { className: "bt-secret-error", role: "alert" }, error) : null, -- (0, import_react5.createElement)( -- "div", -- { className: "bt-q-foot" }, -- request.kind === "allow" && !replacing ? (0, import_react5.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => setReplacing(true) }, t("Replace value")) : null, -- (0, import_react5.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: cancel }, t("Cancel")), -- filling ? (0, import_react5.createElement)("button", { type: "button", className: "bt-q-submit", disabled: !long || busy, onClick: save }, busy ? t("Saving…") : t("Save")) : (0, import_react5.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: allow }, busy ? t("Allowing…") : t("Allow")) -- ) +-function MicIcon({ size = 16 }) { +- return (0, import_react3.createElement)( +- "svg", +- { width: size, height: size, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", "aria-hidden": true }, +- (0, import_react3.createElement)("rect", { x: 7, y: 2.5, width: 6, height: 10, rx: 3, fill: "currentColor", stroke: "none" }), +- (0, import_react3.createElement)("path", { d: "M4.5 9.5a5.5 5.5 0 0 0 11 0M10 15v2.5" }) - ); + +// src/client/remote-approval-wait.js @@ -9819,24 +10402,11 @@ diff --git a/client.js b/client.js + if (tool && inputAt <= (tool.at ?? 0)) return null; + return { key: "remote-approval", label: REMOTE_APPROVAL_LABEL, state: "thinking" }; } --function SettledSecret({ bot, request, roster }) { -- const canceled = request.status === "canceled"; -- const text = canceled ? t("{bot} asked for {name}", { bot: bot.name, name: request.name }) : request.status === "allowed" ? t("Allowed {bot} to use {name}", { bot: bot.name, name: request.name }) : t("Saved {name}", { name: request.name }); -- return (0, import_react5.createElement)( -- "div", -- { className: "bt-q bt-q-settled bt-secret bt-secret-done", role: "group", "aria-label": text, "data-status": request.status }, -- (0, import_react5.createElement)( -- "div", -- { className: "bt-q-head" }, -- (0, import_react5.createElement)("span", { className: "bt-secret-who" }, (0, import_react5.createElement)(BotMark, { bot, size: 22 })), -- (0, import_react5.createElement)("div", { className: "bt-q-text" }, (0, import_react5.createElement)( -- "p", -- { className: "bt-q-title" }, -- text, -- canceled ? null : (0, import_react5.createElement)("span", { className: "bt-secret-scope-tag" }, ` · ${scopeLabel(request.scope, roster)}`) -- )), -- canceled ? (0, import_react5.createElement)("span", { className: "bt-q-badge" }, t("Canceled")) : (0, import_react5.createElement)("span", { className: "bt-q-check bt-secret-check", title: t("Done") }, (0, import_react5.createElement)(CheckIcon)) -- ) +-function WaveIcon({ size = 16 }) { +- return (0, import_react3.createElement)( +- "svg", +- { width: size, height: size, viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": true }, +- [[3, 7.5, 5], [6.5, 4.5, 11], [10, 2.5, 15], [13.5, 5.5, 9], [17, 8, 4]].map(([x, y, height]) => (0, import_react3.createElement)("rect", { key: x, x: x - 1, y, width: 2, height, rx: 1 })) - ); + +// src/client/activity-row-host.js @@ -9848,11 +10418,15 @@ diff --git a/client.js b/client.js + if (typeof Element !== "undefined" && root instanceof Element) return root.querySelector("[data-chat-running]"); + return root.querySelector(RUNNING_HOST); } --function RequestView({ bot, request, roster, actions }) { -- return request.status === "pending" ? (0, import_react5.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }) : (0, import_react5.createElement)(SettledSecret, { bot, request, roster }); +-function ShareIcon() { +- return (0, import_react3.createElement)( +- "svg", +- { width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, +- (0, import_react3.createElement)("path", { d: "M10 12.5V3M6.5 6.5L10 3l3.5 3.5M4 11v4.5A1.5 1.5 0 0 0 5.5 17h9a1.5 1.5 0 0 0 1.5-1.5V11" }) +- ); + +// src/client/activity-row.js -+var import_react11 = require("react"); ++var import_react13 = require("react"); +var import_react_dom2 = require("react-dom"); +var PHRASE_HOLD_MS = 800; +var drawPhrase = (pool) => t(pool[Math.min(pool.length - 1, Math.floor(Math.random() * pool.length))]); @@ -9862,37 +10436,28 @@ diff --git a/client.js b/client.js + const hours = Math.floor(minutes / 60); + return minutes % 60 === 0 ? `${hours}h` : `${hours}h ${minutes % 60}m`; } --function SecretToolCell({ sessionId, callId, name, done, content, roster, actions }) { -- const bot = roster.byId[sessionId]; -- if (!bot) return null; -- const request = (roster.secretRequests?.[bot.id] ?? []).find((entry) => entry.callId === callId && (entry.sessionId ?? sessionId) === sessionId); -- if (request) return (0, import_react5.createElement)("div", { className: "bt-q-inline" }, (0, import_react5.createElement)(RequestView, { bot, request, roster, actions })); -- if (done && /already saved/.test(contentText(content))) { -- return (0, import_react5.createElement)("div", { className: "bt-event" }, (0, import_react5.createElement)("span", { className: "bt-secret-event" }, (0, import_react5.createElement)(KeyIcon), t("{bot} is using {name}", { bot: bot.name, name: name ?? t("a saved key") }))); -- } -- return null; +-function CloseIcon() { +- return (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M5 5l10 10M15 5L5 15", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round" })); +var REMOTE_GRACE_MS = 1500; +function useAwaitingReply(roster, sessionId) { + const at = roster?.remoteAwaiting?.[sessionId]; -+ const [, tick] = (0, import_react11.useState)(0); ++ const [, tick] = (0, import_react13.useState)(0); + const shown = awaitingReply(roster, sessionId); -+ (0, import_react11.useEffect)(() => { ++ (0, import_react13.useEffect)(() => { + if (!shown) return void 0; + const timer = setTimeout(() => tick((n) => n + 1), Math.max(0, at + AWAIT_REPLY_MS - Date.now()) + 50); + return () => clearTimeout(timer); + }, [shown, at]); + return shown; } --function SecretDock({ sessionId, useRoster, useCards, useSession, actions }) { -- const roster = useRoster((value) => value); -- const shown = useCards?.((state) => state[sessionId]) ?? NONE; -- const loading = useSession?.(historyLoading) === true; -- const bot = roster.byId[sessionId]; -- if (!bot || currentPart(bot) !== sessionId) return null; -- const drawn = (entry) => entry.callId && entry.sessionId === sessionId && (loading || shown[entry.callId] > 0); -- const waiting = (roster.secretRequests?.[bot.id] ?? []).filter((entry) => entry.status === "pending" && !drawn(entry)); -- if (waiting.length === 0) return null; -- return (0, import_react5.createElement)("div", { className: "bt-q-dock bt-secret-dock" }, waiting.map((request) => (0, import_react5.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }))); +-var ChevronLeftIcon = () => (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M12.5 4.5L7 10l5.5 5.5" })); +-var ChevronRightIcon = () => (0, import_react3.createElement)("svg", { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M7.5 4.5L13 10l-5.5 5.5" })); +-var lineIcon = (paths) => function LineIcon() { +- return (0, import_react3.createElement)( +- "svg", +- { width: 15, height: 15, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, +- paths.map((d, index) => (0, import_react3.createElement)("path", { key: index, d })) +- ); +function findHost(where) { + if (where !== TAIL_HOST) return findRunningHostIn(document); + const flow = document.querySelector("[data-conversation-scroll] [data-chat-flow]") ?? document.querySelector("[data-chat-flow]"); @@ -9906,12 +10471,20 @@ diff --git a/client.js b/client.js + let top = -1; + for (const node of document.querySelectorAll(`[data-chat-flow-kind${kind ? `="${kind}"` : ""}][data-chat-turn]`)) top = Math.max(top, Number(node.dataset.chatTurn)); + return top; -+}; + }; +-var CLOUD = "M6.5 15.25H5.75a3.25 3.25 0 0 1-.55-6.45 4.75 4.75 0 0 1 9.2-1.1 3.75 3.75 0 0 1 .1 7.55H13.5"; +-function CloudDownloadIcon({ done = false }) { +- return (0, import_react3.createElement)( +- "svg", +- { width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, +- (0, import_react3.createElement)("path", { d: CLOUD }), +- done ? (0, import_react3.createElement)("path", { d: "M7.75 13.25l1.75 1.75 3-3.25" }) : (0, import_react3.createElement)("g", { className: "bt-cloud-arrow" }, (0, import_react3.createElement)("path", { d: "M10 9.75v7" }), (0, import_react3.createElement)("path", { d: "M7.75 14.5L10 16.75l2.25-2.25" })) +- ); +function useReplyAfterSend(remote, sending) { -+ const sendTurn = (0, import_react11.useRef)(-1); -+ const wasSending = (0, import_react11.useRef)(false); -+ const [replied, setReplied] = (0, import_react11.useState)(false); -+ (0, import_react11.useEffect)(() => { ++ const sendTurn = (0, import_react13.useRef)(-1); ++ const wasSending = (0, import_react13.useRef)(false); ++ const [replied, setReplied] = (0, import_react13.useState)(false); ++ (0, import_react13.useEffect)(() => { + if (!remote) return void 0; + if (sending) { + wasSending.current = true; @@ -9941,41 +10514,35 @@ diff --git a/client.js b/client.js + }, [remote, sending]); + return replied; } --function ScopeEditor({ secret, roster, onSave }) { -- const [mode, setMode] = (0, import_react5.useState)(secret.scope === "all" ? "all" : "some"); -- const [picked, setPicked] = (0, import_react5.useState)(secret.scope === "all" ? [] : secret.scope); -- const toggle = (id) => setPicked((list) => list.includes(id) ? list.filter((item) => item !== id) : [...list, id]); -- const same = mode === "all" ? secret.scope === "all" : secret.scope !== "all" && [...picked].sort().join() === [...secret.scope].sort().join(); -- return (0, import_react5.createElement)( -- "div", -- { className: "bt-secret-edit-block" }, -- (0, import_react5.createElement)("div", { className: "bt-secret-edit-label" }, t("Who may use it")), -- (0, import_react5.createElement)( -- "div", -- { className: "bt-secret-radios", role: "radiogroup", "aria-label": t("Who may use {name}", { name: secret.name }) }, -- [["all", t("All Bots")], ["some", t("Chosen Bots")]].map(([id, text]) => (0, import_react5.createElement)( -- "label", -- { key: id, className: "bt-secret-radio" }, -- (0, import_react5.createElement)("input", { type: "radio", name: `scope-${secret.name}`, checked: mode === id, onChange: () => setMode(id) }), -- text -- )) -- ), -- mode === "some" ? (0, import_react5.createElement)("div", { className: "bt-secret-bots" }, roster.bots.map((bot) => (0, import_react5.createElement)("button", { -- key: bot.id, -- type: "button", -- className: "bt-secret-bot", -- "aria-pressed": picked.includes(bot.id), -- onClick: () => toggle(bot.id) -- }, (0, import_react5.createElement)(BotAvatar, { bot, size: 20, badge: false, live: false }), bot.name, picked.includes(bot.id) ? (0, import_react5.createElement)(CheckIcon) : null))) : null, -- (0, import_react5.createElement)( -- "div", -- { className: "bt-secret-row-actions" }, -- (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: same, onClick: () => onSave(mode === "all" ? "all" : picked) }, t("Save access")) +-var SmileIcon = lineIcon(["M10 3.5a6.5 6.5 0 1 1 0 13 6.5 6.5 0 0 1 0-13z", "M7.3 11.6a3.4 3.4 0 0 0 5.4 0", "M7.75 8.25h.01M12.25 8.25h.01"]); +-var ReplyIcon = lineIcon(["M8 5L4 9l4 4", "M4 9h7.5a4.5 4.5 0 0 1 4.5 4.5V15"]); +-var DotsIcon = lineIcon(["M5 10h.01M10 10h.01M15 10h.01"]); +-var CheckIcon = lineIcon(["M4.5 10.5l3.5 3.5 7.5-8"]); +-var ArrowDownIcon = lineIcon(["M10 4v12", "M5 11l5 5 5-5"]); +-var DownloadIcon = lineIcon(["M10 3.5v9", "M6.5 9.5L10 13l3.5-3.5", "M4 16h12"]); +-var GaugeIcon = lineIcon(["M3.5 13.5a6.5 6.5 0 1 1 13 0", "M10 13.5l3-4", "M10 13.5h.01"]); +-var PlugIcon = lineIcon(["M7 3v4M13 3v4", "M5 7h10v2.5a5 5 0 0 1-10 0z", "M10 14.5V17"]); +-var CalendarIcon = lineIcon(["M5.5 5h9A1.5 1.5 0 0 1 16 6.5v8a1.5 1.5 0 0 1-1.5 1.5h-9A1.5 1.5 0 0 1 4 14.5v-8A1.5 1.5 0 0 1 5.5 5z", "M4 8.75h12", "M7.25 3.5v3M12.75 3.5v3"]); +-var ConnectorIcon = lineIcon(["M7 10a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0z", "M18 10a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0z", "M7 10h6"]); +-var SwitchIcon = lineIcon(["M4 7h9.5M10.5 3.5L14 7l-3.5 3.5", "M16 13H6.5M9.5 9.5L6 13l3.5 3.5"]); +-var PaperclipIcon = lineIcon(["M15.5 9.5l-5.6 5.6a3.4 3.4 0 0 1-4.8-4.8l6.1-6.1a2.25 2.25 0 0 1 3.2 3.2l-6 6a1.1 1.1 0 0 1-1.6-1.6l5.5-5.5"]); +-var ClockIcon = lineIcon(["M10 3.5a6.5 6.5 0 1 1 0 13 6.5 6.5 0 0 1 0-13z", "M10 6.5V10l2.5 1.5"]); +-var GearIcon = lineIcon(["M10 7.4a2.6 2.6 0 1 1 0 5.2 2.6 2.6 0 0 1 0-5.2z", "M7.85 4.4l.29-1.87a7.7 7.7 0 0 1 3.72 0l.29 1.87a6 6 0 0 1 1.63.94l1.76-.69a7.7 7.7 0 0 1 1.86 3.23l-1.47 1.18a6 6 0 0 1 0 1.88l1.47 1.18a7.7 7.7 0 0 1-1.86 3.23l-1.76-.69a6 6 0 0 1-1.63.94l-.29 1.87a7.7 7.7 0 0 1-3.72 0l-.29-1.87a6 6 0 0 1-1.63-.94l-1.76.69a7.7 7.7 0 0 1-1.86-3.23l1.47-1.18a6 6 0 0 1 0-1.88L2.6 7.88a7.7 7.7 0 0 1 1.86-3.23l1.76.69a6 6 0 0 1 1.63-.94z"]); +-var PinIcon = lineIcon(["M12.5 3l4.5 4.5-3 1.5-2.5 2.5.5 3.5-1.5 1.5L7 13 3.5 16.5", "M7 13l-3.5-3.5L5 8l3.5.5L11 6l1.5-3"]); +-function PinMarkIcon() { +- return (0, import_react3.createElement)( +- "svg", +- { width: 12, height: 12, viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": true }, +- (0, import_react3.createElement)( +- "g", +- { transform: "rotate(45 10 10)" }, +- (0, import_react3.createElement)("path", { d: "M8 2.5h4a.9.9 0 0 1 0 1.8h-.4v4.1c0 1.4 1.1 2.6 2.6 3.1l.7.3v1.5H5.1v-1.5l.7-.3c1.5-.5 2.6-1.7 2.6-3.1V4.3H8a.9.9 0 0 1 0-1.8z" }), +- (0, import_react3.createElement)("path", { d: "M9.35 13.3h1.3v3.6L10 18l-.65-1.1z" }) - ) - ); +function useRunningHost(active, where = RUNNING_HOST) { -+ const [host, setHost] = (0, import_react11.useState)(null); -+ (0, import_react11.useEffect)(() => { ++ const [host, setHost] = (0, import_react13.useState)(null); ++ (0, import_react13.useEffect)(() => { + if (!active) { + setHost(null); + return void 0; @@ -9998,20 +10565,45 @@ diff --git a/client.js b/client.js + }, [active, where]); + return host; } --function ValueEditor({ secret, onSave }) { -- const [value, setValue] = (0, import_react5.useState)(""); -- const [replaced, setReplaced] = (0, import_react5.useState)(false); -- const long = value.trim().length >= MIN_VALUE; -- const save = () => { -- if (!long) return; -- void Promise.resolve(onSave(value)).then((ok) => { -- if (ok) { -- setValue(""); -- setReplaced(true); +-var UnreadIcon = lineIcon(["M10 3.5a4.5 4.5 0 0 0-4.5 4.5v3L4 13.5h12L14.5 11V8", "M8.3 16a1.8 1.8 0 0 0 3.4 0", "M15.5 3.2a1.6 1.6 0 1 1 0 3.2 1.6 1.6 0 0 1 0-3.2z"]); +-var PencilIcon = lineIcon(["M9 4H6a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-3", "M14.3 3.7a1.6 1.6 0 0 1 2.3 2.3L10.5 12l-3 .8.8-3z"]); +-var InfoIcon = lineIcon(["M10 3.5a6.5 6.5 0 1 1 0 13 6.5 6.5 0 0 1 0-13z", "M10 9.25v4", "M10 6.6h.01"]); +-var StarLineIcon = lineIcon(["M10 3l2.1 4.3 4.7.7-3.4 3.3.8 4.7L10 13.8 5.8 16l.8-4.7L3.2 8l4.7-.7z"]); +-var CopyIcon = lineIcon(["M8.5 7h6A1.5 1.5 0 0 1 16 8.5v6a1.5 1.5 0 0 1-1.5 1.5h-6A1.5 1.5 0 0 1 7 14.5v-6A1.5 1.5 0 0 1 8.5 7z", "M4 12.5V5.5A1.5 1.5 0 0 1 5.5 4H13"]); +-var HideIcon = lineIcon(["M3 3l14 14", "M8.6 5.2A7.6 7.6 0 0 1 10 5c4.5 0 7 5 7 5a12.6 12.6 0 0 1-2 2.6M12.2 14.5A6.8 6.8 0 0 1 10 15c-4.5 0-7-5-7-5a12.4 12.4 0 0 1 3-3.4", "M8.5 8.5a2 2 0 0 0 3 3"]); +-var TrashIcon = lineIcon(["M3.5 5.5h13", "M8 5.5V4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v1.5", "M5 5.5l.7 10A1.5 1.5 0 0 0 7.2 17h5.6a1.5 1.5 0 0 0 1.5-1.5l.7-10", "M8.5 9v4.5M11.5 9v4.5"]); +-var DuplicateIcon = lineIcon(["M7 7h8.5v9.5H7z", "M4.5 13V3.5H13", "M11.25 9.5v4.5M9 11.75h4.5"]); +-var SlidersIcon = lineIcon(["M4 6.5h5M12.5 6.5H16M4 13.5h4M11.5 13.5H16", "M10.5 4.5v4M9.5 11.5v4"]); +-var MemoryIcon = lineIcon(["M5.5 3.5h8A1.5 1.5 0 0 1 15 5v10a1.5 1.5 0 0 1-1.5 1.5h-8z", "M5.5 3.5v13", "M8.5 7.5h3.5M8.5 10.5h2.5", "M12 3.5v4l1-.8 1 .8"]); +-var FolderIcon = lineIcon(["M3 6A1.5 1.5 0 0 1 4.5 4.5h3.2l1.8 2h6A1.5 1.5 0 0 1 17 8v6.5a1.5 1.5 0 0 1-1.5 1.5h-11A1.5 1.5 0 0 1 3 14.5z"]); +-var ChatsIcon = lineIcon(["M3.5 5.5A1.5 1.5 0 0 1 5 4h7a1.5 1.5 0 0 1 1.5 1.5V10A1.5 1.5 0 0 1 12 11.5H8L5 14v-2.5A1.5 1.5 0 0 1 3.5 10z", "M13.5 7.5H15A1.5 1.5 0 0 1 16.5 9v4.5A1.5 1.5 0 0 1 15 15v2l-2.5-2h-3A1.5 1.5 0 0 1 8 13.5V13"]); +-var SETTINGS_ICONS = { general: GearIcon, bots: PeopleIcon, groups: ChatsIcon, usage: GaugeIcon }; +- +-// src/client/questions.js +-var import_react4 = require("react"); +-var keyLetter = (index) => String.fromCharCode(65 + index); +-var optionsOf = (question) => (question?.options ?? []).map((option) => typeof option === "string" ? { label: option } : option); +-var isTypingTarget = (node) => node instanceof HTMLInputElement || node instanceof HTMLTextAreaElement || node instanceof HTMLSelectElement || node instanceof HTMLElement && node.isContentEditable; +-function useOptionKeys(count, onPick, ownRef) { +- const pick2 = (0, import_react4.useRef)(onPick); +- pick2.current = onPick; +- (0, import_react4.useEffect)(() => { +- if (count === 0) return void 0; +- const onKey = (event) => { +- if (event.defaultPrevented || event.metaKey || event.ctrlKey || event.altKey || event.shiftKey || event.key.length !== 1) return; +- if (isTypingTarget(event.target) || isTypingTarget(document.activeElement)) return; +- if (document.querySelector('[role="dialog"], [aria-modal="true"]') !== null) return; +- const index = event.key.toUpperCase().charCodeAt(0) - 65; +- if (index >= 0 && index < count) { +- event.preventDefault(); +- pick2.current(index); +- } else if (index === count && ownRef.current) { +- event.preventDefault(); +- ownRef.current.focus(); +function useRowEntrances(replacing) { -+ const check = (0, import_react11.useRef)(replacing); ++ const check = (0, import_react13.useRef)(replacing); + check.current = replacing; -+ (0, import_react11.useEffect)(() => { ++ (0, import_react13.useEffect)(() => { + const seen = /* @__PURE__ */ new WeakSet(); + const started = Date.now(); + let column = null; @@ -10044,27 +10636,13 @@ diff --git a/client.js b/client.js + item.dataset.btEnter = reply && check.current() ? "after-collapse" : "new"; + item.addEventListener("animationend", settle); } -+ }; + }; +- document.addEventListener("keydown", onKey, true); +- return () => document.removeEventListener("keydown", onKey, true); +- }, [count, ownRef]); + const observer = new MutationObserver(() => { + if (!frame) frame = requestAnimationFrame(scan); - }); -- }; -- const edit = (next) => { -- setValue(next); -- setReplaced(false); -- }; -- return (0, import_react5.createElement)( -- "div", -- { className: "bt-secret-edit-block" }, -- (0, import_react5.createElement)("div", { className: "bt-secret-edit-label" }, t("Replace the value")), -- (0, import_react5.createElement)( -- "div", -- { className: "bt-secret-inline" }, -- (0, import_react5.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react5.createElement)(MaskedInput, { value, onChange: edit, onEnter: save, label: t("New value of {name}", { name: secret.name }) })), -- (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !long, onClick: save }, t("Replace")) -- ), -- value !== "" && !long ? (0, import_react5.createElement)("div", { className: "bt-set-hint" }, t("At least {count} characters.", { count: MIN_VALUE })) : replaced ? (0, import_react5.createElement)("div", { className: "bt-set-hint bt-secret-ok", role: "status" }, (0, import_react5.createElement)(CheckIcon), t("Replaced. Bots get the new value from their next command.")) : null -- ); ++ }); + scan(); + return () => { + cancelAnimationFrame(frame); @@ -10072,15 +10650,19 @@ diff --git a/client.js b/client.js + }; + }, []); } --function SecretRow({ secret, roster, actions, run, open, onToggle }) { -- const [confirm, setConfirm] = (0, import_react5.useState)(false); -- (0, import_react5.useEffect)(() => { -- if (!open) setConfirm(false); -- }, [open]); -- const asker = secret.requestedBy ? roster.byId[secret.requestedBy]?.name ?? t("a deleted Bot") : t("you"); -- const allowed = secret.scope === "all" ? [] : secret.scope.map((id) => roster.byId[id]).filter(Boolean); -- const meta = [t("Asked by {name}", { name: asker }), t("added {time}", { time: when(secret.createdAt) }), secret.lastUsedAt ? t("last used {time}", { time: when(secret.lastUsedAt) }) : t("not used yet")].join(" · "); -- return (0, import_react5.createElement)( +-function QuestionView({ question, onAnswer, onDismiss, ownAnswer = false, raised = false }) { +- const [own, setOwn] = (0, import_react4.useState)(""); +- const [picked, setPicked] = (0, import_react4.useState)([]); +- const ownRef = (0, import_react4.useRef)(null); +- const titleId = (0, import_react4.useId)(); +- const options = optionsOf(question); +- const multi = question.multiSelect === true; +- const custom = own.trim(); +- const canSubmit = multi ? picked.length > 0 || custom !== "" : custom !== ""; +- const choose = (label) => { +- if (multi) { +- setPicked((current) => current.includes(label) ? current.filter((item) => item !== label) : [...current, label]); +- return; +function ActivityIndicator({ sessionId, useRoster, useSessionStatus, useLive, useSession, actions }) { + const roster = useRoster((value) => value); + const running = useSessionStatus((map) => map.get(sessionId)?.running === true); @@ -10088,64 +10670,102 @@ diff --git a/client.js b/client.js + const pendingInput = useSession((snapshot) => Math.max(0, ...(snapshot?.pendingSubmissions ?? []).filter((sub) => sub.placement !== "queued").map((sub) => sub.time))); + const bot = roster.byId[sessionId]; + const room2 = roster.roomsById[sessionId]; -+ const entries2 = (0, import_react11.useMemo)(() => Object.values(JSON.parse(liveKey)), [liveKey]); ++ const entries2 = (0, import_react13.useMemo)(() => Object.values(JSON.parse(liveKey)), [liveKey]); + const streaming = entries2.some((entry) => entry.text); + const tools = entries2.filter((entry) => !entry.text).sort((a, b) => a.at - b.at); + const relaying = tools.some((entry) => entry.relay); + const awaiting = useAwaitingReply(roster, sessionId); -+ const sendRun = (0, import_react11.useRef)(false); ++ const sendRun = (0, import_react13.useRef)(false); + if (!running) sendRun.current = false; + else if (pendingInput > 0) sendRun.current = true; + const replied = useReplyAfterSend(bot?.remote !== void 0, running && sendRun.current); + const visible = bot?.remote !== void 0 ? !streaming && (running ? sendRun.current : awaiting && !replied) : running && !streaming && !relaying && (bot !== void 0 || room2 !== void 0); -+ const lastRun = (0, import_react11.useRef)({ running, send: false }); ++ const lastRun = (0, import_react13.useRef)({ running, send: false }); + const bridging = bot?.remote !== void 0 && !streaming && lastRun.current.running && lastRun.current.send && !running; + lastRun.current = { running, send: sendRun.current }; + const steady = bridging; + const tool = tools.at(-1); -+ const inputRef = (0, import_react11.useRef)(0); ++ const inputRef = (0, import_react13.useRef)(0); + const inputAt = Math.max(inputRef.current, pendingInput); + inputRef.current = inputAt; + const phrase = visible ? remoteApprovalPhrase(bot?.remote !== void 0, { tool, inputAt }) : null; + const want = !visible ? null : phrase ? { ...phrase, label: t(phrase.label) } : inputAt > (tool?.at ?? 0) ? { key: `input:${inputAt}`, pool: PHRASES.thinking, state: "thinking" } : tool ? { key: tool.label ? `tool:${tool.label}` : "working", label: tool.label, pool: PHRASES.working, state: tool.state ?? "working" } : { key: "thinking", pool: PHRASES.thinking, state: "thinking" }; -+ const [shown, setShown] = (0, import_react11.useState)(null); ++ const [shown, setShown] = (0, import_react13.useState)(null); + const wantKey = want?.key ?? null; -+ const markState = (0, import_react11.useRef)("thinking"); ++ const markState = (0, import_react13.useRef)("thinking"); + if (want) markState.current = want.state; -+ (0, import_react11.useEffect)(() => { ++ (0, import_react13.useEffect)(() => { + if (wantKey === null || shown?.key === wantKey) return void 0; + const make = () => setShown({ key: wantKey, text: want.label ?? drawPhrase(want.pool), at: Date.now() }); + const wait = shown ? shown.at + PHRASE_HOLD_MS - Date.now() : 0; + if (wait <= 0) { + make(); + return void 0; -+ } -+ const timer = setTimeout(make, wait); -+ return () => clearTimeout(timer); -+ }, [wantKey, shown]); -+ const [phase, setPhase] = (0, import_react11.useState)(null); -+ const endedAt2 = (0, import_react11.useRef)(0); -+ const shift = (0, import_react11.useRef)(null); -+ const leaving = (0, import_react11.useRef)(false); -+ leaving.current = phase !== null && !visible; -+ (0, import_react11.useEffect)(() => { -+ if (visible) { -+ setPhase("in"); -+ return void 0; -+ } -+ let timer; -+ const leave = () => { -+ setPhase((current) => current === "in" ? "out" : current); -+ timer = setTimeout(() => { -+ shift.current = document.querySelector("[data-conversation-scroll]")?.scrollTop ?? null; -+ setPhase((current) => current === "out" ? null : current); -+ }, 140); -+ }; -+ if (steady) timer = setTimeout(leave, REMOTE_GRACE_MS); -+ else leave(); -+ return () => clearTimeout(timer); -+ }, [visible]); -+ (0, import_react11.useLayoutEffect)(() => { + } +- onAnswer({ selected: [label] }); +- }; +- const submit = () => { +- if (!canSubmit) return; +- onAnswer({ selected: multi ? picked : [], ...custom ? { custom } : {} }); +- }; +- useOptionKeys(options.length, (index) => choose(options[index].label), ownRef); +- const ownLetter = options.length > 0 ? keyLetter(options.length) : void 0; +- const field = ownAnswer ? (0, import_react4.createElement)("textarea", { +- ref: ownRef, +- rows: 1, +- value: own, +- autoComplete: "off", +- spellCheck: false, +- className: "bt-q-input", +- "aria-label": t("Your own answer"), +- placeholder: t("Type your own answer"), +- "aria-keyshortcuts": ownLetter?.toLowerCase(), +- onChange: (event) => setOwn(event.target.value), +- onKeyDown: (event) => { +- if (event.key !== "Enter" || event.shiftKey || event.nativeEvent.isComposing) return; +- event.preventDefault(); +- submit(); ++ const timer = setTimeout(make, wait); ++ return () => clearTimeout(timer); ++ }, [wantKey, shown]); ++ const [phase, setPhase] = (0, import_react13.useState)(null); ++ const endedAt2 = (0, import_react13.useRef)(0); ++ const shift = (0, import_react13.useRef)(null); ++ const leaving = (0, import_react13.useRef)(false); ++ leaving.current = phase !== null && !visible; ++ (0, import_react13.useEffect)(() => { ++ if (visible) { ++ setPhase("in"); ++ return void 0; + } +- }) : null; +- const rows = options.map((option, optionIndex) => { +- const selected = multi && picked.includes(option.label); +- return (0, import_react4.createElement)( +- "button", +- { +- key: option.label, +- type: "button", +- className: "bt-q-opt", +- "aria-pressed": multi ? selected : void 0, +- "aria-keyshortcuts": keyLetter(optionIndex).toLowerCase(), +- onClick: () => choose(option.label) +- }, +- (0, import_react4.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)), +- (0, import_react4.createElement)( ++ let timer; ++ const leave = () => { ++ setPhase((current) => current === "in" ? "out" : current); ++ timer = setTimeout(() => { ++ shift.current = document.querySelector("[data-conversation-scroll]")?.scrollTop ?? null; ++ setPhase((current) => current === "out" ? null : current); ++ }, 140); ++ }; ++ if (steady) timer = setTimeout(leave, REMOTE_GRACE_MS); ++ else leave(); ++ return () => clearTimeout(timer); ++ }, [visible]); ++ (0, import_react13.useLayoutEffect)(() => { + if (phase !== null) return; + endedAt2.current = Date.now(); + setShown(null); @@ -10156,243 +10776,226 @@ diff --git a/client.js b/client.js + const delta = before - scroller.scrollTop; + if (delta > 0) scroller.querySelector("[data-chat-flow]")?.animate([{ transform: `translateY(${-delta}px)` }, { transform: "none" }], { duration: 140, easing: "cubic-bezier(.23,1,.32,1)" }); + }, [phase]); -+ (0, import_react11.useEffect)(() => { ++ (0, import_react13.useEffect)(() => { + if (!running) actions.clearLive(sessionId); + }, [running, sessionId]); + useRowEntrances(() => leaving.current || Date.now() - endedAt2.current < 300); -+ const [now, setNow] = (0, import_react11.useState)(Date.now); -+ (0, import_react11.useEffect)(() => { ++ const [now, setNow] = (0, import_react13.useState)(Date.now); ++ (0, import_react13.useEffect)(() => { + if (phase !== "in") return void 0; + const timer = setInterval(() => setNow(Date.now()), 1e4); + return () => clearInterval(timer); + }, [phase]); + const remote = bot?.remote !== void 0; + const host = useRunningHost(running || remote && phase !== null, running || !remote ? RUNNING_HOST : TAIL_HOST); -+ const drawn = (0, import_react11.useRef)(false); ++ const drawn = (0, import_react13.useRef)(false); + const carry = drawn.current; -+ (0, import_react11.useEffect)(() => { ++ (0, import_react13.useEffect)(() => { + drawn.current = Boolean(host && phase !== null && shown); + }, [host, phase, shown]); + if (!host || phase === null || !shown) return null; + const elapsed = now - shown.at >= 6e4 ? elapsedLabel(now - shown.at) : null; -+ return (0, import_react_dom2.createPortal)((0, import_react11.createElement)( - "div", -- { className: "bt-secret-item", "data-open": open ? "" : void 0 }, -- (0, import_react5.createElement)( -- "button", -- { type: "button", className: "bt-set-row bt-secret-summary", "aria-expanded": open, onClick: onToggle }, -- (0, import_react5.createElement)( -- "span", -- { className: "bt-set-copy" }, -- (0, import_react5.createElement)("span", { className: "bt-secret-title" }, (0, import_react5.createElement)(KeyIcon), (0, import_react5.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react5.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), -- (0, import_react5.createElement)("span", { className: "bt-set-hint" }, meta) -- ), -- (0, import_react5.createElement)( ++ return (0, import_react_dom2.createPortal)((0, import_react13.createElement)( ++ "div", + { className: "bt-typing", "data-exiting": phase === "out" ? "" : void 0, "data-carry": carry && phase !== "out" ? "" : void 0, "data-remote": remote ? "" : void 0, "data-flybot": shown.key === "remote-approval" ? "remote-approval" : void 0, "aria-hidden": true }, -+ bot ? (0, import_react11.createElement)(BotMark, { bot, size: 28, state: markState.current, live: true, pokeable: true }) : (0, import_react11.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), -+ (0, import_react11.createElement)( ++ bot ? (0, import_react13.createElement)(BotMark, { bot, size: 28, state: markState.current, live: true, pokeable: true }) : (0, import_react13.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), ++ (0, import_react13.createElement)( + "span", + { className: "bt-typing-text" }, -+ (0, import_react11.createElement)( ++ (0, import_react13.createElement)( "span", -- { className: "bt-set-control" }, -- secret.scope === "all" ? (0, import_react5.createElement)("span", { className: "bt-tag" }, t("All Bots")) : allowed.length === 0 ? (0, import_react5.createElement)("span", { className: "bt-tag" }, t("No Bot")) : (0, import_react5.createElement)("span", { className: "bt-secret-faces", title: allowed.map((bot) => bot.name).join(", ") }, allowed.slice(0, 5).map((bot) => (0, import_react5.createElement)(BotAvatar, { key: bot.id, bot, size: 20, badge: false, live: false }))) -- ) +- { className: "bt-q-body" }, +- (0, import_react4.createElement)("span", { className: "bt-q-label" }, option.label), +- option.description ? (0, import_react4.createElement)("span", { className: "bt-q-desc" }, option.description) : null +- ), +- selected && !raised ? (0, import_react4.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react4.createElement)(CheckIcon)) : null +- ); +- }); +- if (raised && field) { +- rows.push((0, import_react4.createElement)( +- "label", +- { key: "own", className: "bt-q-opt bt-q-ownrow", "data-filled": custom !== "" ? "" : void 0 }, +- ownLetter ? (0, import_react4.createElement)("span", { className: "bt-key", "aria-hidden": true }, ownLetter) : null, +- (0, import_react4.createElement)("span", { className: "bt-q-body" }, field) +- )); +- } +- let foot = null; +- if (raised && multi) { +- foot = (0, import_react4.createElement)( +- "div", +- { className: "bt-q-foot" }, +- (0, import_react4.createElement)("button", { type: "button", className: "bt-q-btn", onClick: onDismiss }, t("Skip")), +- (0, import_react4.createElement)("button", { type: "submit", className: "bt-q-submit", disabled: !canSubmit }, t("Submit")) +- ); +- } else if ((raised || multi) && canSubmit) { +- foot = (0, import_react4.createElement)("div", { className: "bt-q-foot" }, (0, import_react4.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit"))); +- } +- return (0, import_react4.createElement)( +- "form", +- { +- className: raised ? "bt-q bt-q-raised" : "bt-q", +- "aria-labelledby": titleId, +- onSubmit: (event) => { +- event.preventDefault(); +- submit(); +- } +- }, +- (0, import_react4.createElement)( +- "div", +- { className: "bt-q-head" }, +- (0, import_react4.createElement)( +- "div", +- { className: "bt-q-text" }, +- (0, import_react4.createElement)("p", { className: "bt-q-title", id: titleId }, question.header ? `${question.header} · ` : "", question.question), +- question.detail ? (0, import_react4.createElement)("div", { className: "bt-q-detail" }, question.detail) : null, +- raised && multi ? (0, import_react4.createElement)("div", { className: "bt-q-detail" }, t("Choose all that apply")) : null +- ), +- (0, import_react4.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Dismiss question"), title: t("Dismiss"), onClick: onDismiss }, (0, import_react4.createElement)(CloseIcon)) - ), -- open ? (0, import_react5.createElement)( +- rows.length > 0 ? (0, import_react4.createElement)("div", { className: "bt-q-list", role: "group" }, rows) : null, +- field && !raised ? (0, import_react4.createElement)( - "div", -- { className: "bt-secret-edit" }, -- (0, import_react5.createElement)(ScopeEditor, { key: JSON.stringify(secret.scope), secret, roster, onSave: (scope) => run(actions.secretUpdate(secret.name, scope)) }), -- (0, import_react5.createElement)(ValueEditor, { secret, onSave: (value) => run(actions.secretSet({ name: secret.name, value })) }), -- (0, import_react5.createElement)( +- { className: "bt-q-custom" }, +- (0, import_react4.createElement)("label", { className: "bt-q-field" }, field), +- !multi && canSubmit ? (0, import_react4.createElement)("button", { type: "submit", className: "bt-q-submit" }, t("Submit")) : null +- ) : null, +- foot +- ); +-} +-function SettledQuestion({ question, answer }) { +- const options = optionsOf(question); +- const prompt = question?.question ?? ""; +- const chosen = [...answer.selected ?? [], ...answer.custom ? [answer.custom] : []]; +- if (chosen.length === 0) { +- return (0, import_react4.createElement)( +- "div", +- { className: "bt-q bt-q-settled bt-q-dismissed", role: "group", "aria-label": prompt }, +- (0, import_react4.createElement)( - "div", -- { className: "bt-secret-row-actions" }, -- confirm ? [ -- (0, import_react5.createElement)("span", { key: "q", className: "bt-set-hint" }, t("Delete {name}? Bots lose it at once.", { name: secret.name })), -- (0, import_react5.createElement)("button", { key: "no", type: "button", className: "bt-soft bt-soft-sm", onClick: () => setConfirm(false) }, t("Keep")), -- (0, import_react5.createElement)("button", { key: "yes", type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => run(actions.secretDelete(secret.name)) }, t("Delete")) -- ] : (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => setConfirm(true) }, (0, import_react5.createElement)(TrashIcon), t("Delete")) +- { className: "bt-q-head" }, +- (0, import_react4.createElement)("div", { className: "bt-q-text" }, (0, import_react4.createElement)("p", { className: "bt-q-title" }, prompt)), +- (0, import_react4.createElement)("span", { className: "bt-q-badge" }, t("Dismissed")) + { key: `${shown.key}:${shown.at}`, className: "bt-typing-label" }, -+ (0, import_react11.createElement)(Shimmer, null, `${shown.text}…`), -+ elapsed ? (0, import_react11.createElement)("span", { className: "bt-typing-time" }, `· ${elapsed}`) : null ++ (0, import_react13.createElement)(Shimmer, null, `${shown.text}…`), ++ elapsed ? (0, import_react13.createElement)("span", { className: "bt-typing-time" }, `· ${elapsed}`) : null ) -- ) : null +- ); +- } +- return (0, import_react4.createElement)( +- "div", +- { className: "bt-q bt-q-settled", role: "group", "aria-label": prompt }, +- prompt ? (0, import_react4.createElement)("div", { className: "bt-q-head" }, (0, import_react4.createElement)("div", { className: "bt-q-text" }, (0, import_react4.createElement)("p", { className: "bt-q-title" }, prompt))) : null, +- (0, import_react4.createElement)("div", { className: "bt-q-list", role: "group", "aria-label": t("Your answer") }, chosen.map((label, index) => { +- const optionIndex = options.findIndex((option) => option.label === label); +- return (0, import_react4.createElement)( +- "div", +- { key: `${label}-${index}`, className: "bt-q-opt" }, +- optionIndex >= 0 ? (0, import_react4.createElement)("span", { className: "bt-key", "aria-hidden": true }, keyLetter(optionIndex)) : null, +- (0, import_react4.createElement)("span", { className: "bt-q-body" }, (0, import_react4.createElement)("span", { className: "bt-q-label" }, label)), +- (0, import_react4.createElement)("span", { className: "bt-q-check", title: t("Selected") }, (0, import_react4.createElement)(CheckIcon)) +- ); +- })) - ); --} --function AddSecret({ actions, run, onDone }) { -- const [name, setName] = (0, import_react5.useState)(""); -- const [purpose, setPurpose] = (0, import_react5.useState)(""); -- const [value, setValue] = (0, import_react5.useState)(""); -- const ready = /^[A-Za-z][\w-]{0,63}$/.test(name.trim()) && value.trim().length >= MIN_VALUE; -- const save = () => { -- if (!ready) return; -- void run(actions.secretSet({ name, purpose, value, scope: "all" })).then((ok) => { -- if (ok) { -- setValue(""); -- onDone(); -- } -- }); ++ ) ++ ), host); + } +-function QuestionCard({ matched }) { +- const pending = matched; +- const questions = pending.questions ?? []; +- const [index, setIndex] = (0, import_react4.useState)(0); +- const [answers, setAnswers] = (0, import_react4.useState)([]); +- const question = questions[index]; +- if (question === void 0) return null; +- const onAnswer = (answer) => { +- const next = [...answers, { id: question.id, ...answer }]; +- if (index + 1 < questions.length) { +- setAnswers(next); +- setIndex(index + 1); +- return; +- } +- pending.answer({ answers: next }); - }; -- return (0, import_react5.createElement)( +- return (0, import_react4.createElement)(QuestionView, { key: index, question, onAnswer, onDismiss: () => pending.dismiss(), ownAnswer: true, raised: true }); ++ ++// src/shared/session-list-filter.js ++var SESSION_FILTERS = ["all", "group", "direct", "unread"]; ++function sessionStatusOf(map, id) { ++ if (id == null || map == null) return void 0; ++ if (typeof map.get === "function") return map.get(id); ++ return map[id]; ++} ++function sessionIsUnread(entry, statusMap, markedUnread) { ++ const item = entry?.item; ++ if (!item) return false; ++ if (markedUnread?.[item.id]) return true; ++ if (entry.kind === "agent") { ++ return (item.sessions ?? []).some((id) => sessionStatusOf(statusMap, id)?.completionUnread === true); ++ } ++ if (entry.kind === "room") { ++ return sessionStatusOf(statusMap, item.id)?.completionUnread === true; ++ } ++ const part = item.sessionId ?? item.id; ++ const status = sessionStatusOf(statusMap, part); ++ return status?.completionUnread === true || status?.pendingInteraction !== void 0; + } +-function PendingQuestion({ sessionId, question, actions, inline }) { +- const [answered, setAnswered] = (0, import_react4.useState)(null); +- if (answered === question.id) return null; +- const onAnswer = (answer) => { +- setAnswered(question.id); +- void actions.answerQuestion(sessionId, question.id, { selected: answer.selected ?? [], custom: answer.custom ?? "" }).catch(() => setAnswered(null)); +- }; +- const onDismiss = () => { +- setAnswered(question.id); +- void actions.dismissQuestion(sessionId); +- }; +- return (0, import_react4.createElement)( - "div", -- { className: "bt-set-row bt-set-paste bt-secret-add" }, -- (0, import_react5.createElement)("input", { className: "bt-input", "aria-label": t("Key name"), placeholder: t("NAME, e.g. GITHUB_TOKEN"), value: name, spellCheck: false, autoComplete: "off", autoFocus: true, onChange: (event) => setName(event.target.value.toUpperCase()) }), -- (0, import_react5.createElement)("input", { className: "bt-input", "aria-label": t("What it is for"), placeholder: t("What it is for"), value: purpose, autoComplete: "off", onChange: (event) => setPurpose(event.target.value) }), -- (0, import_react5.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react5.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value") })), -- (0, import_react5.createElement)( -- "div", -- { className: "bt-secret-row-actions" }, -- (0, import_react5.createElement)("span", { className: "bt-set-hint" }, t("New keys are for all Bots; narrow it down afterwards.")), -- (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDone }, t("Cancel")), -- (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !ready, onClick: save }, t("Save key")) - ) +- { className: inline ? "bt-q-inline" : "bt-q-dock" }, +- (0, import_react4.createElement)(QuestionView, { key: question.id, question, onAnswer, onDismiss, ownAnswer: question.allowCustom === true, raised: !inline }) - ); --} --function SecretsPage({ roster, actions, run, Section }) { -- const [open, setOpen] = (0, import_react5.useState)(null); -- const [adding, setAdding] = (0, import_react5.useState)(false); -- const secrets = roster.secrets ?? []; -- return [ -- (0, import_react5.createElement)( -- "p", -- { key: "about", className: "bt-secret-about" }, -- t("Keys your Bots asked for. Bots never see the values: they use them as "), -- (0, import_react5.createElement)("code", null, "$DSH_SECRET_NAME"), -- t(" in their shell, and every value is replaced by "), -- (0, import_react5.createElement)("code", null, "[secret:NAME]"), -- t(" before anything goes to a model.") -- ), -- (0, import_react5.createElement)( -- Section, -- { key: "list", title: t("Secrets · {count}", { count: secrets.length }) }, -- secrets.length === 0 && !adding ? (0, import_react5.createElement)("div", { className: "bt-set-row" }, (0, import_react5.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : null, -- secrets.map((secret) => (0, import_react5.createElement)(SecretRow, { key: secret.name, secret, roster, actions, run, open: open === secret.name, onToggle: () => setOpen(open === secret.name ? null : secret.name) })), -- adding ? (0, import_react5.createElement)(AddSecret, { actions, run, onDone: () => setAdding(false) }) : null -- ), -- adding ? null : (0, import_react5.createElement)("div", { key: "add", className: "bt-actions" }, (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setAdding(true) }, t("Add a key"))) -- ]; --} --var SECRET_CSS = ` --.bt-secret-head{align-items:center;gap:10px} --.bt-secret-who{position:relative;flex:none;display:inline-flex} --.bt-secret-lock{position:absolute;right:-5px;bottom:-4px;width:16px;height:16px;border-radius:50%;background:var(--bt-main);color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;box-shadow:0 0 0 1.5px var(--bt-bubble)} --.bt-secret-lock svg{width:11px;height:11px} --.bt-secret-name{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:12px;line-height:16px;padding:1px 6px;border-radius:5px;background:var(--bt-hover);color:var(--bt-ink)} --.bt-secret-body{display:flex;flex-direction:column;gap:8px} --.bt-secret-field{align-items:center;min-height:36px} --.bt-secret-input{flex:1;width:100%;min-width:0;margin:0;padding:0;border:0;outline:none;background:transparent;color:var(--bt-ink);font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:14px;line-height:20px;letter-spacing:.04em} --.bt-secret-input[data-masked]{-webkit-text-security:disc} --.bt-secret-input::placeholder{color:var(--bt-ink-3);font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;letter-spacing:0} --.bt-secret-scope{position:relative;display:inline-grid;grid-template-columns:1fr 1fr;align-self:flex-start;padding:2px;border-radius:999px;background:var(--bt-hover)} --.bt-secret-glide{position:absolute;top:2px;bottom:2px;left:2px;width:calc(50% - 2px);border-radius:999px;background:var(--bt-main);box-shadow:0 1px 3px rgba(20,20,20,.08),inset 0 0 0 .5px color-mix(in srgb,var(--bt-ink) 6%,transparent);transition:${spring(SPRING_SHAPE, "transform")}} --.bt-secret-glide[data-at="1"]{transform:translateX(100%)} --.bt-secret-seg{position:relative;z-index:1;height:28px;padding:0 14px;border:0;border-radius:999px;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;white-space:nowrap;cursor:pointer;transition:color .16s ease} --.bt-secret-seg[aria-checked=true]{color:var(--bt-ink);font-weight:500} --.bt-secret-seg:focus-visible{outline:2px solid var(--bt-accent);outline-offset:-2px} --/* A key card asks the user to act, so the process group carrying it stays open in every -- work-details mode (same override as .bt-group-replies in styles.js). */ --[data-step-process]:has(.bt-secret)>div:first-child{display:none!important} --[data-step-process]:has(.bt-secret)>[data-step-process-body]{display:block!important;content-visibility:visible!important;max-height:none!important;overflow:visible!important;mask-image:none!important;scrollbar-gutter:auto!important} --.bt-secret-ok{display:flex;align-items:center;gap:4px;margin-top:6px;animation:bt-secret-in .22s cubic-bezier(.22,1,.36,1)} --.bt-secret-ok svg{width:13px;height:13px;color:#16a34a} --@keyframes bt-secret-in{from{opacity:0;transform:translateY(-2px)}} --.bt-secret-saved{display:flex;align-items:center;gap:6px;font-size:13px;line-height:18px;color:var(--bt-ink-2)} --.bt-secret-note{font-size:12px;line-height:17px;color:var(--bt-ink-3)} --.bt-secret-note code,.bt-secret-about code{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px} --.bt-secret-warn{display:flex;align-items:center;gap:6px;padding:6px 10px;border-radius:8px;font-size:12px;line-height:16px;color:#b25e09;background:color-mix(in srgb,#f59e0b 12%,transparent)} --.bt-secret-error{font-size:12px;line-height:16px;color:#e02135} --.bt-secret .bt-q-btn:disabled{opacity:.5;cursor:default} --.bt-secret-done .bt-q-head{align-items:center} --.bt-secret-done .bt-q-title{font-size:13px;line-height:18px;color:var(--bt-ink-2);font-weight:500} --.bt-secret-scope-tag{font-weight:400;color:var(--bt-ink-3)} --.bt-secret-check{color:var(--bt-green,#22a06b);animation:bt-secret-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} backwards} --.bt-secret-done{animation:bt-secret-settle .32s cubic-bezier(.22,1,.36,1) backwards} --@keyframes bt-secret-pop{from{opacity:0;transform:scale(.4)}} --@keyframes bt-secret-settle{from{opacity:.4;transform:scale(.985)}} --.bt-secret-event{display:inline-flex;align-items:center;gap:5px} --.bt-secret-dock{flex-direction:column;align-items:center} --.bt-secret-dock .bt-q{max-width:min(550px,calc(100% - 32px))} --.bt-secret-about{margin:0 0 12px;padding:0 4px;font-size:12px;line-height:17px;color:var(--bt-ink-2)} --.bt-secret-title{display:flex;align-items:center;gap:6px;min-width:0;color:var(--bt-ink)} --.bt-secret-title svg{flex:none;color:var(--bt-ink-2)} --.bt-secret-purpose{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--bt-ink-2)} --.bt-secret-faces{display:inline-flex} --.bt-secret-faces>*+*{margin-left:-6px} --.bt-secret-edit{display:flex;flex-direction:column;gap:14px;padding:4px 12px 14px;animation:bt-q-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .2s ease-out backwards} --.bt-secret-edit-block{display:flex;flex-direction:column;gap:8px} --.bt-secret-edit-label{font-size:12px;line-height:16px;font-weight:600;color:var(--bt-ink-2)} --.bt-secret-radios{display:flex;gap:16px;font-size:13px} --.bt-secret-radio{display:inline-flex;align-items:center;gap:6px;cursor:pointer} --.bt-secret-bots{display:flex;flex-wrap:wrap;gap:6px} --.bt-secret-bot{display:inline-flex;align-items:center;gap:6px;height:30px;padding:0 10px 0 5px;border-radius:999px;border:.5px solid var(--bt-line);background:var(--bt-card);color:var(--bt-ink-2);font:inherit;font-size:12px;cursor:pointer;transition:background-color .12s ease,color .12s ease,border-color .12s ease} --.bt-secret-bot[aria-pressed=true]{background:var(--bt-active);color:var(--bt-ink);border-color:var(--bt-line-2)} --.bt-secret-bot svg{width:13px;height:13px} --.bt-secret-inline{display:flex;gap:8px;align-items:center} --.bt-secret-row-actions{display:flex;align-items:center;justify-content:flex-end;gap:8px;flex-wrap:wrap} --.bt-secret-row-actions .bt-set-hint{flex:1} --.bt-secret-danger{color:#e02135;display:inline-flex;align-items:center;gap:4px} --.bt-secret-danger svg{width:13px;height:13px} --.bt-secret-add .bt-input{height:34px} --@media (prefers-reduced-motion:reduce){.bt-secret-glide{transition:none}.bt-secret-check,.bt-secret-done,.bt-secret-ok,.bt-secret-edit{animation:none}} --`; -- --// src/client/turn-reasoning.js --function turnReasoning(steps, current) { -- const members = steps.length ? steps : [current]; -- if (members.find((step) => stepReasoning(step) !== "")?.step !== current.step) return ""; -- return members.filter((step) => !thinkingLive(step)).map(stepReasoning).filter(Boolean).join("\n\n"); -+ ), host); ++function matchesSessionFilter(entry, filter, unread = false) { ++ if (filter === "group") return entry?.kind === "room"; ++ if (filter === "direct") return entry?.kind === "bot" || entry?.kind === "agent"; ++ if (filter === "unread") return unread === true; ++ return true; } --var texts = (step) => step.blocks.filter((block) => block.kind === "text" && block.text.trim() !== ""); --var thinkingLive = (step) => step.status === "running" && texts(step).length === 0 && step.blocks.some((block) => block.kind === "reasoning"); --var stepReasoning = (step) => step.blocks.filter((block) => block.kind === "reasoning").map((block) => block.text).join("\n").trim(); - --// src/client/cells.js --var import_react6 = require("react"); --var import_react_dom = require("react-dom"); --var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives"); --var mdLabels = () => ({ code: { copyLabel: t("Copy"), copiedLabel: t("Copied") }, footnotes: t("Footnotes") }); --function Bubbles({ texts: texts2, roster, selfId, actions, streaming, sessionId, msgKey, useUi, lead, mentions }) { -- const onClick = (event) => { -- const target = mentionTarget(event); -- if (target === null) return; -- event.preventDefault(); -- event.stopPropagation(); -- actions.openSession(target); -- }; -- const reactions = useUi ? useUi((state) => msgKey ? state.reactions?.[msgKey] ?? null : null) : null; -- return (0, import_react6.createElement)( -- "div", -- { className: "bt-astack", "data-lead": lead ? "" : void 0, onClickCapture: onClick }, -- texts2.map((text, index) => { -- const key = msgKey ? `${msgKey}:${index}` : void 0; -- const picked = key ? reactions?.[index] ?? [] : []; -- const last = index === texts2.length - 1; -- const live = streaming && last; -- return (0, import_react6.createElement)( -- "div", -- { key: index, className: "bt-msg" }, -- (0, import_react6.createElement)( -- "div", -- { className: "bt-msg-line" }, -- lead && last ? lead : null, -- (0, import_react6.createElement)( -- "div", -- { className: "bt-bubble" }, -- (0, import_react6.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: linkMentions(text, roster.bots, selfId), streaming: live, labels: mdLabels(), variant: "compact", fileMentions: mentions }) -- ), -- live ? null : (0, import_react6.createElement)(MessageTools, { text, name: roster.byId[selfId]?.name ?? t("Bot"), sessionId, react: key ? (emoji) => actions.toggleReaction(msgKey, index, emoji) : void 0, actions }) -- ), -- picked.length ? (0, import_react6.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react6.createElement)("button", { -- key: emoji, -- type: "button", -- className: "bt-react", -- "aria-label": t("Remove reaction {emoji}", { emoji }), -- onClick: () => actions.toggleReaction(msgKey, index, emoji) -- }, emoji))) : null -- ); -- }) -- ); +-function QuestionDock({ sessionId, useRoster, useCards, useSession, actions }) { +- const question = useRoster((value) => value.questions?.[sessionId]); +- const drawn = useCards?.((state) => state[sessionId]?.[question?.callId] > 0) === true; +- const loading = useSession?.(historyLoading) === true; +- if (question === void 0 || question.callId && (drawn || loading)) return null; +- return (0, import_react4.createElement)(PendingQuestion, { sessionId, question, actions, inline: false }); ++ ++// src/shared/session-unread.js ++function shouldClearManualUnread({ active, wasActive, marked }) { ++ return Boolean(marked) && active === true && wasActive !== true; ++} ++function unreadEntryId(roster, sessionId) { ++ if (sessionId == null || sessionId === "") return sessionId; ++ if (roster?.byId?.[sessionId] || roster?.roomsById?.[sessionId]) return sessionId; ++ const bot = (roster?.bots ?? []).find((item) => (item.sessionId ?? item.id) === sessionId); ++ if (bot) return bot.id; ++ const agent = (roster?.agents ?? []).find((item) => item.id === sessionId || (item.sessions ?? []).includes(sessionId)); ++ if (agent) return agent.id; ++ return sessionId; ++} ++function isManuallyUnread(unread, id) { ++ return Boolean(id) && unread?.[id] === true; + } +-function AnsweredCell({ node }) { +- const data = node.data ?? {}; +- const questions = Array.isArray(data.questions) ? data.questions : []; +- if (questions.length === 0) { +- return data.text ? (0, import_react4.createElement)("div", { className: "bt-urow" }, (0, import_react4.createElement)("div", { className: "bt-ububble" }, data.text)) : null; +- } +- const answers = Array.isArray(data.answers) ? data.answers : []; +- return (0, import_react4.createElement)("div", { className: "bt-q-inline" }, questions.map((question) => (0, import_react4.createElement)(SettledQuestion, { +- key: question.id, +- question, +- answer: answers.find((answer) => answer.id === question.id) ?? { selected: [] } +- }))); ++ +// src/client/dsh-offer.js +var APP_OFFER = /* @__PURE__ */ new Set(["available", "downloading", "verifying", "installing", "ready"]); +var bare = (value) => String(value ?? "").trim().replace(/^v/i, "").split("+")[0]; @@ -10402,127 +11005,100 @@ diff --git a/client.js b/client.js + if (dsh.kind === "npm") return true; + return dsh.kind === "app" && APP_OFFER.has(app?.phase) && sameVersion(app.version, dsh.verified); } --var REACTIONS = ["👍", "❤️", "😂", "😮", "😢", "🙏"]; --function useDismiss(open, close, refs) { -- (0, import_react6.useEffect)(() => { -- if (!open) return void 0; -- const onDown = (event) => { -- if (refs.some((ref) => ref.current?.contains(event.target))) return; -- close(); -- }; -- const onKey = (event) => { -- if (event.key === "Escape") { -- event.stopPropagation(); -- close(); -- } -+ + +-// src/client/secret-card.js +-var import_react5 = require("react"); +-var MIN_VALUE = 4; +-var NONE = {}; +-var KeyIcon = () => (0, import_react5.createElement)( +- "svg", +- { width: 15, height: 15, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, +- (0, import_react5.createElement)("path", { d: "M7 9.5a3.5 3.5 0 1 1 0 .01z" }), +- (0, import_react5.createElement)("path", { d: "M10.4 10.6L17 10.6M14.5 10.6v2.4M16.6 10.6v1.8" }) +-); +-var LockIcon = () => (0, import_react5.createElement)( +- "svg", +- { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, +- (0, import_react5.createElement)("path", { d: "M6.5 9V7a3.5 3.5 0 0 1 7 0v2" }), +- (0, import_react5.createElement)("rect", { x: 4.5, y: 9, width: 11, height: 8, rx: 2 }) +-); +-var WarnIcon = () => (0, import_react5.createElement)( +- "svg", +- { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, +- (0, import_react5.createElement)("path", { d: "M10 3.5l7 12.5H3z" }), +- (0, import_react5.createElement)("path", { d: "M10 8.5v3.5M10 14.2h.01" }) +-); +-var MASK_BY_CSS = typeof CSS !== "undefined" && typeof CSS.supports === "function" && CSS.supports("-webkit-text-security", "disc"); +-var insecure = () => typeof location !== "undefined" && location.protocol === "http:" && !/^(localhost|127(?:\.\d{1,3}){3}|\[::1\])$/.test(location.hostname); +-var scopeLabel = (scope, roster) => { +- if (scope === "all") return t("All Bots"); +- const names = (scope ?? []).map((id) => roster.byId[id]?.name).filter(Boolean); +- return names.length === 0 ? t("No Bot") : names.join(t(" and ")); +// src/client/overlay-hooks.js -+var import_react12 = require("react"); ++var import_react14 = require("react"); +var escapeLayers = []; +var onEscapeKey = (event) => { + if (event.key === "Escape") escapeLayers.at(-1)?.current(); -+}; + }; +-var when = (time) => Number.isFinite(time) ? new Date(time).toLocaleString(dateLocale(), { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" }) : ""; +-function MaskedInput({ value, onChange, onEnter, label, autoFocus = false }) { +- return (0, import_react5.createElement)("input", { +- className: "bt-secret-input", +- type: MASK_BY_CSS ? "text" : "password", +- "data-masked": MASK_BY_CSS ? "" : void 0, +- value, +- autoFocus, +- autoComplete: MASK_BY_CSS ? "off" : "new-password", +- autoCorrect: "off", +- autoCapitalize: "off", +- spellCheck: false, +- "data-1p-ignore": "", +- "data-lpignore": "true", +- "data-bwignore": "", +- "data-form-type": "other", +- "aria-label": label, +- placeholder: t("Paste or type the key"), +- onChange: (event) => onChange(event.target.value), +- onKeyDown: (event) => { +- if (event.key !== "Enter" || event.nativeEvent.isComposing) return; +- event.preventDefault(); +- onEnter?.(); +- } +function useEscape(onClose) { -+ const ref = (0, import_react12.useRef)(onClose); ++ const ref = (0, import_react14.useRef)(onClose); + ref.current = onClose; -+ (0, import_react12.useEffect)(() => { ++ (0, import_react14.useEffect)(() => { + if (escapeLayers.length === 0) window.addEventListener("keydown", onEscapeKey); + escapeLayers.push(ref); + return () => { + escapeLayers.splice(escapeLayers.indexOf(ref), 1); + if (escapeLayers.length === 0) window.removeEventListener("keydown", onEscapeKey); - }; -- window.addEventListener("mousedown", onDown); -- window.addEventListener("keydown", onKey, true); ++ }; + }, []); +} +function useDialogFocus(ref) { -+ (0, import_react12.useEffect)(() => { ++ (0, import_react14.useEffect)(() => { + const before = document.activeElement; + ref.current?.focus?.({ preventScroll: true }); - return () => { -- window.removeEventListener("mousedown", onDown); -- window.removeEventListener("keydown", onKey, true); ++ return () => { + const active = document.activeElement; + const stillInDialog = active === ref.current || ref.current?.contains?.(active) === true; + const noFocusHeld = !active || active === document.body || active.isConnected === false; + if (before && typeof before.focus === "function" && before.isConnected && (stillInDialog || noFocusHeld || active === before)) before.focus({ preventScroll: true }); - }; -- }, [open]); ++ }; + }, []); - } --function MessageTools({ text, name, sessionId, react, actions }) { -- const [panel, setPanel] = (0, import_react6.useState)(null); -- const [place, setPlace] = (0, import_react6.useState)(null); -- const [copied, setCopied] = (0, import_react6.useState)(false); -- const tools = (0, import_react6.useRef)(null); -- const pop = (0, import_react6.useRef)(null); -- const close = () => setPanel(null); -- useDismiss(panel !== null, close, [tools, pop]); -- const open = (kind, event) => { -- if (panel === kind) { -- close(); -- return; -- } -- const rect = event.currentTarget.getBoundingClientRect(); -- const below = rect.bottom + 220 < window.innerHeight; -- setPlace(kind === "react" ? { left: rect.left + rect.width / 2, top: rect.top - 6, "--bt-origin": "bottom center" } : { left: Math.min(rect.left, window.innerWidth - 208), ...below ? { top: rect.bottom + 4 } : { bottom: window.innerHeight - rect.top + 4, "--bt-origin": "bottom left" } }); -- setPanel(kind); -- }; -- const copy2 = () => { -- void navigator.clipboard?.writeText(text).then(() => { -- setCopied(true); -- setTimeout(() => setCopied(false), 1e3); -- }); -- }; -- const download2 = () => { -- const url = URL.createObjectURL(new Blob([text], { type: "text/markdown" })); -- const link = Object.assign(document.createElement("a"), { href: url, download: `${name}-message.md` }); -- link.click(); -- setTimeout(() => URL.revokeObjectURL(url), 1e3); -- }; -- const item = (label, Icon, run) => (0, import_react6.createElement)("button", { key: label, type: "button", role: "menuitem", onClick: () => { -- close(); -- run(); -- } }, (0, import_react6.createElement)(Icon), label); -- return (0, import_react6.createElement)( -- "div", -- { ref: tools, className: "bt-tools", "data-open": panel !== null || void 0 }, -- react ? (0, import_react6.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Add reaction"), title: t("Add reaction"), "aria-expanded": panel === "react", onClick: (event) => open("react", event) }, (0, import_react6.createElement)(SmileIcon)) : null, -- sessionId ? (0, import_react6.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Reply"), title: t("Reply"), onClick: () => actions.quote(sessionId, text) }, (0, import_react6.createElement)(ReplyIcon)) : null, -- (0, import_react6.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("More message actions"), title: t("More"), "aria-haspopup": "menu", "aria-expanded": panel === "more", onClick: (event) => open("more", event) }, copied ? (0, import_react6.createElement)(CheckIcon) : (0, import_react6.createElement)(DotsIcon)), -- panel === "react" ? (0, import_react_dom.createPortal)((0, import_react6.createElement)( -- "div", -- { ref: pop, className: "bt-react-strip", role: "menu", "aria-label": t("Reactions"), style: place }, -- REACTIONS.map((emoji) => (0, import_react6.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => { -- close(); -- react(emoji); -- } }, emoji)) -- ), document.body) : null, -- panel === "more" ? (0, import_react_dom.createPortal)((0, import_react6.createElement)( -- "div", -- { ref: pop, className: "bt-menu", role: "menu", "aria-label": t("Message actions"), style: place }, -- item(t("Copy"), CopyIcon, copy2), -- item(t("Download"), DownloadIcon, download2) -- ), document.body) : null -- ); ++} +function usePaneLeft() { -+ const [paneLeft, setPaneLeft] = (0, import_react12.useState)(280); -+ (0, import_react12.useLayoutEffect)(() => { ++ const [paneLeft, setPaneLeft] = (0, import_react14.useState)(280); ++ (0, import_react14.useLayoutEffect)(() => { + const column = document.querySelector('[class*="_footArea"]')?.parentElement; + if (column) setPaneLeft(Math.round(column.getBoundingClientRect().right)); + }, []); + return paneLeft; - } --function ThinkingRow({ text }) { -- return (0, import_react6.createElement)( -- "details", -- { className: "bt-think" }, -- (0, import_react6.createElement)("summary", null, t("Thought it through")), -- (0, import_react6.createElement)("div", { className: "bt-think-text" }, text) ++} + +// src/client/member-status.js -+var import_react13 = require("react"); ++var import_react15 = require("react"); +var NO_WORK = { bots: {}, rooms: {}, approvals: [] }; +var ROWS_MAX = 4; +var stepIn = (work, botId, roomId, tool) => { @@ -10541,8 +11117,22 @@ diff --git a/client.js b/client.js + const doing = workIn(room2, work, id); + const approvals = askedIn(room2, work, id, doing); + return { id, approvals, doing, here: doing !== void 0, state: approvals.length > 0 ? "ask" : doing ? "work" : "idle" }; -+ }); -+} + }); + } +-function ScopeSwitch({ value, onChange, bot }) { +- const options = [["all", t("All Bots")], ["bot", t("Only {name}", { name: bot.name })]]; +- return (0, import_react5.createElement)( +- "div", +- { className: "bt-secret-scope", role: "radiogroup", "aria-label": t("Who may use it") }, +- (0, import_react5.createElement)("span", { className: "bt-secret-glide", "data-at": value === "all" ? 0 : 1, "aria-hidden": true }), +- options.map(([id, text]) => (0, import_react5.createElement)("button", { +- key: id, +- type: "button", +- role: "radio", +- "aria-checked": value === id, +- className: "bt-secret-seg", +- onClick: () => onChange(id) +- }, text)) +function busyMembers(room2, work, roster) { + const busy = memberWork(room2, work).filter((entry) => entry.state !== "idle" && roster.byId[entry.id]); + return [...busy.filter((entry) => entry.state === "ask"), ...busy.filter((entry) => entry.state === "work")].map((entry) => ({ ...entry, bot: roster.byId[entry.id] })); @@ -10570,86 +11160,116 @@ diff --git a/client.js b/client.js + return { waiting, doing }; +} +function Face({ entry, size }) { -+ return (0, import_react13.createElement)( ++ return (0, import_react15.createElement)( + "span", + { className: "bt-mw-face", "data-ask": entry.state === "ask" || void 0 }, -+ (0, import_react13.createElement)(BotMark, { bot: entry.bot, size, state: entry.state === "ask" ? "alert" : toolState(entry.doing?.tool ?? "") }) ++ (0, import_react15.createElement)(BotMark, { bot: entry.bot, size, state: entry.state === "ask" ? "alert" : toolState(entry.doing?.tool ?? "") }) ); } --function useFileMentions({ node, openFile, fileMentions, useTurnData }) { -- const tail = useTurnData?.("turn-tail"); -- const location2 = node.location; -- const turn = location2?.kind === "turn" || location2?.kind === "step" ? location2.turn : void 0; -- const seq = node.data.finalNode?.seq; -- return (0, import_react6.useMemo)(() => { -- if (typeof fileMentions !== "function" || turn?.status !== "closed" || seq === void 0) return void 0; -- return tail?.closing?.finalNode.seq === seq ? fileMentions({ turn, seq, openFile }) : void 0; -- }, [fileMentions, openFile, seq, tail, turn]); +-function SecretHead({ bot, title, detail, name, onClose }) { +- return (0, import_react5.createElement)( +- "div", +- { className: "bt-q-head bt-secret-head" }, +- (0, import_react5.createElement)("span", { className: "bt-secret-who" }, (0, import_react5.createElement)(BotMark, { bot, size: 28 }), (0, import_react5.createElement)("span", { className: "bt-secret-lock" }, (0, import_react5.createElement)(LockIcon))), +- (0, import_react5.createElement)( +- "div", +- { className: "bt-q-text" }, +- (0, import_react5.createElement)("p", { className: "bt-q-title" }, title), +- (0, import_react5.createElement)("div", { className: "bt-q-detail" }, (0, import_react5.createElement)("code", { className: "bt-secret-name" }, name), detail ? ` · ${detail}` : "") +- ), +- onClose ? (0, import_react5.createElement)("button", { type: "button", className: "bt-q-x", "aria-label": t("Cancel the request"), title: t("Cancel"), onClick: onClose }, (0, import_react5.createElement)(CloseIcon)) : null +var elapsedSince = (now, at) => typeof at === "number" && now - at >= 6e4 ? elapsedLabel(now - at) : ""; +function WorkRow({ bot, tool, step, label, at, now, onOpen }) { + const text2 = `${label} · ${workText(tool, step)}`; + const elapsed = elapsedSince(now, at); -+ return (0, import_react13.createElement)( ++ return (0, import_react15.createElement)( + "button", + { type: "button", className: "bt-mw-row", "aria-label": [text2, elapsed].filter(Boolean).join(" · "), onClick: onOpen }, -+ (0, import_react13.createElement)(BotMark, { bot, size: 22, state: toolState(tool ?? ""), live: true }), -+ (0, import_react13.createElement)("span", { className: "bt-mw-row-text" }, (0, import_react13.createElement)(Shimmer, null, text2)), -+ elapsed ? (0, import_react13.createElement)("span", { className: "bt-mw-row-time" }, `· ${elapsed}`) : null -+ ); ++ (0, import_react15.createElement)(BotMark, { bot, size: 22, state: toolState(tool ?? ""), live: true }), ++ (0, import_react15.createElement)("span", { className: "bt-mw-row-text" }, (0, import_react15.createElement)(Shimmer, null, text2)), ++ elapsed ? (0, import_react15.createElement)("span", { className: "bt-mw-row-time" }, `· ${elapsed}`) : null + ); } --function AssistantCell({ node, groupPart, sessionId, openFile, fileMentions, useTurnData, useRoster, useUi, useTurnSteps, useTurnContext, actions }) { -- const roster = useRoster((value) => value); -- const data = node.data; -- const steps = useTurnSteps(String(data.turn)); -- const contexts = useTurnContext(String(data.turn)); -- const mentions = useFileMentions({ node, openFile, fileMentions, useTurnData }); -- const hidden = Boolean(roster.roomsById[sessionId]) || isHiddenTurn(roster, sessionId, data.turn); -- const texts2 = groupPart === "reasoning" ? [] : data.blocks.filter((block) => block.kind === "text" && block.text.trim() !== "").map((block) => block.text); -- const running = data.status === "running"; -- useLiveNote(actions, sessionId, `text:${node.key ?? data.seq}`, !hidden && running && texts2.length > 0 ? { text: true } : null); -- if (hidden) return null; -- const reasoning = groupPart === "response" ? "" : turnReasoning(steps, data); -- const relays = relayPart(data, groupPart) ? relaysBefore(contexts, steps, data) : []; -- if (texts2.length === 0 && !reasoning && relays.length === 0) return null; -- const selfId = roster.byId[sessionId]?.id ?? sessionId; -- return (0, import_react6.createElement)( -- import_react6.Fragment, -- null, -- relays.map((relay) => { -- const source = relay.source; -- const sender = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; -- return (0, import_react6.createElement)(EventLine, { -- key: relay.seq, -- prefix: source.role === "stopped" ? t("Stopped by") : source.role === "reply" ? t("Reply from") : t("Message from"), -- bots: [sender], -- onOpen: () => { -- if (sender.id) actions.openExchange(selfId, sender.id); -- }, -- whole: true -- }); +-function SecretCard({ bot, request, roster, actions }) { +- const [value, setValue] = (0, import_react5.useState)(""); +- const [scope, setScope] = (0, import_react5.useState)("all"); +- const [replacing, setReplacing] = (0, import_react5.useState)(false); +- const [busy, setBusy] = (0, import_react5.useState)(false); +- const [error, setError] = (0, import_react5.useState)(""); +- const noteId = (0, import_react5.useId)(); +- const secret = (roster.secrets ?? []).find((entry) => entry.name === request.name); +- const run = (promise) => { +- setBusy(true); +- setError(""); +- return Promise.resolve(promise).then(() => setValue(""), (failure) => setError(failure?.message ?? String(failure))).finally(() => setBusy(false)); +- }; +- const cancel = () => run(actions.secretCancel(request.id)); +- const long = value.trim().length >= MIN_VALUE; +- const save = () => { +- if (long && !busy) void run(actions.secretSet({ requestId: request.id, value, scope })); +- }; +- const allow = () => { +- if (!busy) void run(actions.secretAllow(request.id)); +- }; +- const filling = request.kind === "fill" || replacing; +- const warn = insecure() ? (0, import_react5.createElement)("div", { className: "bt-secret-warn", role: "note" }, (0, import_react5.createElement)(WarnIcon), t("This page is not on HTTPS: the key crosses the network unencrypted.")) : null; +- return (0, import_react5.createElement)( +- "div", +- { className: "bt-q bt-secret", role: "group", "aria-describedby": noteId, "data-kind": request.kind }, +- (0, import_react5.createElement)(SecretHead, { +- bot, +- title: request.kind === "allow" ? t("Let {bot} use {name}?", { bot: bot.name, name: request.name }) : t("{name} needs a key", { name: bot.name }), +- detail: request.purpose, +- name: request.name, +- onClose: busy ? void 0 : cancel - }), -- reasoning ? (0, import_react6.createElement)(ThinkingRow, { text: reasoning }) : null, -- texts2.length ? (0, import_react6.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, streaming: running, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi, mentions }) : null +- request.kind === "allow" ? (0, import_react5.createElement)("div", { className: "bt-secret-saved" }, (0, import_react5.createElement)(KeyIcon), t("Saved for {scope}", { scope: scopeLabel(secret?.scope, roster) })) : null, +- filling ? (0, import_react5.createElement)( +- "div", +- { className: "bt-secret-body" }, +- (0, import_react5.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react5.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value of {name}", { name: request.name }), autoFocus: replacing })), +- request.kind === "fill" ? (0, import_react5.createElement)(ScopeSwitch, { value: scope, onChange: setScope, bot }) : null +- ) : null, +- (0, import_react5.createElement)( +- "div", +- { className: "bt-secret-note", id: noteId }, +- t("{bot} never sees the value. It reaches {bot}'s shell as ", { bot: bot.name }), +- (0, import_react5.createElement)("code", null, `$DSH_SECRET_${request.name}`), +- ".", +- filling && value !== "" && !long ? t(" At least {count} characters.", { count: MIN_VALUE }) : "" +function SummaryLine({ busy, now, onOpen }) { + const { waiting, doing } = summaryText(busy); + const elapsed = doing ? elapsedSince(now, busy.find((entry) => entry.state === "work")?.doing.since) : ""; -+ return (0, import_react13.createElement)( ++ return (0, import_react15.createElement)( + "button", + { type: "button", className: "bt-mw-row bt-mw-line", "aria-label": [waiting, doing, elapsed].filter(Boolean).join(" · "), onClick: onOpen }, -+ (0, import_react13.createElement)("span", { className: "bt-mw-stack", "aria-hidden": true }, busy.slice(0, 4).map((entry) => (0, import_react13.createElement)(Face, { key: entry.id, entry, size: 16 }))), -+ (0, import_react13.createElement)( ++ (0, import_react15.createElement)("span", { className: "bt-mw-stack", "aria-hidden": true }, busy.slice(0, 4).map((entry) => (0, import_react15.createElement)(Face, { key: entry.id, entry, size: 16 }))), ++ (0, import_react15.createElement)( + "span", + { className: "bt-mw-row-text" }, -+ waiting ? (0, import_react13.createElement)("span", { className: "bt-mw-ask" }, waiting) : null, ++ waiting ? (0, import_react15.createElement)("span", { className: "bt-mw-ask" }, waiting) : null, + waiting && doing ? " · " : null, -+ doing ? (0, import_react13.createElement)(Shimmer, null, doing) : null -+ ), -+ elapsed ? (0, import_react13.createElement)("span", { className: "bt-mw-row-time" }, `· ${elapsed}`) : null ++ doing ? (0, import_react15.createElement)(Shimmer, null, doing) : null + ), +- warn, +- error ? (0, import_react5.createElement)("div", { className: "bt-secret-error", role: "alert" }, error) : null, +- (0, import_react5.createElement)( +- "div", +- { className: "bt-q-foot" }, +- request.kind === "allow" && !replacing ? (0, import_react5.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => setReplacing(true) }, t("Replace value")) : null, +- (0, import_react5.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: cancel }, t("Cancel")), +- filling ? (0, import_react5.createElement)("button", { type: "button", className: "bt-q-submit", disabled: !long || busy, onClick: save }, busy ? t("Saving…") : t("Save")) : (0, import_react5.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: allow }, busy ? t("Allowing…") : t("Allow")) +- ) ++ elapsed ? (0, import_react15.createElement)("span", { className: "bt-mw-row-time" }, `· ${elapsed}`) : null ); } --function EventLine({ prefix, bots, joiner = t("and"), onOpen, whole = false }) { -- if (whole && bots.length === 1) { -- return (0, import_react6.createElement)( +-function SettledSecret({ bot, request, roster }) { +- const canceled = request.status === "canceled"; +- const text = canceled ? t("{bot} asked for {name}", { bot: bot.name, name: request.name }) : request.status === "allowed" ? t("Allowed {bot} to use {name}", { bot: bot.name, name: request.name }) : t("Saved {name}", { name: request.name }); +- return (0, import_react5.createElement)( +- "div", +- { className: "bt-q bt-q-settled bt-secret bt-secret-done", role: "group", "aria-label": text, "data-status": request.status }, +- (0, import_react5.createElement)( +function MemberDock({ sessionId, useRoster, useWork, actions }) { + const roster = useRoster((value) => value); + const work = useWork((value) => value); @@ -10660,53 +11280,88 @@ diff --git a/client.js b/client.js + const groups = bot !== void 0 && !ownChat ? botGroupWork(bot.id, work, roster) : []; + const shown = busy.length > 0 || groups.length > 0; + const now = useNow(shown); -+ const ref = (0, import_react13.useRef)(null); ++ const ref = (0, import_react15.useRef)(null); + useFlowColumn(ref, shown, sessionId); + if (!shown) return null; + if (room2) { + const { rows: rows2, rest } = splitBusy(busy); + const open = () => actions.showDetails(sessionId); -+ return (0, import_react13.createElement)( ++ return (0, import_react15.createElement)( "div", -- { className: "bt-event" }, -- (0, import_react6.createElement)( -- "button", -- { type: "button", className: "bt-event-whole", title: bots[0].name, onClick: () => onOpen?.(bots[0]) }, -- (0, import_react6.createElement)("span", null, prefix), -- (0, import_react6.createElement)(BotMark, { bot: bots[0], size: 16 }), -- (0, import_react6.createElement)("span", { className: "bt-event-name" }, bots[0].name) -- ) +- { className: "bt-q-head" }, +- (0, import_react5.createElement)("span", { className: "bt-secret-who" }, (0, import_react5.createElement)(BotMark, { bot, size: 22 })), +- (0, import_react5.createElement)("div", { className: "bt-q-text" }, (0, import_react5.createElement)( +- "p", +- { className: "bt-q-title" }, +- text, +- canceled ? null : (0, import_react5.createElement)("span", { className: "bt-secret-scope-tag" }, ` · ${scopeLabel(request.scope, roster)}`) +- )), +- canceled ? (0, import_react5.createElement)("span", { className: "bt-q-badge" }, t("Canceled")) : (0, import_react5.createElement)("span", { className: "bt-q-check bt-secret-check", title: t("Done") }, (0, import_react5.createElement)(CheckIcon)) +- ) +- ); +-} +-function RequestView({ bot, request, roster, actions }) { +- return request.status === "pending" ? (0, import_react5.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }) : (0, import_react5.createElement)(SettledSecret, { bot, request, roster }); +-} +-function SecretToolCell({ sessionId, callId, name, done, content, roster, actions }) { +- const bot = roster.byId[sessionId]; +- if (!bot) return null; +- const request = (roster.secretRequests?.[bot.id] ?? []).find((entry) => entry.callId === callId && (entry.sessionId ?? sessionId) === sessionId); +- if (request) return (0, import_react5.createElement)("div", { className: "bt-q-inline" }, (0, import_react5.createElement)(RequestView, { bot, request, roster, actions })); +- if (done && /already saved/.test(contentText(content))) { +- return (0, import_react5.createElement)("div", { className: "bt-event" }, (0, import_react5.createElement)("span", { className: "bt-secret-event" }, (0, import_react5.createElement)(KeyIcon), t("{bot} is using {name}", { bot: bot.name, name: name ?? t("a saved key") }))); + { ref, className: "bt-mw-dock-stack" }, -+ rows2.map((entry) => (0, import_react13.createElement)(WorkRow, { key: entry.id, bot: entry.bot, tool: entry.doing.tool, step: entry.doing.step, label: entry.bot.name, at: entry.doing.since, now, onOpen: open })), -+ rest.length > 0 ? (0, import_react13.createElement)(SummaryLine, { busy: rest, now, onOpen: open }) : null - ); ++ rows2.map((entry) => (0, import_react15.createElement)(WorkRow, { key: entry.id, bot: entry.bot, tool: entry.doing.tool, step: entry.doing.step, label: entry.bot.name, at: entry.doing.since, now, onOpen: open })), ++ rest.length > 0 ? (0, import_react15.createElement)(SummaryLine, { busy: rest, now, onOpen: open }) : null ++ ); } -- const parts = []; -- parts.push((0, import_react6.createElement)("span", { key: "p" }, prefix)); -- bots.forEach((bot, index) => { -- if (index > 0) parts.push((0, import_react6.createElement)("span", { key: `j${index}` }, joiner)); -- parts.push((0, import_react6.createElement)( -- "button", -- { key: bot.id ?? index, type: "button", onClick: () => onOpen?.(bot) }, -- (0, import_react6.createElement)(BotMark, { bot, size: 16 }), -- bot.name -- )); -- }); -- return (0, import_react6.createElement)("div", { className: "bt-event" }, parts); +- return null; -} --function GroupMessage({ bot, text, room: room2, roster, actions, msgKey, useUi }) { -- const lead = (0, import_react6.createElement)( -- "button", -- { type: "button", className: "bt-lead", "aria-label": t("Open {name}'s chat", { name: bot.name }), onClick: () => actions.openSession(bot.id) }, -- (0, import_react6.createElement)(BotMark, { bot, size: 22 }) -+ const rows = groups.slice(0, ROWS_MAX); -+ const more = groups.length - rows.length; -+ return (0, import_react13.createElement)( -+ "div", -+ { ref, className: "bt-mw-dock-stack" }, -+ rows.map((item) => (0, import_react13.createElement)(WorkRow, { -+ key: item.room.id, -+ bot, +-function SecretDock({ sessionId, useRoster, useCards, useSession, actions }) { +- const roster = useRoster((value) => value); +- const shown = useCards?.((state) => state[sessionId]) ?? NONE; +- const loading = useSession?.(historyLoading) === true; +- const bot = roster.byId[sessionId]; +- if (!bot || currentPart(bot) !== sessionId) return null; +- const drawn = (entry) => entry.callId && entry.sessionId === sessionId && (loading || shown[entry.callId] > 0); +- const waiting = (roster.secretRequests?.[bot.id] ?? []).filter((entry) => entry.status === "pending" && !drawn(entry)); +- if (waiting.length === 0) return null; +- return (0, import_react5.createElement)("div", { className: "bt-q-dock bt-secret-dock" }, waiting.map((request) => (0, import_react5.createElement)(SecretCard, { key: `${request.id}:${request.kind}`, bot, request, roster, actions }))); +-} +-function ScopeEditor({ secret, roster, onSave }) { +- const [mode, setMode] = (0, import_react5.useState)(secret.scope === "all" ? "all" : "some"); +- const [picked, setPicked] = (0, import_react5.useState)(secret.scope === "all" ? [] : secret.scope); +- const toggle = (id) => setPicked((list) => list.includes(id) ? list.filter((item) => item !== id) : [...list, id]); +- const same = mode === "all" ? secret.scope === "all" : secret.scope !== "all" && [...picked].sort().join() === [...secret.scope].sort().join(); +- return (0, import_react5.createElement)( ++ const rows = groups.slice(0, ROWS_MAX); ++ const more = groups.length - rows.length; ++ return (0, import_react15.createElement)( + "div", +- { className: "bt-secret-edit-block" }, +- (0, import_react5.createElement)("div", { className: "bt-secret-edit-label" }, t("Who may use it")), +- (0, import_react5.createElement)( +- "div", +- { className: "bt-secret-radios", role: "radiogroup", "aria-label": t("Who may use {name}", { name: secret.name }) }, +- [["all", t("All Bots")], ["some", t("Chosen Bots")]].map(([id, text]) => (0, import_react5.createElement)( +- "label", +- { key: id, className: "bt-secret-radio" }, +- (0, import_react5.createElement)("input", { type: "radio", name: `scope-${secret.name}`, checked: mode === id, onChange: () => setMode(id) }), +- text +- )) +- ), +- mode === "some" ? (0, import_react5.createElement)("div", { className: "bt-secret-bots" }, roster.bots.map((bot) => (0, import_react5.createElement)("button", { +- key: bot.id, +- type: "button", +- className: "bt-secret-bot", +- "aria-pressed": picked.includes(bot.id), +- onClick: () => toggle(bot.id) +- }, (0, import_react5.createElement)(BotAvatar, { bot, size: 20, badge: false, live: false }), bot.name, picked.includes(bot.id) ? (0, import_react5.createElement)(CheckIcon) : null))) : null, +- (0, import_react5.createElement)( ++ { ref, className: "bt-mw-dock-stack" }, ++ rows.map((item) => (0, import_react15.createElement)(WorkRow, { ++ key: item.room.id, ++ bot, + tool: item.tool, + step: item.step, + label: t("in {name}", { name: item.room.name }), @@ -10714,16 +11369,47 @@ diff --git a/client.js b/client.js + now, + onOpen: () => actions.openSession(item.room.id) + })), -+ more > 0 ? (0, import_react13.createElement)( -+ "div", ++ more > 0 ? (0, import_react15.createElement)( + "div", +- { className: "bt-secret-row-actions" }, +- (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: same, onClick: () => onSave(mode === "all" ? "all" : picked) }, t("Save access")) +- ) + { className: "bt-mw-row bt-mw-line bt-mw-static" }, -+ (0, import_react13.createElement)("span", { className: "bt-mw-row-text" }, moreRooms(more)) ++ (0, import_react15.createElement)("span", { className: "bt-mw-row-text" }, moreRooms(more)) + ) : null ); -- return (0, import_react6.createElement)( -+} + } +-function ValueEditor({ secret, onSave }) { +- const [value, setValue] = (0, import_react5.useState)(""); +- const [replaced, setReplaced] = (0, import_react5.useState)(false); +- const long = value.trim().length >= MIN_VALUE; +- const save = () => { +- if (!long) return; +- void Promise.resolve(onSave(value)).then((ok) => { +- if (ok) { +- setValue(""); +- setReplaced(true); +- } +- }); +- }; +- const edit = (next) => { +- setValue(next); +- setReplaced(false); +- }; +- return (0, import_react5.createElement)( +- "div", +- { className: "bt-secret-edit-block" }, +- (0, import_react5.createElement)("div", { className: "bt-secret-edit-label" }, t("Replace the value")), +- (0, import_react5.createElement)( +- "div", +- { className: "bt-secret-inline" }, +- (0, import_react5.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react5.createElement)(MaskedInput, { value, onChange: edit, onEnter: save, label: t("New value of {name}", { name: secret.name }) })), +- (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !long, onClick: save }, t("Replace")) +- ), +- value !== "" && !long ? (0, import_react5.createElement)("div", { className: "bt-set-hint" }, t("At least {count} characters.", { count: MIN_VALUE })) : replaced ? (0, import_react5.createElement)("div", { className: "bt-set-hint bt-secret-ok", role: "status" }, (0, import_react5.createElement)(CheckIcon), t("Replaced. Bots get the new value from their next command.")) : null +- ); +function useFlowColumn(ref, active, key) { -+ (0, import_react13.useLayoutEffect)(() => { ++ (0, import_react15.useLayoutEffect)(() => { + const node = ref.current; + const flow = document.querySelector("[data-chat-flow]"); + if (!active || !node || !flow) return void 0; @@ -10738,10 +11424,19 @@ diff --git a/client.js b/client.js + for (const target of [flow, flow.parentElement, node.parentElement]) if (target) observer.observe(target); + return () => observer.disconnect(); + }, [active, key]); -+} + } +-function SecretRow({ secret, roster, actions, run, open, onToggle }) { +- const [confirm, setConfirm] = (0, import_react5.useState)(false); +- (0, import_react5.useEffect)(() => { +- if (!open) setConfirm(false); +- }, [open]); +- const asker = secret.requestedBy ? roster.byId[secret.requestedBy]?.name ?? t("a deleted Bot") : t("you"); +- const allowed = secret.scope === "all" ? [] : secret.scope.map((id) => roster.byId[id]).filter(Boolean); +- const meta = [t("Asked by {name}", { name: asker }), t("added {time}", { time: when(secret.createdAt) }), secret.lastUsedAt ? t("last used {time}", { time: when(secret.lastUsedAt) }) : t("not used yet")].join(" · "); +- return (0, import_react5.createElement)( +function useNow(active) { -+ const [now, setNow] = (0, import_react13.useState)(Date.now); -+ (0, import_react13.useEffect)(() => { ++ const [now, setNow] = (0, import_react15.useState)(Date.now); ++ (0, import_react15.useEffect)(() => { + if (!active) return void 0; + const timer = setInterval(() => setNow(Date.now()), 3e4); + return () => clearInterval(timer); @@ -10754,138 +11449,260 @@ diff --git a/client.js b/client.js + ...approval.roomId ? [["always-room", "Always allow for this group"]] : [] +]; +function ApprovalCard({ approval, bot, actions }) { -+ const [busy, setBusy] = (0, import_react13.useState)(false); ++ const [busy, setBusy] = (0, import_react15.useState)(false); + const answer = (choice) => { + setBusy(true); + void Promise.resolve(actions.answerApproval(approval.id, choice)).catch((error) => actions.reportError(error, "approval")).finally(() => setBusy(false)); + }; -+ return (0, import_react13.createElement)( ++ return (0, import_react15.createElement)( "div", -- { className: "bt-group-msg" }, -- (0, import_react6.createElement)( -- "span", -- { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, -- bot.name, -- room2?.admin === bot.id ? (0, import_react6.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null +- { className: "bt-secret-item", "data-open": open ? "" : void 0 }, +- (0, import_react5.createElement)( +- "button", +- { type: "button", className: "bt-set-row bt-secret-summary", "aria-expanded": open, onClick: onToggle }, +- (0, import_react5.createElement)( +- "span", +- { className: "bt-set-copy" }, +- (0, import_react5.createElement)("span", { className: "bt-secret-title" }, (0, import_react5.createElement)(KeyIcon), (0, import_react5.createElement)("code", { className: "bt-secret-name" }, secret.name), secret.purpose ? (0, import_react5.createElement)("span", { className: "bt-secret-purpose" }, secret.purpose) : null), +- (0, import_react5.createElement)("span", { className: "bt-set-hint" }, meta) +- ), +- (0, import_react5.createElement)( +- "span", +- { className: "bt-set-control" }, +- secret.scope === "all" ? (0, import_react5.createElement)("span", { className: "bt-tag" }, t("All Bots")) : allowed.length === 0 ? (0, import_react5.createElement)("span", { className: "bt-tag" }, t("No Bot")) : (0, import_react5.createElement)("span", { className: "bt-secret-faces", title: allowed.map((bot) => bot.name).join(", ") }, allowed.slice(0, 5).map((bot) => (0, import_react5.createElement)(BotAvatar, { key: bot.id, bot, size: 20, badge: false, live: false }))) +- ) - ), -- (0, import_react6.createElement)(Bubbles, { texts: [text], roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead }) +- open ? (0, import_react5.createElement)( +- "div", +- { className: "bt-secret-edit" }, +- (0, import_react5.createElement)(ScopeEditor, { key: JSON.stringify(secret.scope), secret, roster, onSave: (scope) => run(actions.secretUpdate(secret.name, scope)) }), +- (0, import_react5.createElement)(ValueEditor, { secret, onSave: (value) => run(actions.secretSet({ name: secret.name, value })) }), +- (0, import_react5.createElement)( +- "div", +- { className: "bt-secret-row-actions" }, +- confirm ? [ +- (0, import_react5.createElement)("span", { key: "q", className: "bt-set-hint" }, t("Delete {name}? Bots lose it at once.", { name: secret.name })), +- (0, import_react5.createElement)("button", { key: "no", type: "button", className: "bt-soft bt-soft-sm", onClick: () => setConfirm(false) }, t("Keep")), +- (0, import_react5.createElement)("button", { key: "yes", type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => run(actions.secretDelete(secret.name)) }, t("Delete")) +- ] : (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-secret-danger", onClick: () => setConfirm(true) }, (0, import_react5.createElement)(TrashIcon), t("Delete")) +- ) +- ) : null + { className: "bt-mw-card", role: "group", "aria-label": t("{name} is waiting for your approval", { name: bot.name }) }, -+ (0, import_react13.createElement)("div", { className: "bt-mw-tool" }, approval.tool), -+ approval.detail?.text ? (0, import_react13.createElement)("div", { className: "bt-mw-text" }, approval.detail.text) : null, -+ approval.reason ? (0, import_react13.createElement)("div", { className: "bt-mw-reason" }, approval.reason) : null, -+ approval.detail?.code ? (0, import_react13.createElement)("code", { className: "bt-mw-code", title: approval.detail.code }, approval.detail.code) : null, -+ approval.answerable ? (0, import_react13.createElement)( ++ (0, import_react15.createElement)("div", { className: "bt-mw-tool" }, approval.tool), ++ approval.detail?.text ? (0, import_react15.createElement)("div", { className: "bt-mw-text" }, approval.detail.text) : null, ++ approval.reason ? (0, import_react15.createElement)("div", { className: "bt-mw-reason" }, approval.reason) : null, ++ approval.detail?.code ? (0, import_react15.createElement)("code", { className: "bt-mw-code", title: approval.detail.code }, approval.detail.code) : null, ++ approval.answerable ? (0, import_react15.createElement)( + "div", + { className: "bt-mw-actions" }, -+ (0, import_react13.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => answer("reject") }, t("Reject")), -+ (0, import_react13.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: () => answer("allow") }, t("Allow once")), -+ ...alwaysChoices(approval, bot).map(([choice, label]) => (0, import_react13.createElement)("button", { key: choice, type: "button", className: "bt-q-btn", "data-choice": choice, disabled: busy, onClick: () => answer(choice) }, t(label))) -+ ) : (0, import_react13.createElement)( ++ (0, import_react15.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => answer("reject") }, t("Reject")), ++ (0, import_react15.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: () => answer("allow") }, t("Allow once")), ++ ...alwaysChoices(approval, bot).map(([choice, label]) => (0, import_react15.createElement)("button", { key: choice, type: "button", className: "bt-q-btn", "data-choice": choice, disabled: busy, onClick: () => answer(choice) }, t(label))) ++ ) : (0, import_react15.createElement)( + "div", + { className: "bt-mw-actions" }, -+ (0, import_react13.createElement)("button", { type: "button", className: "bt-q-btn", onClick: () => actions.openSession(bot.id) }, t("Open {name}'s chat", { name: bot.name })) ++ (0, import_react15.createElement)("button", { type: "button", className: "bt-q-btn", onClick: () => actions.openSession(bot.id) }, t("Open {name}'s chat", { name: bot.name })) + ) ); } --function GroupEvent({ prefix, room: room2, name, roster, actions }) { -- return (0, import_react6.createElement)( +-function AddSecret({ actions, run, onDone }) { +- const [name, setName] = (0, import_react5.useState)(""); +- const [purpose, setPurpose] = (0, import_react5.useState)(""); +- const [value, setValue] = (0, import_react5.useState)(""); +- const ready = /^[A-Za-z][\w-]{0,63}$/.test(name.trim()) && value.trim().length >= MIN_VALUE; +- const save = () => { +- if (!ready) return; +- void run(actions.secretSet({ name, purpose, value, scope: "all" })).then((ok) => { +- if (ok) { +- setValue(""); +- onDone(); +- } +- }); +function MemberWork({ entry, bot, room: room2, actions, now }) { -+ const [stopping, setStopping] = (0, import_react13.useState)(false); ++ const [stopping, setStopping] = (0, import_react15.useState)(false); + if (entry.state === "ask") { -+ return (0, import_react13.createElement)( ++ return (0, import_react15.createElement)( + "div", + { className: "bt-mw-member" }, -+ (0, import_react13.createElement)("div", { className: "bt-mw-state bt-mw-ask" }, `${t("Waiting for your approval")}${since(now, entry.approvals[0].at)}`), -+ entry.approvals.map((approval) => (0, import_react13.createElement)(ApprovalCard, { key: approval.id, approval, bot, actions })) ++ (0, import_react15.createElement)("div", { className: "bt-mw-state bt-mw-ask" }, `${t("Waiting for your approval")}${since(now, entry.approvals[0].at)}`), ++ entry.approvals.map((approval) => (0, import_react15.createElement)(ApprovalCard, { key: approval.id, approval, bot, actions })) + ); + } + if (entry.state !== "work") return null; + const stop = () => { + setStopping(true); + void Promise.resolve(actions.stopMemberWork(room2.id, bot.id)).catch((error) => actions.reportError(error, "stop")).finally(() => setStopping(false)); -+ }; -+ return (0, import_react13.createElement)( + }; +- return (0, import_react5.createElement)( ++ return (0, import_react15.createElement)( "div", -- { className: "bt-event" }, -- (0, import_react6.createElement)("span", null, prefix), -- room2 ? (0, import_react6.createElement)("button", { type: "button", onClick: () => actions.openSession(room2.id) }, (0, import_react6.createElement)(RoomAvatar, { room: room2, roster, size: 16 }), room2.name) : name ? (0, import_react6.createElement)("span", null, name) : null +- { className: "bt-set-row bt-set-paste bt-secret-add" }, +- (0, import_react5.createElement)("input", { className: "bt-input", "aria-label": t("Key name"), placeholder: t("NAME, e.g. GITHUB_TOKEN"), value: name, spellCheck: false, autoComplete: "off", autoFocus: true, onChange: (event) => setName(event.target.value.toUpperCase()) }), +- (0, import_react5.createElement)("input", { className: "bt-input", "aria-label": t("What it is for"), placeholder: t("What it is for"), value: purpose, autoComplete: "off", onChange: (event) => setPurpose(event.target.value) }), +- (0, import_react5.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react5.createElement)(MaskedInput, { value, onChange: setValue, onEnter: save, label: t("Value") })), +- (0, import_react5.createElement)( + { className: "bt-mw-member" }, -+ (0, import_react13.createElement)( -+ "div", ++ (0, import_react15.createElement)( + "div", +- { className: "bt-secret-row-actions" }, +- (0, import_react5.createElement)("span", { className: "bt-set-hint" }, t("New keys are for all Bots; narrow it down afterwards.")), +- (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDone }, t("Cancel")), +- (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: !ready, onClick: save }, t("Save key")) + { className: "bt-mw-state bt-mw-work" }, -+ (0, import_react13.createElement)("span", null, (0, import_react13.createElement)(Shimmer, null, workText(entry.doing.tool, entry.doing.step)), since(now, entry.doing.since)), -+ entry.here && entry.doing.handed !== true ? (0, import_react13.createElement)("button", { type: "button", className: "bt-mw-stop", disabled: stopping, onClick: stop }, t("Stop")) : null -+ ) ++ (0, import_react15.createElement)("span", null, (0, import_react15.createElement)(Shimmer, null, workText(entry.doing.tool, entry.doing.step)), since(now, entry.doing.since)), ++ entry.here && entry.doing.handed !== true ? (0, import_react15.createElement)("button", { type: "button", className: "bt-mw-stop", disabled: stopping, onClick: stop }, t("Stop")) : null + ) ); } --function MemoryEvent({ sessionId, scope, result, roster, actions, findBot }) { -- if (!/^(Saved to|Updated in|Removed from) /.test(result)) return null; -- const self = roster.byId[sessionId]; -- const team = /^(team|团队|共享)$/i.test(String(scope ?? "").trim()); -- const other = team || !scope ? void 0 : findBot(scope); -- const target = other && other.id !== self?.id ? other : self; -- if (!target) return null; -- const label = team ? t("Team memory updated") : target === self ? t("Memory updated") : t("Updated {name}'s memory", { name: target.name }); -- return (0, import_react6.createElement)( +-function SecretsPage({ roster, actions, run, Section }) { +- const [open, setOpen] = (0, import_react5.useState)(null); +- const [adding, setAdding] = (0, import_react5.useState)(false); +- const secrets = roster.secrets ?? []; +- return [ +- (0, import_react5.createElement)( +- "p", +- { key: "about", className: "bt-secret-about" }, +- t("Keys your Bots asked for. Bots never see the values: they use them as "), +- (0, import_react5.createElement)("code", null, "$DSH_SECRET_NAME"), +- t(" in their shell, and every value is replaced by "), +- (0, import_react5.createElement)("code", null, "[secret:NAME]"), +- t(" before anything goes to a model.") +- ), +- (0, import_react5.createElement)( +- Section, +- { key: "list", title: t("Secrets · {count}", { count: secrets.length }) }, +- secrets.length === 0 && !adding ? (0, import_react5.createElement)("div", { className: "bt-set-row" }, (0, import_react5.createElement)("span", { className: "bt-set-hint" }, t("No keys yet. When a Bot needs one, it shows a card in its chat."))) : null, +- secrets.map((secret) => (0, import_react5.createElement)(SecretRow, { key: secret.name, secret, roster, actions, run, open: open === secret.name, onToggle: () => setOpen(open === secret.name ? null : secret.name) })), +- adding ? (0, import_react5.createElement)(AddSecret, { actions, run, onDone: () => setAdding(false) }) : null +- ), +- adding ? null : (0, import_react5.createElement)("div", { key: "add", className: "bt-actions" }, (0, import_react5.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setAdding(true) }, t("Add a key"))) +- ]; +function useMemberWork(room2, useWork) { + const work = useWork?.((value) => value) ?? NO_WORK; + const entries2 = room2 ? memberWork(room2, work) : []; + const now = useNow(entries2.some((entry) => entry.state !== "idle")); + return { entries: entries2, now }; -+} -+var MEMBER_CSS = ` -+.bt-mw-dock-stack{box-sizing:border-box;display:flex;flex-direction:column;align-items:flex-start;gap:2px;width:var(--dsh-chat-content-width,min(960px,100%));margin:0 auto 6px;pointer-events:none} -+.bt-mw-row{pointer-events:auto;display:flex;align-items:center;gap:10px;min-width:0;max-width:calc(100% + 6px);height:32px;margin-inline-start:-6px;padding:0 12px 0 6px;border:0;border-radius:16px;background:none;color:var(--bt-ink-2);font:inherit;font-size:14px;cursor:pointer;animation:bt-mw-in .32s cubic-bezier(.23,1,.32,1) backwards;transition:background-color .16s ease-out} -+.bt-mw-row:hover{background:var(--bt-hover)} -+.bt-mw-static{cursor:default;padding-inline-start:38px} -+.bt-mw-static:hover{background:none} -+.bt-mw-row>.bt-mark{flex:none} -+.bt-mw-row-text{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -+.bt-mw-row-time{flex:none;font-size:12px;color:var(--bt-ink-3);white-space:nowrap} -+.bt-mw-work{display:flex;align-items:center;justify-content:space-between;gap:8px} -+.bt-mw-stop{flex:none;height:22px;padding:0 10px;border:1px solid var(--bt-line,rgba(0,0,0,.12));border-radius:11px;background:none;color:var(--bt-ink-2);font:inherit;font-size:12px;cursor:pointer} -+.bt-mw-stop:hover{background:var(--bt-hover)} -+.bt-mw-stop:disabled{opacity:.5;cursor:default} -+.bt-mw-line{gap:8px} -+.bt-mw-stack{display:inline-flex;align-items:center;flex:none;line-height:0} -+.bt-mw-stack>*+*{margin-left:-4px} -+.bt-mw-face{position:relative;display:inline-flex;flex:none;border-radius:50%} -+.bt-mw-stack .bt-mw-face{box-shadow:0 0 0 1.5px var(--bt-main,#fff)} -+.bt-mw-face[data-ask]::after{content:"";position:absolute;right:-2px;bottom:-2px;width:7px;height:7px;border-radius:50%;background:#e3a008;box-shadow:0 0 0 1.5px var(--bt-main,#fff)} -+.bt-mw-ask{color:#b7791f;flex:none;white-space:nowrap} -+body[data-ds-dark-theme] .bt-mw-ask{color:#f0b84a} -+.bt-mw-member{padding:0 6px 8px 42px;display:flex;flex-direction:column;gap:6px} -+.bt-mw-state{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin-top:-4px} -+.bt-mw-card{display:flex;flex-direction:column;gap:4px;padding:10px 12px;border-radius:12px;background:var(--bt-hover);font-size:12px;line-height:17px;color:var(--bt-ink-2)} -+.bt-mw-tool{font-weight:600;color:var(--bt-ink)} -+.bt-mw-text{color:var(--bt-ink);overflow-wrap:anywhere} -+.bt-mw-reason{overflow-wrap:anywhere;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden} -+.bt-mw-code{display:block;font:11px/16px ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;color:var(--bt-ink);white-space:pre-wrap;overflow-wrap:anywhere;max-height:120px;overflow:auto} -+.bt-mw-actions{display:flex;flex-wrap:wrap;justify-content:flex-end;gap:6px;margin-top:4px} -+.bt-mw-actions>button{height:28px;padding:0 12px;font-size:12px} -+.bt-mw-actions>button:disabled{opacity:.5;cursor:default} -+@keyframes bt-mw-in{from{opacity:0;transform:translateY(4px)}} -+@media (prefers-reduced-motion:reduce){.bt-mw-row{animation:none}} -+`; -+ -+// src/shared/identity.js -+var nameKey = (value) => stripInvisible(String(value ?? "").normalize("NFC")).trim().toLowerCase().normalize("NFC"); -+var drawnKey = (value) => nameKey(value).replace(NOT_DRAWN, ""); -+ -+// src/shared/task-board.js -+var COLUMNS = ["not-started", "in-progress", "done"]; -+var PRIORITIES = ["urgent", "high", "normal", "low"]; -+var COLUMN_OF = { -+ open: "not-started", -+ claimed: "not-started", -+ working: "in-progress", -+ blocked: "in-progress", -+ "result-ready": "in-progress", -+ accepted: "done", -+ cancelled: "done", -+ failed: "done" -+}; -+function columnOf(task) { + } +-var SECRET_CSS = ` +-.bt-secret-head{align-items:center;gap:10px} +-.bt-secret-who{position:relative;flex:none;display:inline-flex} +-.bt-secret-lock{position:absolute;right:-5px;bottom:-4px;width:16px;height:16px;border-radius:50%;background:var(--bt-main);color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;box-shadow:0 0 0 1.5px var(--bt-bubble)} +-.bt-secret-lock svg{width:11px;height:11px} +-.bt-secret-name{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:12px;line-height:16px;padding:1px 6px;border-radius:5px;background:var(--bt-hover);color:var(--bt-ink)} +-.bt-secret-body{display:flex;flex-direction:column;gap:8px} +-.bt-secret-field{align-items:center;min-height:36px} +-.bt-secret-input{flex:1;width:100%;min-width:0;margin:0;padding:0;border:0;outline:none;background:transparent;color:var(--bt-ink);font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:14px;line-height:20px;letter-spacing:.04em} +-.bt-secret-input[data-masked]{-webkit-text-security:disc} +-.bt-secret-input::placeholder{color:var(--bt-ink-3);font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;letter-spacing:0} +-.bt-secret-scope{position:relative;display:inline-grid;grid-template-columns:1fr 1fr;align-self:flex-start;padding:2px;border-radius:999px;background:var(--bt-hover)} +-.bt-secret-glide{position:absolute;top:2px;bottom:2px;left:2px;width:calc(50% - 2px);border-radius:999px;background:var(--bt-main);box-shadow:0 1px 3px rgba(20,20,20,.08),inset 0 0 0 .5px color-mix(in srgb,var(--bt-ink) 6%,transparent);transition:${spring(SPRING_SHAPE, "transform")}} +-.bt-secret-glide[data-at="1"]{transform:translateX(100%)} +-.bt-secret-seg{position:relative;z-index:1;height:28px;padding:0 14px;border:0;border-radius:999px;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;white-space:nowrap;cursor:pointer;transition:color .16s ease} +-.bt-secret-seg[aria-checked=true]{color:var(--bt-ink);font-weight:500} +-.bt-secret-seg:focus-visible{outline:2px solid var(--bt-accent);outline-offset:-2px} +-/* A key card asks the user to act, so the process group carrying it stays open in every +- work-details mode (same override as .bt-group-replies in styles.js). */ +-[data-step-process]:has(.bt-secret)>div:first-child{display:none!important} +-[data-step-process]:has(.bt-secret)>[data-step-process-body]{display:block!important;content-visibility:visible!important;max-height:none!important;overflow:visible!important;mask-image:none!important;scrollbar-gutter:auto!important} +-.bt-secret-ok{display:flex;align-items:center;gap:4px;margin-top:6px;animation:bt-secret-in .22s cubic-bezier(.22,1,.36,1)} +-.bt-secret-ok svg{width:13px;height:13px;color:#16a34a} +-@keyframes bt-secret-in{from{opacity:0;transform:translateY(-2px)}} +-.bt-secret-saved{display:flex;align-items:center;gap:6px;font-size:13px;line-height:18px;color:var(--bt-ink-2)} +-.bt-secret-note{font-size:12px;line-height:17px;color:var(--bt-ink-3)} +-.bt-secret-note code,.bt-secret-about code{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px} +-.bt-secret-warn{display:flex;align-items:center;gap:6px;padding:6px 10px;border-radius:8px;font-size:12px;line-height:16px;color:#b25e09;background:color-mix(in srgb,#f59e0b 12%,transparent)} +-.bt-secret-error{font-size:12px;line-height:16px;color:#e02135} +-.bt-secret .bt-q-btn:disabled{opacity:.5;cursor:default} +-.bt-secret-done .bt-q-head{align-items:center} +-.bt-secret-done .bt-q-title{font-size:13px;line-height:18px;color:var(--bt-ink-2);font-weight:500} +-.bt-secret-scope-tag{font-weight:400;color:var(--bt-ink-3)} +-.bt-secret-check{color:var(--bt-green,#22a06b);animation:bt-secret-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} backwards} +-.bt-secret-done{animation:bt-secret-settle .32s cubic-bezier(.22,1,.36,1) backwards} +-@keyframes bt-secret-pop{from{opacity:0;transform:scale(.4)}} +-@keyframes bt-secret-settle{from{opacity:.4;transform:scale(.985)}} +-.bt-secret-event{display:inline-flex;align-items:center;gap:5px} +-.bt-secret-dock{flex-direction:column;align-items:center} +-.bt-secret-dock .bt-q{max-width:min(550px,calc(100% - 32px))} +-.bt-secret-about{margin:0 0 12px;padding:0 4px;font-size:12px;line-height:17px;color:var(--bt-ink-2)} +-.bt-secret-title{display:flex;align-items:center;gap:6px;min-width:0;color:var(--bt-ink)} +-.bt-secret-title svg{flex:none;color:var(--bt-ink-2)} +-.bt-secret-purpose{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--bt-ink-2)} +-.bt-secret-faces{display:inline-flex} +-.bt-secret-faces>*+*{margin-left:-6px} +-.bt-secret-edit{display:flex;flex-direction:column;gap:14px;padding:4px 12px 14px;animation:bt-q-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .2s ease-out backwards} +-.bt-secret-edit-block{display:flex;flex-direction:column;gap:8px} +-.bt-secret-edit-label{font-size:12px;line-height:16px;font-weight:600;color:var(--bt-ink-2)} +-.bt-secret-radios{display:flex;gap:16px;font-size:13px} +-.bt-secret-radio{display:inline-flex;align-items:center;gap:6px;cursor:pointer} +-.bt-secret-bots{display:flex;flex-wrap:wrap;gap:6px} +-.bt-secret-bot{display:inline-flex;align-items:center;gap:6px;height:30px;padding:0 10px 0 5px;border-radius:999px;border:.5px solid var(--bt-line);background:var(--bt-card);color:var(--bt-ink-2);font:inherit;font-size:12px;cursor:pointer;transition:background-color .12s ease,color .12s ease,border-color .12s ease} +-.bt-secret-bot[aria-pressed=true]{background:var(--bt-active);color:var(--bt-ink);border-color:var(--bt-line-2)} +-.bt-secret-bot svg{width:13px;height:13px} +-.bt-secret-inline{display:flex;gap:8px;align-items:center} +-.bt-secret-row-actions{display:flex;align-items:center;justify-content:flex-end;gap:8px;flex-wrap:wrap} +-.bt-secret-row-actions .bt-set-hint{flex:1} +-.bt-secret-danger{color:#e02135;display:inline-flex;align-items:center;gap:4px} +-.bt-secret-danger svg{width:13px;height:13px} +-.bt-secret-add .bt-input{height:34px} +-@media (prefers-reduced-motion:reduce){.bt-secret-glide{transition:none}.bt-secret-check,.bt-secret-done,.bt-secret-ok,.bt-secret-edit{animation:none}} ++var MEMBER_CSS = ` ++.bt-mw-dock-stack{box-sizing:border-box;display:flex;flex-direction:column;align-items:flex-start;gap:2px;width:var(--dsh-chat-content-width,min(960px,100%));margin:0 auto 6px;pointer-events:none} ++.bt-mw-row{pointer-events:auto;display:flex;align-items:center;gap:10px;min-width:0;max-width:calc(100% + 6px);height:32px;margin-inline-start:-6px;padding:0 12px 0 6px;border:0;border-radius:16px;background:none;color:var(--bt-ink-2);font:inherit;font-size:14px;cursor:pointer;animation:bt-mw-in .32s cubic-bezier(.23,1,.32,1) backwards;transition:background-color .16s ease-out} ++.bt-mw-row:hover{background:var(--bt-hover)} ++.bt-mw-static{cursor:default;padding-inline-start:38px} ++.bt-mw-static:hover{background:none} ++.bt-mw-row>.bt-mark{flex:none} ++.bt-mw-row-text{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} ++.bt-mw-row-time{flex:none;font-size:12px;color:var(--bt-ink-3);white-space:nowrap} ++.bt-mw-work{display:flex;align-items:center;justify-content:space-between;gap:8px} ++.bt-mw-stop{flex:none;height:22px;padding:0 10px;border:1px solid var(--bt-line,rgba(0,0,0,.12));border-radius:11px;background:none;color:var(--bt-ink-2);font:inherit;font-size:12px;cursor:pointer} ++.bt-mw-stop:hover{background:var(--bt-hover)} ++.bt-mw-stop:disabled{opacity:.5;cursor:default} ++.bt-mw-line{gap:8px} ++.bt-mw-stack{display:inline-flex;align-items:center;flex:none;line-height:0} ++.bt-mw-stack>*+*{margin-left:-4px} ++.bt-mw-face{position:relative;display:inline-flex;flex:none;border-radius:50%} ++.bt-mw-stack .bt-mw-face{box-shadow:0 0 0 1.5px var(--bt-main,#fff)} ++.bt-mw-face[data-ask]::after{content:"";position:absolute;right:-2px;bottom:-2px;width:7px;height:7px;border-radius:50%;background:#e3a008;box-shadow:0 0 0 1.5px var(--bt-main,#fff)} ++.bt-mw-ask{color:#b7791f;flex:none;white-space:nowrap} ++body[data-ds-dark-theme] .bt-mw-ask{color:#f0b84a} ++.bt-mw-member{padding:0 6px 8px 42px;display:flex;flex-direction:column;gap:6px} ++.bt-mw-state{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin-top:-4px} ++.bt-mw-card{display:flex;flex-direction:column;gap:4px;padding:10px 12px;border-radius:12px;background:var(--bt-hover);font-size:12px;line-height:17px;color:var(--bt-ink-2)} ++.bt-mw-tool{font-weight:600;color:var(--bt-ink)} ++.bt-mw-text{color:var(--bt-ink);overflow-wrap:anywhere} ++.bt-mw-reason{overflow-wrap:anywhere;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden} ++.bt-mw-code{display:block;font:11px/16px ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;color:var(--bt-ink);white-space:pre-wrap;overflow-wrap:anywhere;max-height:120px;overflow:auto} ++.bt-mw-actions{display:flex;flex-wrap:wrap;justify-content:flex-end;gap:6px;margin-top:4px} ++.bt-mw-actions>button{height:28px;padding:0 12px;font-size:12px} ++.bt-mw-actions>button:disabled{opacity:.5;cursor:default} ++@keyframes bt-mw-in{from{opacity:0;transform:translateY(4px)}} ++@media (prefers-reduced-motion:reduce){.bt-mw-row{animation:none}} + `; + +-// src/client/turn-reasoning.js +-function turnReasoning(steps, current) { +- const members = steps.length ? steps : [current]; +- if (members.find((step) => stepReasoning(step) !== "")?.step !== current.step) return ""; +- return members.filter((step) => !thinkingLive(step)).map(stepReasoning).filter(Boolean).join("\n\n"); ++// src/shared/identity.js ++var nameKey = (value) => stripInvisible(String(value ?? "").normalize("NFC")).trim().toLowerCase().normalize("NFC"); ++var drawnKey = (value) => nameKey(value).replace(NOT_DRAWN, ""); ++ ++// src/shared/task-board.js ++var COLUMNS = ["not-started", "in-progress", "done"]; ++var PRIORITIES = ["urgent", "high", "normal", "low"]; ++var COLUMN_OF = { ++ open: "not-started", ++ claimed: "not-started", ++ working: "in-progress", ++ blocked: "in-progress", ++ "result-ready": "in-progress", ++ accepted: "done", ++ cancelled: "done", ++ failed: "done" ++}; ++function columnOf(task) { + return COLUMN_OF[task?.status] ?? "not-started"; +} +function occupiesSlot(task) { @@ -10923,68 +11740,55 @@ diff --git a/client.js b/client.js + const value = task?.progress; + if (typeof value !== "number" || !Number.isFinite(value)) return columnOf(task) === "done" && task?.status !== "cancelled" && task?.status !== "failed" ? 100 : 0; + return Math.max(0, Math.min(100, Math.round(value))); -+} -+ + } +-var texts = (step) => step.blocks.filter((block) => block.kind === "text" && block.text.trim() !== ""); +-var thinkingLive = (step) => step.status === "running" && texts(step).length === 0 && step.blocks.some((block) => block.kind === "reasoning"); +-var stepReasoning = (step) => step.blocks.filter((block) => block.kind === "reasoning").map((block) => block.text).join("\n").trim(); + +-// src/client/cells.js +-var import_react6 = require("react"); +-var import_react_dom = require("react-dom"); +-var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives"); +-var mdLabels = () => ({ code: { copyLabel: t("Copy"), copiedLabel: t("Copied") }, footnotes: t("Footnotes") }); +-function Bubbles({ texts: texts2, roster, selfId, actions, streaming, sessionId, msgKey, useUi, lead, mentions }) { +- const onClick = (event) => { +- const target = mentionTarget(event); +- if (target === null) return; +- event.preventDefault(); +- event.stopPropagation(); +- actions.openSession(target); +// src/client/read-only.js +var readOnlySaid = (roster) => typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; -+function readOnlyLine(h50, roster, actions, { key, className, style, reload = true } = {}) { ++function readOnlyLine(h53, roster, actions, { key, className, style, reload = true } = {}) { + if (!readOnlySaid(roster)) return null; -+ return h50( - "div", -- { className: "bt-event" }, -- (0, import_react6.createElement)("button", { type: "button", title: result, onClick: () => actions.openMemory(target.id) }, (0, import_react6.createElement)(MemoryIcon), label) ++ return h53( ++ "div", + { key, className: ["bt-readonly-line", className].filter(Boolean).join(" "), style }, -+ h50("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)), -+ reload ? h50("button", { ++ h53("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)), ++ reload ? h53("button", { + type: "button", + className: "bt-read-only-reload", + onClick: () => { + void Promise.resolve(actions?.reloadTeam?.()).catch((error) => actions?.reportError?.(error, "reload")); + } + }, t("Reload")) : null - ); - } --function PartLine({ time }) { -- return (0, import_react6.createElement)("div", { className: "bt-part-line", role: "separator" }, Number.isFinite(time) ? (0, import_react6.createElement)("span", null, dayLabel(time)) : null); ++ ); ++} +function reloadReceipt(before, after) { + if (!readOnlySaid(before)) return null; + return readOnlySaid(after) ? t("Reloaded just now — this window is still read-only.") : t("Reloaded — this window can write again."); - } --var scrollParent = (node) => { -- for (let at = node.parentElement; at; at = at.parentElement) { -- if (/(auto|scroll)/.test(getComputedStyle(at).overflowY)) return at; -- } -- return null; ++} + +// src/client/inbox.js -+var import_react14 = require("react"); ++var import_react16 = require("react"); +var KEEP_MS = 7 * 864e5; +var POLL_MS3 = 3e4; +var DONE_MAX = 20; +var FEEDBACK_MS = 5e3; -+var line = (d) => (0, import_react14.createElement)("path", { d }); ++var line = (d) => (0, import_react16.createElement)("path", { d }); +var icon = (...paths) => function StatusIcon() { -+ return (0, import_react14.createElement)("svg", { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, paths.map(line)); - }; --function EarlierParts({ sessionId, roster, actions }) { -- const [view, setView] = (0, import_react6.useState)({ items: [], cursor: void 0, loading: true, failed: false, startedAt: null }); -- const top = (0, import_react6.useRef)(null); -- const busy = (0, import_react6.useRef)(false); -- const alive = (0, import_react6.useRef)(true); -- const restore = (0, import_react6.useRef)(null); -- const load = (cursor) => { -- if (busy.current) return; -- busy.current = true; -- setView((current) => ({ ...current, loading: true, failed: false })); -- actions.earlier(sessionId, cursor).then((page) => { -- busy.current = false; -- if (!alive.current) return; -- const scroller = top.current && scrollParent(top.current); -- if (scroller) restore.current = { scroller, fromEnd: scroller.scrollHeight - scroller.scrollTop }; -- setView((current) => ({ items: [...page.items, ...current.items], cursor: page.cursor, loading: false, failed: false, startedAt: page.startedAt ?? current.startedAt })); -- }, () => { -- busy.current = false; -- if (alive.current) setView((current) => ({ ...current, loading: false, failed: true })); ++ return (0, import_react16.createElement)("svg", { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, paths.map(line)); ++}; +var RING = "M10 3.25a6.75 6.75 0 1 1 0 13.5 6.75 6.75 0 0 1 0-13.5z"; +var InboxIcon = icon("M3.5 11.5l1.9-6.1A1.5 1.5 0 0 1 6.83 4.35h6.34a1.5 1.5 0 0 1 1.43 1.05l1.9 6.1", "M3.5 11.5v3.25a1.5 1.5 0 0 0 1.5 1.5h10a1.5 1.5 0 0 0 1.5-1.5V11.5", "M3.5 11.5h3.75l1 1.75h3.5l1-1.75h3.75"); +var AskIcon = icon(RING, "M10 6.75v3.75", "M10 13.25h.01"); @@ -11018,8 +11822,8 @@ diff --git a/client.js b/client.js + for (const listener of taskListeners) listener(sharedTasks); +} +function useTasks(actions) { -+ const [tasks, setTasks] = (0, import_react14.useState)(sharedTasks); -+ (0, import_react14.useEffect)(() => { ++ const [tasks, setTasks] = (0, import_react16.useState)(sharedTasks); ++ (0, import_react16.useEffect)(() => { + taskListeners.add(setTasks); + let stopped = false; + let timer; @@ -11028,141 +11832,13 @@ diff --git a/client.js b/client.js + }).catch(() => { + }).finally(() => { + if (!stopped) timer = setTimeout(load, POLL_MS3); - }); -- }; -- (0, import_react6.useEffect)(() => { -- alive.current = true; -- load(void 0); ++ }); + load(); - return () => { -- alive.current = false; ++ return () => { + stopped = true; + clearTimeout(timer); + taskListeners.delete(setTasks); - }; -- }, [sessionId]); -- (0, import_react6.useLayoutEffect)(() => { -- const pending = restore.current; -- restore.current = null; -- if (pending) pending.scroller.scrollTop = pending.scroller.scrollHeight - pending.fromEnd; -- }, [view.items]); -- (0, import_react6.useEffect)(() => { -- const node = top.current; -- if (!node || view.loading || view.failed || !view.cursor || typeof IntersectionObserver !== "function") return void 0; -- const observer = new IntersectionObserver((entries2) => { -- if (entries2.some((entry) => entry.isIntersecting)) load(view.cursor); -- }, { root: scrollParent(node), rootMargin: "600px 0px 0px 0px" }); -- observer.observe(node); -- return () => observer.disconnect(); -- }, [view.cursor, view.loading, view.failed]); -- const selfId = roster.byId[sessionId]?.id; -- const rows = []; -- for (const item of view.items) { -- const last = rows.at(-1); -- if (item.kind === "bot" && last?.kind === "bot") last.texts.push(item.text); -- else rows.push(item.kind === "bot" ? { kind: "bot", texts: [item.text] } : item); -- } -- return (0, import_react6.createElement)( -- "div", -- { className: "bt-earlier", role: "feed", "aria-label": t("Earlier messages"), "aria-busy": view.loading }, -- (0, import_react6.createElement)( -- "div", -- { ref: top, className: "bt-earlier-top" }, -- view.loading ? (0, import_react6.createElement)(Shimmer, null, t("Loading earlier messages…")) : view.failed ? (0, import_react6.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Couldn’t load earlier messages · Retry")) : view.cursor ? (0, import_react6.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Load earlier")) : null -- ), -- rows.map((row, index) => { -- const key = rows.length - index; -- switch (row.kind) { -- case "divider": -- return (0, import_react6.createElement)(PartLine, { key, time: row.time }); -- case "user": -- return (0, import_react6.createElement)("div", { key, className: "bt-urow" }, (0, import_react6.createElement)( -- "div", -- { className: "bt-ububble" }, -- row.text ? (0, import_react6.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: row.text, labels: mdLabels(), variant: "compact" }) : null, -- row.images ? (0, import_react6.createElement)("span", { className: "bt-uimages" }, row.images === 1 ? t("1 image") : t("{count} images", { count: row.images })) : null -- )); -- case "answer": -- return (0, import_react6.createElement)(AnsweredCell, { key, node: { data: row } }); -- case "bot": -- return (0, import_react6.createElement)(Bubbles, { key, texts: row.texts, roster, selfId, actions }); -- case "event": { -- if (row.role === "report") return (0, import_react6.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_react6.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => { -- if (selfId && other.id) actions.openExchange(selfId, other.id); -- }, whole: true }); -- } -- default: -- return null; -- } -- }), -- (0, import_react6.createElement)(PartLine, { time: view.startedAt }) -- ); --} --function TriggerCell({ node, sessionId, useRoster, useSessions, useTurnClock, useUi, actions }) { -- const roster = useRoster((value) => value); -- const data = node.data; -- const source = data.source !== null && typeof data.source === "object" ? data.source : {}; -- const selfId = roster.byId[sessionId]?.id ?? sessionId; -- const deferred = source.kind === "bot" && source.deferred === true; -- const relayed = isRelayContext(data); -- const turn = node.location?.turn?.turn ?? data.turn; -- (0, import_react6.useLayoutEffect)(() => { -- if (relayed) actions.noteTurnPeer(sessionId, turn, source.senderSessionId); -- }, [relayed, sessionId, turn, source.senderSessionId]); -- const order = useSessions((list) => { -- const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline; -- return Array.isArray(outline) ? outline.map((entry) => entry.turn).join(",") : ""; -- }); -- const peers = useTurnClock((state) => { -- if (!relayed) return ""; -- const turns = state[sessionId] ?? {}; -- return Object.keys(turns).filter((key) => turns[key].peer !== void 0).map((key) => `${key}:${turns[key].peer}`).join(","); -- }); -- const visit = useUi((state) => state.visits?.[sessionId]); -- const hiddenTurns = roster.exchangeTurns[sessionId]; -- const unreadOpening = useTurnClock((state) => { -- const first = openingTurn(state[sessionId], order, hiddenTurns); -- return first?.turn === turn && unseenSince(visit, first.start) ? clockLabel(first.start) : ""; -- }); -- const body = triggerBody(); -- return unreadOpening ? (0, import_react6.createElement)(import_react6.Fragment, null, (0, import_react6.createElement)("div", { className: "bt-open-new" }, (0, import_react6.createElement)(NewDivider), (0, import_react6.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_react6.createElement)(EarlierParts, { sessionId, roster, actions }); -- if (source.role === "kickoff" || source.role === "room") return null; -- if (source.role === "secret" || deferred) return null; -- if (source.role === "post") { -- if (source.failed !== void 0 || source.resumed === true || source.stopped === true) return null; -- const room2 = roster.roomsById[sessionId]; -- const poster = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; -- return (0, import_react6.createElement)(GroupMessage, { bot: poster, text: stripHeader(contentText(data.content)), room: room2, roster, actions, msgKey: `${sessionId}:${data.turn}:post`, useUi }); -- } -- if (source.role === "report") { -- return (0, import_react6.createElement)(GroupEvent, { prefix: t("Replies from"), room: roster.roomsById[source.roomId], name: t("a group chat"), roster, actions }); -- } -- if (source.role === "resume" || source.resumed === true) return (0, import_react6.createElement)("div", { className: "bt-event" }, t("Picked up its work after a restart")); -- if (source.role === "retry" || source.retried === true) return (0, import_react6.createElement)("div", { className: "bt-event" }, t("Asked to make the tool call it wrote as text")); -- const run = relayed ? commRunOf( -- order.split(",").filter(Boolean).map(Number), -- Object.fromEntries(peers.split(",").filter(Boolean).map((pair) => [Number(pair.slice(0, pair.indexOf(":"))), pair.slice(pair.indexOf(":") + 1)])), -- turn, -- hiddenTurns -- ) : null; -- if (run === "folded") return null; -- const sender = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; -- const count = run?.count ?? (isHiddenTurn(roster, sessionId, turn) ? 2 : 1); -- const bots = [sender]; -- for (const peer of (run?.peerIds ?? []).map((id) => roster.byId[id]).filter(Boolean)) { -- if (!bots.some((bot) => bot.id === peer.id)) bots.push(peer); -- } -- return (0, import_react6.createElement)(EventLine, { -- prefix: source.role === "stopped" ? t("Stopped by") : count > 1 ? t("{count} messages with", { count }) : t("Message from"), -- bots, -- onOpen: (bot) => actions.openExchange(selfId, bot.id), -- whole: true ++ }; + }, []); + return tasks; +} @@ -11175,25 +11851,15 @@ diff --git a/client.js b/client.js + for (const listener of workflowListeners) listener(sharedWorkflows); +} +function useWorkflows(actions) { -+ const [workflows, setWorkflows] = (0, import_react14.useState)(sharedWorkflows); -+ (0, import_react14.useEffect)(() => { ++ const [workflows, setWorkflows] = (0, import_react16.useState)(sharedWorkflows); ++ (0, import_react16.useEffect)(() => { + workflowListeners.add(setWorkflows); + if (workflowPoll === null && typeof actions?.workflowState === "function") { + const load = () => Promise.resolve(actions.workflowState()).then(publishWorkflows, () => { - }); ++ }); + load(); + workflowPoll = setInterval(load, POLL_MS3); - } -- if (source.kind === "schedule") { -- const prompts = reminderPrompts(contentText(data.content)); -- return (0, import_react6.createElement)("div", { className: "bt-event" }, prompts.length > 0 ? t("Scheduled task: {text}", { text: prompts.join(" · ").slice(0, 80) }) : t("Routine started")); -- } -- if (source.kind === "user-question-reply") return null; -- return (0, import_react6.createElement)("div", { className: "bt-event" }, contentText(data.content).slice(0, 80) || t("Update")); -- } --} --function NewDivider() { -- return (0, import_react6.createElement)("div", { className: "bt-new-sep", role: "separator", "aria-label": t("New messages") }, (0, import_react6.createElement)("span", null, t("New"))); ++ } + return () => { + workflowListeners.delete(setWorkflows); + if (workflowListeners.size === 0 && workflowPoll !== null) { @@ -11203,22 +11869,7 @@ diff --git a/client.js b/client.js + }; + }, []); + return workflows; - } --function TurnProcessCell({ node, sessionId, turnProcess, useRoster, useUi, useTurnClock, actions }) { -- const open = turnProcess === void 0 || !turnProcess.foldable || turnProcess.open; -- (0, import_react6.useEffect)(() => { -- if (!open) turnProcess.setOpen(true); -- }, [open, turnProcess]); -- const turn = node?.location?.turn?.turn ?? node?.data?.turn; -- const start = node?.location?.turn?.start?.time; -- const hidden = useRoster((roster) => isHiddenTurn(roster, sessionId, turn)); -- (0, import_react6.useEffect)(() => { -- actions.noteTurnTime(sessionId, turn, "first", start); -- }, [sessionId, turn, start]); -- const visit = useUi((state) => state.visits?.[sessionId]); -- const fresh = useTurnClock((state) => { -- const own = state[sessionId]?.[turn]; -- return !hidden && typeof visit?.seen === "number" && own?.first !== void 0 && own.first <= visit.seen && own.end !== void 0 && own.end > visit.seen && own.end <= visit.entered; ++} +var ownBot = (roster, id) => { + const bot = roster.byId?.[id]; + if (bot === void 0 || bot.remote) return void 0; @@ -11321,22 +11972,7 @@ diff --git a/client.js b/client.js + title: count === 1 ? t("1 message waits for your approval") : t("{count} messages wait for your approval", { count }), + hint: t("Approve it in the chat"), + ...extra - }); -- return fresh ? (0, import_react6.createElement)(NewDivider) : null; --} --function Nothing() { -- return null; --} --var SEPARATOR_GAP_MS = 30 * 60 * 1e3; --function clockLabel(time, now = Date.now()) { -- const date = new Date(time); -- const midnight = (value) => new Date(value.getFullYear(), value.getMonth(), value.getDate()).getTime(); -- const days = Math.round((midnight(new Date(now)) - midnight(date)) / 864e5); -- const clock4 = date.toLocaleTimeString(dateLocale(), { hour: "numeric", minute: "2-digit" }); -- if (days === 0) return t("Today {time}", { time: clock4 }); -- if (days === 1) return t("Yesterday {time}", { time: clock4 }); -- const sameYear = date.getFullYear() === new Date(now).getFullYear(); -- return `${date.toLocaleDateString(dateLocale(), { weekday: "short", month: "short", day: "numeric", ...sameYear ? {} : { year: "numeric" } })} ${clock4}`; ++ }); + for (const bot of roster.bots ?? []) { + const count = bot.pendingCount ?? 0; + if (count <= 0) continue; @@ -11500,20 +12136,14 @@ diff --git a/client.js b/client.js + return Promise.resolve(actions.answerApproval(card.approval.id, choice)); + } + return void 0; - } --function nextTurnStart(turns, turn) { -- let next; -- for (const key in turns) { -- const candidate = Number(key); -- if (candidate > turn && turns[key].first !== void 0 && (next === void 0 || candidate < next)) next = candidate; ++} +var answerSlots = /* @__PURE__ */ new Map(); +var answerSlot = (id) => { + let slot = answerSlots.get(id); + if (slot === void 0) { + slot = { text: "", picked: [] }; + answerSlots.set(id, slot); - } -- return next === void 0 ? void 0 : turns[next].first; ++ } + return slot; +}; +var resultSlots = /* @__PURE__ */ new Map(); @@ -11526,7 +12156,7 @@ diff --git a/client.js b/client.js + return slot; +}; +function ResultActions({ card, busy, onAnswer }) { -+ const [, redraw] = (0, import_react14.useState)(0); ++ const [, redraw] = (0, import_react16.useState)(0); + if (!(card.kind === "task" && card.status === "result")) return null; + const slot = resultSlot(card.id); + const send = () => { @@ -11534,10 +12164,10 @@ diff --git a/client.js b/client.js + if (busy || note === "") return; + onAnswer(card, { note }); + }; -+ return (0, import_react14.createElement)( ++ return (0, import_react16.createElement)( + "span", + { className: "bt-inbox-result" }, -+ slot.open ? (0, import_react14.createElement)("input", { ++ slot.open ? (0, import_react16.createElement)("input", { + type: "text", + className: "bt-inbox-answer-text", + value: slot.text, @@ -11554,23 +12184,15 @@ diff --git a/client.js b/client.js + send(); + } + }) : null, -+ slot.open ? (0, import_react14.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: send }, t("Send it back")) : (0, import_react14.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { ++ slot.open ? (0, import_react16.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: send }, t("Send it back")) : (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { + slot.open = true; + redraw((count) => count + 1); + } }, t("Send back")), -+ (0, import_react14.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "accept") }, t("Accept")) ++ (0, import_react16.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "accept") }, t("Accept")) + ); - } --function openingTurn(turns, firstTurns, hiddenTurns) { -- if (!turns || !firstTurns) return null; -- const start = nextTurnStart(turns, -Infinity); -- if (start === void 0) return null; -- const turn = Number(Object.keys(turns).filter((key) => turns[key].first === start)[0]); -- const listed = firstTurns.split(",").map(Number); -- const earlier = listed.filter((entry) => entry < turn); -- return listed.includes(turn) && earlier.every((entry) => hiddenTurns?.includes(entry)) ? { turn, start } : null; ++} +function AnswerFields({ card, busy, onAnswer }) { -+ const [, redraw] = (0, import_react14.useState)(0); ++ const [, redraw] = (0, import_react16.useState)(0); + const question = card.kind === "question"; + const taskInput = card.kind === "task" && card.status === "input" && typeof card.task?.inputRequest?.id === "string"; + if (!question && !taskInput) return null; @@ -11597,11 +12219,13 @@ diff --git a/client.js b/client.js + } + slot.picked = slot.picked.includes(label) ? slot.picked.filter((item) => item !== label) : [...slot.picked, label]; + redraw((count) => count + 1); -+ }; -+ return (0, import_react14.createElement)( + }; +- const reactions = useUi ? useUi((state) => msgKey ? state.reactions?.[msgKey] ?? null : null) : null; +- return (0, import_react6.createElement)( ++ return (0, import_react16.createElement)( + "span", + { className: "bt-inbox-answer" }, -+ ...options.map((option, index) => (0, import_react14.createElement)("button", { ++ ...options.map((option, index) => (0, import_react16.createElement)("button", { + key: `${option.label}-${index}`, + type: "button", + className: "bt-soft bt-soft-sm", @@ -11609,7 +12233,7 @@ diff --git a/client.js b/client.js + "aria-pressed": multi ? slot.picked.includes(option.label) : void 0, + onClick: () => choose(option.label) + }, option.label)), -+ (0, import_react14.createElement)("input", { ++ (0, import_react16.createElement)("input", { + type: "text", + className: "bt-inbox-answer-text", + value: slot.text, @@ -11626,32 +12250,9 @@ diff --git a/client.js b/client.js + send(); + } + }), -+ (0, import_react14.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: send }, t("Submit")) ++ (0, import_react16.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: send }, t("Submit")) + ); - } --var unseenSince = (visit, time) => typeof visit?.seen === "number" && time > visit.seen && time <= visit.entered; --function TurnTailCell({ turn: location2, sessionId, useTurnClock, useUi, actions }) { -- const turn = location2.turn; -- const time = location2.end.time; -- (0, import_react6.useEffect)(() => { -- actions.noteTurnTime(sessionId, turn, "end", time); -- }, [sessionId, turn, time]); -- const label = useTurnClock((state) => { -- const start = nextTurnStart(state[sessionId] ?? {}, turn); -- return start !== void 0 && start - time >= SEPARATOR_GAP_MS ? clockLabel(start) : ""; -- }); -- const visit = useUi((state) => state.visits?.[sessionId]); -- const fresh = useTurnClock((state) => { -- if (typeof visit?.seen !== "number" || time > visit.seen) return false; -- const start = nextTurnStart(state[sessionId] ?? {}, turn); -- return start !== void 0 && start > visit.seen && start <= visit.entered; -- }); -- if (!label && !fresh) return null; -- return (0, import_react6.createElement)( -- import_react6.Fragment, -- null, -- label ? (0, import_react6.createElement)("div", { className: "bt-time-sep", role: "separator" }, label) : null, -- fresh ? (0, import_react6.createElement)(NewDivider) : null ++} +function InboxRow({ wide, useRoster, useWork, useUi, actions }) { + const roster = useRoster((value) => value); + const work = useWork ? useWork((value) => value) : {}; @@ -11660,7 +12261,7 @@ diff --git a/client.js b/client.js + const workflows = useWorkflows(actions); + const count = needsCount(roster, work, tasks, void 0, workflows); + const label = count > 0 ? t("Inbox, {count} need you", { count }) : t("Inbox"); -+ return (0, import_react14.createElement)( ++ return (0, import_react16.createElement)( + "button", + { + type: "button", @@ -11671,77 +12272,19 @@ diff --git a/client.js b/client.js + "aria-expanded": open, + onClick: () => actions.openInbox() + }, -+ (0, import_react14.createElement)("span", { className: "bt-inbox-mark" }, (0, import_react14.createElement)(InboxIcon)), -+ wide ? (0, import_react14.createElement)("span", { className: "bt-inbox-label" }, t("Inbox")) : null, -+ count > 0 ? (0, import_react14.createElement)("span", { className: "bt-inbox-count", "aria-hidden": true }, count > 99 ? "99+" : String(count)) : null - ); - } --function Shimmer({ children }) { -- return (0, import_react6.createElement)("span", { className: "bt-shimmer" }, children); ++ (0, import_react16.createElement)("span", { className: "bt-inbox-mark" }, (0, import_react16.createElement)(InboxIcon)), ++ wide ? (0, import_react16.createElement)("span", { className: "bt-inbox-label" }, t("Inbox")) : null, ++ count > 0 ? (0, import_react16.createElement)("span", { className: "bt-inbox-count", "aria-hidden": true }, count > 99 ? "99+" : String(count)) : null ++ ); ++} +function Status({ status }) { + const { label, tone, Icon } = STATUSES[status]; -+ return (0, import_react14.createElement)("span", { className: "bt-inbox-status", "data-tone": tone }, (0, import_react14.createElement)(Icon), (0, import_react14.createElement)("span", null, t(label))); - } --var PHRASES = { -- thinking: ["Thinking about it", "Weighing the options", "Working out a plan", "Sorting out the details"], -- working: ["On it", "Busy with it", "Moving ahead", "Taking care of it", "Making headway"] --}; --var TOOL_PHRASES = [ -- [/web_?search|search_?web/i, "Searching online"], -- [/fetch|browse|browser|web/i, "Reading a page"], -- [/shell|bash|pwsh|powershell|exec|command|terminal/i, "Running shell commands"], -- [/^(read|view|cat)\b|read_/i, "Opening a file"], -- [/grep|glob|list_dir|^ls$|find|search/i, "Looking through files"], -- [/write|edit|patch|apply|replace/i, "Writing changes"], -- [/image|photo|draw/i, "Working on an image"] --]; --var GROUP_PHRASES = { create_group: "Creating a group", update_group: "Updating the group", delete_group: "Deleting the group", post_to_group: "Posting in the group" }; --function toolActivity(name, arg, findBot, self) { -- switch (name) { -- case "ask_user": -- return null; -- case "request_secret": -- return null; -- case "list_secrets": -- return { label: t("Checking the keys"), state: "searching" }; -- case "ask_user_question": -- return { label: t("Waiting for your answer"), state: "alert" }; -- case "group_relay": -- return { relay: true, state: "orbit" }; -- case "message_bot": { -- const target = findBot(arg("to")); -- return { label: target ? t("Asking {name}", { name: target.name }) : t("Asking another Bot"), state: "sending" }; -- } -- case "stop_bot": { -- const target = findBot(arg("bot")); -- return { label: target ? t("Stopping {name}", { name: target.name }) : t("Stopping another Bot"), state: "sending" }; -- } -- case "create_bot": -- return { label: t("Creating {name}", { name: arg("name") ?? t("a Bot") }), state: "sending" }; -- case "update_bot": { -- const target = findBot(arg("name")) ?? findBot(arg("bot")) ?? (arg("bot") ? void 0 : self); -- return { label: t("Updating {name}", { name: target?.name ?? t("a Bot") }), state: "sending" }; -- } -- case "list_bots": -- return { label: t("Checking the team"), state: "searching" }; -- case "read_group_chat": -- return { label: t("Reading {name}", { name: arg("group") ?? t("a group chat") }), state: "searching" }; -- case "read_own_chat": -- return { label: t("Looking back through the chat"), state: "searching" }; -- case "remember": -- return { label: t("Saving to memory"), state: "working" }; -- case "forget": -- return { label: t("Updating memory"), state: "working" }; -- case "recall": -- return { label: t("Checking memory"), state: "searching" }; -- default: -- if (GROUP_PHRASES[name]) return { label: t(GROUP_PHRASES[name]), state: "sending" }; -- const phrase = TOOL_PHRASES.find(([pattern]) => pattern.test(name))?.[1]; -- return { label: phrase ? t(phrase) : null, state: toolState(name) }; ++ return (0, import_react16.createElement)("span", { className: "bt-inbox-status", "data-tone": tone }, (0, import_react16.createElement)(Icon), (0, import_react16.createElement)("span", null, t(label))); ++} +function whenText(card, now) { + if (card.status === "running" || card.status === "task") { + return typeof card.since === "number" && now - card.since >= 6e4 ? t("for {time}", { time: elapsedLabel(now - card.since) }) : t("just started"); - } ++ } + return typeof card.at === "number" ? relativeShort(card.at) : ""; +} +function InboxCard({ card, roster, now, busy, error, onAnswer, onOpen }) { @@ -11755,73 +12298,124 @@ diff --git a/client.js b/client.js + const target = card.kind === "task" ? card.task?.target?.href : void 0; + const writeBack = card.kind === "task" && card.task?.writeBack?.state === "failed" ? card.task.writeBack : void 0; + const unconfirmed = card.kind === "task" && card.task?.writeBack?.state === "unconfirmed" ? card.task.writeBack : void 0; -+ return (0, import_react14.createElement)( -+ "div", -+ { className: "bt-inbox-card", role: "group", "aria-label": `${t(STATUSES[card.status].label)}: ${card.title}`, "data-status": card.status, "data-run": card.kind === "workflow" ? card.run?.id : void 0 }, -+ (0, import_react14.createElement)("span", { className: "bt-inbox-ava" }, card.bot ? (0, import_react14.createElement)(BotAvatar, { bot: card.bot, size: 28, badge: false, live: false }) : card.room ? (0, import_react14.createElement)(RoomAvatar, { room: card.room, roster, size: 28 }) : null), -+ (0, import_react14.createElement)( -+ "span", -+ { className: "bt-inbox-copy" }, -+ (0, import_react14.createElement)( -+ "span", -+ { className: "bt-inbox-top" }, -+ (0, import_react14.createElement)(Status, { status: card.status }), -+ (0, import_react14.createElement)("span", { className: "bt-inbox-meta", title: meta }, meta) -+ ), -+ (0, import_react14.createElement)("span", { className: "bt-inbox-title", title: card.title }, card.title), -+ card.calls > 0 ? (0, import_react14.createElement)("span", { className: "bt-inbox-calls" }, t("{count} tool calls", { count: card.calls })) : null, -+ card.reason ? (0, import_react14.createElement)("span", { className: "bt-inbox-reason", title: card.reason }, failureSentence(card.reason, t)) : null, -+ card.activity ? (0, import_react14.createElement)("span", { className: "bt-inbox-activity", title: card.activity }, t("Latest: {text}", { text: card.activity })) : null, -+ card.hint ? (0, import_react14.createElement)("span", { className: "bt-inbox-hint" }, card.hint) : null, -+ evidence.length > 0 ? (0, import_react14.createElement)("span", { className: "bt-inbox-evidence" }, ...evidence.map((href, index) => (0, import_react14.createElement)("a", { -+ key: `${href}-${index}`, -+ href, -+ target: "_blank", -+ rel: "noreferrer noopener", -+ className: "bt-inbox-evidence-link", -+ title: href -+ }, href))) : null, -+ sentBack ? (0, import_react14.createElement)("span", { className: "bt-inbox-reason", title: sentBack }, t("Sent back: {note}", { note: sentBack })) : null, -+ target ? (0, import_react14.createElement)("span", { className: "bt-inbox-evidence" }, (0, import_react14.createElement)("a", { -+ href: target, -+ target: "_blank", -+ rel: "noreferrer noopener", -+ className: "bt-inbox-evidence-link bt-inbox-target", -+ title: target -+ }, t("Comment goes to {target}", { target: target.replace(/^https:\/\/github\.com\//, "") }))) : null, -+ writeBack ? (0, import_react14.createElement)("span", { className: "bt-inbox-writeback", role: "alert", title: writeBack.error }, t("Could not comment on {target}: {error}", { target: writeBack.target, error: writeBack.error })) : null, -+ unconfirmed ? (0, import_react14.createElement)("span", { className: "bt-inbox-writeback", title: unconfirmed.target }, t("Could not confirm the comment on {target} went out", { target: unconfirmed.target })) : null, -+ ...locked ? [] : [(0, import_react14.createElement)(AnswerFields, { card, busy, onAnswer }), (0, import_react14.createElement)(ResultActions, { card, busy, onAnswer })], -+ error ? (0, import_react14.createElement)("span", { className: "bt-inbox-error", role: "alert" }, error) : null -+ ), -+ (0, import_react14.createElement)( -+ "span", -+ { className: "bt-inbox-actions" }, -+ answerable ? (0, import_react14.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "reject") }, t("Reject")) : null, -+ answerable ? (0, import_react14.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "allow") }, t("Allow once")) : null, -+ ...(answerable ? alwaysChoices(card.approval, card.bot) : []).map(([choice, label]) => (0, import_react14.createElement)("button", { key: choice, type: "button", className: "bt-soft bt-soft-sm", "data-choice": choice, disabled: busy, onClick: () => onAnswer(card, choice) }, t(label))), -+ (0, import_react14.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "aria-label": who ? t("Open {name}", { name: card.room?.name ?? who }) : t("Open"), onClick: () => onOpen(card) }, t("Open")) -+ ) -+ ); - } --function workPhrase(tool) { -- if (!tool) return t("Thinking about it"); -- return toolActivity(tool, () => void 0, () => void 0)?.label ?? t("On it"); ++ return (0, import_react16.createElement)( + "div", +- { className: "bt-astack", "data-lead": lead ? "" : void 0, onClickCapture: onClick }, +- texts2.map((text, index) => { +- const key = msgKey ? `${msgKey}:${index}` : void 0; +- const picked = key ? reactions?.[index] ?? [] : []; +- const last = index === texts2.length - 1; +- const live = streaming && last; +- return (0, import_react6.createElement)( +- "div", +- { key: index, className: "bt-msg" }, +- (0, import_react6.createElement)( +- "div", +- { className: "bt-msg-line" }, +- lead && last ? lead : null, +- (0, import_react6.createElement)( +- "div", +- { className: "bt-bubble" }, +- (0, import_react6.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: linkMentions(text, roster.bots, selfId), streaming: live, labels: mdLabels(), variant: "compact", fileMentions: mentions }) +- ), +- live ? null : (0, import_react6.createElement)(MessageTools, { text, name: roster.byId[selfId]?.name ?? t("Bot"), sessionId, react: key ? (emoji) => actions.toggleReaction(msgKey, index, emoji) : void 0, actions }) +- ), +- picked.length ? (0, import_react6.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react6.createElement)("button", { +- key: emoji, +- type: "button", +- className: "bt-react", +- "aria-label": t("Remove reaction {emoji}", { emoji }), +- onClick: () => actions.toggleReaction(msgKey, index, emoji) +- }, emoji))) : null +- ); +- }) ++ { className: "bt-inbox-card", role: "group", "aria-label": `${t(STATUSES[card.status].label)}: ${card.title}`, "data-status": card.status, "data-run": card.kind === "workflow" ? card.run?.id : void 0 }, ++ (0, import_react16.createElement)("span", { className: "bt-inbox-ava" }, card.bot ? (0, import_react16.createElement)(BotAvatar, { bot: card.bot, size: 28, badge: false, live: false }) : card.room ? (0, import_react16.createElement)(RoomAvatar, { room: card.room, roster, size: 28 }) : null), ++ (0, import_react16.createElement)( ++ "span", ++ { className: "bt-inbox-copy" }, ++ (0, import_react16.createElement)( ++ "span", ++ { className: "bt-inbox-top" }, ++ (0, import_react16.createElement)(Status, { status: card.status }), ++ (0, import_react16.createElement)("span", { className: "bt-inbox-meta", title: meta }, meta) ++ ), ++ (0, import_react16.createElement)("span", { className: "bt-inbox-title", title: card.title }, card.title), ++ card.calls > 0 ? (0, import_react16.createElement)("span", { className: "bt-inbox-calls" }, t("{count} tool calls", { count: card.calls })) : null, ++ card.reason ? (0, import_react16.createElement)("span", { className: "bt-inbox-reason", title: card.reason }, failureSentence(card.reason, t)) : null, ++ card.activity ? (0, import_react16.createElement)("span", { className: "bt-inbox-activity", title: card.activity }, t("Latest: {text}", { text: card.activity })) : null, ++ card.hint ? (0, import_react16.createElement)("span", { className: "bt-inbox-hint" }, card.hint) : null, ++ evidence.length > 0 ? (0, import_react16.createElement)("span", { className: "bt-inbox-evidence" }, ...evidence.map((href, index) => (0, import_react16.createElement)("a", { ++ key: `${href}-${index}`, ++ href, ++ target: "_blank", ++ rel: "noreferrer noopener", ++ className: "bt-inbox-evidence-link", ++ title: href ++ }, href))) : null, ++ sentBack ? (0, import_react16.createElement)("span", { className: "bt-inbox-reason", title: sentBack }, t("Sent back: {note}", { note: sentBack })) : null, ++ target ? (0, import_react16.createElement)("span", { className: "bt-inbox-evidence" }, (0, import_react16.createElement)("a", { ++ href: target, ++ target: "_blank", ++ rel: "noreferrer noopener", ++ className: "bt-inbox-evidence-link bt-inbox-target", ++ title: target ++ }, t("Comment goes to {target}", { target: target.replace(/^https:\/\/github\.com\//, "") }))) : null, ++ writeBack ? (0, import_react16.createElement)("span", { className: "bt-inbox-writeback", role: "alert", title: writeBack.error }, t("Could not comment on {target}: {error}", { target: writeBack.target, error: writeBack.error })) : null, ++ unconfirmed ? (0, import_react16.createElement)("span", { className: "bt-inbox-writeback", title: unconfirmed.target }, t("Could not confirm the comment on {target} went out", { target: unconfirmed.target })) : null, ++ ...locked ? [] : [(0, import_react16.createElement)(AnswerFields, { card, busy, onAnswer }), (0, import_react16.createElement)(ResultActions, { card, busy, onAnswer })], ++ error ? (0, import_react16.createElement)("span", { className: "bt-inbox-error", role: "alert" }, error) : null ++ ), ++ (0, import_react16.createElement)( ++ "span", ++ { className: "bt-inbox-actions" }, ++ answerable ? (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "reject") }, t("Reject")) : null, ++ answerable ? (0, import_react16.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy, onClick: () => onAnswer(card, "allow") }, t("Allow once")) : null, ++ ...(answerable ? alwaysChoices(card.approval, card.bot) : []).map(([choice, label]) => (0, import_react16.createElement)("button", { key: choice, type: "button", className: "bt-soft bt-soft-sm", "data-choice": choice, disabled: busy, onClick: () => onAnswer(card, choice) }, t(label))), ++ (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "aria-label": who ? t("Open {name}", { name: card.room?.name ?? who }) : t("Open"), onClick: () => onOpen(card) }, t("Open")) ++ ) + ); + } +-var REACTIONS = ["👍", "❤️", "😂", "😮", "😢", "🙏"]; +-function useDismiss(open, close, refs) { +- (0, import_react6.useEffect)(() => { +- if (!open) return void 0; +- const onDown = (event) => { +- if (refs.some((ref) => ref.current?.contains(event.target))) return; +- close(); +- }; +- const onKey = (event) => { +- if (event.key === "Escape") { +- event.stopPropagation(); +- close(); +- } +- }; +- window.addEventListener("mousedown", onDown); +- window.addEventListener("keydown", onKey, true); +- return () => { +- window.removeEventListener("mousedown", onDown); +- window.removeEventListener("keydown", onKey, true); +- }; +- }, [open]); +function useNow2(ms) { -+ const [now, setNow] = (0, import_react14.useState)(Date.now); -+ (0, import_react14.useEffect)(() => { ++ const [now, setNow] = (0, import_react16.useState)(Date.now); ++ (0, import_react16.useEffect)(() => { + const timer = setInterval(() => setNow(Date.now()), ms); + return () => clearInterval(timer); + }, [ms]); + return now; } --function useLiveNote(actions, sessionId, id, entry) { -- const key = entry ? JSON.stringify(entry) : ""; -- (0, import_react6.useEffect)(() => { -- if (!key) return void 0; -- actions.noteLive(sessionId, id, JSON.parse(key)); -- return () => actions.noteLive(sessionId, id, null); -- }, [sessionId, id, key]); +-function MessageTools({ text, name, sessionId, react, actions }) { +- const [panel, setPanel] = (0, import_react6.useState)(null); +- const [place, setPlace] = (0, import_react6.useState)(null); +- const [copied, setCopied] = (0, import_react6.useState)(false); +- const tools = (0, import_react6.useRef)(null); +- const pop = (0, import_react6.useRef)(null); +- const close = () => setPanel(null); +- useDismiss(panel !== null, close, [tools, pop]); +- const open = (kind, event) => { +- if (panel === kind) { +- close(); +function openCard(actions, card) { + actions.closeInbox(); + if (card?.kind === "workflow") { @@ -11829,37 +12423,7 @@ diff --git a/client.js b/client.js + return; + } + actions.openSession(card.chat); - } --function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi, useWork }) { -- const [live, setLive] = (0, import_react6.useState)({ replies: [], speaking: null }); -- (0, import_react6.useEffect)(() => { -- if (done) return void 0; -- let stop = false; -- let timer; -- let seen = ""; -- const tick = async () => { -- const result = await actions.roomProgress(sessionId); -- if (stop) return; -- const entry = (result ?? []).find((item) => item.callId === callId) ?? (result ?? [])[0]; -- const key = entry ? JSON.stringify([entry.replies, entry.speaking]) : ""; -- if (entry && key !== seen) { -- seen = key; -- setLive({ replies: entry.replies ?? [], speaking: entry.speaking ?? null }); -- } -- timer = setTimeout(tick, document.hidden ? 5e3 : 1e3); -- }; -- void tick(); -- return () => { -- stop = true; -- clearTimeout(timer); -- }; -- }, [done, sessionId, callId]); -- let replies = live.replies; -- if (done) { -- try { -- replies = JSON.parse(contentText(content)).replies ?? []; -- } catch { -- replies = []; ++} +function closedSettings(state) { + if (!state.settings && !state.remoteBotSettings) return state; + const back = state.settings?.back === "inbox"; @@ -11871,14 +12435,14 @@ diff --git a/client.js b/client.js + const tasks = useTasks(actions); + const workflows = useWorkflows(actions); + const now = useNow2(3e4); -+ const [answered, setAnswered] = (0, import_react14.useState)({}); -+ const [busy, setBusy] = (0, import_react14.useState)(""); -+ const [errors, setErrors] = (0, import_react14.useState)({}); -+ const [feedback, setFeedback] = (0, import_react14.useState)(""); -+ const [allDone, setAllDone] = (0, import_react14.useState)(false); -+ const close = (0, import_react14.useCallback)(() => actions.closeInbox(), []); ++ const [answered, setAnswered] = (0, import_react16.useState)({}); ++ const [busy, setBusy] = (0, import_react16.useState)(""); ++ const [errors, setErrors] = (0, import_react16.useState)({}); ++ const [feedback, setFeedback] = (0, import_react16.useState)(""); ++ const [allDone, setAllDone] = (0, import_react16.useState)(false); ++ const close = (0, import_react16.useCallback)(() => actions.closeInbox(), []); + useEscape(close); -+ (0, import_react14.useEffect)(() => { ++ (0, import_react16.useEffect)(() => { + if (!feedback) return void 0; + const timer = setTimeout(() => setFeedback(""), FEEDBACK_MS); + return () => clearTimeout(timer); @@ -11892,115 +12456,88 @@ diff --git a/client.js b/client.js + const pending = inboxAnswer(actions, card, choice); + if (pending === void 0) { + setBusy(""); -+ return; + return; } -- } -- const pending = done || !live.speaking ? [] : [live.speaking]; -- const speakerTool = useWork?.((work) => work.bots?.[live.speaking]?.tool) ?? void 0; -- if (replies.length === 0 && pending.length === 0) return null; -- const room2 = roster.roomsById[sessionId]; -- return (0, import_react6.createElement)( +- const rect = event.currentTarget.getBoundingClientRect(); +- const below = rect.bottom + 220 < window.innerHeight; +- setPlace(kind === "react" ? { left: rect.left + rect.width / 2, top: rect.top - 6, "--bt-origin": "bottom center" } : { left: Math.min(rect.left, window.innerWidth - 208), ...below ? { top: rect.bottom + 4 } : { bottom: window.innerHeight - rect.top + 4, "--bt-origin": "bottom left" } }); +- setPanel(kind); +- }; +- const copy2 = () => { +- void navigator.clipboard?.writeText(text).then(() => { +- setCopied(true); +- setTimeout(() => setCopied(false), 1e3); +- }); +- }; +- const download2 = () => { +- const url = URL.createObjectURL(new Blob([text], { type: "text/markdown" })); +- const link = Object.assign(document.createElement("a"), { href: url, download: `${name}-message.md` }); +- link.click(); +- setTimeout(() => URL.revokeObjectURL(url), 1e3); + void Promise.resolve(pending).then(() => { + setAnswered((value) => ({ ...value, [card.id]: true })); + const name = card.bot?.name ?? ""; + setFeedback(card.kind === "approval" ? choice === "allow" ? t("Allowed once for {name}", { name }) : choice === "always-bot" ? t("Always allowed for {name}", { name }) : choice === "always-room" ? t("Always allowed in this group") : t("Rejected for {name}", { name }) : t("Answered")); + }, (failure) => setErrors((value) => ({ ...value, [card.id]: hostText(failure?.message ?? String(failure)) }))).finally(() => setBusy("")); -+ }; + }; +- const item = (label, Icon, run) => (0, import_react6.createElement)("button", { key: label, type: "button", role: "menuitem", onClick: () => { +- close(); +- run(); +- } }, (0, import_react6.createElement)(Icon), label); +- return (0, import_react6.createElement)( + const open = (card) => openCard(actions, card); -+ return (0, import_react14.createElement)( ++ return (0, import_react16.createElement)( "div", -- { className: "bt-group-replies" }, -- replies.map((reply, index) => { -- const bot = roster.byId[reply.botId] ?? { id: reply.botId, name: reply.name, color: reply.color ?? "gray" }; -- if (reply.kind === "user") { -- return (0, import_react6.createElement)("div", { key: `user-${index}`, className: "bt-urow" }, (0, import_react6.createElement)( -- "div", -- { className: "bt-ububble" }, -- (0, import_react6.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: reply.text, labels: mdLabels(), variant: "compact" }) -- )); -- } -- if (reply.kind === "failed") { -- return (0, import_react6.createElement)( -- "div", -- { key: `${reply.botId}-${index}`, className: "bt-event bt-event-error", role: "status", title: [reply.code, reply.status, reply.text].filter(Boolean).join(" · ") }, -- t("{name} could not answer: {reason}", { name: bot.name, reason: failureLabel(reply.code, reply.text) }) -- ); -- } -- if (reply.kind === "lookup") { -- return (0, import_react6.createElement)( -- "div", -- { key: `${reply.botId}-${index}`, className: "bt-event" }, -- reply.text ? t("{name} looked up its own chat for “{text}”", { name: bot.name, text: reply.text }) : t("{name} looked up its own chat", { name: bot.name }) -- ); -- } -- if (reply.kind === "missed") { -- return (0, import_react6.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name })); -- } -- if (reply.kind === "resumed") { -- return (0, import_react6.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name })); -- } -- if (reply.kind === "cut") { -- return (0, import_react6.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name })); -- } -- if (reply.kind === "approval" || reply.kind === "working") { -- return (0, import_react6.createElement)( -- "div", -- { key: `${reply.botId}-${index}`, className: "bt-event" }, -- (0, import_react6.createElement)( -- "button", -- { type: "button", className: "bt-event-whole", onClick: () => actions.showDetails(sessionId) }, -- (0, import_react6.createElement)(BotMark, { bot, size: 16 }), -- (0, import_react6.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name })) -- ) -- ); -- } -- if (reply.kind === "stopped") { -- return (0, import_react6.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("You stopped {name}'s work", { name: bot.name })); -- } -- return (0, import_react6.createElement)(GroupMessage, { key: `${reply.botId}-${index}`, bot, text: reply.text, room: room2, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi }); -- }), -- pending.map((id) => { -- const bot = roster.byId[id]; -- if (!bot) return null; -- return (0, import_react6.createElement)( +- { ref: tools, className: "bt-tools", "data-open": panel !== null || void 0 }, +- react ? (0, import_react6.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Add reaction"), title: t("Add reaction"), "aria-expanded": panel === "react", onClick: (event) => open("react", event) }, (0, import_react6.createElement)(SmileIcon)) : null, +- sessionId ? (0, import_react6.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Reply"), title: t("Reply"), onClick: () => actions.quote(sessionId, text) }, (0, import_react6.createElement)(ReplyIcon)) : null, +- (0, import_react6.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("More message actions"), title: t("More"), "aria-haspopup": "menu", "aria-expanded": panel === "more", onClick: (event) => open("more", event) }, copied ? (0, import_react6.createElement)(CheckIcon) : (0, import_react6.createElement)(DotsIcon)), +- panel === "react" ? (0, import_react_dom.createPortal)((0, import_react6.createElement)( +- "div", +- { ref: pop, className: "bt-react-strip", role: "menu", "aria-label": t("Reactions"), style: place }, +- REACTIONS.map((emoji) => (0, import_react6.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => { +- close(); +- react(emoji); +- } }, emoji)) +- ), document.body) : null, +- panel === "more" ? (0, import_react_dom.createPortal)((0, import_react6.createElement)( + { className: "bt-mem-layer bt-inbox-layer", "data-leaving": leaving || void 0 }, -+ (0, import_react14.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), -+ (0, import_react14.createElement)( -+ "div", ++ (0, import_react16.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), ++ (0, import_react16.createElement)( + "div", +- { ref: pop, className: "bt-menu", role: "menu", "aria-label": t("Message actions"), style: place }, +- item(t("Copy"), CopyIcon, copy2), +- item(t("Download"), DownloadIcon, download2) +- ), document.body) : null + { className: "bt-mem bt-inbox", role: "dialog", "aria-modal": true, "aria-labelledby": "bt-inbox-heading" }, -+ (0, import_react14.createElement)( - "div", -- { key: `pending-${id}`, className: "bt-activity" }, -- (0, import_react6.createElement)(BotMark, { bot, size: 22, state: speakerTool ? toolState(speakerTool) : "thinking" }), -- (0, import_react6.createElement)(Shimmer, null, speakerTool ? `${bot.name} · ${workPhrase(speakerTool)}…` : t("{name} is typing…", { name: bot.name })) -- ); -- }) ++ (0, import_react16.createElement)( ++ "div", + { className: "bt-mem-head" }, -+ (0, import_react14.createElement)("h2", { id: "bt-inbox-heading" }, t("Inbox")), -+ (0, import_react14.createElement)("span", { className: "bt-mem-status" }, t("Your Bots")), -+ (0, import_react14.createElement)("span", { className: "bt-mem-head-gap" }), -+ (0, import_react14.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close inbox"), autoFocus: true, onClick: close }, (0, import_react14.createElement)(CloseIcon)) ++ (0, import_react16.createElement)("h2", { id: "bt-inbox-heading" }, t("Inbox")), ++ (0, import_react16.createElement)("span", { className: "bt-mem-status" }, t("Your Bots")), ++ (0, import_react16.createElement)("span", { className: "bt-mem-head-gap" }), ++ (0, import_react16.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close inbox"), autoFocus: true, onClick: close }, (0, import_react16.createElement)(CloseIcon)) + ), -+ (0, import_react14.createElement)( ++ (0, import_react16.createElement)( + "div", + { className: "bt-mem-body bt-inbox-body" }, -+ ...locked ? [readOnlyLine(import_react14.createElement, roster, actions, { key: "readonly" })] : [], -+ (0, import_react14.createElement)("div", { className: "bt-inbox-feedback", role: "status", "aria-live": "polite" }, feedback), ++ ...locked ? [readOnlyLine(import_react16.createElement, roster, actions, { key: "readonly" })] : [], ++ (0, import_react16.createElement)("div", { className: "bt-inbox-feedback", role: "status", "aria-live": "polite" }, feedback), + GROUPS.map((group) => { + const settled = group.id === "done" ? model.doneAll ?? groups.done : null; + const canOpen = group.id === "done" && settled.length > DONE_MAX; + const rows = canOpen && allDone ? settled : groups[group.id]; + const hidden = group.id === "done" ? Math.max(0, (model.doneTotal ?? rows.length) - rows.length) : 0; -+ return (0, import_react14.createElement)( ++ return (0, import_react16.createElement)( + "section", + { key: group.id, className: "bt-inbox-group", "aria-labelledby": `bt-inbox-${group.id}` }, -+ (0, import_react14.createElement)( ++ (0, import_react16.createElement)( + "h3", + { id: `bt-inbox-${group.id}`, className: "bt-inbox-head" }, -+ (0, import_react14.createElement)("span", null, t(group.title)), -+ rows.length > 0 ? (0, import_react14.createElement)("span", { className: "bt-inbox-head-count" }, String(rows.length)) : null ++ (0, import_react16.createElement)("span", null, t(group.title)), ++ rows.length > 0 ? (0, import_react16.createElement)("span", { className: "bt-inbox-head-count" }, String(rows.length)) : null + ), -+ rows.length === 0 ? (0, import_react14.createElement)("p", { className: "bt-inbox-empty" }, t(group.empty)) : (0, import_react14.createElement)("div", { className: "bt-inbox-list" }, rows.map((card) => (0, import_react14.createElement)(InboxCard, { ++ rows.length === 0 ? (0, import_react16.createElement)("p", { className: "bt-inbox-empty" }, t(group.empty)) : (0, import_react16.createElement)("div", { className: "bt-inbox-list" }, rows.map((card) => (0, import_react16.createElement)(InboxCard, { + key: card.id, + card, + roster, @@ -12010,8 +12547,8 @@ diff --git a/client.js b/client.js + onAnswer: answer, + onOpen: open + }))), -+ hidden > 0 ? (0, import_react14.createElement)("div", { key: "more", className: "bt-inbox-more" }, t("{count} more not shown", { count: hidden })) : null, -+ canOpen ? (0, import_react14.createElement)("button", { ++ hidden > 0 ? (0, import_react16.createElement)("div", { key: "more", className: "bt-inbox-more" }, t("{count} more not shown", { count: hidden })) : null, ++ canOpen ? (0, import_react16.createElement)("button", { + key: "all", + type: "button", + className: "bt-inbox-show-all", @@ -12024,17 +12561,12 @@ diff --git a/client.js b/client.js + ) ); } --var DRAWN = /* @__PURE__ */ new Set(["message_bot", "stop_bot", "create_bot", "update_bot", "group_relay", "create_group", "update_group", "delete_group", "post_to_group", "ask_user", "request_secret", "ask_user_question", "read_group_chat", "remember", "forget"]); --var CARDS = /* @__PURE__ */ new Set(["ask_user", "request_secret"]); --function callTree(root) { -- const calls = []; -- const seen = /* @__PURE__ */ new Set(); -- const visit = (call2) => { -- const id = call2.callId ?? call2; -- if (seen.has(id)) return; -- seen.add(id); -- calls.push(call2); -- for (const child of call2.subCalls ?? []) visit(child); +-function ThinkingRow({ text }) { +- return (0, import_react6.createElement)( +- "details", +- { className: "bt-think" }, +- (0, import_react6.createElement)("summary", null, t("Thought it through")), +- (0, import_react6.createElement)("div", { className: "bt-think-text" }, text) +var INBOX_CSS = ` +.bt-inbox-row{min-height:40px;padding:6px 8px;gap:10px} +.bt-inbox-mark{flex:none;width:36px;height:28px;display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink-2)} @@ -12102,21 +12634,11 @@ diff --git a/client.js b/client.js + key, + id: String(task.id), + title: String(task.title ?? "") - }; -- visit(root); -- return calls; - } --function useShownCards(actions, sessionId, callIds) { -- const key = JSON.stringify(callIds); -- (0, import_react6.useLayoutEffect)(() => { -- const ids = JSON.parse(key); -- if (ids.length === 0 || !actions.noteCards) return void 0; -- actions.noteCards(sessionId, ids, 1); -- return () => actions.noteCards(sessionId, ids, -1); -- }, [sessionId, key]); ++ }; ++} + +// src/client/board-card.js -+var import_react15 = require("react"); ++var import_react17 = require("react"); +var TASK_SKIN = { + card: "bt-board-card", + top: "bt-board-card-top", @@ -12146,7 +12668,7 @@ diff --git a/client.js b/client.js + onDragEnd = null +}) { + const labels = Array.isArray(card?.labels) ? card.labels : []; -+ return (0, import_react15.createElement)( ++ return (0, import_react17.createElement)( + "article", + { + ...attrs, @@ -12161,79 +12683,77 @@ diff --git a/client.js b/client.js + } : void 0, + onDragEnd: draggable ? () => onDragEnd?.() : void 0 + }, -+ (0, import_react15.createElement)( ++ (0, import_react17.createElement)( + "span", + { className: skin.top }, -+ (0, import_react15.createElement)("span", { className: skin.id }, idText), ++ (0, import_react17.createElement)("span", { className: skin.id }, idText), + topExtra, -+ badge ? (0, import_react15.createElement)("span", { className: skin.badge, "data-badge": card?.badge ?? void 0 }, badge) : null ++ badge ? (0, import_react17.createElement)("span", { className: skin.badge, "data-badge": card?.badge ?? void 0 }, badge) : null + ), -+ (0, import_react15.createElement)("span", { className: skin.title }, card?.title || emptyTitle), -+ labels.length ? (0, import_react15.createElement)("span", { className: skin.labels }, labels.map((name) => (0, import_react15.createElement)("span", { key: name, className: skin.label, "data-label": name }, name))) : null, -+ card?.owner ? (0, import_react15.createElement)("span", { className: skin.owner, "data-kind": card.ownerKind ?? "human" }, card.owner) : null, -+ note ? (0, import_react15.createElement)("span", { className: skin.note }, note) : null, ++ (0, import_react17.createElement)("span", { className: skin.title }, card?.title || emptyTitle), ++ labels.length ? (0, import_react17.createElement)("span", { className: skin.labels }, labels.map((name) => (0, import_react17.createElement)("span", { key: name, className: skin.label, "data-label": name }, name))) : null, ++ card?.owner ? (0, import_react17.createElement)("span", { className: skin.owner, "data-kind": card.ownerKind ?? "human" }, card.owner) : null, ++ note ? (0, import_react17.createElement)("span", { className: skin.note }, note) : null, + meta, + footer, + actions -+ ); + ); } --function renderCall(call2, { sessionId, roster, actions, useUi, useWork, findBot }) { -- const tool = toolName(call2); -- const done = call2.kind === "tool-result"; -- const { text: arg, value: argValue } = toolArgs(call2); -- const self = roster.byId[sessionId]; -- switch (tool) { -- case "message_bot": { -- const target = findBot(arg("to")) ?? { name: arg("to") ?? "…", color: "gray" }; -- if (done && call2.isError) return (0, import_react6.createElement)("div", { className: "bt-event" }, t("Couldn't message {name}", { name: target.name })); -- return (0, import_react6.createElement)(EventLine, { prefix: t("Messaged"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); -- } -- case "stop_bot": { -- const target = findBot(arg("bot")) ?? { name: arg("bot") ?? "…", color: "gray" }; -- if (done && call2.isError) return (0, import_react6.createElement)("div", { className: "bt-event" }, t("Couldn't stop {name}", { name: target.name })); -- return (0, import_react6.createElement)(EventLine, { prefix: t("Stopped"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); -- } -- case "create_bot": { -- const created = findBot(arg("name")); -- if (!done || created === void 0) return null; -- return (0, import_react6.createElement)(EventLine, { prefix: t("Created"), bots: [created], onOpen: (bot) => actions.openSession(bot.id) }); -- } -- case "update_bot": { -- const target = findBot(arg("name")) ?? findBot(arg("bot")) ?? (arg("bot") ? void 0 : self); -- return done && target ? (0, import_react6.createElement)(EventLine, { prefix: t("Updated"), bots: [target], onOpen: (bot) => actions.openSession(bot.id) }) : null; -- } -- case "group_relay": -- return (0, import_react6.createElement)(GroupReplies, { sessionId, callId: call2.callId, done, content: call2.content, roster, actions, useUi, useWork }); -- case "create_group": -- case "update_group": -- case "delete_group": -- case "post_to_group": { -- const verbs = { -- create_group: ["Created group", "Couldn't create the group"], -- update_group: ["Updated group", "Couldn't update the group"], -- delete_group: ["Deleted group", "Couldn't delete the group"], -- post_to_group: ["Posted in", "Couldn't post in the group"] -- }[tool]; -- if (!done) return null; -- const result = contentText(call2.content); -- const named = /^(Created group|Updated|Nothing changed in|Deleted|Posted in) "([^"]+)"/.exec(result); -- if (call2.isError || !named) return (0, import_react6.createElement)("div", { className: "bt-event", title: result }, t(verbs[1])); -- const name = named[2]; -- const room2 = roster.rooms.find((entry) => entry.name === name); -- return (0, import_react6.createElement)(GroupEvent, { prefix: t(verbs[0]), room: tool === "delete_group" ? void 0 : room2, name, roster, actions }); +-function useFileMentions({ node, openFile, fileMentions, useTurnData }) { +- const tail = useTurnData?.("turn-tail"); +- const location2 = node.location; +- const turn = location2?.kind === "turn" || location2?.kind === "step" ? location2.turn : void 0; +- const seq = node.data.finalNode?.seq; +- return (0, import_react6.useMemo)(() => { +- if (typeof fileMentions !== "function" || turn?.status !== "closed" || seq === void 0) return void 0; +- return tail?.closing?.finalNode.seq === seq ? fileMentions({ turn, seq, openFile }) : void 0; +- }, [fileMentions, openFile, seq, tail, turn]); + +// src/client/kanban.js -+var import_react16 = require("react"); ++var import_react18 = require("react"); +var POLL_MS4 = 15e3; +function BoardIcon() { -+ return (0, import_react16.createElement)( ++ return (0, import_react18.createElement)( + "svg", + { width: 18, height: 18, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinejoin: "round", "aria-hidden": true }, -+ (0, import_react16.createElement)("rect", { x: 2.5, y: 3, width: 4, height: 14, rx: 1 }), -+ (0, import_react16.createElement)("rect", { x: 8, y: 3, width: 4, height: 9, rx: 1 }), -+ (0, import_react16.createElement)("rect", { x: 13.5, y: 3, width: 4, height: 12, rx: 1 }) ++ (0, import_react18.createElement)("rect", { x: 2.5, y: 3, width: 4, height: 14, rx: 1 }), ++ (0, import_react18.createElement)("rect", { x: 8, y: 3, width: 4, height: 9, rx: 1 }), ++ (0, import_react18.createElement)("rect", { x: 13.5, y: 3, width: 4, height: 12, rx: 1 }) + ); -+} + } +-function AssistantCell({ node, groupPart, sessionId, openFile, fileMentions, useTurnData, useRoster, useUi, useTurnSteps, useTurnContext, actions }) { +- const roster = useRoster((value) => value); +- const data = node.data; +- const steps = useTurnSteps(String(data.turn)); +- const contexts = useTurnContext(String(data.turn)); +- const mentions = useFileMentions({ node, openFile, fileMentions, useTurnData }); +- const hidden = Boolean(roster.roomsById[sessionId]) || isHiddenTurn(roster, sessionId, data.turn); +- const texts2 = groupPart === "reasoning" ? [] : data.blocks.filter((block) => block.kind === "text" && block.text.trim() !== "").map((block) => block.text); +- const running = data.status === "running"; +- useLiveNote(actions, sessionId, `text:${node.key ?? data.seq}`, !hidden && running && texts2.length > 0 ? { text: true } : null); +- if (hidden) return null; +- const reasoning = groupPart === "response" ? "" : turnReasoning(steps, data); +- const relays = relayPart(data, groupPart) ? relaysBefore(contexts, steps, data) : []; +- if (texts2.length === 0 && !reasoning && relays.length === 0) return null; +- const selfId = roster.byId[sessionId]?.id ?? sessionId; +- return (0, import_react6.createElement)( +- import_react6.Fragment, +- null, +- relays.map((relay) => { +- const source = relay.source; +- const sender = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; +- return (0, import_react6.createElement)(EventLine, { +- key: relay.seq, +- prefix: source.role === "stopped" ? t("Stopped by") : source.role === "reply" ? t("Reply from") : t("Message from"), +- bots: [sender], +- onOpen: () => { +- if (sender.id) actions.openExchange(selfId, sender.id); +- }, +- whole: true +- }); +- }), +- reasoning ? (0, import_react6.createElement)(ThinkingRow, { text: reasoning }) : null, +- texts2.length ? (0, import_react6.createElement)(Bubbles, { texts: texts2, roster, selfId, actions, streaming: running, sessionId, msgKey: `${sessionId}:${data.turn}:${node.key ?? data.seq ?? ""}`, useUi, mentions }) : null +function shortId(id) { + const hex = String(id ?? "").replace(/^task-/, ""); + return `#${hex.slice(-6)}`; @@ -12299,11 +12819,7 @@ diff --git a/client.js b/client.js + for (const bot of children.get(parent) ?? []) { + rows.push({ kind: "bot", id: bot.id, name: bot.name, depth, bot }); + walk(bot.id, depth + 1); - } -- case "ask_user": { -- const question = roster.questions?.[sessionId]; -- if (!question || question.callId !== call2.callId) return (0, import_react6.createElement)("span", { className: "bt-q-gone", hidden: true }); -- return (0, import_react6.createElement)(PendingQuestion, { sessionId, question, actions, inline: true }); ++ } + }; + walk("", 0); + const groups = (roster?.rooms ?? []).filter((room2) => room2 && room2.hidden !== true && room2.origin !== "face-to-face" && adminOf(roster, room2)).map((room2) => ({ kind: "group", id: room2.id, name: room2.displayName || room2.name || t("Group"), room: room2 })); @@ -12368,16 +12884,7 @@ diff --git a/client.js b/client.js + if (!map.has(id)) { + map.set(id, []); + order.push(id); - } -- case "request_secret": -- return (0, import_react6.createElement)(SecretToolCell, { sessionId, callId: call2.callId, name: arg("name"), done, content: call2.content, roster, actions }); -- case "ask_user_question": { -- if (!done) return null; -- let parsed = null; -- try { -- parsed = JSON.parse(contentText(call2.content)); -- } catch { -- parsed = null; ++ } + map.get(id).push(task); + } + return order.map((id) => ({ id, name: botName(roster, map.get(id)[0]) || id, tasks: map.get(id) })); @@ -12385,11 +12892,11 @@ diff --git a/client.js b/client.js +var upsert = (list, task) => list.some((item) => item.id === task.id) ? list.map((item) => item.id === task.id ? task : item) : [...list, task]; +var without = (list, id) => list.filter((item) => item.id !== id); +function useBoardTasks(actions, scope) { -+ const [own, setOwn] = (0, import_react16.useState)([]); -+ const [groupTasks, setGroupTasks] = (0, import_react16.useState)([]); -+ const [archive, setArchive] = (0, import_react16.useState)([]); ++ const [own, setOwn] = (0, import_react18.useState)([]); ++ const [groupTasks, setGroupTasks] = (0, import_react18.useState)([]); ++ const [archive, setArchive] = (0, import_react18.useState)([]); + const key = scope?.kind === "group" ? `group:${scope.roomId}` : `bot:${scope.botId ?? ""}`; -+ (0, import_react16.useEffect)(() => { ++ (0, import_react18.useEffect)(() => { + let stopped = false; + const load = () => { + const query = scope?.kind === "group" ? { roomId: scope.roomId } : {}; @@ -12423,7 +12930,7 @@ diff --git a/client.js b/client.js + return { own, groupTasks, tasks, archive: done, replace }; +} +function RailButton({ row, selected, meta, onSelect }) { -+ return (0, import_react16.createElement)( ++ return (0, import_react18.createElement)( + "button", + { + type: "button", @@ -12435,8 +12942,8 @@ diff --git a/client.js b/client.js + style: row.depth ? { paddingLeft: `${10 + row.depth * 14}px` } : void 0, + onClick: () => onSelect(row.kind === "group" ? { kind: "group", roomId: row.id } : { kind: "bot", botId: row.id }) + }, -+ (0, import_react16.createElement)("span", { className: "bt-board-rail-name" }, row.name), -+ meta ? (0, import_react16.createElement)("span", { className: "bt-board-rail-meta" }, meta) : null ++ (0, import_react18.createElement)("span", { className: "bt-board-rail-name" }, row.name), ++ meta ? (0, import_react18.createElement)("span", { className: "bt-board-rail-meta" }, meta) : null + ); +} +function BoardCard2({ task, roster, movable, onMove, onDrag, partOf: partOf2 }) { @@ -12447,7 +12954,7 @@ diff --git a/client.js b/client.js + const question = task.waitingFor === "input" ? task.inputRequest?.question : ""; + const overall = task.kind === "group"; + const finished = column === "done" ? finishedAt(task) : void 0; -+ return (0, import_react16.createElement)(BoardCard, { ++ return (0, import_react18.createElement)(BoardCard, { + card: taskCard(task), + skin: TASK_SKIN, + attrs: { @@ -12459,34 +12966,34 @@ diff --git a/client.js b/client.js + idText: shortId(task.id), + emptyTitle: t("Untitled task"), + topExtra: [ -+ (0, import_react16.createElement)("span", { key: "priority", className: "bt-board-priority", "data-priority": priority }, priorityLabel(priority)), -+ (0, import_react16.createElement)("span", { key: "status", className: "bt-board-status" }, statusLabel(task.status)) ++ (0, import_react18.createElement)("span", { key: "priority", className: "bt-board-priority", "data-priority": priority }, priorityLabel(priority)), ++ (0, import_react18.createElement)("span", { key: "status", className: "bt-board-status" }, statusLabel(task.status)) + ], + note: task.note ?? "", + meta: [ -+ overall ? (0, import_react16.createElement)("span", { key: "kind", className: "bt-board-kind" }, t("Group task")) : null, -+ partOf2 ? (0, import_react16.createElement)("span", { key: "part", className: "bt-board-part" }, t("Part of {title}", { title: partOf2 })) : null, -+ question ? (0, import_react16.createElement)("span", { key: "wait", className: "bt-board-wait" }, question) : null ++ overall ? (0, import_react18.createElement)("span", { key: "kind", className: "bt-board-kind" }, t("Group task")) : null, ++ partOf2 ? (0, import_react18.createElement)("span", { key: "part", className: "bt-board-part" }, t("Part of {title}", { title: partOf2 })) : null, ++ question ? (0, import_react18.createElement)("span", { key: "wait", className: "bt-board-wait" }, question) : null + ], -+ footer: (0, import_react16.createElement)( ++ footer: (0, import_react18.createElement)( + "span", + { className: "bt-board-foot" }, -+ who ? (0, import_react16.createElement)("span", { className: "bt-board-who" }, who) : null, -+ Number.isFinite(finished) && finished > 0 ? (0, import_react16.createElement)("span", { key: "finished", className: "bt-board-when" }, relativeShort(finished)) : null, -+ (0, import_react16.createElement)( ++ who ? (0, import_react18.createElement)("span", { className: "bt-board-who" }, who) : null, ++ Number.isFinite(finished) && finished > 0 ? (0, import_react18.createElement)("span", { key: "finished", className: "bt-board-when" }, relativeShort(finished)) : null, ++ (0, import_react18.createElement)( + "span", + { className: "bt-board-progress" }, -+ (0, import_react16.createElement)( ++ (0, import_react18.createElement)( + "span", + { className: "bt-board-progress-bar", role: "progressbar", "aria-valuemin": 0, "aria-valuemax": 100, "aria-valuenow": progress, "aria-label": t("Progress") }, -+ (0, import_react16.createElement)("span", { style: { width: `${progress}%` } }) ++ (0, import_react18.createElement)("span", { style: { width: `${progress}%` } }) + ), -+ (0, import_react16.createElement)("span", { className: "bt-board-percent" }, t("{percent}%", { percent: progress })) ++ (0, import_react18.createElement)("span", { className: "bt-board-percent" }, t("{percent}%", { percent: progress })) + ) + ), + actions: [ -+ movable && column === "not-started" ? (0, import_react16.createElement)("button", { key: "start", type: "button", className: "bt-soft bt-soft-sm", onClick: () => onMove?.(task.id, "in-progress") }, t("Start")) : null, -+ movable && column === "in-progress" && task.status !== "blocked" ? (0, import_react16.createElement)("button", { key: "complete", type: "button", className: "bt-soft bt-soft-sm", onClick: () => onMove?.(task.id, "done") }, t("Complete")) : null ++ movable && column === "not-started" ? (0, import_react18.createElement)("button", { key: "start", type: "button", className: "bt-soft bt-soft-sm", onClick: () => onMove?.(task.id, "in-progress") }, t("Start")) : null, ++ movable && column === "in-progress" && task.status !== "blocked" ? (0, import_react18.createElement)("button", { key: "complete", type: "button", className: "bt-soft bt-soft-sm", onClick: () => onMove?.(task.id, "done") }, t("Complete")) : null + ], + draggable: movable, + dragValue: task.id, @@ -12501,7 +13008,7 @@ diff --git a/client.js b/client.js + const tree = lanes ? columnTree(tasks) : null; + const linked = tree ? tree.loose.filter((task) => task.parentId || task.parentTitle) : []; + const plain = tree ? tree.loose.filter((task) => !task.parentId && !task.parentTitle) : tasks; -+ return (0, import_react16.createElement)( ++ return (0, import_react18.createElement)( + "section", + { + className: "bt-board-column", @@ -12517,39 +13024,35 @@ diff --git a/client.js b/client.js + const id = event.dataTransfer?.getData("text/plain"); + if (id) onMove?.(id, column); + onDrag?.(null); - } -- const answer = parsed?.answers?.[0]; -- const question = argValue("questions")?.[0]; -- if (!answer) return null; -- return (0, import_react6.createElement)("div", { className: "bt-q-inline" }, (0, import_react6.createElement)(SettledQuestion, { question, answer })); ++ } + }, -+ (0, import_react16.createElement)( ++ (0, import_react18.createElement)( + "h3", + { className: "bt-board-column-head" }, -+ (0, import_react16.createElement)("span", null, columnTitle(column)), ++ (0, import_react18.createElement)("span", null, columnTitle(column)), + // #2045: the Done column is one archive page. `tasks.length` is what was drawn, not what the + // owner has, so a full page says `20 newest` instead of claiming the page is the total. -+ (0, import_react16.createElement)("span", { className: "bt-board-count" }, column === "done" && archiveFull ? t("{count} newest", { count: tasks.length }) : String(tasks.length)) ++ (0, import_react18.createElement)("span", { className: "bt-board-count" }, column === "done" && archiveFull ? t("{count} newest", { count: tasks.length }) : String(tasks.length)) + ), -+ dragging ? (0, import_react16.createElement)("div", { className: "bt-board-drop" }, dropLabel(column)) : null, -+ tasks.length === 0 && !dragging ? (0, import_react16.createElement)("p", { className: "bt-board-empty" }, t("Nothing in this column.")) : null, -+ tree ? tree.nests.map((nest) => (0, import_react16.createElement)( ++ dragging ? (0, import_react18.createElement)("div", { className: "bt-board-drop" }, dropLabel(column)) : null, ++ tasks.length === 0 && !dragging ? (0, import_react18.createElement)("p", { className: "bt-board-empty" }, t("Nothing in this column.")) : null, ++ tree ? tree.nests.map((nest) => (0, import_react18.createElement)( + "div", + { key: nest.task.id, className: "bt-board-nest" }, -+ (0, import_react16.createElement)(BoardCard2, cardProps(nest.task, roster, onMove, onDrag, void 0, locked)), -+ nest.children.map((child) => (0, import_react16.createElement)( ++ (0, import_react18.createElement)(BoardCard2, cardProps(nest.task, roster, onMove, onDrag, void 0, locked)), ++ nest.children.map((child) => (0, import_react18.createElement)( + "div", + { key: child.id, className: "bt-board-subtask", "data-parent": nest.task.id }, -+ (0, import_react16.createElement)(BoardCard2, cardProps(child, roster, onMove, onDrag, void 0, locked)) ++ (0, import_react18.createElement)(BoardCard2, cardProps(child, roster, onMove, onDrag, void 0, locked)) + )) + )) : null, -+ linked.map((task) => (0, import_react16.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, task.parentTitle || "", locked) })), -+ lanes ? lanesOf(plain, roster).map((lane) => (0, import_react16.createElement)( ++ linked.map((task) => (0, import_react18.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, task.parentTitle || "", locked) })), ++ lanes ? lanesOf(plain, roster).map((lane) => (0, import_react18.createElement)( + "div", + { key: lane.id, className: "bt-board-lane" }, -+ (0, import_react16.createElement)("span", { className: "bt-board-lane-name" }, lane.name), -+ lane.tasks.map((task) => (0, import_react16.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, void 0, locked) })) -+ )) : plain.map((task) => (0, import_react16.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, void 0, locked) })) ++ (0, import_react18.createElement)("span", { className: "bt-board-lane-name" }, lane.name), ++ lane.tasks.map((task) => (0, import_react18.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, void 0, locked) })) ++ )) : plain.map((task) => (0, import_react18.createElement)(BoardCard2, { key: task.id, ...cardProps(task, roster, onMove, onDrag, void 0, locked) })) + ); +} +function BoardView({ roster, actions, tasks, rail, scope, counts: counts2, dragging, error, draft, onDraft, onSelect, onMove, onDrag, onCreate, archiveFull, locked }) { @@ -12557,18 +13060,18 @@ diff --git a/client.js b/client.js + const lanes = scope?.kind === "group"; + const selectedBot = scope?.kind === "bot" ? scope.botId : ""; + const selectedRoom = scope?.kind === "group" ? scope.roomId : ""; -+ return (0, import_react16.createElement)( ++ return (0, import_react18.createElement)( + "div", + { className: "bt-board-body" }, -+ (0, import_react16.createElement)( ++ (0, import_react18.createElement)( + "aside", + { className: "bt-board-rail", "aria-label": t("Task board") }, -+ (0, import_react16.createElement)("h3", { className: "bt-board-rail-head" }, t("Your Bots")), -+ rail.bots.length === 0 ? (0, import_react16.createElement)("p", { className: "bt-board-empty" }, t("No tasks yet.")) : rail.bots.map((row) => { ++ (0, import_react18.createElement)("h3", { className: "bt-board-rail-head" }, t("Your Bots")), ++ rail.bots.length === 0 ? (0, import_react18.createElement)("p", { className: "bt-board-empty" }, t("No tasks yet.")) : rail.bots.map((row) => { + const count = counts2?.[row.id] ?? { done: 0, total: 0 }; + const capped = archiveFull && (scope?.kind === "group" ? count.done > 0 : count.done >= ARCHIVE_SHOWN); + const meta = count.total === 0 ? "" : capped ? t("{count}+ done", { count: count.done }) : t("{done}/{total}", { done: count.done, total: count.total }); -+ return (0, import_react16.createElement)(RailButton, { ++ return (0, import_react18.createElement)(RailButton, { + key: row.id, + row, + selected: row.id === selectedBot, @@ -12576,31 +13079,31 @@ diff --git a/client.js b/client.js + meta + }); + }), -+ rail.groups.length > 0 ? (0, import_react16.createElement)("h3", { className: "bt-board-rail-head" }, t("Groups you admin")) : null, -+ rail.groups.map((row) => (0, import_react16.createElement)(RailButton, { key: row.id, row, selected: row.id === selectedRoom, onSelect })) ++ rail.groups.length > 0 ? (0, import_react18.createElement)("h3", { className: "bt-board-rail-head" }, t("Groups you admin")) : null, ++ rail.groups.map((row) => (0, import_react18.createElement)(RailButton, { key: row.id, row, selected: row.id === selectedRoom, onSelect })) + ), -+ (0, import_react16.createElement)( ++ (0, import_react18.createElement)( + "div", + { className: "bt-board-main" }, -+ error ? (0, import_react16.createElement)("p", { className: "bt-board-error", role: "alert" }, error) : null, -+ lanes ? (0, import_react16.createElement)("p", { className: "bt-board-hint" }, t("Assign, claim, and progress live on this board: one overall task, a subtask per part, an assignee, a column, and progress. @ only wakes someone.")) : null, -+ scope?.kind === "bot" && onCreate && !locked ? (0, import_react16.createElement)( ++ error ? (0, import_react18.createElement)("p", { className: "bt-board-error", role: "alert" }, error) : null, ++ lanes ? (0, import_react18.createElement)("p", { className: "bt-board-hint" }, t("Assign, claim, and progress live on this board: one overall task, a subtask per part, an assignee, a column, and progress. @ only wakes someone.")) : null, ++ scope?.kind === "bot" && onCreate && !locked ? (0, import_react18.createElement)( + "form", + { className: "bt-board-add", onSubmit: (event) => { + event.preventDefault(); + onCreate(draft); + } }, -+ (0, import_react16.createElement)("input", { "aria-label": t("Task title"), placeholder: t("New task"), value: draft ?? "", onChange: (event) => onDraft?.(event.target.value) }), -+ (0, import_react16.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, t("Add task")) ++ (0, import_react18.createElement)("input", { "aria-label": t("Task title"), placeholder: t("New task"), value: draft ?? "", onChange: (event) => onDraft?.(event.target.value) }), ++ (0, import_react18.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, t("Add task")) + ) : null, + // #2273: the board is a 1080px overlay and covers the sidebar banner and the Settings hint, + // so the lock's own sentence is drawn here too, from the host, not in a second wording — + // with the shared Reload beside it, since the sidebar's entry is covered by this overlay. -+ locked ? readOnlyLine(import_react16.createElement, roster, actions, { key: "readonly", className: "bt-board-hint" }) : null, -+ (0, import_react16.createElement)( ++ locked ? readOnlyLine(import_react18.createElement, roster, actions, { key: "readonly", className: "bt-board-hint" }) : null, ++ (0, import_react18.createElement)( + "div", + { className: "bt-board-columns" }, -+ ["not-started", "in-progress", "done"].map((column) => (0, import_react16.createElement)(BoardColumn, { ++ ["not-started", "in-progress", "done"].map((column) => (0, import_react18.createElement)(BoardColumn, { + key: column, + column, + tasks: columns[column], @@ -12619,7 +13122,7 @@ diff --git a/client.js b/client.js +function KanbanRow({ wide, useUi, actions }) { + const open = useUi ? useUi((value) => Boolean(value.board)) : false; + const label = t("Tasks"); -+ return (0, import_react16.createElement)( ++ return (0, import_react18.createElement)( + "button", + { + type: "button", @@ -12630,10 +13133,13 @@ diff --git a/client.js b/client.js + "aria-expanded": open, + onClick: () => actions.openBoard() + }, -+ (0, import_react16.createElement)("span", { className: "bt-board-mark" }, (0, import_react16.createElement)(BoardIcon)), -+ wide ? (0, import_react16.createElement)("span", { className: "bt-board-label" }, label) : null -+ ); -+} ++ (0, import_react18.createElement)("span", { className: "bt-board-mark" }, (0, import_react18.createElement)(BoardIcon)), ++ wide ? (0, import_react18.createElement)("span", { className: "bt-board-label" }, label) : null + ); + } +-function EventLine({ prefix, bots, joiner = t("and"), onOpen, whole = false }) { +- if (whole && bots.length === 1) { +- return (0, import_react6.createElement)( +function scopeName(roster, scope) { + if (scope?.kind === "group") return roster.roomsById?.[scope.roomId]?.name || t("Group"); + if (scope?.kind === "bot") return roster.byId?.[scope.botId]?.name || ""; @@ -12642,15 +13148,15 @@ diff --git a/client.js b/client.js +function KanbanDialog({ roster, actions, leaving = false }) { + const locked = typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; + const rail = boardRail(roster); -+ const [scope, setScope] = (0, import_react16.useState)(() => rail.bots[0] ? { kind: "bot", botId: rail.bots[0].id } : rail.groups[0] ? { kind: "group", roomId: rail.groups[0].id } : null); -+ const [dragging, setDragging] = (0, import_react16.useState)(null); -+ const [error, setError] = (0, import_react16.useState)(""); -+ const [draft, setDraft] = (0, import_react16.useState)(""); ++ const [scope, setScope] = (0, import_react18.useState)(() => rail.bots[0] ? { kind: "bot", botId: rail.bots[0].id } : rail.groups[0] ? { kind: "group", roomId: rail.groups[0].id } : null); ++ const [dragging, setDragging] = (0, import_react18.useState)(null); ++ const [error, setError] = (0, import_react18.useState)(""); ++ const [draft, setDraft] = (0, import_react18.useState)(""); + const { own, groupTasks, tasks, archive, replace } = useBoardTasks(actions, scope); + const boardTasks = boardTasksFor(tasks, archive); -+ const close = (0, import_react16.useCallback)(() => actions.closeBoard(), []); ++ const close = (0, import_react18.useCallback)(() => actions.closeBoard(), []); + useEscape(close); -+ (0, import_react16.useEffect)(() => { ++ (0, import_react18.useEffect)(() => { + if (typeof window === "undefined") return; + if (!window.location.hash.startsWith("#task=")) return; + const [kind, id] = window.location.hash.slice("#task=".length).split(":"); @@ -12677,11 +13183,7 @@ diff --git a/client.js b/client.js + replace(await actions.taskUpdate({ id, column })); + } catch (failure) { + setError(failure?.message ?? String(failure)); - } -- case "read_group_chat": { -- if (!done) return null; -- const room2 = roster.rooms.find((entry) => entry.name === arg("group")); -- return room2 ? (0, import_react6.createElement)(GroupEvent, { prefix: t("Read"), room: room2, roster, actions }) : null; ++ } + }; + const create = async (title) => { + if (locked) return; @@ -12693,33 +13195,36 @@ diff --git a/client.js b/client.js + setDraft(""); + } catch (failure) { + setError(failure?.message ?? String(failure)); - } -- case "remember": -- case "forget": -- return done && !call2.isError ? (0, import_react6.createElement)(MemoryEvent, { sessionId, scope: arg("scope"), result: contentText(call2.content), roster, actions, findBot }) : null; -- default: -- return null; -- } ++ } + }; + const name = scopeName(roster, scope); -+ return (0, import_react16.createElement)( ++ return (0, import_react18.createElement)( + "div", + { className: "bt-mem-layer bt-board-layer", "data-leaving": leaving || void 0 }, -+ (0, import_react16.createElement)("div", { className: "bt-scrim", onClick: close }), -+ (0, import_react16.createElement)( -+ "div", ++ (0, import_react18.createElement)("div", { className: "bt-scrim", onClick: close }), ++ (0, import_react18.createElement)( + "div", +- { className: "bt-event" }, +- (0, import_react6.createElement)( +- "button", +- { type: "button", className: "bt-event-whole", title: bots[0].name, onClick: () => onOpen?.(bots[0]) }, +- (0, import_react6.createElement)("span", null, prefix), +- (0, import_react6.createElement)(BotMark, { bot: bots[0], size: 16 }), +- (0, import_react6.createElement)("span", { className: "bt-event-name" }, bots[0].name) +- ) +- ); + { className: "bt-mem bt-board", role: "dialog", "aria-modal": true, "aria-labelledby": "bt-board-heading" }, -+ (0, import_react16.createElement)( ++ (0, import_react18.createElement)( + "div", + { className: "bt-mem-head" }, -+ (0, import_react16.createElement)("h2", { id: "bt-board-heading" }, t("Board")), -+ (0, import_react16.createElement)("span", { className: "bt-mem-status" }, name), ++ (0, import_react18.createElement)("h2", { id: "bt-board-heading" }, t("Board")), ++ (0, import_react18.createElement)("span", { className: "bt-mem-status" }, name), + // #1854: the left sidebar's Projects row is the one entry to a Project board; this header + // used to draw a second door (#1701), so the sidebar row was the only way in for the rest. -+ (0, import_react16.createElement)("span", { className: "bt-mem-head-gap" }), -+ (0, import_react16.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close board"), autoFocus: true, onClick: close }, (0, import_react16.createElement)(CloseIcon)) ++ (0, import_react18.createElement)("span", { className: "bt-mem-head-gap" }), ++ (0, import_react18.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close board"), autoFocus: true, onClick: close }, (0, import_react18.createElement)(CloseIcon)) + ), -+ (0, import_react16.createElement)(BoardView, { ++ (0, import_react18.createElement)(BoardView, { + roster, + actions, + tasks: boardTasks, @@ -12739,22 +13244,7 @@ diff --git a/client.js b/client.js + }) + ) + ); - } --function ToolCell({ node, sessionId, useRoster, useUi, useWork, actions }) { -- const roster = useRoster((value) => value); -- const root = node.data.root; -- const turn = node.location?.turn?.turn ?? root.turn; -- const hidden = isHiddenTurn(roster, sessionId, turn); -- const findBot = (nameOrId) => roster.byId[nameOrId] ?? roster.bots.find((bot) => bot.name.toLowerCase() === String(nameOrId ?? "").toLowerCase()); -- const calls = hidden ? [] : callTree(root); -- const drawn = calls.filter((call2) => DRAWN.has(toolName(call2))); -- const running = root.kind === "tool-result" ? void 0 : calls.findLast((call2) => call2.kind !== "tool-result"); -- const note = running ? toolActivity(toolName(running), toolArgs(running).text, findBot, roster.byId[sessionId]) : null; -- useLiveNote(actions, sessionId, `tool:${root.callId ?? node.key}`, note); -- useShownCards(actions, sessionId, drawn.filter((call2) => CARDS.has(toolName(call2)) && call2.callId).map((call2) => call2.callId)); -- if (drawn.length === 0) return null; -- const env = { sessionId, roster, actions, useUi, useWork, findBot }; -- return (0, import_react6.createElement)(import_react6.Fragment, null, drawn.map((call2, index) => (0, import_react6.createElement)(import_react6.Fragment, { key: call2.callId ?? index }, renderCall(call2, env)))); ++} +var KANBAN_CSS = ` +.bt-board-row{min-height:40px;padding:6px 8px;gap:10px} +.bt-board-mark{flex:none;width:36px;height:28px;display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink-2)} @@ -12817,54 +13307,20 @@ diff --git a/client.js b/client.js + .bt-mem.bt-board{width:100vw;border-radius:0;border:0} + .bt-board-columns{flex-direction:column} + .bt-board-column{min-width:0} - } ++} +`; - --// src/client/activity-row.js --var import_react7 = require("react"); --var import_react_dom2 = require("react-dom"); --var PHRASE_HOLD_MS = 800; --var drawPhrase = (pool) => t(pool[Math.min(pool.length - 1, Math.floor(Math.random() * pool.length))]); --function elapsedLabel(ms) { -- const minutes = Math.floor(ms / 6e4); -- if (minutes < 60) return `${Math.max(1, minutes)}m`; -- const hours = Math.floor(minutes / 60); -- return minutes % 60 === 0 ? `${hours}h` : `${hours}h ${minutes % 60}m`; ++ +// src/client/project-presence.js -+var import_react17 = require("react"); ++var import_react19 = require("react"); +function useProjectPresent() { + const slots = registry(); -+ const [present, setPresent] = (0, import_react17.useState)(() => projectPresent()); -+ (0, import_react17.useEffect)(() => { ++ const [present, setPresent] = (0, import_react19.useState)(() => projectPresent()); ++ (0, import_react19.useEffect)(() => { + setPresent(projectPresent()); + return slots.subscribe(() => setPresent(projectPresent())); + }, [slots]); + return present; - } --function useRunningHost(active) { -- const [host, setHost] = (0, import_react7.useState)(null); -- (0, import_react7.useEffect)(() => { -- if (!active) { -- setHost(null); -- return void 0; -- } -- let frame = 0; -- const find = () => { -- frame = 0; -- const node = document.querySelector("[data-chat-flow] > [data-chat-running]"); -- setHost((prev) => prev === node ? prev : node); -- }; -- const observer = new MutationObserver(() => { -- if (!frame) frame = requestAnimationFrame(find); -- }); -- observer.observe(document.querySelector("[data-conversation-scroll]") ?? document.body, { childList: true, subtree: true }); -- find(); -- return () => { -- cancelAnimationFrame(frame); -- observer.disconnect(); -- }; -- }, [active]); -- return host; ++} + +// src/client/role-labels.js +var ROLE_LABELS = { owner: "Owner", maintainer: "Maintainer", member: "Member" }; @@ -12874,7 +13330,7 @@ diff --git a/client.js b/client.js +} + +// src/client/projects-nav.js -+var import_react18 = require("react"); ++var import_react20 = require("react"); +var import_react_dom3 = require("react-dom"); +var PROJECTS_NAV_CSS = ` +.bt-projects-row { display: flex; align-items: center; gap: 8px; } @@ -12908,17 +13364,35 @@ diff --git a/client.js b/client.js + for (const role of choices) { + if (role === current) continue; + items.push({ role, label: roleText(role), current: false, pick: true }); -+ } + } +- const parts = []; +- parts.push((0, import_react6.createElement)("span", { key: "p" }, prefix)); +- bots.forEach((bot, index) => { +- if (index > 0) parts.push((0, import_react6.createElement)("span", { key: `j${index}` }, joiner)); +- parts.push((0, import_react6.createElement)( +- "button", +- { key: bot.id ?? index, type: "button", onClick: () => onOpen?.(bot) }, +- (0, import_react6.createElement)(BotMark, { bot, size: 16 }), +- bot.name +- )); +- }); +- return (0, import_react6.createElement)("div", { className: "bt-event" }, parts); + return items; +} +function roleNote(answer) { + if (answer?.changed === true) return t("Role changed."); + const reason = typeof answer?.reason === "string" && answer.reason !== "" ? answer.reason : t("refused"); + return t("Role unchanged: {reason}", { reason }); -+} + } +-function GroupMessage({ bot, text, room: room2, roster, actions, msgKey, useUi }) { +- const lead = (0, import_react6.createElement)( +function ProjectList({ projects, error, note, onOpen, onRole }) { -+ const rows = projects === null ? (0, import_react18.createElement)("div", { className: "bt-projects-note" }, t("Reading Projects…")) : error !== "" ? (0, import_react18.createElement)("div", { className: "bt-projects-note" }, error) : projects.length === 0 ? (0, import_react18.createElement)("div", { className: "bt-projects-empty" }, t("No Projects yet")) : projects.map((project) => (0, import_react18.createElement)( -+ "button", ++ const rows = projects === null ? (0, import_react20.createElement)("div", { className: "bt-projects-note" }, t("Reading Projects…")) : error !== "" ? (0, import_react20.createElement)("div", { className: "bt-projects-note" }, error) : projects.length === 0 ? (0, import_react20.createElement)("div", { className: "bt-projects-empty" }, t("No Projects yet")) : projects.map((project) => (0, import_react20.createElement)( + "button", +- { type: "button", className: "bt-lead", "aria-label": t("Open {name}'s chat", { name: bot.name }), onClick: () => actions.openSession(bot.id) }, +- (0, import_react6.createElement)(BotMark, { bot, size: 22 }) +- ); +- return (0, import_react6.createElement)( + { + key: String(project.id), + type: "button", @@ -12932,121 +13406,138 @@ diff --git a/client.js b/client.js + onRole?.(project, event); + } + }, -+ (0, import_react18.createElement)("span", { className: "bt-project-entry-name" }, projectName(project)), -+ roleText(project.role) === "" ? null : (0, import_react18.createElement)("span", { className: "bt-project-entry-role" }, roleText(project.role)) ++ (0, import_react20.createElement)("span", { className: "bt-project-entry-name" }, projectName(project)), ++ roleText(project.role) === "" ? null : (0, import_react20.createElement)("span", { className: "bt-project-entry-role" }, roleText(project.role)) + )); -+ return (0, import_react18.createElement)( -+ "div", ++ return (0, import_react20.createElement)( + "div", +- { className: "bt-group-msg" }, +- (0, import_react6.createElement)( +- "span", +- { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, +- bot.name, +- room2?.admin === bot.id ? (0, import_react6.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null +- ), +- (0, import_react6.createElement)(Bubbles, { texts: [text], roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead }) + { className: "bt-projects-list", role: "group", "aria-label": t("Projects") }, + rows, -+ note === "" || note === void 0 ? null : (0, import_react18.createElement)("div", { className: "bt-projects-note", role: "status" }, note) -+ ); ++ note === "" || note === void 0 ? null : (0, import_react20.createElement)("div", { className: "bt-projects-note", role: "status" }, note) + ); } --function useRowEntrances(replacing) { -- const check = (0, import_react7.useRef)(replacing); -- check.current = replacing; -- (0, import_react7.useEffect)(() => { -- const seen = /* @__PURE__ */ new WeakSet(); -- const started = Date.now(); -- let column = null; -- let frame = 0; -- const settle = (event) => { -- if (event.target !== event.currentTarget || !/^bt-row/.test(event.animationName)) return; -- delete event.currentTarget.dataset.btEnter; -- event.currentTarget.removeEventListener("animationend", settle); +-function GroupEvent({ prefix, room: room2, name, roster, actions }) { +- return (0, import_react6.createElement)( +- "div", +- { className: "bt-event" }, +- (0, import_react6.createElement)("span", null, prefix), +- room2 ? (0, import_react6.createElement)("button", { type: "button", onClick: () => actions.openSession(room2.id) }, (0, import_react6.createElement)(RoomAvatar, { room: room2, roster, size: 16 }), room2.name) : name ? (0, import_react6.createElement)("span", null, name) : null +function Chevron() { -+ return (0, import_react18.createElement)( ++ return (0, import_react20.createElement)( + "svg", + { width: 12, height: 12, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, -+ (0, import_react18.createElement)("path", { d: "M7.5 4.5L13 10l-5.5 5.5" }) -+ ); -+} ++ (0, import_react20.createElement)("path", { d: "M7.5 4.5L13 10l-5.5 5.5" }) + ); + } +-function MemoryEvent({ sessionId, scope, result, roster, actions, findBot }) { +- if (!/^(Saved to|Updated in|Removed from) /.test(result)) return null; +- const self = roster.byId[sessionId]; +- const team = /^(team|团队|共享)$/i.test(String(scope ?? "").trim()); +- const other = team || !scope ? void 0 : findBot(scope); +- const target = other && other.id !== self?.id ? other : self; +- if (!target) return null; +- const label = team ? t("Team memory updated") : target === self ? t("Memory updated") : t("Updated {name}'s memory", { name: target.name }); +- return (0, import_react6.createElement)( +- "div", +- { className: "bt-event" }, +- (0, import_react6.createElement)("button", { type: "button", title: result, onClick: () => actions.openMemory(target.id) }, (0, import_react6.createElement)(MemoryIcon), label) +function ProjectsMark() { -+ return (0, import_react18.createElement)( ++ return (0, import_react20.createElement)( + "svg", + { width: 18, height: 18, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinejoin: "round", "aria-hidden": true }, -+ (0, import_react18.createElement)("path", { d: "M2.5 5.5h6l1.5 2h7.5v8a1 1 0 0 1-1 1h-13a1 1 0 0 1-1-1z" }), -+ (0, import_react18.createElement)("path", { d: "M2.5 5.5v-1a1 1 0 0 1 1-1h4l1.5 2" }) -+ ); -+} ++ (0, import_react20.createElement)("path", { d: "M2.5 5.5h6l1.5 2h7.5v8a1 1 0 0 1-1 1h-13a1 1 0 0 1-1-1z" }), ++ (0, import_react20.createElement)("path", { d: "M2.5 5.5v-1a1 1 0 0 1 1-1h4l1.5 2" }) + ); + } +-function PartLine({ time }) { +- return (0, import_react6.createElement)("div", { className: "bt-part-line", role: "separator" }, Number.isFinite(time) ? (0, import_react6.createElement)("span", null, dayLabel(time)) : null); +-} +-var scrollParent = (node) => { +- for (let at = node.parentElement; at; at = at.parentElement) { +- if (/(auto|scroll)/.test(getComputedStyle(at).overflowY)) return at; +- } +- return null; +-}; +-function EarlierParts({ sessionId, roster, actions }) { +- const [view, setView] = (0, import_react6.useState)({ items: [], cursor: void 0, loading: true, failed: false, startedAt: null }); +- const top = (0, import_react6.useRef)(null); +- const busy = (0, import_react6.useRef)(false); +- const alive = (0, import_react6.useRef)(true); +- const restore = (0, import_react6.useRef)(null); +- const load = (cursor) => { +- if (busy.current) return; +- busy.current = true; +- setView((current) => ({ ...current, loading: true, failed: false })); +- actions.earlier(sessionId, cursor).then((page) => { +- busy.current = false; +- if (!alive.current) return; +- const scroller = top.current && scrollParent(top.current); +- if (scroller) restore.current = { scroller, fromEnd: scroller.scrollHeight - scroller.scrollTop }; +- setView((current) => ({ items: [...page.items, ...current.items], cursor: page.cursor, loading: false, failed: false, startedAt: page.startedAt ?? current.startedAt })); +- }, () => { +- busy.current = false; +- if (alive.current) setView((current) => ({ ...current, loading: false, failed: true })); +- }); +- }; +- (0, import_react6.useEffect)(() => { +- alive.current = true; +- load(void 0); +function ProjectRoleMenu({ project, x, y, onPick, onClose }) { -+ const ref = (0, import_react18.useRef)(null); -+ (0, import_react18.useEffect)(() => { ++ const ref = (0, import_react20.useRef)(null); ++ (0, import_react20.useEffect)(() => { + const onDown = (event) => { + if (!ref.current?.contains(event.target)) onClose(); - }; -- const scan = () => { -- frame = 0; -- const next = document.querySelector("[data-chat-flow]"); -- if (next !== column) { -- observer.disconnect(); -- column = next; -- if (column) observer.observe(column, { childList: true, subtree: true }); -- } -- if (!column) return; -- const items = [...column.querySelectorAll(":scope > [data-chat-flow-key]")]; -- let last = -1; -- items.forEach((item, index) => { -- if (seen.has(item)) last = index; -- }); -- const fresh = items.filter((item) => !seen.has(item) && item.offsetHeight > 0); -- for (const item of fresh) seen.add(item); -- if (last < 0 || Date.now() - started < 800 || fresh.length > 3) return; -- for (const item of fresh) { -- if (items.indexOf(item) < last) continue; -- const reply = [void 0, "assistant-step", "tool-call"].includes(item.dataset.chatFlowKind); -- item.dataset.btEnter = reply && check.current() ? "after-collapse" : "new"; -- item.addEventListener("animationend", settle); -- } ++ }; + const onKey = (event) => { + if (event.key === "Escape") onClose(); - }; -- const observer = new MutationObserver(() => { -- if (!frame) frame = requestAnimationFrame(scan); -- }); -- scan(); ++ }; + window.addEventListener("mousedown", onDown, true); + window.addEventListener("keydown", onKey, true); return () => { -- cancelAnimationFrame(frame); -- observer.disconnect(); +- alive.current = false; + window.removeEventListener("mousedown", onDown, true); + window.removeEventListener("keydown", onKey, true); }; -- }, []); --} --function ActivityIndicator({ sessionId, useRoster, useSessionStatus, useLive, useSession, actions }) { -- const roster = useRoster((value) => value); -- const running = useSessionStatus((map) => map.get(sessionId)?.running === true); -- const liveKey = useLive((state) => JSON.stringify(state[sessionId] ?? {})); -- const pendingInput = useSession((snapshot) => Math.max(0, ...(snapshot?.pendingSubmissions ?? []).filter((sub) => sub.placement !== "queued").map((sub) => sub.time))); -- const bot = roster.byId[sessionId]; -- const room2 = roster.roomsById[sessionId]; -- const entries2 = (0, import_react7.useMemo)(() => Object.values(JSON.parse(liveKey)), [liveKey]); -- const streaming = entries2.some((entry) => entry.text); -- const tools = entries2.filter((entry) => !entry.text).sort((a, b) => a.at - b.at); -- const relaying = tools.some((entry) => entry.relay); -- const visible = running && !streaming && !relaying && (bot !== void 0 || room2 !== void 0); -- const tool = tools.at(-1); -- const inputRef = (0, import_react7.useRef)(0); -- const inputAt = Math.max(inputRef.current, pendingInput); -- inputRef.current = inputAt; -- const want = !visible ? null : inputAt > (tool?.at ?? 0) ? { key: `input:${inputAt}`, pool: PHRASES.thinking, state: "thinking" } : tool ? { key: tool.label ? `tool:${tool.label}` : "working", label: tool.label, pool: PHRASES.working, state: tool.state ?? "working" } : { key: "thinking", pool: PHRASES.thinking, state: "thinking" }; -- const [shown, setShown] = (0, import_react7.useState)(null); -- const wantKey = want?.key ?? null; -- const markState = (0, import_react7.useRef)("thinking"); -- if (want) markState.current = want.state; -- (0, import_react7.useEffect)(() => { -- if (wantKey === null || shown?.key === wantKey) return void 0; -- const make = () => setShown({ key: wantKey, text: want.label ?? drawPhrase(want.pool), at: Date.now() }); -- const wait = shown ? shown.at + PHRASE_HOLD_MS - Date.now() : 0; -- if (wait <= 0) { -- make(); -- return void 0; +- }, [sessionId]); +- (0, import_react6.useLayoutEffect)(() => { +- const pending = restore.current; +- restore.current = null; +- if (pending) pending.scroller.scrollTop = pending.scroller.scrollHeight - pending.fromEnd; +- }, [view.items]); +- (0, import_react6.useEffect)(() => { +- const node = top.current; +- if (!node || view.loading || view.failed || !view.cursor || typeof IntersectionObserver !== "function") return void 0; +- const observer = new IntersectionObserver((entries2) => { +- if (entries2.some((entry) => entry.isIntersecting)) load(view.cursor); +- }, { root: scrollParent(node), rootMargin: "600px 0px 0px 0px" }); +- observer.observe(node); +- return () => observer.disconnect(); +- }, [view.cursor, view.loading, view.failed]); +- const selfId = roster.byId[sessionId]?.id; +- const rows = []; +- for (const item of view.items) { +- const last = rows.at(-1); +- if (item.kind === "bot" && last?.kind === "bot") last.texts.push(item.text); +- else rows.push(item.kind === "bot" ? { kind: "bot", texts: [item.text] } : item); +- } +- return (0, import_react6.createElement)( + }, [onClose]); + const items = projectMenuItems(project); -+ return (0, import_react_dom3.createPortal)((0, import_react18.createElement)( -+ "div", ++ return (0, import_react_dom3.createPortal)((0, import_react20.createElement)( + "div", +- { className: "bt-earlier", role: "feed", "aria-label": t("Earlier messages"), "aria-busy": view.loading }, +- (0, import_react6.createElement)( +- "div", +- { ref: top, className: "bt-earlier-top" }, +- view.loading ? (0, import_react6.createElement)(Shimmer, null, t("Loading earlier messages…")) : view.failed ? (0, import_react6.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Couldn’t load earlier messages · Retry")) : view.cursor ? (0, import_react6.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Load earlier")) : null + { + ref, + className: "bt-project-menu", @@ -13055,8 +13546,8 @@ diff --git a/client.js b/client.js + style: { left: `${x}px`, top: `${y}px` }, + "data-project-id": String(project?.id ?? "") + }, -+ (0, import_react18.createElement)("div", { className: "bt-projects-note" }, projectName(project)), -+ items.length === 0 ? (0, import_react18.createElement)("div", { className: "bt-projects-note" }, t("No role to switch here.")) : items.map((item) => (0, import_react18.createElement)("button", { ++ (0, import_react20.createElement)("div", { className: "bt-projects-note" }, projectName(project)), ++ items.length === 0 ? (0, import_react20.createElement)("div", { className: "bt-projects-note" }, t("No role to switch here.")) : items.map((item) => (0, import_react20.createElement)("button", { + key: item.role, + type: "button", + role: "menuitemradio", @@ -13073,31 +13564,19 @@ diff --git a/client.js b/client.js +function ProjectsNav({ wide = true, request, onOpen } = {}) { + const read = request ?? call; + const present = useProjectPresent(); -+ const open = (0, import_react18.useCallback)((id) => { ++ const open = (0, import_react20.useCallback)((id) => { + if (onOpen) { + onOpen(id); + return; - } -- const timer = setTimeout(make, wait); -- return () => clearTimeout(timer); -- }, [wantKey, shown]); -- const [phase, setPhase] = (0, import_react7.useState)(null); -- const endedAt = (0, import_react7.useRef)(0); -- const shift = (0, import_react7.useRef)(null); -- const leaving = (0, import_react7.useRef)(false); -- leaving.current = phase !== null && !visible; -- (0, import_react7.useEffect)(() => { -- if (visible) { -- setPhase("in"); -- return void 0; ++ } + if (typeof window !== "undefined") window.location.hash = projectHash(id); + }, [onOpen]); -+ const [expanded, setExpanded] = (0, import_react18.useState)(false); -+ const [projects, setProjects] = (0, import_react18.useState)(null); -+ const [error, setError] = (0, import_react18.useState)(""); -+ const [note, setNote] = (0, import_react18.useState)(""); -+ const [menu, setMenu] = (0, import_react18.useState)(null); -+ const load = (0, import_react18.useCallback)(async () => { ++ const [expanded, setExpanded] = (0, import_react20.useState)(false); ++ const [projects, setProjects] = (0, import_react20.useState)(null); ++ const [error, setError] = (0, import_react20.useState)(""); ++ const [note, setNote] = (0, import_react20.useState)(""); ++ const [menu, setMenu] = (0, import_react20.useState)(null); ++ const load = (0, import_react20.useCallback)(async () => { + try { + const listing = await read("projects"); + const list = Array.isArray(listing?.projects) ? listing.projects : []; @@ -13106,41 +13585,9 @@ diff --git a/client.js b/client.js + } catch (failure) { + setProjects([]); + setError(failure?.message ?? String(failure)); - } -- setPhase((current) => current === "in" ? "out" : current); -- const timer = setTimeout(() => { -- shift.current = document.querySelector("[data-conversation-scroll]")?.scrollTop ?? null; -- setPhase((current) => current === "out" ? null : current); -- }, 140); -- return () => clearTimeout(timer); -- }, [visible]); -- (0, import_react7.useLayoutEffect)(() => { -- if (phase !== null) return; -- endedAt.current = Date.now(); -- setShown(null); -- const before = shift.current; -- shift.current = null; -- const scroller = document.querySelector("[data-conversation-scroll]"); -- if (before === null || !scroller || reducedMotion()) return; -- const delta = before - scroller.scrollTop; -- if (delta > 0) scroller.querySelector("[data-chat-flow]")?.animate([{ transform: `translateY(${-delta}px)` }, { transform: "none" }], { duration: 140, easing: "cubic-bezier(.23,1,.32,1)" }); -- }, [phase]); -- (0, import_react7.useEffect)(() => { -- if (!running) actions.clearLive(sessionId); -- }, [running, sessionId]); -- useRowEntrances(() => leaving.current || Date.now() - endedAt.current < 300); -- const [now, setNow] = (0, import_react7.useState)(Date.now); -- (0, import_react7.useEffect)(() => { -- if (phase !== "in") return void 0; -- const timer = setInterval(() => setNow(Date.now()), 1e4); -- return () => clearInterval(timer); -- }, [phase]); -- const host = useRunningHost(running); -- if (!host || phase === null || !shown) return null; -- const elapsed = now - shown.at >= 6e4 ? elapsedLabel(now - shown.at) : null; -- return (0, import_react_dom2.createPortal)((0, import_react7.createElement)( ++ } + }, [read]); -+ (0, import_react18.useEffect)(() => { ++ (0, import_react20.useEffect)(() => { + if (!expanded) return; + void load(); + }, [expanded, load]); @@ -13154,33 +13601,10 @@ diff --git a/client.js b/client.js + }; + const listed = expanded && wide; + if (!present) return null; -+ return (0, import_react18.createElement)( - "div", -- { className: "bt-typing", "data-exiting": phase === "out" ? "" : void 0, "aria-hidden": true }, -- bot ? (0, import_react7.createElement)(BotMark, { bot, size: 28, state: markState.current, live: true, pokeable: true }) : (0, import_react7.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), -- (0, import_react7.createElement)( -- "span", -- { className: "bt-typing-text" }, -- (0, import_react7.createElement)( -- "span", -- { key: `${shown.key}:${shown.at}`, className: "bt-typing-label" }, -- (0, import_react7.createElement)(Shimmer, null, `${shown.text}…`), -- elapsed ? (0, import_react7.createElement)("span", { className: "bt-typing-time" }, `· ${elapsed}`) : null -- ) -- ) -- ), host); --} -- --// src/client/dsh-offer.js --var APP_OFFER = /* @__PURE__ */ new Set(["available", "downloading", "verifying", "installing", "ready"]); --var bare = (value) => String(value ?? "").trim().replace(/^v/i, "").split("+")[0]; --var sameVersion = (a, b) => bare(a) !== "" && bare(a) === bare(b); --function showsDshRow(dsh, app) { -- if (!dsh?.verified || !dsh.current || sameVersion(dsh.verified, dsh.current)) return false; -- if (dsh.kind === "npm") return true; -- return dsh.kind === "app" && APP_OFFER.has(app?.phase) && sameVersion(app.version, dsh.verified); ++ return (0, import_react20.createElement)( ++ "div", + { className: "bt-projects" }, -+ (0, import_react18.createElement)( ++ (0, import_react20.createElement)( + "button", + { + type: "button", @@ -13190,12 +13614,35 @@ diff --git a/client.js b/client.js + title: wide ? void 0 : t("Projects"), + onClick: toggle + }, -+ (0, import_react18.createElement)("span", { className: "bt-projects-mark" }, (0, import_react18.createElement)(ProjectsMark)), -+ wide ? (0, import_react18.createElement)("span", { className: "bt-projects-label" }, t("Projects")) : null, -+ wide ? (0, import_react18.createElement)("span", { className: "bt-projects-chevron", "aria-hidden": true }, (0, import_react18.createElement)(Chevron)) : null -+ ), -+ listed ? (0, import_react18.createElement)(ProjectList, { projects, error, note, onOpen: open, onRole: (project, event) => setMenu({ project, x: event.clientX, y: event.clientY }) }) : null, -+ menu === null ? null : (0, import_react18.createElement)(ProjectRoleMenu, { ++ (0, import_react20.createElement)("span", { className: "bt-projects-mark" }, (0, import_react20.createElement)(ProjectsMark)), ++ wide ? (0, import_react20.createElement)("span", { className: "bt-projects-label" }, t("Projects")) : null, ++ wide ? (0, import_react20.createElement)("span", { className: "bt-projects-chevron", "aria-hidden": true }, (0, import_react20.createElement)(Chevron)) : null + ), +- rows.map((row, index) => { +- const key = rows.length - index; +- switch (row.kind) { +- case "divider": +- return (0, import_react6.createElement)(PartLine, { key, time: row.time }); +- case "user": +- return (0, import_react6.createElement)("div", { key, className: "bt-urow" }, (0, import_react6.createElement)( +- "div", +- { className: "bt-ububble" }, +- row.text ? (0, import_react6.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: row.text, labels: mdLabels(), variant: "compact" }) : null, +- row.images ? (0, import_react6.createElement)("span", { className: "bt-uimages" }, row.images === 1 ? t("1 image") : t("{count} images", { count: row.images })) : null +- )); +- case "answer": +- return (0, import_react6.createElement)(AnsweredCell, { key, node: { data: row } }); +- case "bot": +- return (0, import_react6.createElement)(Bubbles, { key, texts: row.texts, roster, selfId, actions }); +- case "event": { +- if (row.role === "report") return (0, import_react6.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_react6.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => { +- if (selfId && other.id) actions.openExchange(selfId, other.id); +- }, whole: true }); ++ listed ? (0, import_react20.createElement)(ProjectList, { projects, error, note, onOpen: open, onRole: (project, event) => setMenu({ project, x: event.clientX, y: event.clientY }) }) : null, ++ menu === null ? null : (0, import_react20.createElement)(ProjectRoleMenu, { + project: menu.project, + x: menu.x, + y: menu.y, @@ -13209,131 +13656,185 @@ diff --git a/client.js b/client.js + if (answer?.changed === true) void load(); + } catch (failure) { + setNote(failure?.message ?? String(failure)); -+ } -+ } + } +- default: +- return null; + } +- }), +- (0, import_react6.createElement)(PartLine, { time: view.startedAt }) + }) + ); - } - - // src/client/sidebar.js --var import_react8 = require("react"); --var import_react_dom3 = require("react-dom"); -+var import_react19 = require("react"); ++} ++ ++// src/client/sidebar.js ++var import_react21 = require("react"); +var import_react_dom4 = require("react-dom"); - var import_dsh_client_ui_primitives2 = require("@deepseek-ai/dsh-client-ui-primitives"); - function useMarkedUnread(id, active, marked, actions) { -- (0, import_react8.useEffect)(() => { -+ (0, import_react19.useEffect)(() => { - if (active && marked) actions.clearUnread(id); - }, [active, marked]); - } --var PinMark = () => (0, import_react8.createElement)("span", { className: "bt-pin", "aria-hidden": true }, (0, import_react8.createElement)(PinMarkIcon)); -+var PinMark = () => (0, import_react19.createElement)("span", { className: "bt-pin", "aria-hidden": true }, (0, import_react19.createElement)(PinMarkIcon)); - var useApproval = (useWork, match) => useWork ? useWork((work) => (work.approvals ?? []).some(match)) : false; - var useGroupWork = (useWork, pick2) => useWork ? useWork((work) => pick2(work.rooms ?? {}).join(",")) : ""; --var workKeys = (text) => text === "" ? [] : text.split(",").map((key) => { ++var import_dsh_client_ui_primitives3 = require("@deepseek-ai/dsh-client-ui-primitives"); ++function useMarkedUnread(id, active, marked, actions) { ++ const wasActive = (0, import_react21.useRef)(false); ++ (0, import_react21.useEffect)(() => { ++ const opened = shouldClearManualUnread({ active, wasActive: wasActive.current, marked }); ++ wasActive.current = active; ++ if (opened) actions.clearUnread(id); ++ }, [active, marked, id]); ++} ++var PinMark = () => (0, import_react21.createElement)("span", { className: "bt-pin", "aria-hidden": true }, (0, import_react21.createElement)(PinMarkIcon)); ++var useApproval = (useWork, match) => useWork ? useWork((work) => (work.approvals ?? []).some(match)) : false; ++var useGroupWork = (useWork, pick2) => useWork ? useWork((work) => pick2(work.rooms ?? {}).join(",")) : ""; +var workKeys = (text2) => text2 === "" ? [] : text2.split(",").map((key) => { - const [id, tool] = key.split("|"); - return { id, tool: tool || void 0 }; - }); --var workLine = (lead, tool, more) => (0, import_react8.createElement)(Shimmer, null, `${lead} · ${workPhrase(tool)}…${more > 0 ? ` +${more}` : ""}`); --function BotRow({ bot, roster, actions, useSessions, useSessionStatus, useSessionRetainInfo, useActivity, useWork, wide, marked }) { -+var workLine = (lead, tool, more) => (0, import_react19.createElement)(Shimmer, null, `${lead} · ${workPhrase(tool)}…${more > 0 ? ` +${more}` : ""}`); ++ const [id, tool] = key.split("|"); ++ return { id, tool: tool || void 0 }; ++}); ++var workLine = (lead, tool, more) => (0, import_react21.createElement)(Shimmer, null, `${lead} · ${workPhrase(tool)}…${more > 0 ? ` +${more}` : ""}`); +function BotRow({ bot, roster, actions, useSessions, useSessionStatus, useSessionRetainInfo, useActivity, useWork, wide, marked, asRow = false }) { - const id = bot.id; - const part = currentPart(bot); -- const preview = useSessions((list) => previewOf(list, part, roster.exchangeTurns[part])); ++ const id = bot.id; ++ const part = currentPart(bot); + const preview = useSessions((list) => nameMentions(previewOf(list, part, roster.exchangeTurns[part], unsentReplyTurns(bot, part), botNames(roster)), roster)); - const running = useSessionStatus((map) => map.get(part)?.running === true); - const active = useSessionRetainInfo(part, (info) => (info?.retainedBy?.mainView ?? 0) > 0); - const unread = useSessionStatus((map) => map.get(part)?.completionUnread === true || map.get(part)?.pendingInteraction !== void 0) || marked && !active; - useMarkedUnread(id, active, marked, actions); - const main = isMainOf(roster, id); -- const tile = roster.mainBotId === id; ++ const running = useSessionStatus((map) => map.get(part)?.running === true); ++ const active = useSessionRetainInfo(part, (info) => (info?.retainedBy?.mainView ?? 0) > 0); ++ const unread = useSessionStatus((map) => map.get(part)?.completionUnread === true || map.get(part)?.pendingInteraction !== void 0) || marked && !active; ++ useMarkedUnread(id, active, marked, actions); ++ const main = isMainOf(roster, id); + const tile = roster.mainBotId === id && !asRow; - const approval = useApproval(useWork, (entry) => entry.botId === id); -- const alert = roster.questions?.[part] !== void 0 || approval; ++ const approval = useApproval(useWork, (entry) => entry.botId === id); + const waiting = approval || (bot.pendingCount ?? 0) > 0; + const alert = roster.questions?.[part] !== void 0 || waiting; - const doing = useActivity((map) => map[id]); - const groups = workKeys(useGroupWork(useWork, (rooms) => Object.entries(rooms).flatMap(([roomId, entries2]) => entries2.filter((entry) => entry.botId === id).map((entry) => `${roomId}|${entry.tool ?? ""}`)))); - const away = !running && groups.length > 0; - const state = botState(running || away, doing, alert); -- const awayLine = away ? workLine(roster.roomsById[groups[0].id]?.name ?? t("a group chat"), groups[0].tool, groups.length - 1) : null; -- if (bot.hidden && !active && !main) return null; ++ const doing = useActivity((map) => map[id]); ++ const groups = workKeys(useGroupWork(useWork, (rooms) => Object.entries(rooms).flatMap(([roomId, entries2]) => entries2.filter((entry) => entry.botId === id).map((entry) => `${roomId}|${entry.tool ?? ""}`)))); ++ const away = !running && groups.length > 0; ++ const state = botState(running || away, doing, alert); + const shownAway = away ? awayGroups(groups, roster.roomsById) : []; + const awayLine = shownAway.length > 0 ? workLine(roster.roomsById[shownAway[0].id]?.name ?? t("a group chat"), shownAway[0].tool, shownAway.length - 1) : null; + if (!isShownRemoteChat(bot) && !active && !main) return null; - const onContextMenu = (event) => { - event.preventDefault(); - actions.openMenu({ kind: "bot", id, x: event.clientX, y: event.clientY }); - }; - const pinned = bot.pinned === true && !tile; -- const label = [bot.name, main ? t("Main Bot") : "", pinned ? t("Pinned") : "", running || away ? t("Working") : "", approval ? t("Waiting for your approval") : alert ? t("Waiting for your answer") : "", unread ? t("Unread activity") : ""].filter(Boolean).join(", "); ++ const onContextMenu = (event) => { ++ event.preventDefault(); ++ actions.openMenu({ kind: "bot", id, x: event.clientX, y: event.clientY }); ++ }; ++ const pinned = bot.pinned === true && !tile; + const remote = Boolean(bot.remote); + const shown = remote ? friendBotTitle(bot) : bot.name; + const secondLine = awayLine || preview || (remote ? bot.remote?.gone ? t("no longer shared") : t("Friend's Bot") : ""); + const label = [shown, main ? t("Main Bot") : "", pinned ? t("Pinned") : "", running || away ? t("Working") : "", waiting ? t("Waiting for your approval") : alert ? t("Waiting for your answer") : "", unread ? t("Unread activity") : ""].filter(Boolean).join(", "); - if (tile && wide) { -- return (0, import_react8.createElement)("div", { className: "bt-tile-wrap" }, (0, import_react8.createElement)( -+ return (0, import_react19.createElement)("div", { className: "bt-tile-wrap" }, (0, import_react19.createElement)( - "button", - { - type: "button", -@@ -4785,55 +4785,131 @@ function BotRow({ bot, roster, actions, useSessions, useSessionStatus, useSessio - onClick: () => actions.openSession(id), - onContextMenu - }, -- (0, import_react8.createElement)(BotAvatar, { bot, size: 60, state, main: true }), -- (0, import_react8.createElement)("span", { className: "bt-tile-name" }, bot.name), -- bot.role ? (0, import_react8.createElement)("span", { className: "bt-chip" }, bot.role) : null -+ (0, import_react19.createElement)(BotAvatar, { bot, size: 60, state, main: true }), -+ (0, import_react19.createElement)("span", { className: "bt-tile-name" }, shown), ++ if (tile && wide) { ++ return (0, import_react21.createElement)("div", { className: "bt-tile-wrap" }, (0, import_react21.createElement)( ++ "button", ++ { ++ type: "button", ++ className: "bt-tile", ++ "aria-label": label, ++ "aria-current": active ? "page" : void 0, ++ "data-bot-id": id, ++ title: preview || bot.name, ++ onClick: () => actions.openSession(id), ++ onContextMenu ++ }, ++ (0, import_react21.createElement)(BotAvatar, { bot, size: 60, state, main: true }), ++ (0, import_react21.createElement)("span", { className: "bt-tile-name" }, shown), + // The Main Bot's tile gets the same unread dot as a row (#420); a wait shows on its avatar. -+ unread && !waiting && !active ? (0, import_react19.createElement)("span", { className: "bt-unread bt-tile-unread", "aria-hidden": true }) : null, -+ bot.role ? (0, import_react19.createElement)("span", { className: "bt-chip" }, bot.role) : null - )); - } -- return (0, import_react8.createElement)( -+ const unreadMark = wide && waiting && !active ? (0, import_react19.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react19.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null; -+ const row = (0, import_react19.createElement)( - "button", - { - type: "button", - className: "bt-row", - "aria-label": label, - "aria-current": active ? "page" : void 0, ++ unread && !waiting && !active ? (0, import_react21.createElement)("span", { className: "bt-unread bt-tile-unread", "aria-hidden": true }) : null, ++ bot.role ? (0, import_react21.createElement)("span", { className: "bt-chip" }, bot.role) : null ++ )); ++ } ++ const unreadMark = wide && waiting && !active ? (0, import_react21.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react21.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null; ++ const row = (0, import_react21.createElement)( ++ "button", ++ { ++ type: "button", ++ className: "bt-row", ++ "aria-label": label, ++ "aria-current": active ? "page" : void 0, + // An own Bot's hover text names its model (#366); a friend's Bot runs on its owner's model. - "data-bot-id": id, -- title: wide ? void 0 : bot.name, ++ "data-bot-id": id, + title: remote ? shown : botRowTitle(shown, modelOf(bot, roster)?.name, wide), - onClick: () => actions.openSession(id), - onContextMenu - }, -- (0, import_react8.createElement)(BotAvatar, { bot, size: 36, state, main }), -- pinned && !wide ? (0, import_react8.createElement)(PinMark) : null, -- wide ? (0, import_react8.createElement)( -+ (0, import_react19.createElement)(BotAvatar, { bot, size: 36, state, main }), -+ pinned && !wide ? (0, import_react19.createElement)(PinMark) : null, -+ wide ? (0, import_react19.createElement)( - "span", - { className: "bt-row-body" }, -- (0, import_react8.createElement)("span", { className: "bt-row-name" }, (0, import_react8.createElement)("span", { className: "bt-row-title" }, bot.name), pinned ? (0, import_react8.createElement)(PinMark) : null), -- awayLine ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, awayLine) : preview ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, preview) : null -+ (0, import_react19.createElement)( ++ onClick: () => actions.openSession(id), ++ onContextMenu ++ }, ++ (0, import_react21.createElement)(BotAvatar, { bot, size: 36, state, main }), ++ pinned && !wide ? (0, import_react21.createElement)(PinMark) : null, ++ wide ? (0, import_react21.createElement)( ++ "span", ++ { className: "bt-row-body" }, ++ (0, import_react21.createElement)( + "span", + { className: "bt-row-name" }, -+ (0, import_react19.createElement)("span", { className: "bt-row-title" }, shown), -+ bot.remote ? (0, import_react19.createElement)(RemoteMark, { remote: bot.remote }) : null, -+ pinned ? (0, import_react19.createElement)(PinMark) : null ++ (0, import_react21.createElement)("span", { className: "bt-row-title" }, shown), ++ bot.remote ? (0, import_react21.createElement)(RemoteMark, { remote: bot.remote }) : null, ++ pinned ? (0, import_react21.createElement)(PinMark) : null + ), -+ secondLine ? (0, import_react19.createElement)("span", { className: "bt-row-preview" }, secondLine) : null - ) : null, -- wide && unread && !active ? (0, import_react8.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null ++ secondLine ? (0, import_react21.createElement)("span", { className: "bt-row-preview" }, secondLine) : null ++ ) : null, + unreadMark -+ ); + ); +-} +-function TriggerCell({ node, sessionId, useRoster, useSessions, useTurnClock, useUi, actions }) { +- const roster = useRoster((value) => value); +- const data = node.data; +- const source = data.source !== null && typeof data.source === "object" ? data.source : {}; +- const selfId = roster.byId[sessionId]?.id ?? sessionId; +- const deferred = source.kind === "bot" && source.deferred === true; +- const relayed = isRelayContext(data); +- const turn = node.location?.turn?.turn ?? data.turn; +- (0, import_react6.useLayoutEffect)(() => { +- if (relayed) actions.noteTurnPeer(sessionId, turn, source.senderSessionId); +- }, [relayed, sessionId, turn, source.senderSessionId]); +- const order = useSessions((list) => { +- const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline; +- return Array.isArray(outline) ? outline.map((entry) => entry.turn).join(",") : ""; +- }); +- const peers = useTurnClock((state) => { +- if (!relayed) return ""; +- const turns = state[sessionId] ?? {}; +- return Object.keys(turns).filter((key) => turns[key].peer !== void 0).map((key) => `${key}:${turns[key].peer}`).join(","); +- }); +- const visit = useUi((state) => state.visits?.[sessionId]); +- const hiddenTurns = roster.exchangeTurns[sessionId]; +- const unreadOpening = useTurnClock((state) => { +- const first = openingTurn(state[sessionId], order, hiddenTurns); +- return first?.turn === turn && unseenSince(visit, first.start) ? clockLabel(first.start) : ""; +- }); +- const body = triggerBody(); +- return unreadOpening ? (0, import_react6.createElement)(import_react6.Fragment, null, (0, import_react6.createElement)("div", { className: "bt-open-new" }, (0, import_react6.createElement)(NewDivider), (0, import_react6.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_react6.createElement)(EarlierParts, { sessionId, roster, actions }); +- if (source.role === "kickoff" || source.role === "room") return null; +- if (source.role === "secret" || deferred) return null; +- if (source.role === "post") { +- if (source.failed !== void 0 || source.resumed === true || source.stopped === true) return null; +- const room2 = roster.roomsById[sessionId]; +- const poster = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; +- return (0, import_react6.createElement)(GroupMessage, { bot: poster, text: stripHeader(contentText(data.content)), room: room2, roster, actions, msgKey: `${sessionId}:${data.turn}:post`, useUi }); +- } +- if (source.role === "report") { +- return (0, import_react6.createElement)(GroupEvent, { prefix: t("Replies from"), room: roster.roomsById[source.roomId], name: t("a group chat"), roster, actions }); +- } +- if (source.role === "resume" || source.resumed === true) return (0, import_react6.createElement)("div", { className: "bt-event" }, t("Picked up its work after a restart")); +- if (source.role === "retry" || source.retried === true) return (0, import_react6.createElement)("div", { className: "bt-event" }, t("Asked to make the tool call it wrote as text")); +- const run = relayed ? commRunOf( +- order.split(",").filter(Boolean).map(Number), +- Object.fromEntries(peers.split(",").filter(Boolean).map((pair) => [Number(pair.slice(0, pair.indexOf(":"))), pair.slice(pair.indexOf(":") + 1)])), +- turn, +- hiddenTurns +- ) : null; +- if (run === "folded") return null; +- const sender = roster.byId[source.senderSessionId] ?? { id: source.senderSessionId, name: source.senderName ?? t("a Bot"), color: "gray" }; +- const count = run?.count ?? (isHiddenTurn(roster, sessionId, turn) ? 2 : 1); +- const bots = [sender]; +- for (const peer of (run?.peerIds ?? []).map((id) => roster.byId[id]).filter(Boolean)) { +- if (!bots.some((bot) => bot.id === peer.id)) bots.push(peer); +- } +- return (0, import_react6.createElement)(EventLine, { +- prefix: source.role === "stopped" ? t("Stopped by") : count > 1 ? t("{count} messages with", { count }) : t("Message from"), +- bots, +- onOpen: (bot) => actions.openExchange(selfId, bot.id), +- whole: true +- }); +- } +- if (source.kind === "schedule") { +- const prompts = reminderPrompts(contentText(data.content)); +- return (0, import_react6.createElement)("div", { className: "bt-event" }, prompts.length > 0 ? t("Scheduled task: {text}", { text: prompts.join(" · ").slice(0, 80) }) : t("Routine started")); + const settingsLabel = bot.remote ? t("Bot settings") : t("Edit Bot"); -+ const settings = wide ? (0, import_react19.createElement)("button", { ++ const settings = wide ? (0, import_react21.createElement)("button", { + type: "button", + className: "bt-row-settings", + "aria-label": settingsLabel, @@ -13343,9 +13844,12 @@ diff --git a/client.js b/client.js + event.stopPropagation(); + keepSidebarStill(event.currentTarget); + actions.openSettings("bots", id); -+ } -+ }, (0, import_react19.createElement)(GearIcon)) : null; -+ if (settings) return (0, import_react19.createElement)("div", { className: "bt-row-wrap", "data-bot-id": id }, row, settings); + } +- if (source.kind === "user-question-reply") return null; +- return (0, import_react6.createElement)("div", { className: "bt-event" }, contentText(data.content).slice(0, 80) || t("Update")); +- } ++ }, (0, import_react21.createElement)(GearIcon)) : null; ++ if (settings) return (0, import_react21.createElement)("div", { className: "bt-row-wrap", "data-bot-id": id }, row, settings); + return row; +} +function keepSidebarStill(node) { @@ -13356,210 +13860,316 @@ diff --git a/client.js b/client.js + }; + reset(); + if (typeof requestAnimationFrame === "function") requestAnimationFrame(() => requestAnimationFrame(reset)); -+} + } +-function NewDivider() { +- return (0, import_react6.createElement)("div", { className: "bt-new-sep", role: "separator", "aria-label": t("New messages") }, (0, import_react6.createElement)("span", null, t("New"))); +function RemoteMark({ remote }) { -+ return (0, import_react19.createElement)( ++ return (0, import_react21.createElement)( + "span", + { className: "bt-row-remote", title: remote.gone ? `${remote.handle} · ${t("no longer shared")}` : remote.handle, "aria-label": t("Friend's Bot") }, -+ (0, import_react19.createElement)( ++ (0, import_react21.createElement)( + "svg", + { width: 11, height: 11, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", "aria-hidden": true }, -+ (0, import_react19.createElement)("circle", { cx: 12, cy: 12, r: 9 }), -+ (0, import_react19.createElement)("path", { d: "M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18" }) ++ (0, import_react21.createElement)("circle", { cx: 12, cy: 12, r: 9 }), ++ (0, import_react21.createElement)("path", { d: "M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18" }) + ) + ); -+} + } +-function TurnProcessCell({ node, sessionId, turnProcess, useRoster, useUi, useTurnClock, actions }) { +- const open = turnProcess === void 0 || !turnProcess.foldable || turnProcess.open; +- (0, import_react6.useEffect)(() => { +- if (!open) turnProcess.setOpen(true); +- }, [open, turnProcess]); +- const turn = node?.location?.turn?.turn ?? node?.data?.turn; +- const start = node?.location?.turn?.start?.time; +- const hidden = useRoster((roster) => isHiddenTurn(roster, sessionId, turn)); +- (0, import_react6.useEffect)(() => { +- actions.noteTurnTime(sessionId, turn, "first", start); +- }, [sessionId, turn, start]); +- const visit = useUi((state) => state.visits?.[sessionId]); +- const fresh = useTurnClock((state) => { +- const own = state[sessionId]?.[turn]; +- return !hidden && typeof visit?.seen === "number" && own?.first !== void 0 && own.first <= visit.seen && own.end !== void 0 && own.end > visit.seen && own.end <= visit.entered; +- }); +- return fresh ? (0, import_react6.createElement)(NewDivider) : null; +function isPastFaceRoom(room2) { + if (room2?.origin !== "face-to-face") return false; + const status = room2.face?.status; + if (status === "closed" || status === "left") return true; + const expires = room2.face?.expiresAt; + return status === "candidate" && expires && Number.isFinite(Date.parse(expires)) && Date.parse(expires) <= Date.now(); -+} + } +-function Nothing() { +- return null; +function FaceMark() { -+ return (0, import_react19.createElement)( ++ return (0, import_react21.createElement)( + "span", + { className: "bt-row-remote bt-row-face", title: t("Face-to-face"), "aria-label": t("Face-to-face") }, -+ (0, import_react19.createElement)( ++ (0, import_react21.createElement)( + "svg", + { width: 11, height: 11, viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2, strokeLinecap: "round", "aria-hidden": true }, -+ (0, import_react19.createElement)("circle", { cx: 9, cy: 8, r: 3 }), -+ (0, import_react19.createElement)("circle", { cx: 16, cy: 9, r: 2.5 }), -+ (0, import_react19.createElement)("path", { d: "M4 18a5 5 0 0 1 10 0M14 18a4 4 0 0 1 6 0" }) ++ (0, import_react21.createElement)("circle", { cx: 9, cy: 8, r: 3 }), ++ (0, import_react21.createElement)("circle", { cx: 16, cy: 9, r: 2.5 }), ++ (0, import_react21.createElement)("path", { d: "M4 18a5 5 0 0 1 10 0M14 18a4 4 0 0 1 6 0" }) + ) - ); ++ ); } - function RoomRow({ room: room2, roster, actions, useSessions, useSessionStatus, useSessionRetainInfo, useWork, wide, marked }) { - const id = room2.id; -- const fallback = useSessions((list) => previewOf(list, id)); -- const preview = room2.preview?.replace(/\s+/g, " ").trim() || fallback; -+ const fallback = useSessions((list) => nameMentions(previewOf(list, id, [], [], botNames(roster)), roster)); -+ const preview = nameMentions(visibleText(room2.preview), roster) || fallback; - const active = useSessionRetainInfo(id, (info) => (info?.retainedBy?.mainView ?? 0) > 0); - const unread = useSessionStatus((map) => map.get(id)?.completionUnread === true) || marked && !active; - useMarkedUnread(id, active, marked, actions); - const approval = useApproval(useWork, (entry) => entry.roomId === id); -+ const question = roster.questions?.[id] !== void 0; - const members = workKeys(useGroupWork(useWork, (rooms) => (rooms[id] ?? []).map((entry) => `${entry.botId}|${entry.tool ?? ""}`))); - const first = roster.byId[members[0]?.id]; - const workingLine = first ? workLine(first.name, members[0].tool, members.length - 1) : null; - if (room2.hidden && !active) return null; - const pinned = room2.pinned === true; -- const label = [room2.name, pinned ? t("Pinned") : "", members.length > 0 ? t("Working") : "", approval ? t("Waiting for your approval") : ""].filter(Boolean).join(", "); -- return (0, import_react8.createElement)( -+ const title = roomTitle(room2); +-var SEPARATOR_GAP_MS = 30 * 60 * 1e3; +-function clockLabel(time, now = Date.now()) { +- const date = new Date(time); +- const midnight = (value) => new Date(value.getFullYear(), value.getMonth(), value.getDate()).getTime(); +- const days = Math.round((midnight(new Date(now)) - midnight(date)) / 864e5); +- const clock4 = date.toLocaleTimeString(dateLocale(), { hour: "numeric", minute: "2-digit" }); +- if (days === 0) return t("Today {time}", { time: clock4 }); +- if (days === 1) return t("Yesterday {time}", { time: clock4 }); +- const sameYear = date.getFullYear() === new Date(now).getFullYear(); +- return `${date.toLocaleDateString(dateLocale(), { weekday: "short", month: "short", day: "numeric", ...sameYear ? {} : { year: "numeric" } })} ${clock4}`; ++function RoomRow({ room: room2, roster, actions, useSessions, useSessionStatus, useSessionRetainInfo, useWork, wide, marked }) { ++ const id = room2.id; ++ const fallback = useSessions((list) => nameMentions(previewOf(list, id, [], [], botNames(roster)), roster)); ++ const preview = nameMentions(visibleText(room2.preview), roster) || fallback; ++ const active = useSessionRetainInfo(id, (info) => (info?.retainedBy?.mainView ?? 0) > 0); ++ const unread = useSessionStatus((map) => map.get(id)?.completionUnread === true) || marked && !active; ++ useMarkedUnread(id, active, marked, actions); ++ const approval = useApproval(useWork, (entry) => entry.roomId === id); ++ const question = roster.questions?.[id] !== void 0; ++ const members = workKeys(useGroupWork(useWork, (rooms) => (rooms[id] ?? []).map((entry) => `${entry.botId}|${entry.tool ?? ""}`))); ++ const first = roster.byId[members[0]?.id]; ++ const workingLine = first ? workLine(first.name, members[0].tool, members.length - 1) : null; ++ if (room2.hidden && !active) return null; ++ const pinned = room2.pinned === true; ++ const title = roomTitle(room2); + const from = room2.sharedFrom ? sharedRoomTitle(room2.sharedFrom.inviterName) : ""; + const hover = from && from !== title ? `${title} · ${from}` : title; + const waiting = approval || (room2.pendingCount ?? 0) > 0; + const alert = question || waiting; + const face = room2.origin === "face-to-face"; + const label = [hover, face ? t("Face-to-face") : "", pinned ? t("Pinned") : "", members.length > 0 ? t("Working") : "", waiting ? t("Waiting for your approval") : alert ? t("Waiting for your answer") : ""].filter(Boolean).join(", "); -+ return (0, import_react19.createElement)( - "button", - { - type: "button", - className: "bt-row", - "aria-label": label, - "aria-current": active ? "page" : void 0, ++ return (0, import_react21.createElement)( ++ "button", ++ { ++ type: "button", ++ className: "bt-row", ++ "aria-label": label, ++ "aria-current": active ? "page" : void 0, + // The full title on hover. The row wraps the number-first form so the second + // name is not cut to "SelfB…" (#1102, #304, #458). + title: hover, - "data-room-id": id, - onClick: () => actions.openSession(id), - onContextMenu: (event) => { -@@ -4841,20 +4841,20 @@ function RoomRow({ room: room2, roster, actions, useSessions, useSessionStatus, - actions.openMenu({ kind: "room", id, x: event.clientX, y: event.clientY }); - } - }, -- (0, import_react8.createElement)(RoomAvatar, { room: room2, roster, size: 36 }), -- pinned && !wide ? (0, import_react8.createElement)(PinMark) : null, -- wide ? (0, import_react8.createElement)( -+ (0, import_react19.createElement)(RoomAvatar, { room: room2, roster, size: 36 }), -+ pinned && !wide ? (0, import_react19.createElement)(PinMark) : null, -+ wide ? (0, import_react19.createElement)( - "span", - { className: "bt-row-body" }, -- (0, import_react8.createElement)("span", { className: "bt-row-name" }, (0, import_react8.createElement)("span", { className: "bt-row-title" }, room2.name), pinned ? (0, import_react8.createElement)(PinMark) : null), -- workingLine ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, workingLine) : preview ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, preview) : null -+ (0, import_react19.createElement)("span", { className: "bt-row-name" }, (0, import_react19.createElement)("span", { className: face ? "bt-row-title bt-row-title-face" : "bt-row-title" }, face ? faceRowTitle(title) : title), face ? (0, import_react19.createElement)(FaceMark) : room2.sharedFrom ? (0, import_react19.createElement)("span", { className: "bt-tag", title: from }, t("Shared")) : null, pinned ? (0, import_react19.createElement)(PinMark) : null), -+ workingLine ? (0, import_react19.createElement)("span", { className: "bt-row-preview" }, workingLine) : preview ? (0, import_react19.createElement)("span", { className: "bt-row-preview" }, preview) : null - ) : null, -- wide && approval && !active ? (0, import_react8.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react8.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null -+ wide && alert && !active ? (0, import_react19.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react19.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null - ); ++ "data-room-id": id, ++ onClick: () => actions.openSession(id), ++ onContextMenu: (event) => { ++ event.preventDefault(); ++ actions.openMenu({ kind: "room", id, x: event.clientX, y: event.clientY }); ++ } ++ }, ++ (0, import_react21.createElement)(RoomAvatar, { room: room2, roster, size: 36 }), ++ pinned && !wide ? (0, import_react21.createElement)(PinMark) : null, ++ wide ? (0, import_react21.createElement)( ++ "span", ++ { className: "bt-row-body" }, ++ (0, import_react21.createElement)("span", { className: "bt-row-name" }, (0, import_react21.createElement)("span", { className: face ? "bt-row-title bt-row-title-face" : "bt-row-title" }, face ? faceRowTitle(title) : title), face ? (0, import_react21.createElement)(FaceMark) : room2.sharedFrom ? (0, import_react21.createElement)("span", { className: "bt-tag", title: from }, t("Shared")) : null, pinned ? (0, import_react21.createElement)(PinMark) : null), ++ workingLine ? (0, import_react21.createElement)("span", { className: "bt-row-preview" }, workingLine) : preview ? (0, import_react21.createElement)("span", { className: "bt-row-preview" }, preview) : null ++ ) : null, ++ wide && alert && !active ? (0, import_react21.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react21.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null ++ ); } - function AgentSessionRow({ session, agent, actions, renaming, index }) { -- const input = (0, import_react8.useRef)(null); -- (0, import_react8.useLayoutEffect)(() => { -+ const input = (0, import_react19.useRef)(null); -+ (0, import_react19.useLayoutEffect)(() => { - if (!renaming) return; - input.current?.focus(); - input.current?.select(); -@@ -4875,10 +4875,10 @@ function AgentSessionRow({ session, agent, actions, renaming, index }) { - } - })(); - }; -- return (0, import_react8.createElement)( -+ return (0, import_react19.createElement)( - "div", - { className: "bt-agent-sub-row bt-agent-edit", style: { "--i": index } }, -- (0, import_react8.createElement)("input", { -+ (0, import_react19.createElement)("input", { - ref: input, - defaultValue: session.title, - "aria-label": t("Rename"), -@@ -4891,7 +4891,7 @@ function AgentSessionRow({ session, agent, actions, renaming, index }) { - }) - ); +-function nextTurnStart(turns, turn) { +- let next; +- for (const key in turns) { +- const candidate = Number(key); +- if (candidate > turn && turns[key].first !== void 0 && (next === void 0 || candidate < next)) next = candidate; ++function AgentSessionRow({ session, agent, actions, renaming, index }) { ++ const input = (0, import_react21.useRef)(null); ++ (0, import_react21.useLayoutEffect)(() => { ++ if (!renaming) return; ++ input.current?.focus(); ++ input.current?.select(); ++ }, [renaming]); ++ if (renaming) { ++ const commit = (keep) => { ++ const value = input.current?.value ?? ""; ++ if (!keep || value.trim() === "" || value.trim() === session.title) { ++ actions.endAgentRename(); ++ return; ++ } ++ void (async () => { ++ try { ++ await actions.renameAgentSession(agent.id, session.id, value); ++ actions.endAgentRename(); ++ } catch (error) { ++ actions.reportError(error, "agent-rename"); ++ } ++ })(); ++ }; ++ return (0, import_react21.createElement)( ++ "div", ++ { className: "bt-agent-sub-row bt-agent-edit", style: { "--i": index } }, ++ (0, import_react21.createElement)("input", { ++ ref: input, ++ defaultValue: session.title, ++ "aria-label": t("Rename"), ++ onKeyDown: (event) => { ++ if (event.nativeEvent.isComposing) return; ++ if (event.key === "Enter") commit(true); ++ else if (event.key === "Escape") commit(false); ++ }, ++ onBlur: () => commit(true) ++ }) ++ ); } -- return (0, import_react8.createElement)( -+ return (0, import_react19.createElement)( - "button", - { - type: "button", -@@ -4905,8 +4905,8 @@ function AgentSessionRow({ session, agent, actions, renaming, index }) { - actions.openMenu({ kind: "agent-session", id: session.id, agentId: agent.id, x: event.clientX, y: event.clientY }); - } - }, -- (0, import_react8.createElement)("span", { className: "bt-agent-sub-title" }, session.title), -- (0, import_react8.createElement)("span", { className: "bt-agent-sub-time" }, session.at > 0 ? relativeShort(session.at) : "") -+ (0, import_react19.createElement)("span", { className: "bt-agent-sub-title" }, session.title), -+ (0, import_react19.createElement)("span", { className: "bt-agent-sub-time" }, session.at > 0 ? relativeShort(session.at) : "") - ); - } - function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, marked }) { -@@ -4941,10 +4941,10 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, - const preview = sessions[0]?.title ?? t("New session"); - const label = ["DSH Agent", running ? t("Working") : "", unread ? t("Unread activity") : ""].filter(Boolean).join(", "); - const open = active && wide; -- return (0, import_react8.createElement)( -+ return (0, import_react19.createElement)( - "div", - { className: "bt-agent" }, -- (0, import_react8.createElement)( -+ (0, import_react19.createElement)( - "button", - { - type: "button", -@@ -4959,30 +4959,30 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, - actions.openMenu({ kind: "agent", id: agent.id, x: event.clientX, y: event.clientY }); - } - }, -- (0, import_react8.createElement)("span", { className: `bt-agent-ava${running ? " bt-run" : ""}` }, (0, import_react8.createElement)(import_dsh_client_ui_primitives2.FishLogo, { size: 22 })), -- wide ? (0, import_react8.createElement)( -+ (0, import_react19.createElement)("span", { className: `bt-agent-ava${running ? " bt-run" : ""}` }, (0, import_react19.createElement)(import_dsh_client_ui_primitives2.FishLogo, { size: 22 })), -+ wide ? (0, import_react19.createElement)( - "span", - { className: "bt-row-body" }, -- (0, import_react8.createElement)("span", { className: "bt-row-name" }, "DSH Agent"), -- preview ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, preview) : null -+ (0, import_react19.createElement)("span", { className: "bt-row-name" }, "DSH Agent"), -+ preview ? (0, import_react19.createElement)("span", { className: "bt-row-preview" }, preview) : null - ) : null, -- wide && unread && !active ? (0, import_react8.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null -+ wide && unread && !active ? (0, import_react19.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null - ), -- (0, import_react8.createElement)( -+ (0, import_react19.createElement)( - "div", - { className: "bt-agent-sub", "data-open": open || void 0 }, -- (0, import_react8.createElement)( -+ (0, import_react19.createElement)( - "div", - { className: "bt-agent-sub-in" }, -- (0, import_react8.createElement)( -+ (0, import_react19.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")); - } }, -- (0, import_react8.createElement)(PlusIcon), -- (0, import_react8.createElement)("span", { className: "bt-agent-sub-title" }, t("New session")) -+ (0, import_react19.createElement)(PlusIcon), -+ (0, import_react19.createElement)("span", { className: "bt-agent-sub-title" }, t("New session")) - ), -- sessions.map((session, index) => (0, import_react8.createElement)(AgentSessionRow, { -+ sessions.map((session, index) => (0, import_react19.createElement)(AgentSessionRow, { - key: session.id, - session, - agent, -@@ -4996,8 +4996,8 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, +- return next === void 0 ? void 0 : turns[next].first; ++ return (0, import_react21.createElement)( ++ "button", ++ { ++ type: "button", ++ className: "bt-agent-sub-row", ++ "aria-current": session.active ? "page" : void 0, ++ style: { "--i": index }, ++ onClick: () => actions.openAgentSession(session.id), ++ onContextMenu: (event) => { ++ event.preventDefault(); ++ event.stopPropagation(); ++ actions.openMenu({ kind: "agent-session", id: session.id, agentId: agent.id, x: event.clientX, y: event.clientY }); ++ } ++ }, ++ (0, import_react21.createElement)("span", { className: "bt-agent-sub-title" }, session.title), ++ (0, import_react21.createElement)("span", { className: "bt-agent-sub-time" }, session.at > 0 ? relativeShort(session.at) : "") ++ ); ++} ++function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, marked }) { ++ const info = useSessions((list) => JSON.stringify(agent.sessions.map((id) => { ++ const row = list.byId[id]; ++ return { ++ id, ++ // A blank Session's title is the workspace folder name; show the label instead. ++ title: row?.blank === true ? "" : row?.displayTitle ?? row?.title ?? "", ++ at: row?.updatedAt ?? 0, ++ running: row?.running === true, ++ active: (row?.retainedBy?.mainView ?? 0) > 0 ++ }; ++ }).sort((a, b) => b.at - a.at))); ++ const statusInfo = useSessionStatus((map) => JSON.stringify(agent.sessions.map((id) => ({ ++ id, ++ running: map.get(id)?.running === true, ++ unread: map.get(id)?.completionUnread === true ++ })))); ++ const statuses = Object.fromEntries(JSON.parse(statusInfo).map((entry) => [entry.id, entry])); ++ const sessions = JSON.parse(info).map((session) => ({ ++ ...session, ++ running: statuses[session.id]?.running ?? session.running, ++ unread: statuses[session.id]?.unread ?? false, ++ title: session.title === "" ? t("New session") : session.title ++ })); ++ const renaming = useUi((value) => value.renameAgent); ++ const active = sessions.some((session) => session.active); ++ const running = sessions.some((session) => session.running); ++ const unread = sessions.some((session) => session.unread) || marked && !active; ++ useMarkedUnread(agent.id, active, marked, actions); ++ const preview = sessions[0]?.title ?? t("New session"); ++ const label = ["DSH Agent", running ? t("Working") : "", unread ? t("Unread activity") : ""].filter(Boolean).join(", "); ++ const open = active && wide; ++ return (0, import_react21.createElement)( ++ "div", ++ { className: "bt-agent" }, ++ (0, import_react21.createElement)( ++ "button", ++ { ++ type: "button", ++ className: "bt-row", ++ "aria-label": label, ++ "aria-current": active ? "page" : void 0, ++ "data-agent-id": agent.id, ++ title: wide ? void 0 : "DSH Agent", ++ onClick: () => actions.openAgent(agent.id), ++ onContextMenu: (event) => { ++ event.preventDefault(); ++ actions.openMenu({ kind: "agent", id: agent.id, x: event.clientX, y: event.clientY }); ++ } ++ }, ++ (0, import_react21.createElement)("span", { className: `bt-agent-ava${running ? " bt-run" : ""}` }, (0, import_react21.createElement)(import_dsh_client_ui_primitives3.FishLogo, { size: 22 })), ++ wide ? (0, import_react21.createElement)( ++ "span", ++ { className: "bt-row-body" }, ++ (0, import_react21.createElement)("span", { className: "bt-row-name" }, "DSH Agent"), ++ preview ? (0, import_react21.createElement)("span", { className: "bt-row-preview" }, preview) : null ++ ) : null, ++ wide && unread && !active ? (0, import_react21.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null ++ ), ++ (0, import_react21.createElement)( ++ "div", ++ { className: "bt-agent-sub", "data-open": open || void 0 }, ++ (0, import_react21.createElement)( ++ "div", ++ { className: "bt-agent-sub-in" }, ++ (0, import_react21.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")); ++ } }, ++ (0, import_react21.createElement)(PlusIcon), ++ (0, import_react21.createElement)("span", { className: "bt-agent-sub-title" }, t("New session")) ++ ), ++ sessions.map((session, index) => (0, import_react21.createElement)(AgentSessionRow, { ++ key: session.id, ++ session, ++ agent, ++ actions, ++ index: index + 1, ++ renaming: renaming === session.id ++ })) ++ ) ++ ) ++ ); } - var GLIDE = springEasing(1e3, 63); - function useListGlide(listRef, layout, key) { -- const tops = (0, import_react8.useRef)({ layout, map: /* @__PURE__ */ new Map() }); -- (0, import_react8.useLayoutEffect)(() => { -+ const tops = (0, import_react19.useRef)({ layout, map: /* @__PURE__ */ new Map() }); -+ (0, import_react19.useLayoutEffect)(() => { - const list = listRef.current; - if (!list) return; - const next = /* @__PURE__ */ new Map(); -@@ -5014,9 +5014,44 @@ function useListGlide(listRef, layout, key) { - tops.current = { layout, map: next }; - }, [layout, key]); +-function openingTurn(turns, firstTurns, hiddenTurns) { +- if (!turns || !firstTurns) return null; +- const start = nextTurnStart(turns, -Infinity); +- if (start === void 0) return null; +- const turn = Number(Object.keys(turns).filter((key) => turns[key].first === start)[0]); +- const listed = firstTurns.split(",").map(Number); +- const earlier = listed.filter((entry) => entry < turn); +- return listed.includes(turn) && earlier.every((entry) => hiddenTurns?.includes(entry)) ? { turn, start } : null; ++var GLIDE = springEasing(1e3, 63); ++function useListGlide(listRef, layout, key) { ++ const tops = (0, import_react21.useRef)({ layout, map: /* @__PURE__ */ new Map() }); ++ (0, import_react21.useLayoutEffect)(() => { ++ const list = listRef.current; ++ if (!list) return; ++ const next = /* @__PURE__ */ new Map(); ++ const still = reducedMotion() || tops.current.layout !== layout; ++ for (const row of list.querySelectorAll("[data-bot-id],[data-room-id],[data-agent-id]")) { ++ const id = row.dataset.botId ?? row.dataset.roomId ?? row.dataset.agentId; ++ const top = row.offsetTop; ++ next.set(id, top); ++ const before = tops.current.map.get(id); ++ if (!still && before !== void 0 && Math.abs(before - top) > 0.5) { ++ row.animate([{ transform: `translateY(${before - top}px)` }, { transform: "none" }], GLIDE); ++ } ++ } ++ tops.current = { layout, map: next }; ++ }, [layout, key]); } -+var NodeActions = class extends import_react19.Component { +-var unseenSince = (visit, time) => typeof visit?.seen === "number" && time > visit.seen && time <= visit.entered; +-function TurnTailCell({ turn: location2, sessionId, useTurnClock, useUi, actions }) { +- const turn = location2.turn; +- const time = location2.end.time; +- (0, import_react6.useEffect)(() => { +- actions.noteTurnTime(sessionId, turn, "end", time); +- }, [sessionId, turn, time]); +- const label = useTurnClock((state) => { +- const start = nextTurnStart(state[sessionId] ?? {}, turn); +- return start !== void 0 && start - time >= SEPARATOR_GAP_MS ? clockLabel(start) : ""; +- }); +- const visit = useUi((state) => state.visits?.[sessionId]); +- const fresh = useTurnClock((state) => { +- if (typeof visit?.seen !== "number" || time > visit.seen) return false; +- const start = nextTurnStart(state[sessionId] ?? {}, turn); +- return start !== void 0 && start > visit.seen && start <= visit.entered; +- }); +- if (!label && !fresh) return null; +- return (0, import_react6.createElement)( +- import_react6.Fragment, ++var NodeActions = class extends import_react21.Component { + constructor(props) { + super(props); + this.state = { failed: false }; @@ -13571,1040 +14181,1417 @@ diff --git a/client.js b/client.js + console.error("flybot: nodeActions failed", error); + } + render() { -+ return this.state.failed ? null : (0, import_react19.createElement)(this.props.component, { bot: this.props.bot }); ++ return this.state.failed ? null : (0, import_react21.createElement)(this.props.component, { bot: this.props.bot }); + } +}; +function TreeNode({ node, rowProps, markedUnread, collapsed, toggle, actions }) { + const { bot, depth, children } = node; + const closed = collapsed[bot.id] === true; -+ return (0, import_react19.createElement)( -+ import_react19.Fragment, -+ null, -+ (0, import_react19.createElement)( ++ return (0, import_react21.createElement)( ++ import_react21.Fragment, + null, +- label ? (0, import_react6.createElement)("div", { className: "bt-time-sep", role: "separator" }, label) : null, +- fresh ? (0, import_react6.createElement)(NewDivider) : null ++ (0, import_react21.createElement)( + "div", + { className: "bt-tree-item", "data-depth": depth, style: { paddingLeft: `${depth * 16}px` } }, -+ children.length ? (0, import_react19.createElement)( ++ children.length ? (0, import_react21.createElement)( + "button", + { type: "button", className: "bt-tree-toggle", "aria-expanded": !closed, "aria-label": `${closed ? t("Expand") : t("Collapse")} ${bot.name}`, onClick: () => toggle(bot.id) }, -+ (0, import_react19.createElement)("span", { className: "bt-tree-chev", "aria-hidden": true }, "▾") -+ ) : (0, import_react19.createElement)("span", { className: "bt-tree-toggle bt-tree-leaf", "aria-hidden": true }), -+ (0, import_react19.createElement)(BotRow, { ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }), -+ typeof actions === "function" ? (0, import_react19.createElement)(NodeActions, { component: actions, bot }) : null ++ (0, import_react21.createElement)("span", { className: "bt-tree-chev", "aria-hidden": true }, "▾") ++ ) : (0, import_react21.createElement)("span", { className: "bt-tree-toggle bt-tree-leaf", "aria-hidden": true }), ++ (0, import_react21.createElement)(BotRow, { ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }), ++ typeof actions === "function" ? (0, import_react21.createElement)(NodeActions, { component: actions, bot }) : null + ), -+ closed ? null : children.map((child) => (0, import_react19.createElement)(TreeNode, { key: child.bot.id, node: child, rowProps, markedUnread, collapsed, toggle, actions })) -+ ); -+} - function TeamSidebar(props) { - const { wide, useRoster, useUi, useSessions, actions } = props; -- const listRef = (0, import_react8.useRef)(null); -+ const listRef = (0, import_react19.useRef)(null); - const roster = useRoster((value) => value); - const markedUnread = useUi((value) => value.unread); - props.useRegistry((value) => value); -@@ -5025,17 +5025,34 @@ function TeamSidebar(props) { - for (const id of list.ids) stamps[id] = list.byId[id]?.updatedAt ?? 0; - return JSON.stringify(stamps); - }); -- const order = (0, import_react8.useMemo)(() => { -+ const order = (0, import_react19.useMemo)(() => { - const stamps = JSON.parse(updated); - const entries2 = [ -- ...roster.bots.filter((bot) => bot.id !== roster.mainBotId).map((bot) => ({ kind: "bot", item: bot, at: stamps[currentPart(bot)] ?? bot.createdAt })), -- ...roster.rooms.map((room2) => ({ kind: "room", item: room2, at: stamps[room2.id] ?? room2.createdAt })), -+ // Own Bots, friends' Bots, groups and face rooms share one list. A remote chat -+ // still uses BotRow's globe; gone / hidden / home-level remotes stay out. -+ ...roster.bots.filter((bot) => bot.id !== roster.mainBotId && isShownRemoteChat(bot)).map((bot) => ({ kind: "bot", item: bot, at: stamps[currentPart(bot)] ?? bot.createdAt })), -+ ...roster.rooms.filter((room2) => !isPastFaceRoom(room2)).map((room2) => ({ kind: "room", item: room2, at: stamps[room2.id] ?? room2.createdAt })), - // The Agent sorts by its most recent Session, falling back to when it was added. - ...(roster.agents ?? []).map((agent) => ({ kind: "agent", item: agent, at: Math.max(0, ...agent.sessions.map((id) => stamps[id] ?? 0)) || agent.createdAt })) - ]; -- return entries2.sort((a, b) => Number(Boolean(b.item.pinned)) - Number(Boolean(a.item.pinned)) || b.at - a.at); -+ const foreign = (entry) => entry.kind === "bot" && entry.item.remote || entry.kind === "room" && (entry.item.origin === "face-to-face" || entry.item.sharedFrom); -+ return entries2.sort((a, b) => Number(Boolean(b.item.pinned)) - Number(Boolean(a.item.pinned)) || Number(foreign(a)) - Number(foreign(b)) || b.at - a.at); - }, [roster, updated]); - const main = roster.byId[roster.mainBotId]; -+ const readOnlySaid2 = typeof roster.readOnly === "string" && roster.readOnly.trim() !== ""; -+ const readOnlyReload = (0, import_react19.createElement)("button", { -+ type: "button", -+ className: "bt-read-only-reload", -+ onClick: () => { -+ void Promise.resolve(actions.reloadTeam?.()).catch((error) => actions.reportError(error, "reload")); -+ } -+ }, t("Reload")); -+ const structure = useSidebarStructure(); -+ const [collapsed, setCollapsed] = (0, import_react19.useState)({}); -+ const toggle = (id) => setCollapsed((value) => ({ ...value, [id]: !value[id] })); -+ const inTree = (entry) => entry.kind === "bot" && !entry.item.remote; -+ const listed = (entry) => inTree(entry) && structure?.include?.(entry.item.id) !== false; -+ const tree = structure && wide && main ? botTree([main, ...order.filter(listed).map((entry) => entry.item)], main.id, (id) => structure.parentOf(id)) : null; - useListGlide(listRef, wide, order.map((entry) => entry.item.id).join(",")); - useLandOnMainBot(roster, useSessions, actions); - const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide }; -@@ -5045,39 +5045,46 @@ function TeamSidebar(props) { - event.preventDefault(); - actions.openPalette(event.key); - }; -- return (0, import_react8.createElement)( -+ return (0, import_react19.createElement)( - "div", - { className: wide ? "bt-side" : "bt-side bt-rail", onKeyDown: typeToSearch }, -- wide ? (0, import_react8.createElement)( -+ wide ? (0, import_react19.createElement)( - "div", - { className: "bt-side-top" }, -- (0, import_react8.createElement)("span", { className: "bt-brand" }, (0, import_react8.createElement)(BrandMark, { size: 22 }), (0, import_react8.createElement)(BrandName)), -- (0, import_react8.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }), -- (0, import_react8.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react8.createElement)(SearchIcon)), -- (0, import_react8.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react8.createElement)(PlusIcon)) -- ) : (0, import_react8.createElement)( -- import_react8.Fragment, -+ (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)( -+ import_react19.Fragment, - null, -- (0, import_react8.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }), -- (0, import_react8.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react8.createElement)(PlusIcon)) -+ (0, import_react19.createElement)(UpdateButton, { useUpdate: props.useUpdate, 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)) - ), -- wide && roster.readOnly ? (0, import_react8.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null, -- (0, import_react8.createElement)( -+ wide && readOnlySaid2 ? (0, import_react19.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null, -+ wide && readOnlySaid2 ? readOnlyReload : null, -+ !wide && readOnlySaid2 ? (0, import_react19.createElement)("div", { className: "bt-hint bt-read-only", role: "status", title: hostText(roster.readOnly), "aria-label": hostText(roster.readOnly) }, hostText(roster.readOnly)) : null, -+ !wide && readOnlySaid2 ? readOnlyReload : null, -+ (0, import_react19.createElement)(InboxRow, { wide, useRoster, useWork: props.useWork, useUi, actions }), -+ (0, import_react19.createElement)(KanbanRow, { wide, useUi, actions }), -+ (0, import_react19.createElement)(ProjectsNav, { wide }), -+ (0, import_react19.createElement)( - "div", - { ref: listRef, className: "bt-list", role: "region", "aria-label": t("Bot list") }, -- main ? (0, import_react8.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react8.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")), -- order.map((entry) => entry.kind === "bot" ? (0, import_react8.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react8.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react8.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true })) -+ tree ? (0, import_react19.createElement)("div", { className: "bt-tree", role: "group", "aria-label": t("Bot tree") }, tree.map((node) => (0, import_react19.createElement)(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions }))) : 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…")), -+ order.filter((entry) => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false)).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 })), -+ wide ? (0, import_react19.createElement)(FlyBotSections, { roster, actions, renderBot: (bot) => (0, import_react19.createElement)(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null - ) ++ closed ? null : children.map((child) => (0, import_react21.createElement)(TreeNode, { key: child.bot.id, node: child, rowProps, markedUnread, collapsed, toggle, actions })) ); } - function UpdateButton({ useUpdate, actions }) { - const update = useUpdate((value) => value); -- const [open, setOpen] = (0, import_react8.useState)(false); -- const [box, setBox] = (0, import_react8.useState)(null); -- const [error, setError] = (0, import_react8.useState)(""); -- const [dshError, setDshError] = (0, import_react8.useState)(""); -- const button = (0, import_react8.useRef)(null); -- (0, import_react8.useEffect)(() => { -+ const [open, setOpen] = (0, import_react19.useState)(false); -+ const [box, setBox] = (0, import_react19.useState)(null); -+ const [error, setError] = (0, import_react19.useState)(""); -+ const [dshError, setDshError] = (0, import_react19.useState)(""); -+ const button = (0, import_react19.useRef)(null); -+ (0, import_react19.useEffect)(() => { - if (!open) return void 0; - const onDown = (event) => { - if (event.target instanceof Element && (event.target.closest(".bt-update-pop") || button.current?.contains(event.target))) return; -@@ -5116,14 +5116,14 @@ function UpdateButton({ useUpdate, actions }) { - setDshError(""); - void actions.installDshUpdate().catch((failure) => setDshError(hostText(failure?.message ?? String(failure)))); - }; -- const label = phase === "installing" ? t("Updating DS Bot…") : dshPhase === "installing" ? t("Updating DSH…") : phase === "installed" ? t("DS Bot {version} is installed. Restart DSH to use it.", { version: update.installed ?? update.latest }) : dshPhase === "installed" ? t("Restart DSH to start using DSH {version}.", { version: dsh.installed ?? dsh.verified }) : update?.available ? t("DS Bot {version} is available", { version: update.latest }) : t("DSH {version} is available", { version: dsh?.verified }); -+ const label = phase === "installing" ? t("Updating FlyBot core…") : dshPhase === "installing" ? t("Updating DSH…") : phase === "installed" ? t("FlyBot core {version} is installed. Restart DSH to use it.", { version: update.installed ?? update.latest }) : dshPhase === "installed" ? t("Restart DSH to start using DSH {version}.", { version: dsh.installed ?? dsh.verified }) : update?.available ? t("FlyBot core {version} is available", { version: update.latest }) : t("DSH {version} is available", { version: dsh?.verified }); - const message = error || (phase === "failed" ? update.error : ""); - const dshMessage = dshError || (dshPhase === "failed" ? dsh?.error : ""); -- const dshText = dshPhase === "installed" ? t("Restart DSH to start using DSH {version}.", { version: dsh.installed ?? dsh.verified }) : dsh?.available === false && dsh?.blockedBy ? t("Update DS Bot {version} first.", { version: dsh.blockedBy }) : t("You have {version}.", { version: dsh?.current }); -- return (0, import_react8.createElement)( -- import_react8.Fragment, -+ const dshText = dshPhase === "installed" ? t("Restart DSH to start using DSH {version}.", { version: dsh.installed ?? dsh.verified }) : dsh?.available === false && dsh?.blockedBy ? t("Update FlyBot core {version} first.", { version: dsh.blockedBy }) : t("You have {version}.", { version: dsh?.current }); -+ return (0, import_react19.createElement)( -+ import_react19.Fragment, - null, -- (0, import_react8.createElement)("button", { -+ (0, import_react19.createElement)("button", { - ref: button, - type: "button", - className: "bt-round bt-update", -@@ -5133,21 +5133,21 @@ function UpdateButton({ useUpdate, actions }) { - "aria-haspopup": "dialog", - "aria-expanded": open, - onClick: toggle -- }, (0, import_react8.createElement)(CloudDownloadIcon, { done: phase === "installed" }), phase === "failed" || dshPhase === "failed" ? (0, import_react8.createElement)("span", { className: "bt-update-dot", "aria-hidden": true }) : null), -- open && box ? (0, import_react_dom3.createPortal)((0, import_react8.createElement)( -+ }, (0, import_react19.createElement)(CloudDownloadIcon, { done: phase === "installed" }), phase === "failed" || dshPhase === "failed" ? (0, import_react19.createElement)("span", { className: "bt-update-dot", "aria-hidden": true }) : null), -+ open && box ? (0, import_react_dom4.createPortal)((0, import_react19.createElement)( - "div", -- { className: "bt-update-pop", role: "dialog", "aria-label": update?.available || phase !== "idle" ? t("DS Bot update") : t("DSH update"), style: box }, -- update?.available || phase !== "idle" ? (0, import_react8.createElement)( -- import_react8.Fragment, -+ { className: "bt-update-pop", role: "dialog", "aria-label": update?.available || phase !== "idle" ? t("FlyBot core update") : t("DSH update"), style: box }, -+ update?.available || phase !== "idle" ? (0, import_react19.createElement)( -+ import_react19.Fragment, - null, -- (0, import_react8.createElement)("div", { className: "bt-update-title" }, phase === "installed" ? t("Update installed") : t("DS Bot {version}", { version: update.latest })), -- (0, import_react8.createElement)("div", { className: "bt-update-text" }, phase === "installed" ? t("Restart DSH to start using DS Bot {version}.", { version: update.installed ?? update.latest }) : t("You have {version}.", { version: update.current })), -- message ? (0, import_react8.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: message })) : null, -- (0, import_react8.createElement)( -+ (0, import_react19.createElement)("div", { className: "bt-update-title" }, phase === "installed" ? t("Update installed") : t("FlyBot core {version}", { version: update.latest })), -+ (0, import_react19.createElement)("div", { className: "bt-update-text" }, phase === "installed" ? t("Restart DSH to start using FlyBot core {version}.", { version: update.installed ?? update.latest }) : t("You have {version}.", { version: update.current })), -+ message ? (0, import_react19.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: message })) : null, -+ (0, import_react19.createElement)( - "div", - { className: "bt-update-actions" }, -- update.notesUrl ? (0, import_react8.createElement)("a", { className: "bt-update-notes", href: update.notesUrl, target: "_blank", rel: "noopener noreferrer" }, t("What's new")) : null, -- phase === "installed" ? null : (0, import_react8.createElement)("button", { -+ update.notesUrl ? (0, import_react19.createElement)("a", { className: "bt-update-notes", href: update.notesUrl, target: "_blank", rel: "noopener noreferrer" }, t("What's new")) : null, -+ phase === "installed" ? null : (0, import_react19.createElement)("button", { - type: "button", - className: "bt-update-go", - disabled: phase === "installing", -@@ -5155,17 +5155,17 @@ function UpdateButton({ useUpdate, actions }) { - }, phase === "installing" ? t("Updating…") : phase === "failed" ? t("Try again") : t("Update")) - ) - ) : null, -- dshRow ? (0, import_react8.createElement)( -+ dshRow ? (0, import_react19.createElement)( - "div", - { className: "bt-update-dsh" }, -- (0, import_react8.createElement)("div", { className: "bt-update-title" }, t("DSH {version}", { version: dsh.verified })), -- (0, import_react8.createElement)("div", { className: "bt-update-text" }, dshText), -- dshMessage ? (0, import_react8.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: dshMessage })) : null, -- (0, import_react8.createElement)( -+ (0, import_react19.createElement)("div", { className: "bt-update-title" }, t("DSH {version}", { version: dsh.verified })), -+ (0, import_react19.createElement)("div", { className: "bt-update-text" }, dshText), -+ dshMessage ? (0, import_react19.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: dshMessage })) : null, -+ (0, import_react19.createElement)( - "div", - { className: "bt-update-actions" }, -- dsh.kind === "app" ? dsh.available ? (0, import_react8.createElement)("button", { type: "button", className: "bt-update-go", onClick: () => void actions.openAppUpdates(dsh.verified).catch(() => { -- }) }, t("Open updates")) : null : !dsh.available && dshPhase === "idle" ? null : dshPhase === "installed" ? null : (0, import_react8.createElement)("button", { -+ dsh.kind === "app" ? dsh.available ? (0, import_react19.createElement)("button", { type: "button", className: "bt-update-go", onClick: () => void actions.openAppUpdates(dsh.verified).catch(() => { -+ }) }, t("Open updates")) : null : !dsh.available && dshPhase === "idle" ? null : dshPhase === "installed" ? null : (0, import_react19.createElement)("button", { - type: "button", - className: "bt-update-go", - disabled: dshPhase === "installing", -@@ -5176,61 +5176,25 @@ function UpdateButton({ useUpdate, actions }) { - ), document.body) : null - ); - } --function ConnectPlugins({ wide, actions }) { -- const tipId = (0, import_react8.useId)(); -- const [tip, setTip] = (0, import_react8.useState)(false); -- const timer = (0, import_react8.useRef)(0); -- const button = (0, import_react8.useRef)(null); -- const [box, setBox] = (0, import_react8.useState)(null); -- (0, import_react8.useEffect)(() => () => clearTimeout(timer.current), []); -+function ConnectApps({ wide, actions }) { - if (!wide) return null; -- const show = () => { -- clearTimeout(timer.current); -- timer.current = setTimeout(() => { -- const rect = button.current?.getBoundingClientRect(); -- if (!rect) return; -- const left = Math.max(8, Math.min(rect.left, window.innerWidth - 268)); -- setBox({ left, bottom: window.innerHeight - rect.top + 10 }); -- setTip(true); -- }, 250); -- }; -- const hide = () => { -- clearTimeout(timer.current); -- setTip(false); -- }; -- return (0, import_react8.createElement)( -+ return (0, import_react19.createElement)( - "span", - { className: "bt-connect-wrap" }, -- (0, import_react8.createElement)( -+ (0, import_react19.createElement)( - "button", -- { -- ref: button, -- type: "button", -- className: "bt-connect bt-connect-foot", -- "aria-describedby": tip ? tipId : void 0, -- onMouseEnter: show, -- onMouseLeave: hide, -- onFocus: show, -- onBlur: hide, -- onClick: () => actions.selectPanel("plugins") -- }, -- (0, import_react8.createElement)(PlugIcon), -- t("Connect plugins"), -- (0, import_react8.createElement)("span", { className: "bt-connect-warn", "aria-hidden": true }, "!") -- ), -- tip && box ? (0, import_react_dom3.createPortal)((0, import_react8.createElement)( -- "span", -- { role: "tooltip", id: tipId, className: "bt-connect-tip", style: box }, -- t("Plugin compatibility is not fully verified.") -- ), document.body) : null -+ { type: "button", className: "bt-connect bt-connect-foot", onClick: () => actions.openConnectors() }, -+ (0, import_react19.createElement)(PlugIcon), -+ t("Connect apps") -+ ) - ); - } - function YouAvatar() { -- return (0, import_react8.createElement)( -+ return (0, import_react19.createElement)( - "span", - { className: "bt-you-wrap" }, -- (0, import_react8.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react8.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })), -- (0, import_react8.createElement)("span", { style: { position: "absolute", width: 1, height: 1, overflow: "hidden", clip: "rect(0 0 0 0)" } }, t("Settings")) -+ (0, import_react19.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react19.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })), -+ (0, import_react19.createElement)("span", { style: { position: "absolute", width: 1, height: 1, overflow: "hidden", clip: "rect(0 0 0 0)" } }, t("Settings")) - ); - } - var openShellSettings = null; -@@ -5259,6 +5259,18 @@ function openHarnessOnboarding(id) { - else openHarnessSettings(); - }); +-function Shimmer({ children }) { +- return (0, import_react6.createElement)("span", { className: "bt-shimmer" }, children); +-} +-var PHRASES = { +- thinking: ["Thinking about it", "Weighing the options", "Working out a plan", "Sorting out the details"], +- working: ["On it", "Busy with it", "Moving ahead", "Taking care of it", "Making headway"] +-}; +-var TOOL_PHRASES = [ +- [/web_?search|search_?web/i, "Searching online"], +- [/fetch|browse|browser|web/i, "Reading a page"], +- [/shell|bash|pwsh|powershell|exec|command|terminal/i, "Running shell commands"], +- [/^(read|view|cat)\b|read_/i, "Opening a file"], +- [/grep|glob|list_dir|^ls$|find|search/i, "Looking through files"], +- [/write|edit|patch|apply|replace/i, "Writing changes"], +- [/image|photo|draw/i, "Working on an image"] +-]; +-var GROUP_PHRASES = { create_group: "Creating a group", update_group: "Updating the group", delete_group: "Deleting the group", post_to_group: "Posting in the group" }; +-function toolActivity(name, arg, findBot, self) { +- switch (name) { +- case "ask_user": +- return null; +- case "request_secret": +- return null; +- case "list_secrets": +- return { label: t("Checking the keys"), state: "searching" }; +- case "ask_user_question": +- return { label: t("Waiting for your answer"), state: "alert" }; +- case "group_relay": +- return { relay: true, state: "orbit" }; +- case "message_bot": { +- const target = findBot(arg("to")); +- return { label: target ? t("Asking {name}", { name: target.name }) : t("Asking another Bot"), state: "sending" }; +- } +- case "stop_bot": { +- const target = findBot(arg("bot")); +- return { label: target ? t("Stopping {name}", { name: target.name }) : t("Stopping another Bot"), state: "sending" }; +- } +- case "create_bot": +- return { label: t("Creating {name}", { name: arg("name") ?? t("a Bot") }), state: "sending" }; +- case "update_bot": { +- const target = findBot(arg("name")) ?? findBot(arg("bot")) ?? (arg("bot") ? void 0 : self); +- return { label: t("Updating {name}", { name: target?.name ?? t("a Bot") }), state: "sending" }; +- } +- case "list_bots": +- return { label: t("Checking the team"), state: "searching" }; +- case "read_group_chat": +- return { label: t("Reading {name}", { name: arg("group") ?? t("a group chat") }), state: "searching" }; +- case "read_own_chat": +- return { label: t("Looking back through the chat"), state: "searching" }; +- case "remember": +- return { label: t("Saving to memory"), state: "working" }; +- case "forget": +- return { label: t("Updating memory"), state: "working" }; +- case "recall": +- return { label: t("Checking memory"), state: "searching" }; +- default: +- if (GROUP_PHRASES[name]) return { label: t(GROUP_PHRASES[name]), state: "sending" }; +- const phrase = TOOL_PHRASES.find(([pattern]) => pattern.test(name))?.[1]; +- return { label: phrase ? t(phrase) : null, state: toolState(name) }; +- } ++function SessionFilter({ value, onChange }) { ++ const items = [ ++ ["all", t("All")], ++ ["group", t("Group chats")], ++ ["direct", t("Direct chats")], ++ ["unread", t("Unread")] ++ ]; ++ return (0, import_react21.createElement)( ++ "div", ++ { className: "bt-session-filter", role: "radiogroup", "aria-label": t("Session filter") }, ++ items.map(([id, label]) => (0, import_react21.createElement)("button", { ++ key: id, ++ type: "button", ++ role: "radio", ++ className: "bt-session-filter-btn", ++ "data-filter": id, ++ "aria-checked": value === id, ++ onClick: () => onChange(id) ++ }, label)) ++ ); } -+var MODELS_STEP_ID = "flybot-models"; -+var MODELS_STEP_ORDER = 1e3; -+function ModelsSettingsStep({ explicit, complete, openSection }) { -+ (0, import_react19.useLayoutEffect)(() => { -+ if (explicit) openSection("models"); -+ complete(); -+ }, []); +-function workPhrase(tool) { +- if (!tool) return t("Thinking about it"); +- return toolActivity(tool, () => void 0, () => void 0)?.label ?? t("On it"); ++function sessionFilterEmpty(filter) { ++ if (filter === "group") return t("No group chats"); ++ if (filter === "direct") return t("No direct chats"); ++ if (filter === "unread") return t("No unread chats"); + return null; -+} -+function openHarnessModels() { -+ openHarnessOnboarding(MODELS_STEP_ID); -+} - function openThroughMenu(trigger) { - const before = new Set(document.querySelectorAll('[role="menu"]')); - trigger.click(); -@@ -5288,32 +5288,32 @@ function pressSettingsShortcut() { - })); } - function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboarding, actions }) { -- const [open, setOpen] = (0, import_react8.useState)(false); -- (0, import_react8.useLayoutEffect)(() => { -+ const [open, setOpen] = (0, import_react19.useState)(false); -+ (0, import_react19.useLayoutEffect)(() => { - if (!seat) return void 0; - actions.seatAccount(true); - return () => actions.seatAccount(false); - }, [seat]); -- const [box, setBox] = (0, import_react8.useState)(null); -- const button = (0, import_react8.useRef)(null); -- (0, import_react8.useEffect)(() => { -+ const [box, setBox] = (0, import_react19.useState)(null); -+ const button = (0, import_react19.useRef)(null); -+ (0, import_react19.useEffect)(() => { - if (settingsOpen) setOpen(false); - }, [settingsOpen]); -- (0, import_react8.useEffect)(() => { -+ (0, import_react19.useEffect)(() => { - if (!openSettings) return void 0; - openShellSettings = openSettings; - return () => { - if (openShellSettings === openSettings) openShellSettings = null; +-function useLiveNote(actions, sessionId, id, entry) { +- const key = entry ? JSON.stringify(entry) : ""; +- (0, import_react6.useEffect)(() => { +- if (!key) return void 0; +- actions.noteLive(sessionId, id, JSON.parse(key)); +- return () => actions.noteLive(sessionId, id, null); +- }, [sessionId, id, key]); ++function TeamSidebar(props) { ++ const { wide, useRoster, useUi, useSessions, actions } = props; ++ const listRef = (0, import_react21.useRef)(null); ++ const roster = useRoster((value) => value); ++ const markedUnread = useUi((value) => value.unread); ++ props.useRegistry((value) => value); ++ const updated = useSessions((list) => { ++ const stamps = {}; ++ for (const id of list.ids) stamps[id] = list.byId[id]?.updatedAt ?? 0; ++ return JSON.stringify(stamps); ++ }); ++ const order = (0, import_react21.useMemo)(() => { ++ const stamps = JSON.parse(updated); ++ const entries2 = [ ++ // Own Bots, friends' Bots, groups and face rooms share one list. A remote chat ++ // still uses BotRow's globe; gone / hidden / home-level remotes stay out. ++ ...roster.bots.filter((bot) => bot.id !== roster.mainBotId && isShownRemoteChat(bot)).map((bot) => ({ kind: "bot", item: bot, at: stamps[currentPart(bot)] ?? bot.createdAt })), ++ ...roster.rooms.filter((room2) => !isPastFaceRoom(room2)).map((room2) => ({ kind: "room", item: room2, at: stamps[room2.id] ?? room2.createdAt })), ++ // The Agent sorts by its most recent Session, falling back to when it was added. ++ ...(roster.agents ?? []).map((agent) => ({ kind: "agent", item: agent, at: Math.max(0, ...agent.sessions.map((id) => stamps[id] ?? 0)) || agent.createdAt })) ++ ]; ++ const foreign = (entry) => entry.kind === "bot" && entry.item.remote || entry.kind === "room" && (entry.item.origin === "face-to-face" || entry.item.sharedFrom); ++ return entries2.sort((a, b) => Number(Boolean(b.item.pinned)) - Number(Boolean(a.item.pinned)) || Number(foreign(a)) - Number(foreign(b)) || b.at - a.at); ++ }, [roster, updated]); ++ const main = roster.byId[roster.mainBotId]; ++ const readOnlySaid2 = typeof roster.readOnly === "string" && roster.readOnly.trim() !== ""; ++ const readOnlyReload = (0, import_react21.createElement)("button", { ++ type: "button", ++ className: "bt-read-only-reload", ++ onClick: () => { ++ void Promise.resolve(actions.reloadTeam?.()).catch((error) => actions.reportError(error, "reload")); ++ } ++ }, t("Reload")); ++ const structure = useSidebarStructure(); ++ const [collapsed, setCollapsed] = (0, import_react21.useState)({}); ++ const [sessionFilter, setSessionFilter] = (0, import_react21.useState)("all"); ++ const toggle = (id) => setCollapsed((value) => ({ ...value, [id]: !value[id] })); ++ const inTree = (entry) => entry.kind === "bot" && !entry.item.remote; ++ const listed = (entry) => inTree(entry) && structure?.include?.(entry.item.id) !== false; ++ const statusMap = props.useSessionStatus ? props.useSessionStatus((value) => value) : void 0; ++ const unreadIds = (0, import_react21.useMemo)(() => { ++ const ids = /* @__PURE__ */ new Set(); ++ const consider = (entry) => { ++ if (entry?.item && sessionIsUnread(entry, statusMap, markedUnread)) ids.add(entry.item.id); ++ }; ++ if (main) consider({ kind: "bot", item: main }); ++ for (const entry of order) consider(entry); ++ return ids; ++ }, [order, main, statusMap, markedUnread]); ++ const showTree = Boolean(structure && wide && main && (sessionFilter === "all" || sessionFilter === "direct")); ++ const tree = showTree ? botTree([main, ...order.filter(listed).map((entry) => entry.item)], main.id, (id) => structure.parentOf(id)) : null; ++ const visibleOrder = order.filter((entry) => !(tree && inTree(entry)) && !(inTree(entry) && structure?.include?.(entry.item.id) === false) && matchesSessionFilter(entry, sessionFilter, unreadIds.has(entry.item.id))); ++ const showMain = !tree && main && matchesSessionFilter({ kind: "bot", item: main }, sessionFilter, unreadIds.has(main.id)); ++ const filterEmpty = roster.ready && !showMain && !tree && visibleOrder.length === 0 ? sessionFilterEmpty(sessionFilter) : null; ++ useListGlide(listRef, wide, [showMain && main ? main.id : null, ...visibleOrder.map((entry) => entry.item.id)].filter(Boolean).join(",")); ++ useLandOnMainBot(roster, useSessions, actions); ++ const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide }; ++ const typeToSearch = (event) => { ++ if (event.defaultPrevented || event.key.length !== 1 || event.key === " " || event.metaKey || event.ctrlKey || event.altKey || event.nativeEvent.isComposing) return; ++ if (event.target instanceof Element && event.target.closest("input,textarea,[contenteditable]")) return; ++ event.preventDefault(); ++ actions.openPalette(event.key); ++ }; ++ const sideTop = wide ? (0, import_react21.createElement)( ++ "div", ++ { className: "bt-side-top" }, ++ (0, import_react21.createElement)("span", { className: "bt-brand" }, (0, import_react21.createElement)(BrandMark, { size: 22 }), (0, import_react21.createElement)(BrandName)), ++ (0, import_react21.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }), ++ (0, import_react21.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react21.createElement)(SearchIcon)), ++ (0, import_react21.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react21.createElement)(PlusIcon)) ++ ) : (0, import_react21.createElement)( ++ import_react21.Fragment, ++ null, ++ (0, import_react21.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }), ++ (0, import_react21.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react21.createElement)(PlusIcon)) ++ ); ++ const sideBody = [ ++ wide && readOnlySaid2 ? (0, import_react21.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null, ++ wide && readOnlySaid2 ? readOnlyReload : null, ++ !wide && readOnlySaid2 ? (0, import_react21.createElement)("div", { className: "bt-hint bt-read-only", role: "status", title: hostText(roster.readOnly), "aria-label": hostText(roster.readOnly) }, hostText(roster.readOnly)) : null, ++ !wide && readOnlySaid2 ? readOnlyReload : null, ++ (0, import_react21.createElement)(InboxRow, { wide, useRoster, useWork: props.useWork, useUi, actions }), ++ (0, import_react21.createElement)(KanbanRow, { wide, useUi, actions }), ++ (0, import_react21.createElement)(ProjectsNav, { wide }), ++ wide ? (0, import_react21.createElement)(SessionFilter, { value: sessionFilter, onChange: setSessionFilter }) : null, ++ (0, import_react21.createElement)( ++ "div", ++ { ref: listRef, className: "bt-list", role: "region", "aria-label": t("Bot list") }, ++ tree ? (0, import_react21.createElement)("div", { className: "bt-tree", role: "group", "aria-label": t("Bot tree") }, tree.map((node) => (0, import_react21.createElement)(TreeNode, { key: node.bot.id, node, rowProps, markedUnread, collapsed, toggle, actions: structure?.nodeActions }))) : showMain ? (0, import_react21.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react21.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")), ++ visibleOrder.map((entry) => entry.kind === "bot" ? (0, import_react21.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react21.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react21.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true })), ++ filterEmpty ? (0, import_react21.createElement)("div", { className: "bt-hint bt-session-filter-empty" }, filterEmpty) : null, ++ wide && sessionFilter === "all" ? (0, import_react21.createElement)(FlyBotSections, { roster, actions, renderBot: (bot) => (0, import_react21.createElement)(BotRow, { key: bot.id, ...rowProps, bot, asRow: true, marked: markedUnread[bot.id] === true }) }) : null ++ ) ++ ]; ++ const iconRail = wide ? (0, import_react21.createElement)( ++ "nav", ++ { className: "bt-icon-rail", "aria-label": t("FlyBot") }, ++ (0, import_react21.createElement)("span", { className: "bt-brand-rail", title: t("FlyBot") }, (0, import_react21.createElement)(BrandMark, { size: 28 })), ++ (0, import_react21.createElement)("button", { type: "button", className: "bt-rail-btn", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react21.createElement)(SearchIcon)), ++ (0, import_react21.createElement)("button", { type: "button", className: "bt-rail-btn", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react21.createElement)(PlusIcon)) ++ ) : null; ++ return (0, import_react21.createElement)( ++ "div", ++ { className: wide ? "bt-side bt-side-split" : "bt-side bt-rail", onKeyDown: typeToSearch }, ++ iconRail, ++ wide ? (0, import_react21.createElement)("div", { className: "bt-chat-col" }, sideTop, ...sideBody) : (0, import_react21.createElement)(import_react21.Fragment, null, sideTop, ...sideBody) ++ ); + } +-function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi, useWork }) { +- const [live, setLive] = (0, import_react6.useState)({ replies: [], speaking: null }); +- (0, import_react6.useEffect)(() => { +- if (done) return void 0; +- let stop = false; +- let timer; +- let seen = ""; +- const tick = async () => { +- const result = await actions.roomProgress(sessionId); +- if (stop) return; +- const entry = (result ?? []).find((item) => item.callId === callId) ?? (result ?? [])[0]; +- const key = entry ? JSON.stringify([entry.replies, entry.speaking]) : ""; +- if (entry && key !== seen) { +- seen = key; +- setLive({ replies: entry.replies ?? [], speaking: entry.speaking ?? null }); ++function UpdateButton({ useUpdate, actions }) { ++ const update = useUpdate((value) => value); ++ const [open, setOpen] = (0, import_react21.useState)(false); ++ const [box, setBox] = (0, import_react21.useState)(null); ++ const [error, setError] = (0, import_react21.useState)(""); ++ const [dshError, setDshError] = (0, import_react21.useState)(""); ++ const button = (0, import_react21.useRef)(null); ++ (0, import_react21.useEffect)(() => { ++ if (!open) return void 0; ++ const onDown = (event) => { ++ if (event.target instanceof Element && (event.target.closest(".bt-update-pop") || button.current?.contains(event.target))) return; ++ setOpen(false); ++ }; ++ const onKey = (event) => { ++ if (event.key === "Escape") { ++ event.stopPropagation(); ++ setOpen(false); ++ button.current?.focus(); + } +- timer = setTimeout(tick, document.hidden ? 5e3 : 1e3); }; - }, [openSettings]); -- (0, import_react8.useEffect)(() => { -+ (0, import_react19.useEffect)(() => { - if (!openOnboarding) return void 0; - openShellOnboarding = openOnboarding; +- void tick(); ++ window.addEventListener("mousedown", onDown); ++ window.addEventListener("keydown", onKey, true); return () => { - if (openShellOnboarding === openOnboarding) openShellOnboarding = null; +- stop = true; +- clearTimeout(timer); ++ window.removeEventListener("mousedown", onDown); ++ window.removeEventListener("keydown", onKey, true); }; - }, [openOnboarding]); -- (0, import_react8.useEffect)(() => { -+ (0, import_react19.useEffect)(() => { - if (!open) return void 0; - const onDown = (event) => { - if (event.target instanceof Element && (event.target.closest(".bt-account-menu") || button.current?.contains(event.target))) return; -@@ -5341,30 +5341,32 @@ function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboardi - const groups = [ - [ - [t("Usage"), GaugeIcon, () => actions.openSettings("usage")], -- [t("Connectors"), ConnectorIcon, () => actions.openConnectors()], -- [t("Automation tasks"), ClockIcon, () => actions.selectPanel("schedules")], -- [t("Bot settings"), GearIcon, () => actions.openSettings("general")] -+ [t("Connect apps"), ConnectorIcon, () => actions.openConnectors()], -+ [t("Plugins"), PlugIcon, () => actions.selectPanel("plugins")], -+ [t("Scheduled tasks"), ClockIcon, () => actions.openSettings("schedules")], -+ [t("Settings"), GearIcon, () => actions.openSettings("general")] - ], - [ - [t("Switch to classic Agent mode"), SwitchIcon, () => actions.setSurface("agent")] - ] - ]; -- return (0, import_react8.createElement)( -- import_react8.Fragment, -+ return (0, import_react19.createElement)( -+ import_react19.Fragment, - null, -- (0, import_react8.createElement)( -+ (0, import_react19.createElement)( - "button", - { ref: button, type: "button", className: "bt-account", "aria-label": t("Account"), "aria-haspopup": "menu", "aria-expanded": open, onClick: toggle }, -- (0, import_react8.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react8.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })) -+ (0, import_react19.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react19.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })) - ), -- open && box ? (0, import_react_dom3.createPortal)((0, import_react8.createElement)( -+ open && box ? (0, import_react_dom4.createPortal)((0, import_react19.createElement)( - "div", - { className: "bt-menu bt-menu-up bt-account-menu", role: "menu", "aria-label": t("Account"), style: box }, -- groups.map((group, index) => (0, import_react8.createElement)( -- import_react8.Fragment, -+ (0, import_react19.createElement)(FlyBotAccountHeader, { actions }), -+ groups.map((group, index) => (0, import_react19.createElement)( -+ import_react19.Fragment, - { key: index }, -- index > 0 ? (0, import_react8.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, -- group.map(([label, Icon, run, hint]) => (0, import_react8.createElement)("button", { -+ index > 0 ? (0, import_react19.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, -+ group.map(([label, Icon, run, hint]) => (0, import_react19.createElement)("button", { - key: label, - type: "button", - role: "menuitem", -@@ -5372,7 +5372,7 @@ function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboardi - setOpen(false); - void Promise.resolve(run()).catch((error) => actions.reportError(error, "menu")); - } -- }, (0, import_react8.createElement)(Icon), (0, import_react8.createElement)("span", { className: "bt-menu-label" }, label), hint ? (0, import_react8.createElement)("span", { className: "bt-menu-hint" }, hint) : null)) -+ }, (0, import_react19.createElement)(Icon), (0, import_react19.createElement)("span", { className: "bt-menu-label" }, label), hint ? (0, import_react19.createElement)("span", { className: "bt-menu-hint" }, hint) : null)) - )) - ), document.body) : null - ); -@@ -5382,8 +5382,8 @@ function useLandOnMainBot(roster, useSessions, actions) { - const row = Object.values(list.byId).find((session) => (session?.retainedBy?.mainView ?? 0) > 0); - return row ? `${row.id}|${row.blank ? 1 : 0}` : ""; - }); -- const lastBot = (0, import_react8.useRef)(null); -- (0, import_react8.useEffect)(() => { -+ const lastBot = (0, import_react19.useRef)(null); -+ (0, import_react19.useEffect)(() => { - if (!roster.ready || !roster.mainBotId) return void 0; - const [id, blank3] = mainView.split("|"); - const bot = id === "" ? void 0 : roster.byId[id]; -@@ -5397,40 +5397,40 @@ function useLandOnMainBot(roster, useSessions, actions) { - return void 0; - } - const last = lastBot.current; -- const timer = setTimeout(() => actions.landOn(roster.mainBotId, last), last ? 0 : 400); -+ const timer = setTimeout(() => actions.landOn(roster.mainBotId, last, { stay: id === "", view: id }), last ? 0 : 400); - return () => clearTimeout(timer); - }, [mainView, roster]); - } - function FooterAccount(props) { - const seated = props.useUi((value) => value.accountSeated === true); - if (seated) return null; -- return (0, import_react8.createElement)("span", { className: "bt-foot-account" }, (0, import_react8.createElement)(AccountLauncher, { ...props, seat: false })); -+ return (0, import_react19.createElement)("span", { className: "bt-foot-account" }, (0, import_react19.createElement)(AccountLauncher, { ...props, seat: false })); - } - function BotReturn({ wide, useSurface, actions }) { - const mode = useSurface((value) => value.mode); - if (mode !== "agent") return null; -- return (0, import_react8.createElement)( -+ return (0, import_react19.createElement)( - "button", -- { type: "button", className: "bt-return", "aria-label": t("DS Bot"), title: t("DS Bot"), onClick: () => actions.setSurface("bot") }, -- (0, import_react8.createElement)(BotMark, { look: MAIN_LOOK, size: 20 }), -- wide ? (0, import_react8.createElement)("span", { className: "bt-return-name" }, t("DS Bot")) : null -+ { type: "button", className: "bt-return", "aria-label": t("FlyBot"), title: t("FlyBot"), onClick: () => actions.setSurface("bot") }, -+ (0, import_react19.createElement)(FlyBotMark, { size: 20 }), -+ wide ? (0, import_react19.createElement)("span", { className: "bt-return-name" }, t("FlyBot")) : null - ); - } - var RETURN_CSS = ` - .bt-return{display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;padding:0 14px;border:0;border-radius:999px;background:none;color:inherit;font:inherit;font-size:14px;line-height:20px;cursor:pointer;transition:background-color .12s ease} - .bt-return:hover{background:rgba(127,127,127,.14)} - .bt-return:active{transform:scale(.96)} --.bt-return .bt-mark{display:inline-flex;flex:none;line-height:0} --.bt-return .bt-mark svg{width:100%;height:100%;overflow:visible} -+.bt-return .bt-mark,.bt-return .bt-flybot-mark{display:inline-flex;flex:none;line-height:0} -+.bt-return .bt-mark svg,.bt-return .bt-flybot-mark{width:20px;height:20px;overflow:visible} - /* Shell styles carry --bt-ink-deepseek and Agent mode withdraws them; pin it here. */ - .bt-return .bt-mark{--bt-ink-deepseek:#4D6BFE} - .bt-return-name{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} - `; - function BrandMark({ size = 24 }) { -- return (0, import_react8.createElement)("span", { className: "bt-brand-whale" }, (0, import_react8.createElement)(BotMark, { look: MAIN_LOOK, size })); -+ return (0, import_react19.createElement)("span", { className: "bt-brand-mark" }, (0, import_react19.createElement)(FlyBotMark, { size })); - } - function BrandName() { -- return (0, import_react8.createElement)("span", { style: { fontWeight: 600, fontSize: 14 } }, "DS Bot"); -+ return (0, import_react19.createElement)("span", { style: { fontWeight: 600, fontSize: 14 } }, t("FlyBot")); - } - var SIDEBAR_CSS = ` - .bt-side-top .bt-brand{cursor:default;padding-left:6px} -@@ -5440,6 +5440,10 @@ var SIDEBAR_CSS = ` - .bt-rail .bt-row{position:relative} - .bt-rail .bt-pin{position:absolute;top:3px;left:calc(50% + 12px)} - .bt-side .bt-read-only{margin:4px 8px 6px;padding:8px 10px;border-radius:10px;background:var(--bt-hover);font-size:12px;line-height:1.45;text-align:left} -+.bt-rail .bt-read-only{width:100%;margin:4px 0 6px;padding:4px 2px;font-size:10px;line-height:1.3;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} -+.bt-read-only-reload{margin:0 8px 8px;padding:3px 10px;border:1px solid var(--bt-line);border-radius:8px;background:none;color:inherit;font:inherit;font-size:12px;line-height:18px;cursor:pointer;transition:background-color .12s ease} -+.bt-read-only-reload:hover{background:var(--bt-hover)} -+.bt-rail .bt-read-only-reload{width:100%;margin:0 0 6px;padding:2px 0;font-size:10px;line-height:16px;text-align:center} - [class*="_footArea"]:has(.bt-foot-account){display:flex!important;flex-direction:row!important;align-items:center;gap:6px} - [class*="_footArea"]:has(.bt-foot-account)>[class*="_footerActions"],[class*="_footArea"]:has(.bt-foot-account)>[class*="_footerActions"]>div{display:contents!important} - .bt-foot-account{order:-1;flex:none;display:inline-flex} -@@ -5456,7 +5456,7 @@ var SIDEBAR_CSS = ` - .bt-update[data-phase=installing] .bt-cloud-arrow{animation:bt-cloud-drop 1.1s cubic-bezier(.45,0,.55,1) infinite} - @keyframes bt-cloud-drop{0%{transform:translateY(-3px);opacity:0}35%{opacity:1}70%{transform:translateY(1px);opacity:1}100%{transform:translateY(2px);opacity:0}} - .bt-update-dot{position:absolute;top:6px;right:6px;width:7px;height:7px;border-radius:50%;background:#E5484D;box-shadow:0 0 0 1.5px var(--bt-sidebar)} --.bt-update-pop{position:fixed;z-index:60;width:280px;padding:14px 14px 12px;border-radius:14px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 10px 20px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);color:var(--bt-ink);box-sizing:border-box;transform-origin:top left;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;animation:bt-update-pop ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} -+.bt-update-pop{position:fixed;z-index:130;width:280px;padding:14px 14px 12px;border-radius:14px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 10px 20px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);color:var(--bt-ink);box-sizing:border-box;transform-origin:top left;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;animation:bt-update-pop ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} - @keyframes bt-update-pop{from{opacity:0;transform:scale(.96);filter:blur(4px)}} - .bt-update-title{font-size:14px;line-height:20px;font-weight:600} - .bt-update-text{margin-top:2px;font-size:12.5px;line-height:18px;color:var(--bt-ink-2)} -@@ -5491,1679 +5491,2863 @@ var SIDEBAR_CSS = ` - .bt-agent-sub[data-open] .bt-agent-sub-row{animation:bt-agent-row-in .24s ease both;animation-delay:calc(var(--i, 0)*30ms)} - @keyframes bt-agent-row-in{from{opacity:0;filter:blur(4px)}to{opacity:1;filter:blur(0)}} - @media (prefers-reduced-motion:reduce){.bt-agent-sub{transition:none}.bt-agent-sub .bt-agent-sub-row{animation:none}} --`; -- --// src/client/header.js --var import_react9 = require("react"); --var import_react_dom4 = require("react-dom"); --var GoArrow = () => (0, import_react9.createElement)("svg", { width: 14, height: 14, viewBox: "-12 -12 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2.2, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react9.createElement)("path", { d: "M-7 0H7M2 -5L7 0L2 5" })); --var MEMORY_NOTICE_MS = 3200; --var noNews = (select) => select({}); --function useMemoryNotice(ids, useMemoryNews) { -- const seen = useMemoryNews((map) => Math.max(0, ...ids.map((id) => map?.[id]?.seen ?? 0))); -- const [shown, setShown] = (0, import_react9.useState)(false); -- (0, import_react9.useEffect)(() => { -- const left = seen + MEMORY_NOTICE_MS - Date.now(); -- setShown(seen > 0 && left > 0); -- if (seen === 0 || left <= 0) return void 0; -- const timer = setTimeout(() => setShown(false), left); -- return () => clearTimeout(timer); -- }, [seen]); -- return shown; --} --function MemoryNotice({ shown }) { -- const inner = (0, import_react9.useRef)(null); -- const [width, setWidth] = (0, import_react9.useState)(0); -- const label = t("Memory updated"); -- (0, import_react9.useLayoutEffect)(() => { -- if (shown) setWidth(inner.current?.scrollWidth ?? 0); -- }, [label, shown]); -- return (0, import_react9.createElement)( -- "span", -- { className: "bt-pill-mem", "aria-hidden": true, style: { "--bt-mem-w": `${width}px` } }, -- (0, import_react9.createElement)("span", { className: "bt-pill-mem-in", ref: inner }, (0, import_react9.createElement)("span", { className: "bt-pill-mem-ico" }, (0, import_react9.createElement)(MemoryIcon)), label) -- ); --} --function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSession, useActivity, useMemoryNews, useTurnClock, useUi, useLive, actions }) { -- const roster = useRoster((value) => value); -- const title = useSessions((list) => list.byId[sessionId]?.displayTitle ?? list.byId[sessionId]?.title ?? ""); -- const firstTurns = useSessions((list) => { -- const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline; -- return Array.isArray(outline) ? outline.slice(0, 8).map((entry) => entry.turn).join(",") : ""; -- }); -- const hiddenTurns = roster.exchangeTurns?.[sessionId]; -- const visit = useUi((state) => state.visits?.[sessionId]); -- const opening = useTurnClock((state) => { -- const first = openingTurn(state[sessionId], firstTurns, hiddenTurns); -- return first && !unseenSince(visit, first.start) ? clockLabel(first.start) : ""; -- }); -- (0, import_react9.useEffect)(() => { -- if (opening) document.body.style.setProperty("--bt-first-sep", JSON.stringify(opening)); -- else document.body.style.removeProperty("--bt-first-sep"); -- return () => document.body.style.removeProperty("--bt-first-sep"); -- }, [opening]); -- const running = useSessionStatus((map) => map.get(sessionId)?.running === true); -- const owner = roster.byId[sessionId]?.id ?? sessionId; -- const doing = useActivity((map) => map[owner]); -- const bot = roster.byId[sessionId]; +- }, [done, sessionId, callId]); +- let replies = live.replies; +- if (done) { +- try { +- replies = JSON.parse(contentText(content)).replies ?? []; +- } catch { +- replies = []; +- } +- } +- const pending = done || !live.speaking ? [] : [live.speaking]; +- const speakerTool = useWork?.((work) => work.bots?.[live.speaking]?.tool) ?? void 0; +- if (replies.length === 0 && pending.length === 0) return null; - const room2 = roster.roomsById[sessionId]; -- const detailsOpen = useUi((state) => state.details === sessionId); -- const name = bot?.name ?? room2?.name ?? ""; -- const useNews = useMemoryNews ?? noNews; -- const memoryIds = bot ? [bot.id] : room2?.members ?? []; -- const notice = useMemoryNotice(memoryIds, useNews); -- const changed = useNews((map) => latestMemoryChange(map, memoryIds)); -- (0, import_react9.useEffect)(() => { -- document.body.style.setProperty("--bt-placeholder", JSON.stringify(name ? t("Message {name}", { name }) : t("Message"))); -- }, [name, t("Message")]); -- (0, import_react9.useEffect)(() => { -- actions.beginVisit(sessionId); -- return () => actions.endVisit(sessionId); -- }, [sessionId]); -- (0, import_react9.useEffect)(() => { -- if (room2) document.body.dataset.btRoom = ""; -- else delete document.body.dataset.btRoom; -- return () => { -- delete document.body.dataset.btRoom; -- }; -- }, [Boolean(room2)]); -- const memoryNotice = notice && changed !== null && roster.memory !== false; -- return (0, import_react9.createElement)( +- return (0, import_react6.createElement)( - "div", -- { className: "bt-head" }, -- (0, import_react9.createElement)( -- "button", -- { -- type: "button", -- className: "bt-pill", -- "aria-expanded": detailsOpen, -- "data-memory": memoryNotice ? "updated" : void 0, -- "aria-label": memoryNotice ? t("Memory updated. Open {name}'s memory", { name: roster.byId[changed]?.name ?? name }) : t("View conversation details"), -- onClick: () => memoryNotice ? actions.openMemory(changed) : actions.toggleDetails(sessionId) -- }, -- bot ? (0, import_react9.createElement)(BotAvatar, { bot, size: 24, state: botState(running, doing, roster.questions?.[currentPart(bot)] !== void 0), badge: false }) : room2 ? (0, import_react9.createElement)(RoomAvatar, { room: room2, roster, size: 24 }) : null, -- (0, import_react9.createElement)("span", { className: "bt-pill-name" }, bot?.name ?? room2?.name ?? (title || t("New chat"))), -- (0, import_react9.createElement)(MemoryNotice, { shown: memoryNotice }), -- (0, import_react9.createElement)("span", { className: "bt-pill-go", "aria-hidden": true }, (0, import_react9.createElement)(GoArrow)) -- ), -- (0, import_react9.createElement)("span", { className: "bt-sr", role: "status" }, memoryNotice ? t("Memory updated") : ""), -- (0, import_react9.createElement)(NewMessagePills, { key: sessionId, sessionId, useSessions, useUi, useTurnClock }), -- (0, import_react9.createElement)(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, actions }) -- ); --} --function useTranscriptView() { -- const [view, setView] = (0, import_react9.useState)(null); -- (0, import_react9.useEffect)(() => { -- let frame = 0; -- let watched = null; -- const observer = new MutationObserver(() => schedule()); -- const measure = () => { -- frame = 0; -- const scroller = document.querySelector("[data-conversation-scroll]"); -- if (scroller !== watched) { -- observer.disconnect(); -- watched = scroller; -- if (scroller) observer.observe(scroller, { childList: true, subtree: true }); +- { className: "bt-group-replies" }, +- replies.map((reply, index) => { +- const bot = roster.byId[reply.botId] ?? { id: reply.botId, name: reply.name, color: reply.color ?? "gray" }; +- if (reply.kind === "user") { +- return (0, import_react6.createElement)("div", { key: `user-${index}`, className: "bt-urow" }, (0, import_react6.createElement)( +- "div", +- { className: "bt-ububble" }, +- (0, import_react6.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: reply.text, labels: mdLabels(), variant: "compact" }) +- )); - } -- if (!scroller) { -- setView(null); -- return; +- if (reply.kind === "failed") { +- return (0, import_react6.createElement)( +- "div", +- { key: `${reply.botId}-${index}`, className: "bt-event bt-event-error", role: "status", title: [reply.code, reply.status, reply.text].filter(Boolean).join(" · ") }, +- t("{name} could not answer: {reason}", { name: bot.name, reason: failureLabel(reply.code, reply.text) }) +- ); - } -- const box = scroller.getBoundingClientRect(); -- const headerBottom = document.querySelector('header[class*="_header"]')?.getBoundingClientRect().bottom ?? box.top + 50; -- const sep = scroller.querySelector(".bt-new-sep"); -- let divider = null; -- if (sep) { -- const at = sep.getBoundingClientRect(); -- divider = at.bottom <= headerBottom ? "above" : at.top >= box.bottom ? "below" : "in-view"; +- if (reply.kind === "lookup") { +- return (0, import_react6.createElement)( +- "div", +- { key: `${reply.botId}-${index}`, className: "bt-event" }, +- reply.text ? t("{name} looked up its own chat for “{text}”", { name: bot.name, text: reply.text }) : t("{name} looked up its own chat", { name: bot.name }) +- ); - } -- const composer = parseFloat(getComputedStyle(scroller).getPropertyValue("--dsh-composer-height")) || 152; -- const next = { -- unpinned: scroller.querySelector('[class*="_toBottomSlot"]>button') !== null, -- divider, -- center: Math.round(box.left + box.width / 2), -- top: Math.round(headerBottom + 8), -- bottom: Math.round(window.innerHeight - box.bottom + composer + 8) -- }; -- setView((prev) => prev && Object.keys(next).every((key) => prev[key] === next[key]) ? prev : next); -- }; -- const schedule = () => { -- if (!frame) frame = requestAnimationFrame(measure); -- }; -- document.addEventListener("scroll", schedule, true); -- window.addEventListener("resize", schedule); -- schedule(); -- return () => { -- cancelAnimationFrame(frame); -- observer.disconnect(); -- document.removeEventListener("scroll", schedule, true); -- window.removeEventListener("resize", schedule); -- }; -- }, []); -- return view; --} --function NewMessagePills({ sessionId, useSessions, useUi, useTurnClock }) { -- const replies = useSessions((list) => { -- const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline; -- return Array.isArray(outline) ? outline.reduce((count, entry) => count + (entry.response ? 1 : 0), 0) : 0; -- }); -- const visit = useUi((state) => state.visits?.[sessionId]); -- const unread = useTurnClock((state) => { -- if (typeof visit?.seen !== "number") return 0; -- let count = 0; -- for (const entry of Object.values(state[sessionId] ?? {})) { -- if (entry.first !== void 0 && entry.first > visit.seen && entry.first <= visit.entered) count += 1; -- } -- return count; -- }); -- const view = useTranscriptView(); -- const unpinned = view?.unpinned === true; -- const [release, setRelease] = (0, import_react9.useState)({ base: null, dismissed: false }); -- const [above, setAbove] = (0, import_react9.useState)({ seen: false, dismissed: false }); -- (0, import_react9.useEffect)(() => { -- setRelease({ base: unpinned ? replies : null, dismissed: false }); -- }, [unpinned]); -- (0, import_react9.useEffect)(() => { -- if (view?.divider === "in-view") setAbove((state) => state.seen ? state : { ...state, seen: true }); -- }, [view?.divider]); -- const fresh = release.base === null ? 0 : replies - release.base; -- const showDown = unpinned && fresh > 0 && !release.dismissed; -- const showUp = view?.divider === "above" && !above.seen && !above.dismissed; -- (0, import_react9.useEffect)(() => { -- const scroller = document.querySelector("[data-conversation-scroll]"); -- if (!scroller) return void 0; -- scroller.toggleAttribute("data-bt-news", showDown); -- return () => scroller.removeAttribute("data-bt-news"); -- }, [showDown]); -- if (!view || !showDown && !showUp) return null; -- const label = (count) => count === 1 ? t("1 new message") : count > 0 ? t("{count} new messages", { count }) : t("New messages"); -- const pill = (direction, count, style, onJump, onDismiss) => (0, import_react9.createElement)( -- "div", -- { className: "bt-news", "data-direction": direction, style }, -- (0, import_react9.createElement)( -- "button", -- { type: "button", className: "bt-news-jump", onClick: onJump }, -- (0, import_react9.createElement)("span", { className: "bt-news-ico" }, (0, import_react9.createElement)(direction === "up" ? ArrowUpIcon : ArrowDownIcon)), -- label(count) -- ), -- (0, import_react9.createElement)("button", { -- type: "button", -- className: "bt-news-x", -- "aria-label": t("Dismiss new messages"), -- onClick: (event) => { -- event.stopPropagation(); -- onDismiss(); +- if (reply.kind === "missed") { +- return (0, import_react6.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name })); - } -- }, (0, import_react9.createElement)(CloseIcon)) -- ); -- const toLatest = () => { -- const scroller = document.querySelector("[data-conversation-scroll]"); -- const back = scroller?.querySelector('[class*="_toBottomSlot"]>button'); -- if (back) back.click(); -- else scroller?.scrollTo({ top: scroller.scrollHeight, behavior: "smooth" }); -- }; -- const toDivider = () => document.querySelector("[data-conversation-scroll] .bt-new-sep")?.scrollIntoView({ block: "center", behavior: "smooth" }); -- return (0, import_react_dom4.createPortal)( -- (0, import_react9.createElement)( -- import_react9.Fragment, -- null, -- showUp ? pill("up", unread, { left: view.center, top: view.top }, toDivider, () => setAbove((state) => ({ ...state, dismissed: true }))) : null, -- showDown ? pill("down", fresh, { left: view.center, bottom: view.bottom }, toLatest, () => setRelease((state) => ({ ...state, dismissed: true }))) : null -- ), -- document.body -- ); --} -- --// src/client/composer.js --var import_react10 = require("react"); --var import_react_dom5 = require("react-dom"); --var speechApi = () => window.SpeechRecognition ?? window.webkitSpeechRecognition; --var keepComposerFocus = (event) => event.preventDefault(); --function useDictation(onText) { -- const [listening, setListening] = (0, import_react10.useState)(false); -- const [note, setNote] = (0, import_react10.useState)(""); -- const recognition = (0, import_react10.useRef)(null); -- const latest = (0, import_react10.useRef)(onText); -- latest.current = onText; -- (0, import_react10.useEffect)(() => () => recognition.current?.abort(), []); -- (0, import_react10.useEffect)(() => { -- if (!note) return void 0; -- const timer = setTimeout(() => setNote(""), 2600); -- return () => clearTimeout(timer); -- }, [note]); -- const start = ({ continuous = true, onEnd } = {}) => { -- const Api = speechApi(); -- if (!Api) { -- setNote(t("Dictation is not available in this browser")); -- return false; -- } -- const engine = new Api(); -- engine.lang = navigator.language || "zh-CN"; -- engine.interimResults = true; -- engine.continuous = continuous; -- engine.onresult = (event) => { -- let interim = ""; -- for (let index = event.resultIndex; index < event.results.length; index += 1) { -- const result = event.results[index]; -- const text = result[0]?.transcript ?? ""; -- if (result.isFinal) { -- if (text.trim()) latest.current(text, true); -- } else interim += text; +- if (reply.kind === "resumed") { +- return (0, import_react6.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name })); - } -- if (interim) latest.current(interim, false); -- }; -- engine.onerror = (event) => { -- if (event.error === "aborted" || event.error === "no-speech") return; -- setNote(event.error === "not-allowed" || event.error === "service-not-allowed" ? t("Microphone access is blocked") : t("Couldn't hear that")); -- }; -- engine.onend = () => { -- setListening(false); -- recognition.current = null; -- onEnd?.(); -- }; -- recognition.current = engine; -- try { -- engine.start(); -- setListening(true); -- return true; -- } catch { -- setNote(t("Couldn't start dictation")); -- return false; -- } -- }; -- const stop = () => recognition.current?.stop(); -- return { listening, note, start, stop }; --} --function ComposerVoice({ sessionId, inputActions, actions, useUi }) { -- const dictation = useDictation((text, final) => { -- if (final && inputActions) inputActions.insertText(text, inputActions.captureInsertion()); -- }); -- const quote = useUi((state) => state.quote?.sessionId === sessionId ? state.quote : null); -- (0, import_react10.useEffect)(() => { -- if (!quote || !inputActions) return; -- actions.clearQuote(quote.token); -- const excerpt = quote.text.replace(/\s+/g, " ").trim(); -- const line = `> ${excerpt.length > 200 ? `${excerpt.slice(0, 200)}…` : excerpt} - -+.bt-row-wrap{position:relative;display:flex;align-items:center;width:100%;min-width:0} -+.bt-row-wrap>.bt-row{flex:1 1 auto;min-width:0;width:100%} -+.bt-tree-item>.bt-row-wrap{flex:1 1 auto;width:auto;min-width:0} -+/* Gear sits over the row so hover/selected fill the same full-width band as a plain row (#384). */ -+.bt-row-settings{position:absolute;right:6px;top:50%;transform:translateY(-50%);z-index:1;flex:none;display:inline-flex;align-items:center;justify-content:center;width:28px;height:28px;padding:0;border:0;border-radius:8px;background:transparent;color:var(--bt-ink-3);cursor:pointer;opacity:0;pointer-events:none;transition:background-color .12s ease,color .12s ease,opacity .12s ease} -+.bt-row-wrap:hover>.bt-row,.bt-row-wrap:focus-within>.bt-row{padding-right:36px} -+.bt-row-wrap:hover .bt-row-settings,.bt-row-wrap:focus-within .bt-row-settings{opacity:1;pointer-events:auto;color:var(--bt-ink-2);background:var(--bt-hover)} -+.bt-row-settings:hover{opacity:1;color:var(--bt-ink-2);background:var(--bt-hover)} -+.bt-row-settings svg{width:15px;height:15px} - `; -- inputActions.insertText(line, inputActions.captureInsertion()); -- const box = document.querySelector('[class*="_centerCol"] [role=textbox][contenteditable=true]'); -- if (box instanceof HTMLElement) { -- box.focus(); -- const selection = window.getSelection(); -- selection?.selectAllChildren(box); -- selection?.collapseToEnd(); -- } -- }, [quote?.token]); -- if (sessionId === void 0) return null; -- const pluginMic = actions.speech() !== void 0; -- return (0, import_react10.createElement)( -- import_react10.Fragment, -- null, -- pluginMic ? null : (0, import_react10.createElement)("button", { -- type: "button", -- className: "bt-mic", -- "aria-label": dictation.listening ? t("Stop dictation") : t("Dictate"), -- "aria-pressed": dictation.listening, -- title: dictation.listening ? t("Stop dictation") : t("Dictate"), -- onMouseDown: keepComposerFocus, -- onClick: () => dictation.listening ? dictation.stop() : dictation.start() -- }, (0, import_react10.createElement)(MicIcon)), -- (0, import_react10.createElement)("button", { -- type: "button", -- className: "bt-voice", -- "aria-label": t("Start voice chat"), -- title: t("Voice chat"), -- onMouseDown: keepComposerFocus, -- onClick: () => actions.openVoice(sessionId) -- }, (0, import_react10.createElement)(WaveIcon, { size: 18 })), -- dictation.note ? (0, import_react10.createElement)("span", { className: "bt-mic-note", role: "status" }, dictation.note) : null -- ); -+ -+// src/client/busy-ack-logic.js -+function busyAckText(hostAck) { -+ return typeof hostAck?.text === "string" ? hostAck.text.trim() : ""; - } --function menuIcons(roster) { -- const marks = /* @__PURE__ */ new Map(); -- return (row) => { -- if (!row.bot) return PeopleIcon; -- const id = row.bot.id; -- if (!marks.has(id)) marks.set(id, ({ size = 14 }) => (0, import_react10.createElement)(BotMark, { bot: roster.getSnapshot().byId[id] ?? row.bot, size })); -- return marks.get(id); -- }; -+function busyAckPending(hostAck) { -+ return busyAckText(hostAck) === ""; - } --function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { -- const roster = useRoster((value) => value); -- const [open, setOpen] = (0, import_react10.useState)(null); -- const [shown, leaving] = useLinger(open, 120); -- const button = (0, import_react10.useRef)(null); -- const menu = (0, import_react10.useRef)(null); -- (0, import_react10.useEffect)(() => { -- if (!open) return void 0; -- const onDown = (event) => { -- if (![button.current, menu.current].some((node) => node?.contains(event.target))) setOpen(null); -- }; -- const onKey = (event) => { -- if (event.key === "Escape") { -- event.stopPropagation(); -- setOpen(null); +- if (reply.kind === "cut") { +- return (0, import_react6.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name })); - } -+function pendingBusyPlacement(submissions) { -+ if (!Array.isArray(submissions)) return false; -+ return submissions.some((item) => item?.placement === "queued" || item?.placement === "steering"); -+} -+function busyAckVisible({ hostAck, pendingBusy, streamingText }) { -+ if (streamingText) return false; -+ return busyAckText(hostAck) !== "" || pendingBusy === true; -+} -+function roomBusyAck(room2) { -+ const entries2 = Object.entries(room2?.busyAcks ?? {}).filter(([, ack2]) => ack2 !== void 0 && ack2 !== null); -+ if (entries2.length === 0) return null; -+ const [botId, ack] = entries2.sort((a, b) => (b[1].at ?? 0) - (a[1].at ?? 0))[0]; -+ return { botId, text: busyAckText(ack), at: ack.at ?? 0 }; -+} -+function roomBusyAckVisible({ ack, pendingBusy }) { -+ if (ack === null || ack === void 0) return false; -+ return ack.text !== "" || pendingBusy === true; -+} -+ -+// src/client/busy-ack.js -+var import_react20 = require("react"); -+var import_react_dom5 = require("react-dom"); -+function useRunningHost2(active) { -+ const [host, setHost] = (0, import_react20.useState)(null); -+ (0, import_react20.useEffect)(() => { -+ if (!active) { -+ setHost(null); -+ return void 0; -+ } -+ let frame = 0; -+ const find = () => { -+ frame = 0; -+ const node = document.querySelector(RUNNING_HOST); -+ setHost((prev) => prev === node ? prev : node); - }; -- window.addEventListener("mousedown", onDown, true); -- window.addEventListener("keydown", onKey, true); -+ const observer = new MutationObserver(() => { -+ if (!frame) frame = requestAnimationFrame(find); -+ }); -+ observer.observe(document.querySelector("[data-conversation-scroll]") ?? document.body, { childList: true, subtree: true }); -+ find(); - return () => { -- window.removeEventListener("mousedown", onDown, true); -- window.removeEventListener("keydown", onKey, true); -+ cancelAnimationFrame(frame); -+ observer.disconnect(); - }; -- }, [open]); -- const target = roster.byId?.[sessionId]?.id ?? roster.roomsById?.[sessionId]?.id; -- if (sessionId === void 0 || target === void 0) return null; -- const toggle = () => { -- if (open) { -- setOpen(null); -- return; -- } -- const rect = button.current.getBoundingClientRect(); -- setOpen({ left: rect.left, bottom: window.innerHeight - rect.top + 8 }); -- }; -- const attach = () => { -- setOpen(null); -- button.current?.closest("[data-composer-card]")?.querySelector("input[type=file]")?.click(); -- }; -- const schedule = () => { -- setOpen(null); -- actions.openSettings("schedules", target); -- }; -- const reference = () => { -- setOpen(null); -- actions.referenceChat(sessionId, inputActions?.captureInsertion?.()); -- }; -- const canReference = typeof inputActions?.captureInsertion === "function" && actions.canReferenceChat(); -- return (0, import_react10.createElement)( -- import_react10.Fragment, -- null, -- (0, import_react10.createElement)("button", { -- ref: button, -- type: "button", -- className: "bt-plus", -- "aria-label": t("Add"), -- title: t("Add"), -- "aria-haspopup": "menu", -- "aria-expanded": Boolean(open), -- onMouseDown: keepComposerFocus, -- onClick: toggle -- }, (0, import_react10.createElement)(PlusIcon)), -- shown ? (0, import_react_dom5.createPortal)((0, import_react10.createElement)( -+ }, [active]); -+ return host; -+} -+function BusyAckBubble({ sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive }) { -+ const roster = useRoster((value) => value); -+ const room2 = roster.roomsById?.[sessionId]; -+ const memberAck = room2 ? roomBusyAck(room2) : null; -+ const hostAck = useBusyAcks((map) => map?.[sessionId] ?? null); -+ const running = useSessionStatus((map) => map.get(sessionId)?.running === true); -+ const pendingBusy = useSession((snapshot) => pendingBusyPlacement(snapshot?.pendingSubmissions)); -+ const streamingText = useLive((state) => Object.values(state[sessionId] ?? {}).some((entry) => entry?.text)); -+ const visible = room2 ? roomBusyAckVisible({ ack: memberAck, pendingBusy }) : running && busyAckVisible({ hostAck, pendingBusy, streamingText }); -+ const bot = room2 ? roster.byId[memberAck?.botId] : roster.byId[sessionId]; -+ const host = useRunningHost2(visible); -+ const shown = (0, import_react20.useRef)(null); -+ if (visible) shown.current = room2 ? { text: memberAck?.text ?? "", at: memberAck?.at ?? Date.now() } : { text: busyAckText(hostAck), at: hostAck?.at ?? Date.now() }; -+ const text2 = shown.current?.text ?? ""; -+ if (!visible || !host || !shown.current || !bot) return null; -+ return (0, import_react_dom5.createPortal)((0, import_react20.createElement)( -+ "div", -+ { -+ className: "bt-busy-ack", -+ "data-flybot": "busy-ack", -+ role: "status", -+ "aria-live": "polite", -+ "aria-busy": text2 ? void 0 : "true", -+ "data-pending": text2 ? void 0 : "" -+ }, -+ (0, import_react20.createElement)(BotMark, { bot, size: 28, state: "thinking", live: true }), -+ (0, import_react20.createElement)( - "div", -- { -- ref: menu, -- className: "bt-menu bt-menu-up bt-plus-menu", -- role: "menu", -- "aria-label": t("Add"), -- style: { left: shown.left, bottom: shown.bottom }, -- "data-leaving": leaving || void 0 -- }, -- (0, import_react10.createElement)("button", { type: "button", role: "menuitem", onClick: attach }, (0, import_react10.createElement)(PaperclipIcon), (0, import_react10.createElement)("span", { className: "bt-menu-label" }, t("Add files"))), -- canReference ? (0, import_react10.createElement)("button", { type: "button", role: "menuitem", onMouseDown: keepComposerFocus, onClick: reference }, (0, import_react10.createElement)(ChatsIcon), (0, import_react10.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat"))) : null, -- (0, import_react10.createElement)("button", { type: "button", role: "menuitem", onClick: schedule }, (0, import_react10.createElement)(ClockIcon), (0, import_react10.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task"))) -- ), document.body) : null -- ); -+ { className: "bt-astack" }, -+ (0, import_react20.createElement)( -+ "div", -+ { className: "bt-msg" }, -+ (0, import_react20.createElement)( +- if (reply.kind === "approval" || reply.kind === "working") { +- return (0, import_react6.createElement)( ++ }, [open]); ++ const phase = update?.phase ?? "idle"; ++ const dsh = update?.dsh; ++ const dshPhase = dsh?.phase ?? "idle"; ++ const dshRow = showsDshRow(dsh, update?.app); ++ if (!update?.available && !dshRow && phase === "idle" && dshPhase === "idle") return null; ++ const cloudPhase = phase === "installing" || dshPhase === "installing" ? "installing" : phase !== "idle" ? phase : dshPhase; ++ const toggle = () => { ++ const rect = button.current?.getBoundingClientRect(); ++ if (rect) setBox({ left: Math.max(8, Math.min(rect.left, window.innerWidth - 288)), top: rect.bottom + 6 }); ++ setOpen((value) => !value); ++ }; ++ const start = () => { ++ setError(""); ++ void actions.installUpdate().catch((failure) => setError(hostText(failure?.message ?? String(failure)))); ++ }; ++ const startDsh = () => { ++ setDshError(""); ++ void actions.installDshUpdate().catch((failure) => setDshError(hostText(failure?.message ?? String(failure)))); ++ }; ++ const label = phase === "installing" ? t("Updating FlyBot core…") : dshPhase === "installing" ? t("Updating DSH…") : phase === "installed" ? t("FlyBot core {version} is installed. Restart DSH to use it.", { version: update.installed ?? update.latest }) : dshPhase === "installed" ? t("Restart DSH to start using DSH {version}.", { version: dsh.installed ?? dsh.verified }) : update?.available ? t("FlyBot core {version} is available", { version: update.latest }) : t("DSH {version} is available", { version: dsh?.verified }); ++ const message = error || (phase === "failed" ? update.error : ""); ++ const dshMessage = dshError || (dshPhase === "failed" ? dsh?.error : ""); ++ const dshText = dshPhase === "installed" ? t("Restart DSH to start using DSH {version}.", { version: dsh.installed ?? dsh.verified }) : dsh?.available === false && dsh?.blockedBy ? t("Update FlyBot core {version} first.", { version: dsh.blockedBy }) : t("You have {version}.", { version: dsh?.current }); ++ return (0, import_react21.createElement)( ++ import_react21.Fragment, ++ null, ++ (0, import_react21.createElement)("button", { ++ ref: button, ++ type: "button", ++ className: "bt-round bt-update", ++ "data-phase": cloudPhase, ++ "aria-label": label, ++ title: label, ++ "aria-haspopup": "dialog", ++ "aria-expanded": open, ++ onClick: toggle ++ }, (0, import_react21.createElement)(CloudDownloadIcon, { done: phase === "installed" }), phase === "failed" || dshPhase === "failed" ? (0, import_react21.createElement)("span", { className: "bt-update-dot", "aria-hidden": true }) : null), ++ open && box ? (0, import_react_dom4.createPortal)((0, import_react21.createElement)( ++ "div", ++ { className: "bt-update-pop", role: "dialog", "aria-label": update?.available || phase !== "idle" ? t("FlyBot core update") : t("DSH update"), style: box }, ++ update?.available || phase !== "idle" ? (0, import_react21.createElement)( ++ import_react21.Fragment, ++ null, ++ (0, import_react21.createElement)("div", { className: "bt-update-title" }, phase === "installed" ? t("Update installed") : t("FlyBot core {version}", { version: update.latest })), ++ (0, import_react21.createElement)("div", { className: "bt-update-text" }, phase === "installed" ? t("Restart DSH to start using FlyBot core {version}.", { version: update.installed ?? update.latest }) : t("You have {version}.", { version: update.current })), ++ message ? (0, import_react21.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: message })) : null, ++ (0, import_react21.createElement)( + "div", +- { key: `${reply.botId}-${index}`, className: "bt-event" }, +- (0, import_react6.createElement)( +- "button", +- { type: "button", className: "bt-event-whole", onClick: () => actions.showDetails(sessionId) }, +- (0, import_react6.createElement)(BotMark, { bot, size: 16 }), +- (0, import_react6.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name })) +- ) +- ); +- } +- if (reply.kind === "stopped") { +- return (0, import_react6.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("You stopped {name}'s work", { name: bot.name })); +- } +- return (0, import_react6.createElement)(GroupMessage, { key: `${reply.botId}-${index}`, bot, text: reply.text, room: room2, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi }); +- }), +- pending.map((id) => { +- const bot = roster.byId[id]; +- if (!bot) return null; +- return (0, import_react6.createElement)( ++ { className: "bt-update-actions" }, ++ update.notesUrl ? (0, import_react21.createElement)("a", { className: "bt-update-notes", href: update.notesUrl, target: "_blank", rel: "noopener noreferrer" }, t("What's new")) : null, ++ phase === "installed" ? null : (0, import_react21.createElement)("button", { ++ type: "button", ++ className: "bt-update-go", ++ disabled: phase === "installing", ++ onClick: start ++ }, phase === "installing" ? t("Updating…") : phase === "failed" ? t("Try again") : t("Update")) ++ ) ++ ) : null, ++ dshRow ? (0, import_react21.createElement)( + "div", +- { key: `pending-${id}`, className: "bt-activity" }, +- (0, import_react6.createElement)(BotMark, { bot, size: 22, state: speakerTool ? toolState(speakerTool) : "thinking" }), +- (0, import_react6.createElement)(Shimmer, null, speakerTool ? `${bot.name} · ${workPhrase(speakerTool)}…` : t("{name} is typing…", { name: bot.name })) +- ); +- }) ++ { className: "bt-update-dsh" }, ++ (0, import_react21.createElement)("div", { className: "bt-update-title" }, t("DSH {version}", { version: dsh.verified })), ++ (0, import_react21.createElement)("div", { className: "bt-update-text" }, dshText), ++ dshMessage ? (0, import_react21.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: dshMessage })) : null, ++ (0, import_react21.createElement)( + "div", -+ { className: "bt-msg-line" }, -+ text2 ? (0, import_react20.createElement)("div", { className: "bt-bubble" }, text2) : (0, import_react20.createElement)( -+ "div", -+ { className: "bt-bubble bt-busy-dots", "aria-hidden": "true" }, -+ (0, import_react20.createElement)("span", null), -+ (0, import_react20.createElement)("span", null), -+ (0, import_react20.createElement)("span", null) -+ ) ++ { className: "bt-update-actions" }, ++ dsh.kind === "app" ? dsh.available ? (0, import_react21.createElement)("button", { type: "button", className: "bt-update-go", onClick: () => void actions.openAppUpdates(dsh.verified).catch(() => { ++ }) }, t("Open updates")) : null : !dsh.available && dshPhase === "idle" ? null : dshPhase === "installed" ? null : (0, import_react21.createElement)("button", { ++ type: "button", ++ className: "bt-update-go", ++ disabled: dshPhase === "installing", ++ onClick: startDsh ++ }, dshPhase === "installing" ? t("Updating…") : dshPhase === "failed" ? t("Try again") : t("Update")) + ) -+ ) ++ ) : null ++ ), document.body) : null + ); + } +-var DRAWN = /* @__PURE__ */ new Set(["message_bot", "stop_bot", "create_bot", "update_bot", "group_relay", "create_group", "update_group", "delete_group", "post_to_group", "ask_user", "request_secret", "ask_user_question", "read_group_chat", "remember", "forget"]); +-var CARDS = /* @__PURE__ */ new Set(["ask_user", "request_secret"]); +-function callTree(root) { +- const calls = []; +- const seen = /* @__PURE__ */ new Set(); +- const visit = (call2) => { +- const id = call2.callId ?? call2; +- if (seen.has(id)) return; +- seen.add(id); +- calls.push(call2); +- for (const child of call2.subCalls ?? []) visit(child); +- }; +- visit(root); +- return calls; ++function ConnectApps({ wide, actions }) { ++ if (!wide) return null; ++ return (0, import_react21.createElement)( ++ "span", ++ { className: "bt-connect-wrap" }, ++ (0, import_react21.createElement)( ++ "button", ++ { type: "button", className: "bt-connect bt-connect-foot", onClick: () => actions.openConnectors() }, ++ (0, import_react21.createElement)(PlugIcon), ++ t("Connect apps") + ) -+ ), host); ++ ); } -+var BUSY_ACK_CSS = ` -+.bt-busy-ack{display:flex;align-items:flex-end;gap:8px;width:100%;margin-top:var(--dsh-chat-flow-gap,12px);margin-bottom:4px} -+.bt-busy-ack .bt-astack{align-items:flex-start} -+.bt-busy-ack .bt-bubble{opacity:.92} -+.bt-busy-dots{display:inline-flex;align-items:center;gap:4px;height:22px} -+.bt-busy-dots>span{width:5px;height:5px;border-radius:50%;background:var(--bt-ink-3);animation:bt-busy-blink 1.2s ease-in-out infinite} -+.bt-busy-dots>span:nth-child(2){animation-delay:.2s}.bt-busy-dots>span:nth-child(3){animation-delay:.4s} -+@keyframes bt-busy-blink{0%,80%,100%{opacity:.25}40%{opacity:1}} -+@media (prefers-reduced-motion:reduce){.bt-busy-dots>span{animation:none;opacity:.6}} -+`; - --// src/client/at-menu.js --var BOTS_SOURCE = "ds-bot"; --var CHATS_SOURCE = "ds-bot-chats"; --var ROOM_ALL = ["all", "everyone", "所有人", "全体"]; --var OTHER_CHATS_MAX = 8; --var conversationOf = (roster, sessionId) => { -- if (!roster.ready) return null; -- const room2 = roster.roomsById[sessionId]; -- if (room2) return { room: room2 }; +-function useShownCards(actions, sessionId, callIds) { +- const key = JSON.stringify(callIds); +- (0, import_react6.useLayoutEffect)(() => { +- const ids = JSON.parse(key); +- if (ids.length === 0 || !actions.noteCards) return void 0; +- actions.noteCards(sessionId, ids, 1); +- return () => actions.noteCards(sessionId, ids, -1); +- }, [sessionId, key]); ++function YouAvatar() { ++ return (0, import_react21.createElement)( ++ "span", ++ { className: "bt-you-wrap" }, ++ (0, import_react21.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react21.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })), ++ (0, import_react21.createElement)("span", { style: { position: "absolute", width: 1, height: 1, overflow: "hidden", clip: "rect(0 0 0 0)" } }, t("Settings")) ++ ); + } +-function renderCall(call2, { sessionId, roster, actions, useUi, useWork, findBot }) { +- const tool = toolName(call2); +- const done = call2.kind === "tool-result"; +- const { text: arg, value: argValue } = toolArgs(call2); - const self = roster.byId[sessionId]; -- return self ? { self } : null; -+// src/client/project-board.js -+var import_react21 = require("react"); -+var PROJECT_BOARD_CSS = ` -+/* #1750: the board was a short dialog in the page flow — no stylesheet defines 'bt-overlay', so the -+ bot tree and workflows stayed legible under its rows. It is a modal now, on the same tier as the -+ Board and Settings layers, with kanban's own 'bt-scrim' sibling and 'bt-mem' surface. */ -+.bt-project-overlay{position:fixed;inset:0;z-index:121;isolation:isolate;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} +- switch (tool) { +- case "message_bot": { +- const target = findBot(arg("to")) ?? { name: arg("to") ?? "…", color: "gray" }; +- if (done && call2.isError) return (0, import_react6.createElement)("div", { className: "bt-event" }, t("Couldn't message {name}", { name: target.name })); +- return (0, import_react6.createElement)(EventLine, { prefix: t("Messaged"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); +- } +- case "stop_bot": { +- const target = findBot(arg("bot")) ?? { name: arg("bot") ?? "…", color: "gray" }; +- if (done && call2.isError) return (0, import_react6.createElement)("div", { className: "bt-event" }, t("Couldn't stop {name}", { name: target.name })); +- return (0, import_react6.createElement)(EventLine, { prefix: t("Stopped"), bots: [target], onOpen: (bot) => bot.id && actions.openExchange(self?.id ?? sessionId, bot.id), whole: true }); +- } +- case "create_bot": { +- const created = findBot(arg("name")); +- if (!done || created === void 0) return null; +- return (0, import_react6.createElement)(EventLine, { prefix: t("Created"), bots: [created], onOpen: (bot) => actions.openSession(bot.id) }); +- } +- case "update_bot": { +- const target = findBot(arg("name")) ?? findBot(arg("bot")) ?? (arg("bot") ? void 0 : self); +- return done && target ? (0, import_react6.createElement)(EventLine, { prefix: t("Updated"), bots: [target], onOpen: (bot) => actions.openSession(bot.id) }) : null; +- } +- case "group_relay": +- return (0, import_react6.createElement)(GroupReplies, { sessionId, callId: call2.callId, done, content: call2.content, roster, actions, useUi, useWork }); +- case "create_group": +- case "update_group": +- case "delete_group": +- case "post_to_group": { +- const verbs = { +- create_group: ["Created group", "Couldn't create the group"], +- update_group: ["Updated group", "Couldn't update the group"], +- delete_group: ["Deleted group", "Couldn't delete the group"], +- post_to_group: ["Posted in", "Couldn't post in the group"] +- }[tool]; +- if (!done) return null; +- const result = contentText(call2.content); +- const named = /^(Created group|Updated|Nothing changed in|Deleted|Posted in) "([^"]+)"/.exec(result); +- if (call2.isError || !named) return (0, import_react6.createElement)("div", { className: "bt-event", title: result }, t(verbs[1])); +- const name = named[2]; +- const room2 = roster.rooms.find((entry) => entry.name === name); +- return (0, import_react6.createElement)(GroupEvent, { prefix: t(verbs[0]), room: tool === "delete_group" ? void 0 : room2, name, roster, actions }); +- } +- case "ask_user": { +- const question = roster.questions?.[sessionId]; +- if (!question || question.callId !== call2.callId) return (0, import_react6.createElement)("span", { className: "bt-q-gone", hidden: true }); +- return (0, import_react6.createElement)(PendingQuestion, { sessionId, question, actions, inline: true }); +- } +- case "request_secret": +- return (0, import_react6.createElement)(SecretToolCell, { sessionId, callId: call2.callId, name: arg("name"), done, content: call2.content, roster, actions }); +- case "ask_user_question": { +- if (!done) return null; +- let parsed = null; +- try { +- parsed = JSON.parse(contentText(call2.content)); +- } catch { +- parsed = null; +- } +- const answer = parsed?.answers?.[0]; +- const question = argValue("questions")?.[0]; +- if (!answer) return null; +- return (0, import_react6.createElement)("div", { className: "bt-q-inline" }, (0, import_react6.createElement)(SettledQuestion, { question, answer })); +- } +- case "read_group_chat": { +- if (!done) return null; +- const room2 = roster.rooms.find((entry) => entry.name === arg("group")); +- return room2 ? (0, import_react6.createElement)(GroupEvent, { prefix: t("Read"), room: room2, roster, actions }) : null; ++var openShellSettings = null; ++var openShellOnboarding = null; ++var shellShortcuts = null; ++function holdShellShortcuts(shortcuts) { ++ shellShortcuts = shortcuts; ++ return () => { ++ if (shellShortcuts === shortcuts) shellShortcuts = null; ++ }; ++} ++function openHarnessSettings() { ++ requestAnimationFrame(() => { ++ if (openShellSettings) { ++ openShellSettings(); ++ return; + } +- case "remember": +- case "forget": +- return done && !call2.isError ? (0, import_react6.createElement)(MemoryEvent, { sessionId, scope: arg("scope"), result: contentText(call2.content), roster, actions, findBot }) : null; +- default: +- return null; +- } ++ const desktop = document.querySelector('button[aria-haspopup="menu"][data-signed-out]'); ++ if (desktop) openThroughMenu(desktop); ++ else pressSettingsShortcut(); ++ }); + } +-function ToolCell({ node, sessionId, useRoster, useUi, useWork, actions }) { +- const roster = useRoster((value) => value); +- const root = node.data.root; +- const turn = node.location?.turn?.turn ?? root.turn; +- const hidden = isHiddenTurn(roster, sessionId, turn); +- const findBot = (nameOrId) => roster.byId[nameOrId] ?? roster.bots.find((bot) => bot.name.toLowerCase() === String(nameOrId ?? "").toLowerCase()); +- const calls = hidden ? [] : callTree(root); +- const drawn = calls.filter((call2) => DRAWN.has(toolName(call2))); +- const running = root.kind === "tool-result" ? void 0 : calls.findLast((call2) => call2.kind !== "tool-result"); +- const note = running ? toolActivity(toolName(running), toolArgs(running).text, findBot, roster.byId[sessionId]) : null; +- useLiveNote(actions, sessionId, `tool:${root.callId ?? node.key}`, note); +- useShownCards(actions, sessionId, drawn.filter((call2) => CARDS.has(toolName(call2)) && call2.callId).map((call2) => call2.callId)); +- if (drawn.length === 0) return null; +- const env = { sessionId, roster, actions, useUi, useWork, findBot }; +- return (0, import_react6.createElement)(import_react6.Fragment, null, drawn.map((call2, index) => (0, import_react6.createElement)(import_react6.Fragment, { key: call2.callId ?? index }, renderCall(call2, env)))); ++function openHarnessOnboarding(id) { ++ requestAnimationFrame(() => { ++ if (openShellOnboarding) openShellOnboarding(id); ++ else openHarnessSettings(); ++ }); + } +- +-// src/client/activity-row.js +-var import_react7 = require("react"); +-var import_react_dom2 = require("react-dom"); +-var PHRASE_HOLD_MS = 800; +-var drawPhrase = (pool) => t(pool[Math.min(pool.length - 1, Math.floor(Math.random() * pool.length))]); +-function elapsedLabel(ms) { +- const minutes = Math.floor(ms / 6e4); +- if (minutes < 60) return `${Math.max(1, minutes)}m`; +- const hours = Math.floor(minutes / 60); +- return minutes % 60 === 0 ? `${hours}h` : `${hours}h ${minutes % 60}m`; ++var MODELS_STEP_ID = "flybot-models"; ++var MODELS_STEP_ORDER = 1e3; ++function ModelsSettingsStep({ explicit, complete, openSection }) { ++ (0, import_react21.useLayoutEffect)(() => { ++ if (explicit) openSection("models"); ++ complete(); ++ }, []); ++ return null; + } +-function useRunningHost(active) { +- const [host, setHost] = (0, import_react7.useState)(null); +- (0, import_react7.useEffect)(() => { +- if (!active) { +- setHost(null); +- return void 0; +- } +- let frame = 0; +- const find = () => { +- frame = 0; +- const node = document.querySelector("[data-chat-flow] > [data-chat-running]"); +- setHost((prev) => prev === node ? prev : node); +- }; +- const observer = new MutationObserver(() => { +- if (!frame) frame = requestAnimationFrame(find); +- }); +- observer.observe(document.querySelector("[data-conversation-scroll]") ?? document.body, { childList: true, subtree: true }); +- find(); ++function openHarnessModels() { ++ openHarnessOnboarding(MODELS_STEP_ID); ++} ++function openThroughMenu(trigger) { ++ const before = new Set(document.querySelectorAll('[role="menu"]')); ++ trigger.click(); ++ let frames = 0; ++ const look = () => { ++ const menu = [...document.querySelectorAll('[role="menu"]')].find((node) => !before.has(node)); ++ const item = menu?.querySelector('button[role="menuitem"]'); ++ if (item) item.click(); ++ else if (++frames < 30) requestAnimationFrame(look); ++ else pressSettingsShortcut(); ++ }; ++ requestAnimationFrame(look); ++} ++function pressSettingsShortcut() { ++ const binding = shellShortcuts?.catalog.getSnapshot().find((row) => row.id === "settings.open")?.binding; ++ if (!binding) return; ++ const held = new Set(binding.modifiers); ++ window.dispatchEvent(new KeyboardEvent("keydown", { ++ code: binding.code, ++ key: binding.code === "Comma" ? "," : "", ++ bubbles: true, ++ cancelable: true, ++ ctrlKey: held.has("control"), ++ altKey: held.has("alt"), ++ shiftKey: held.has("shift"), ++ metaKey: held.has("meta") ++ })); ++} ++function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboarding, actions }) { ++ const [open, setOpen] = (0, import_react21.useState)(false); ++ (0, import_react21.useLayoutEffect)(() => { ++ if (!seat) return void 0; ++ actions.seatAccount(true); ++ return () => actions.seatAccount(false); ++ }, [seat]); ++ const [box, setBox] = (0, import_react21.useState)(null); ++ const button = (0, import_react21.useRef)(null); ++ (0, import_react21.useEffect)(() => { ++ if (settingsOpen) setOpen(false); ++ }, [settingsOpen]); ++ (0, import_react21.useEffect)(() => { ++ if (!openSettings) return void 0; ++ openShellSettings = openSettings; + return () => { +- cancelAnimationFrame(frame); +- observer.disconnect(); ++ if (openShellSettings === openSettings) openShellSettings = null; + }; +- }, [active]); +- return host; +-} +-function useRowEntrances(replacing) { +- const check = (0, import_react7.useRef)(replacing); +- check.current = replacing; +- (0, import_react7.useEffect)(() => { +- const seen = /* @__PURE__ */ new WeakSet(); +- const started = Date.now(); +- let column = null; +- let frame = 0; +- const settle = (event) => { +- if (event.target !== event.currentTarget || !/^bt-row/.test(event.animationName)) return; +- delete event.currentTarget.dataset.btEnter; +- event.currentTarget.removeEventListener("animationend", settle); ++ }, [openSettings]); ++ (0, import_react21.useEffect)(() => { ++ if (!openOnboarding) return void 0; ++ openShellOnboarding = openOnboarding; ++ return () => { ++ if (openShellOnboarding === openOnboarding) openShellOnboarding = null; + }; +- const scan = () => { +- frame = 0; +- const next = document.querySelector("[data-chat-flow]"); +- if (next !== column) { +- observer.disconnect(); +- column = next; +- if (column) observer.observe(column, { childList: true, subtree: true }); +- } +- if (!column) return; +- const items = [...column.querySelectorAll(":scope > [data-chat-flow-key]")]; +- let last = -1; +- items.forEach((item, index) => { +- if (seen.has(item)) last = index; +- }); +- const fresh = items.filter((item) => !seen.has(item) && item.offsetHeight > 0); +- for (const item of fresh) seen.add(item); +- if (last < 0 || Date.now() - started < 800 || fresh.length > 3) return; +- for (const item of fresh) { +- if (items.indexOf(item) < last) continue; +- const reply = [void 0, "assistant-step", "tool-call"].includes(item.dataset.chatFlowKind); +- item.dataset.btEnter = reply && check.current() ? "after-collapse" : "new"; +- item.addEventListener("animationend", settle); ++ }, [openOnboarding]); ++ (0, import_react21.useEffect)(() => { ++ if (!open) return void 0; ++ const onDown = (event) => { ++ if (event.target instanceof Element && (event.target.closest(".bt-account-menu") || button.current?.contains(event.target))) return; ++ setOpen(false); ++ }; ++ const onKey = (event) => { ++ if (event.key === "Escape") { ++ event.stopPropagation(); ++ setOpen(false); ++ button.current?.focus(); + } + }; +- const observer = new MutationObserver(() => { +- if (!frame) frame = requestAnimationFrame(scan); +- }); +- scan(); ++ window.addEventListener("mousedown", onDown); ++ window.addEventListener("keydown", onKey, true); + return () => { +- cancelAnimationFrame(frame); +- observer.disconnect(); ++ window.removeEventListener("mousedown", onDown); ++ window.removeEventListener("keydown", onKey, true); + }; +- }, []); ++ }, [open]); ++ const toggle = () => { ++ const rect = button.current?.getBoundingClientRect(); ++ if (rect) setBox({ left: rect.left, bottom: window.innerHeight - rect.top + 5 }); ++ setOpen((value) => !value); ++ }; ++ const groups = [ ++ [ ++ [t("Usage"), GaugeIcon, () => actions.openSettings("usage")], ++ [t("Connect apps"), ConnectorIcon, () => actions.openConnectors()], ++ [t("Channels"), ConnectorIcon, () => actions.openSettings("channels")], ++ [t("Plugins"), PlugIcon, () => actions.selectPanel("plugins")], ++ [t("Scheduled tasks"), ClockIcon, () => actions.openSettings("schedules")], ++ [t("Settings"), GearIcon, () => actions.openSettings("general")] ++ ], ++ [ ++ [t("Switch to classic Agent mode"), SwitchIcon, () => actions.setSurface("agent")] ++ ] ++ ]; ++ return (0, import_react21.createElement)( ++ import_react21.Fragment, ++ null, ++ (0, import_react21.createElement)( ++ "button", ++ { ref: button, type: "button", className: "bt-account", "aria-label": t("Account"), "aria-haspopup": "menu", "aria-expanded": open, onClick: toggle }, ++ (0, import_react21.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react21.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })) ++ ), ++ open && box ? (0, import_react_dom4.createPortal)((0, import_react21.createElement)( ++ "div", ++ { className: "bt-menu bt-menu-up bt-account-menu", role: "menu", "aria-label": t("Account"), style: box }, ++ (0, import_react21.createElement)(FlyBotAccountHeader, { actions }), ++ groups.map((group, index) => (0, import_react21.createElement)( ++ import_react21.Fragment, ++ { key: index }, ++ index > 0 ? (0, import_react21.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, ++ group.map(([label, Icon, run, hint]) => (0, import_react21.createElement)("button", { ++ key: label, ++ type: "button", ++ role: "menuitem", ++ onClick: () => { ++ setOpen(false); ++ void Promise.resolve(run()).catch((error) => actions.reportError(error, "menu")); ++ } ++ }, (0, import_react21.createElement)(Icon), (0, import_react21.createElement)("span", { className: "bt-menu-label" }, label), hint ? (0, import_react21.createElement)("span", { className: "bt-menu-hint" }, hint) : null)) ++ )) ++ ), document.body) : null ++ ); + } +-function ActivityIndicator({ sessionId, useRoster, useSessionStatus, useLive, useSession, actions }) { +- const roster = useRoster((value) => value); +- const running = useSessionStatus((map) => map.get(sessionId)?.running === true); +- const liveKey = useLive((state) => JSON.stringify(state[sessionId] ?? {})); +- const pendingInput = useSession((snapshot) => Math.max(0, ...(snapshot?.pendingSubmissions ?? []).filter((sub) => sub.placement !== "queued").map((sub) => sub.time))); +- const bot = roster.byId[sessionId]; +- const room2 = roster.roomsById[sessionId]; +- const entries2 = (0, import_react7.useMemo)(() => Object.values(JSON.parse(liveKey)), [liveKey]); +- const streaming = entries2.some((entry) => entry.text); +- const tools = entries2.filter((entry) => !entry.text).sort((a, b) => a.at - b.at); +- const relaying = tools.some((entry) => entry.relay); +- const visible = running && !streaming && !relaying && (bot !== void 0 || room2 !== void 0); +- const tool = tools.at(-1); +- const inputRef = (0, import_react7.useRef)(0); +- const inputAt = Math.max(inputRef.current, pendingInput); +- inputRef.current = inputAt; +- const want = !visible ? null : inputAt > (tool?.at ?? 0) ? { key: `input:${inputAt}`, pool: PHRASES.thinking, state: "thinking" } : tool ? { key: tool.label ? `tool:${tool.label}` : "working", label: tool.label, pool: PHRASES.working, state: tool.state ?? "working" } : { key: "thinking", pool: PHRASES.thinking, state: "thinking" }; +- const [shown, setShown] = (0, import_react7.useState)(null); +- const wantKey = want?.key ?? null; +- const markState = (0, import_react7.useRef)("thinking"); +- if (want) markState.current = want.state; +- (0, import_react7.useEffect)(() => { +- if (wantKey === null || shown?.key === wantKey) return void 0; +- const make = () => setShown({ key: wantKey, text: want.label ?? drawPhrase(want.pool), at: Date.now() }); +- const wait = shown ? shown.at + PHRASE_HOLD_MS - Date.now() : 0; +- if (wait <= 0) { +- make(); ++function useLandOnMainBot(roster, useSessions, actions) { ++ const mainView = useSessions((list) => { ++ const row = Object.values(list.byId).find((session) => (session?.retainedBy?.mainView ?? 0) > 0); ++ return row ? `${row.id}|${row.blank ? 1 : 0}` : ""; ++ }); ++ const lastBot = (0, import_react21.useRef)(null); ++ (0, import_react21.useEffect)(() => { ++ if (!roster.ready || !roster.mainBotId) return void 0; ++ const [id, blank3] = mainView.split("|"); ++ const bot = id === "" ? void 0 : roster.byId[id]; ++ if (bot !== void 0) { ++ lastBot.current = { botId: bot.id, sessionId: id }; ++ if (currentPart(bot) !== id) actions.landOn(bot.id); + return void 0; + } +- const timer = setTimeout(make, wait); +- return () => clearTimeout(timer); +- }, [wantKey, shown]); +- const [phase, setPhase] = (0, import_react7.useState)(null); +- const endedAt = (0, import_react7.useRef)(0); +- const shift = (0, import_react7.useRef)(null); +- const leaving = (0, import_react7.useRef)(false); +- leaving.current = phase !== null && !visible; +- (0, import_react7.useEffect)(() => { +- if (visible) { +- setPhase("in"); ++ if (id !== "" && (roster.roomsById[id] || (actions.isAgentSession?.(id) ?? roster.agentOf[id] !== void 0) || blank3 !== "1")) { ++ lastBot.current = null; + return void 0; + } +- setPhase((current) => current === "in" ? "out" : current); +- const timer = setTimeout(() => { +- shift.current = document.querySelector("[data-conversation-scroll]")?.scrollTop ?? null; +- setPhase((current) => current === "out" ? null : current); +- }, 140); ++ const last = lastBot.current; ++ const timer = setTimeout(() => actions.landOn(roster.mainBotId, last, { stay: id === "", view: id }), last ? 0 : 400); + return () => clearTimeout(timer); +- }, [visible]); +- (0, import_react7.useLayoutEffect)(() => { +- if (phase !== null) return; +- endedAt.current = Date.now(); +- setShown(null); +- const before = shift.current; +- shift.current = null; +- const scroller = document.querySelector("[data-conversation-scroll]"); +- if (before === null || !scroller || reducedMotion()) return; +- const delta = before - scroller.scrollTop; +- if (delta > 0) scroller.querySelector("[data-chat-flow]")?.animate([{ transform: `translateY(${-delta}px)` }, { transform: "none" }], { duration: 140, easing: "cubic-bezier(.23,1,.32,1)" }); +- }, [phase]); +- (0, import_react7.useEffect)(() => { +- if (!running) actions.clearLive(sessionId); +- }, [running, sessionId]); +- useRowEntrances(() => leaving.current || Date.now() - endedAt.current < 300); +- const [now, setNow] = (0, import_react7.useState)(Date.now); +- (0, import_react7.useEffect)(() => { +- if (phase !== "in") return void 0; +- const timer = setInterval(() => setNow(Date.now()), 1e4); +- return () => clearInterval(timer); +- }, [phase]); +- const host = useRunningHost(running); +- if (!host || phase === null || !shown) return null; +- const elapsed = now - shown.at >= 6e4 ? elapsedLabel(now - shown.at) : null; +- return (0, import_react_dom2.createPortal)((0, import_react7.createElement)( +- "div", +- { className: "bt-typing", "data-exiting": phase === "out" ? "" : void 0, "aria-hidden": true }, +- bot ? (0, import_react7.createElement)(BotMark, { bot, size: 28, state: markState.current, live: true, pokeable: true }) : (0, import_react7.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), +- (0, import_react7.createElement)( +- "span", +- { className: "bt-typing-text" }, +- (0, import_react7.createElement)( +- "span", +- { key: `${shown.key}:${shown.at}`, className: "bt-typing-label" }, +- (0, import_react7.createElement)(Shimmer, null, `${shown.text}…`), +- elapsed ? (0, import_react7.createElement)("span", { className: "bt-typing-time" }, `· ${elapsed}`) : null +- ) +- ) +- ), host); +-} +- +-// src/client/dsh-offer.js +-var APP_OFFER = /* @__PURE__ */ new Set(["available", "downloading", "verifying", "installing", "ready"]); +-var bare = (value) => String(value ?? "").trim().replace(/^v/i, "").split("+")[0]; +-var sameVersion = (a, b) => bare(a) !== "" && bare(a) === bare(b); +-function showsDshRow(dsh, app) { +- if (!dsh?.verified || !dsh.current || sameVersion(dsh.verified, dsh.current)) return false; +- if (dsh.kind === "npm") return true; +- return dsh.kind === "app" && APP_OFFER.has(app?.phase) && sameVersion(app.version, dsh.verified); +-} +- +-// src/client/sidebar.js +-var import_react8 = require("react"); +-var import_react_dom3 = require("react-dom"); +-var import_dsh_client_ui_primitives2 = require("@deepseek-ai/dsh-client-ui-primitives"); +-function useMarkedUnread(id, active, marked, actions) { +- (0, import_react8.useEffect)(() => { +- if (active && marked) actions.clearUnread(id); +- }, [active, marked]); +-} +-var PinMark = () => (0, import_react8.createElement)("span", { className: "bt-pin", "aria-hidden": true }, (0, import_react8.createElement)(PinMarkIcon)); +-var useApproval = (useWork, match) => useWork ? useWork((work) => (work.approvals ?? []).some(match)) : false; +-var useGroupWork = (useWork, pick2) => useWork ? useWork((work) => pick2(work.rooms ?? {}).join(",")) : ""; +-var workKeys = (text) => text === "" ? [] : text.split(",").map((key) => { +- const [id, tool] = key.split("|"); +- return { id, tool: tool || void 0 }; +-}); +-var workLine = (lead, tool, more) => (0, import_react8.createElement)(Shimmer, null, `${lead} · ${workPhrase(tool)}…${more > 0 ? ` +${more}` : ""}`); +-function BotRow({ bot, roster, actions, useSessions, useSessionStatus, useSessionRetainInfo, useActivity, useWork, wide, marked }) { +- const id = bot.id; +- const part = currentPart(bot); +- const preview = useSessions((list) => previewOf(list, part, roster.exchangeTurns[part])); +- const running = useSessionStatus((map) => map.get(part)?.running === true); +- const active = useSessionRetainInfo(part, (info) => (info?.retainedBy?.mainView ?? 0) > 0); +- const unread = useSessionStatus((map) => map.get(part)?.completionUnread === true || map.get(part)?.pendingInteraction !== void 0) || marked && !active; +- useMarkedUnread(id, active, marked, actions); +- const main = isMainOf(roster, id); +- const tile = roster.mainBotId === id; +- const approval = useApproval(useWork, (entry) => entry.botId === id); +- const alert = roster.questions?.[part] !== void 0 || approval; +- const doing = useActivity((map) => map[id]); +- const groups = workKeys(useGroupWork(useWork, (rooms) => Object.entries(rooms).flatMap(([roomId, entries2]) => entries2.filter((entry) => entry.botId === id).map((entry) => `${roomId}|${entry.tool ?? ""}`)))); +- const away = !running && groups.length > 0; +- const state = botState(running || away, doing, alert); +- const awayLine = away ? workLine(roster.roomsById[groups[0].id]?.name ?? t("a group chat"), groups[0].tool, groups.length - 1) : null; +- if (bot.hidden && !active && !main) return null; +- const onContextMenu = (event) => { +- event.preventDefault(); +- actions.openMenu({ kind: "bot", id, x: event.clientX, y: event.clientY }); +- }; +- const pinned = bot.pinned === true && !tile; +- const label = [bot.name, main ? t("Main Bot") : "", pinned ? t("Pinned") : "", running || away ? t("Working") : "", approval ? t("Waiting for your approval") : alert ? t("Waiting for your answer") : "", unread ? t("Unread activity") : ""].filter(Boolean).join(", "); +- if (tile && wide) { +- return (0, import_react8.createElement)("div", { className: "bt-tile-wrap" }, (0, import_react8.createElement)( +- "button", +- { +- type: "button", +- className: "bt-tile", +- "aria-label": label, +- "aria-current": active ? "page" : void 0, +- "data-bot-id": id, +- title: preview || bot.name, +- onClick: () => actions.openSession(id), +- onContextMenu +- }, +- (0, import_react8.createElement)(BotAvatar, { bot, size: 60, state, main: true }), +- (0, import_react8.createElement)("span", { className: "bt-tile-name" }, bot.name), +- bot.role ? (0, import_react8.createElement)("span", { className: "bt-chip" }, bot.role) : null +- )); +- } +- return (0, import_react8.createElement)( +- "button", +- { +- type: "button", +- className: "bt-row", +- "aria-label": label, +- "aria-current": active ? "page" : void 0, +- "data-bot-id": id, +- title: wide ? void 0 : bot.name, +- onClick: () => actions.openSession(id), +- onContextMenu +- }, +- (0, import_react8.createElement)(BotAvatar, { bot, size: 36, state, main }), +- pinned && !wide ? (0, import_react8.createElement)(PinMark) : null, +- wide ? (0, import_react8.createElement)( +- "span", +- { className: "bt-row-body" }, +- (0, import_react8.createElement)("span", { className: "bt-row-name" }, (0, import_react8.createElement)("span", { className: "bt-row-title" }, bot.name), pinned ? (0, import_react8.createElement)(PinMark) : null), +- awayLine ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, awayLine) : preview ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, preview) : null +- ) : null, +- wide && unread && !active ? (0, import_react8.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null +- ); ++ }, [mainView, roster]); + } +-function RoomRow({ room: room2, roster, actions, useSessions, useSessionStatus, useSessionRetainInfo, useWork, wide, marked }) { +- const id = room2.id; +- const fallback = useSessions((list) => previewOf(list, id)); +- const preview = room2.preview?.replace(/\s+/g, " ").trim() || fallback; +- const active = useSessionRetainInfo(id, (info) => (info?.retainedBy?.mainView ?? 0) > 0); +- const unread = useSessionStatus((map) => map.get(id)?.completionUnread === true) || marked && !active; +- useMarkedUnread(id, active, marked, actions); +- const approval = useApproval(useWork, (entry) => entry.roomId === id); +- const members = workKeys(useGroupWork(useWork, (rooms) => (rooms[id] ?? []).map((entry) => `${entry.botId}|${entry.tool ?? ""}`))); +- const first = roster.byId[members[0]?.id]; +- const workingLine = first ? workLine(first.name, members[0].tool, members.length - 1) : null; +- if (room2.hidden && !active) return null; +- const pinned = room2.pinned === true; +- const label = [room2.name, pinned ? t("Pinned") : "", members.length > 0 ? t("Working") : "", approval ? t("Waiting for your approval") : ""].filter(Boolean).join(", "); +- return (0, import_react8.createElement)( +- "button", +- { +- type: "button", +- className: "bt-row", +- "aria-label": label, +- "aria-current": active ? "page" : void 0, +- "data-room-id": id, +- onClick: () => actions.openSession(id), +- onContextMenu: (event) => { +- event.preventDefault(); +- actions.openMenu({ kind: "room", id, x: event.clientX, y: event.clientY }); +- } +- }, +- (0, import_react8.createElement)(RoomAvatar, { room: room2, roster, size: 36 }), +- pinned && !wide ? (0, import_react8.createElement)(PinMark) : null, +- wide ? (0, import_react8.createElement)( +- "span", +- { className: "bt-row-body" }, +- (0, import_react8.createElement)("span", { className: "bt-row-name" }, (0, import_react8.createElement)("span", { className: "bt-row-title" }, room2.name), pinned ? (0, import_react8.createElement)(PinMark) : null), +- workingLine ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, workingLine) : preview ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, preview) : null +- ) : null, +- wide && approval && !active ? (0, import_react8.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react8.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null +- ); ++function FooterAccount(props) { ++ const seated = props.useUi((value) => value.accountSeated === true); ++ if (seated) return null; ++ return (0, import_react21.createElement)("span", { className: "bt-foot-account" }, (0, import_react21.createElement)(AccountLauncher, { ...props, seat: false })); + } +-function AgentSessionRow({ session, agent, actions, renaming, index }) { +- const input = (0, import_react8.useRef)(null); +- (0, import_react8.useLayoutEffect)(() => { +- if (!renaming) return; +- input.current?.focus(); +- input.current?.select(); +- }, [renaming]); +- if (renaming) { +- const commit = (keep) => { +- const value = input.current?.value ?? ""; +- if (!keep || value.trim() === "" || value.trim() === session.title) { +- actions.endAgentRename(); +- return; +- } +- void (async () => { +- try { +- await actions.renameAgentSession(agent.id, session.id, value); +- actions.endAgentRename(); +- } catch (error) { +- actions.reportError(error, "agent-rename"); +- } +- })(); +- }; +- return (0, import_react8.createElement)( +- "div", +- { className: "bt-agent-sub-row bt-agent-edit", style: { "--i": index } }, +- (0, import_react8.createElement)("input", { +- ref: input, +- defaultValue: session.title, +- "aria-label": t("Rename"), +- onKeyDown: (event) => { +- if (event.nativeEvent.isComposing) return; +- if (event.key === "Enter") commit(true); +- else if (event.key === "Escape") commit(false); +- }, +- onBlur: () => commit(true) +- }) +- ); +- } +- return (0, import_react8.createElement)( ++function BotReturn({ wide, useSurface, actions }) { ++ const mode = useSurface((value) => value.mode); ++ if (mode !== "agent") return null; ++ return (0, import_react21.createElement)( + "button", +- { +- type: "button", +- className: "bt-agent-sub-row", +- "aria-current": session.active ? "page" : void 0, +- style: { "--i": index }, +- onClick: () => actions.openAgentSession(session.id), +- onContextMenu: (event) => { +- event.preventDefault(); +- event.stopPropagation(); +- actions.openMenu({ kind: "agent-session", id: session.id, agentId: agent.id, x: event.clientX, y: event.clientY }); +- } +- }, +- (0, import_react8.createElement)("span", { className: "bt-agent-sub-title" }, session.title), +- (0, import_react8.createElement)("span", { className: "bt-agent-sub-time" }, session.at > 0 ? relativeShort(session.at) : "") ++ { type: "button", className: "bt-return", "aria-label": t("FlyBot"), title: t("FlyBot"), onClick: () => actions.setSurface("bot") }, ++ (0, import_react21.createElement)(FlyBotMark, { size: 20 }), ++ wide ? (0, import_react21.createElement)("span", { className: "bt-return-name" }, t("FlyBot")) : null + ); + } +-function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide, marked }) { +- const info = useSessions((list) => JSON.stringify(agent.sessions.map((id) => { +- const row = list.byId[id]; +- return { +- id, +- // A blank Session's title is the workspace folder name; show the label instead. +- title: row?.blank === true ? "" : row?.displayTitle ?? row?.title ?? "", +- at: row?.updatedAt ?? 0, +- running: row?.running === true, +- active: (row?.retainedBy?.mainView ?? 0) > 0 ++var RETURN_CSS = ` ++.bt-return{display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;padding:0 14px;border:0;border-radius:999px;background:none;color:inherit;font:inherit;font-size:14px;line-height:20px;cursor:pointer;transition:background-color .12s ease} ++.bt-return:hover{background:rgba(127,127,127,.14)} ++.bt-return:active{transform:scale(.96)} ++.bt-return .bt-mark,.bt-return .bt-flybot-mark{display:inline-flex;flex:none;line-height:0} ++.bt-return .bt-mark svg,.bt-return .bt-flybot-mark{width:20px;height:20px;overflow:visible} ++/* Shell styles carry --bt-ink-deepseek and Agent mode withdraws them; pin it here. */ ++.bt-return .bt-mark{--bt-ink-deepseek:#4D6BFE} ++.bt-return-name{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} ++`; ++function BrandMark({ size = 24 }) { ++ return (0, import_react21.createElement)("span", { className: "bt-brand-mark" }, (0, import_react21.createElement)(FlyBotMark, { size })); ++} ++function BrandName() { ++ return (0, import_react21.createElement)("span", { style: { fontWeight: 600, fontSize: 14 } }, t("FlyBot")); ++} ++var SIDEBAR_CSS = ` ++.bt-session-filter{display:flex;flex-wrap:wrap;gap:4px;padding:8px 10px 2px;flex:none} ++.bt-session-filter-btn{height:26px;padding:0 10px;border:.5px solid var(--bt-line);border-radius:999px;background:transparent;color:var(--bt-ink-2);font:inherit;font-size:12px;line-height:26px;cursor:pointer} ++.bt-session-filter-btn[aria-checked=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink);font-weight:600} ++.bt-session-filter-empty{padding:16px 12px;text-align:center} ++.bt-side-top .bt-brand{cursor:default;padding-left:6px} ++.bt-side-top .bt-brand:hover{background:none} ++.bt-brand .bt-mark{flex:none} ++.bt-pin{flex:none;display:inline-flex;color:var(--bt-ink-3)} ++.bt-rail .bt-row{position:relative} ++.bt-rail .bt-pin{position:absolute;top:3px;left:calc(50% + 12px)} ++.bt-side .bt-read-only{margin:4px 8px 6px;padding:8px 10px;border-radius:10px;background:var(--bt-hover);font-size:12px;line-height:1.45;text-align:left} ++.bt-rail .bt-read-only{width:100%;margin:4px 0 6px;padding:4px 2px;font-size:10px;line-height:1.3;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} ++.bt-read-only-reload{margin:0 8px 8px;padding:3px 10px;border:1px solid var(--bt-line);border-radius:8px;background:none;color:inherit;font:inherit;font-size:12px;line-height:18px;cursor:pointer;transition:background-color .12s ease} ++.bt-read-only-reload:hover{background:var(--bt-hover)} ++.bt-rail .bt-read-only-reload{width:100%;margin:0 0 6px;padding:2px 0;font-size:10px;line-height:16px;text-align:center} ++[class*="_footArea"]:has(.bt-foot-account){display:flex!important;flex-direction:row!important;align-items:center;gap:6px} ++[class*="_footArea"]:has(.bt-foot-account)>[class*="_footerActions"],[class*="_footArea"]:has(.bt-foot-account)>[class*="_footerActions"]>div{display:contents!important} ++.bt-foot-account{order:-1;flex:none;display:inline-flex} ++[class*="_footArea"]:has(.bt-foot-account) .bt-connect-foot{order:0;flex:1 1 auto;min-width:0;width:auto} ++[class*="_footArea"]:has(.bt-foot-account)>[class*="_settingsArea"]{order:1;flex:none} ++[class*="_footArea"]:has(.bt-foot-account)>[class*="_settingsArea"] button[class*="_trigger"] [class*="_label"]{display:none!important} ++ ++/* The update cloud springs in when a newer DS Bot shows up; its arrow drops in a ++ loop while the install runs. */ ++.bt-round.bt-update{position:relative;color:var(--bt-accent,#4D6BFE);animation:bt-update-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} ++.bt-round.bt-update svg{width:17px;height:17px} ++.bt-round.bt-update[data-phase=installed]{color:var(--bt-ink-2)} ++@keyframes bt-update-in{from{opacity:0;transform:scale(.6);filter:blur(4px)}} ++.bt-update[data-phase=installing] .bt-cloud-arrow{animation:bt-cloud-drop 1.1s cubic-bezier(.45,0,.55,1) infinite} ++@keyframes bt-cloud-drop{0%{transform:translateY(-3px);opacity:0}35%{opacity:1}70%{transform:translateY(1px);opacity:1}100%{transform:translateY(2px);opacity:0}} ++.bt-update-dot{position:absolute;top:6px;right:6px;width:7px;height:7px;border-radius:50%;background:#E5484D;box-shadow:0 0 0 1.5px var(--bt-sidebar)} ++.bt-update-pop{position:fixed;z-index:130;width:280px;padding:14px 14px 12px;border-radius:14px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 10px 20px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);color:var(--bt-ink);box-sizing:border-box;transform-origin:top left;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;animation:bt-update-pop ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} ++@keyframes bt-update-pop{from{opacity:0;transform:scale(.96);filter:blur(4px)}} ++.bt-update-title{font-size:14px;line-height:20px;font-weight:600} ++.bt-update-text{margin-top:2px;font-size:12.5px;line-height:18px;color:var(--bt-ink-2)} ++.bt-update-error{margin-top:8px;font-size:12px;line-height:17px;color:#c21d2e;overflow-wrap:anywhere;max-height:90px;overflow:auto} ++.bt-update-actions{display:flex;align-items:center;justify-content:flex-end;gap:10px;margin-top:12px} ++.bt-update-notes{margin-right:auto;font-size:12.5px;color:var(--bt-ink-2);text-decoration:none} ++.bt-update-notes:hover{color:var(--bt-ink);text-decoration:underline} ++.bt-update-go{height:30px;padding:0 14px;border:0;border-radius:999px;background:var(--bt-accent,#4D6BFE);color:var(--bt-accent-ink,#fff);font:inherit;font-size:13px;font-weight:500;cursor:pointer;transition:opacity .12s ease,transform .12s ease} ++.bt-update-go:hover:not(:disabled){opacity:.9} ++.bt-update-go:active:not(:disabled){transform:scale(.96)} ++.bt-update-go:disabled{opacity:.6;cursor:default} ++.bt-update-dsh:not(:first-child){margin-top:12px;padding-top:12px;border-top:.5px solid var(--bt-line-2)} ++@media (prefers-reduced-motion:reduce){.bt-round.bt-update,.bt-update-pop,.bt-update .bt-cloud-arrow{animation:none}} ++ ++/* The DSH Agent row and its expanding Session list. The black whale is the ++ harness's own mark, so the row reads as "plain dsh" next to the Bot marks. */ ++.bt-agent-ava{flex:none;width:36px;height:36px;border-radius:50%;display:inline-flex;align-items:center;justify-content:center;background:var(--bt-hover);color:var(--bt-ink)} ++.bt-agent-ava.bt-run{animation:bt-agent-pulse 1.4s ease-in-out infinite} ++@keyframes bt-agent-pulse{0%,100%{opacity:1}50%{opacity:.55}} ++.bt-agent-sub{display:grid;grid-template-rows:0fr;transition:grid-template-rows ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} ++.bt-agent-sub[data-open]{grid-template-rows:1fr} ++.bt-agent-sub-in{overflow:hidden;min-height:0;margin-left:44px} ++.bt-agent-sub-row{display:flex;align-items:center;gap:8px;width:100%;padding:5px 10px 5px 8px;border:0;border-radius:8px;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;line-height:20px;text-align:left;cursor:pointer} ++.bt-agent-sub-row:hover{background:var(--bt-hover);color:var(--bt-ink)} ++.bt-agent-sub-row[aria-current=page]{background:var(--bt-hover);color:var(--bt-ink);font-weight:500} ++.bt-agent-sub-title{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} ++.bt-agent-sub-time{flex:none;font-size:11px;color:var(--bt-ink-3)} ++.bt-agent-new{color:var(--bt-ink-3)} ++.bt-agent-new svg{width:14px;height:14px;flex:none} ++.bt-agent-edit{padding:3px 10px 3px 4px} ++.bt-agent-edit input{width:100%;border:0;border-radius:6px;background:var(--bt-hover);color:var(--bt-ink);font:inherit;font-size:13px;line-height:20px;padding:2px 8px;outline:none;box-shadow:inset 0 0 0 .5px var(--bt-line-2)} ++.bt-agent-sub[data-open] .bt-agent-sub-row{animation:bt-agent-row-in .24s ease both;animation-delay:calc(var(--i, 0)*30ms)} ++@keyframes bt-agent-row-in{from{opacity:0;filter:blur(4px)}to{opacity:1;filter:blur(0)}} ++@media (prefers-reduced-motion:reduce){.bt-agent-sub{transition:none}.bt-agent-sub .bt-agent-sub-row{animation:none}} ++ ++.bt-row-wrap{position:relative;display:flex;align-items:center;width:100%;min-width:0} ++.bt-row-wrap>.bt-row{flex:1 1 auto;min-width:0;width:100%} ++.bt-tree-item>.bt-row-wrap{flex:1 1 auto;width:auto;min-width:0} ++/* Gear sits over the row so hover/selected fill the same full-width band as a plain row (#384). */ ++.bt-row-settings{position:absolute;right:6px;top:50%;transform:translateY(-50%);z-index:1;flex:none;display:inline-flex;align-items:center;justify-content:center;width:28px;height:28px;padding:0;border:0;border-radius:8px;background:transparent;color:var(--bt-ink-3);cursor:pointer;opacity:0;pointer-events:none;transition:background-color .12s ease,color .12s ease,opacity .12s ease} ++.bt-row-wrap:hover>.bt-row,.bt-row-wrap:focus-within>.bt-row{padding-right:36px} ++.bt-row-wrap:hover .bt-row-settings,.bt-row-wrap:focus-within .bt-row-settings{opacity:1;pointer-events:auto;color:var(--bt-ink-2);background:var(--bt-hover)} ++.bt-row-settings:hover{opacity:1;color:var(--bt-ink-2);background:var(--bt-hover)} ++.bt-row-settings svg{width:15px;height:15px} ++`; ++ ++// src/client/busy-ack-logic.js ++function busyAckText(hostAck) { ++ return typeof hostAck?.text === "string" ? hostAck.text.trim() : ""; ++} ++function busyAckPending(hostAck) { ++ return busyAckText(hostAck) === ""; ++} ++function pendingBusyPlacement(submissions) { ++ if (!Array.isArray(submissions)) return false; ++ return submissions.some((item) => item?.placement === "queued" || item?.placement === "steering"); ++} ++function busyAckVisible({ hostAck, pendingBusy, streamingText }) { ++ if (streamingText) return false; ++ return busyAckText(hostAck) !== "" || pendingBusy === true; ++} ++function roomBusyAck(room2) { ++ const entries2 = Object.entries(room2?.busyAcks ?? {}).filter(([, ack2]) => ack2 !== void 0 && ack2 !== null); ++ if (entries2.length === 0) return null; ++ const [botId, ack] = entries2.sort((a, b) => (b[1].at ?? 0) - (a[1].at ?? 0))[0]; ++ return { botId, text: busyAckText(ack), at: ack.at ?? 0 }; ++} ++function roomBusyAckVisible({ ack, pendingBusy }) { ++ if (ack === null || ack === void 0) return false; ++ return ack.text !== "" || pendingBusy === true; ++} ++ ++// src/client/busy-ack.js ++var import_react22 = require("react"); ++var import_react_dom5 = require("react-dom"); ++function useRunningHost2(active) { ++ const [host, setHost] = (0, import_react22.useState)(null); ++ (0, import_react22.useEffect)(() => { ++ if (!active) { ++ setHost(null); ++ return void 0; ++ } ++ let frame = 0; ++ const find = () => { ++ frame = 0; ++ const node = document.querySelector(RUNNING_HOST); ++ setHost((prev) => prev === node ? prev : node); + }; +- }).sort((a, b) => b.at - a.at))); +- const statusInfo = useSessionStatus((map) => JSON.stringify(agent.sessions.map((id) => ({ +- id, +- running: map.get(id)?.running === true, +- unread: map.get(id)?.completionUnread === true +- })))); +- const statuses = Object.fromEntries(JSON.parse(statusInfo).map((entry) => [entry.id, entry])); +- const sessions = JSON.parse(info).map((session) => ({ +- ...session, +- running: statuses[session.id]?.running ?? session.running, +- unread: statuses[session.id]?.unread ?? false, +- title: session.title === "" ? t("New session") : session.title +- })); +- const renaming = useUi((value) => value.renameAgent); +- const active = sessions.some((session) => session.active); +- const running = sessions.some((session) => session.running); +- const unread = sessions.some((session) => session.unread) || marked && !active; +- useMarkedUnread(agent.id, active, marked, actions); +- const preview = sessions[0]?.title ?? t("New session"); +- const label = ["DSH Agent", running ? t("Working") : "", unread ? t("Unread activity") : ""].filter(Boolean).join(", "); +- const open = active && wide; +- return (0, import_react8.createElement)( ++ const observer = new MutationObserver(() => { ++ if (!frame) frame = requestAnimationFrame(find); ++ }); ++ observer.observe(document.querySelector("[data-conversation-scroll]") ?? document.body, { childList: true, subtree: true }); ++ find(); ++ return () => { ++ cancelAnimationFrame(frame); ++ observer.disconnect(); ++ }; ++ }, [active]); ++ return host; ++} ++function BusyAckBubble({ sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive }) { ++ const roster = useRoster((value) => value); ++ const room2 = roster.roomsById?.[sessionId]; ++ const memberAck = room2 ? roomBusyAck(room2) : null; ++ const hostAck = useBusyAcks((map) => map?.[sessionId] ?? null); ++ const running = useSessionStatus((map) => map.get(sessionId)?.running === true); ++ const pendingBusy = useSession((snapshot) => pendingBusyPlacement(snapshot?.pendingSubmissions)); ++ const streamingText = useLive((state) => Object.values(state[sessionId] ?? {}).some((entry) => entry?.text)); ++ const visible = room2 ? roomBusyAckVisible({ ack: memberAck, pendingBusy }) : running && busyAckVisible({ hostAck, pendingBusy, streamingText }); ++ const bot = room2 ? roster.byId[memberAck?.botId] : roster.byId[sessionId]; ++ const host = useRunningHost2(visible); ++ const shown = (0, import_react22.useRef)(null); ++ if (visible) shown.current = room2 ? { text: memberAck?.text ?? "", at: memberAck?.at ?? Date.now() } : { text: busyAckText(hostAck), at: hostAck?.at ?? Date.now() }; ++ const text2 = shown.current?.text ?? ""; ++ if (!visible || !host || !shown.current || !bot) return null; ++ return (0, import_react_dom5.createPortal)((0, import_react22.createElement)( + "div", +- { className: "bt-agent" }, +- (0, import_react8.createElement)( +- "button", +- { +- type: "button", +- className: "bt-row", +- "aria-label": label, +- "aria-current": active ? "page" : void 0, +- "data-agent-id": agent.id, +- title: wide ? void 0 : "DSH Agent", +- onClick: () => actions.openAgent(agent.id), +- onContextMenu: (event) => { +- event.preventDefault(); +- actions.openMenu({ kind: "agent", id: agent.id, x: event.clientX, y: event.clientY }); +- } +- }, +- (0, import_react8.createElement)("span", { className: `bt-agent-ava${running ? " bt-run" : ""}` }, (0, import_react8.createElement)(import_dsh_client_ui_primitives2.FishLogo, { size: 22 })), +- wide ? (0, import_react8.createElement)( +- "span", +- { className: "bt-row-body" }, +- (0, import_react8.createElement)("span", { className: "bt-row-name" }, "DSH Agent"), +- preview ? (0, import_react8.createElement)("span", { className: "bt-row-preview" }, preview) : null +- ) : null, +- wide && unread && !active ? (0, import_react8.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null +- ), +- (0, import_react8.createElement)( ++ { ++ className: "bt-busy-ack", ++ "data-flybot": "busy-ack", ++ role: "status", ++ "aria-live": "polite", ++ "aria-busy": text2 ? void 0 : "true", ++ "data-pending": text2 ? void 0 : "" ++ }, ++ (0, import_react22.createElement)(BotMark, { bot, size: 28, state: "thinking", live: true }), ++ (0, import_react22.createElement)( + "div", +- { className: "bt-agent-sub", "data-open": open || void 0 }, +- (0, import_react8.createElement)( ++ { className: "bt-astack" }, ++ (0, import_react22.createElement)( + "div", +- { className: "bt-agent-sub-in" }, +- (0, import_react8.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")); +- } }, +- (0, import_react8.createElement)(PlusIcon), +- (0, import_react8.createElement)("span", { className: "bt-agent-sub-title" }, t("New session")) +- ), +- sessions.map((session, index) => (0, import_react8.createElement)(AgentSessionRow, { +- key: session.id, +- session, +- agent, +- actions, +- index: index + 1, +- renaming: renaming === session.id +- })) ++ { className: "bt-msg" }, ++ (0, import_react22.createElement)( ++ "div", ++ { className: "bt-msg-line" }, ++ text2 ? (0, import_react22.createElement)("div", { className: "bt-bubble" }, text2) : (0, import_react22.createElement)( ++ "div", ++ { className: "bt-bubble bt-busy-dots", "aria-hidden": "true" }, ++ (0, import_react22.createElement)("span", null), ++ (0, import_react22.createElement)("span", null), ++ (0, import_react22.createElement)("span", null) ++ ) ++ ) + ) + ) +- ); +-} +-var GLIDE = springEasing(1e3, 63); +-function useListGlide(listRef, layout, key) { +- const tops = (0, import_react8.useRef)({ layout, map: /* @__PURE__ */ new Map() }); +- (0, import_react8.useLayoutEffect)(() => { +- const list = listRef.current; +- if (!list) return; +- const next = /* @__PURE__ */ new Map(); +- const still = reducedMotion() || tops.current.layout !== layout; +- for (const row of list.querySelectorAll("[data-bot-id],[data-room-id],[data-agent-id]")) { +- const id = row.dataset.botId ?? row.dataset.roomId ?? row.dataset.agentId; +- const top = row.offsetTop; +- next.set(id, top); +- const before = tops.current.map.get(id); +- if (!still && before !== void 0 && Math.abs(before - top) > 0.5) { +- row.animate([{ transform: `translateY(${before - top}px)` }, { transform: "none" }], GLIDE); +- } ++ ), host); ++} ++var BUSY_ACK_CSS = ` ++.bt-busy-ack{display:flex;align-items:flex-end;gap:8px;width:100%;margin-top:var(--dsh-chat-flow-gap,12px);margin-bottom:4px} ++.bt-busy-ack .bt-astack{align-items:flex-start} ++.bt-busy-ack .bt-bubble{opacity:.92} ++.bt-busy-dots{display:inline-flex;align-items:center;gap:4px;height:22px} ++.bt-busy-dots>span{width:5px;height:5px;border-radius:50%;background:var(--bt-ink-3);animation:bt-busy-blink 1.2s ease-in-out infinite} ++.bt-busy-dots>span:nth-child(2){animation-delay:.2s}.bt-busy-dots>span:nth-child(3){animation-delay:.4s} ++@keyframes bt-busy-blink{0%,80%,100%{opacity:.25}40%{opacity:1}} ++@media (prefers-reduced-motion:reduce){.bt-busy-dots>span{animation:none;opacity:.6}} ++`; ++ ++// src/client/project-board.js ++var import_react23 = require("react"); ++var PROJECT_BOARD_CSS = ` ++/* #1750: the board was a short dialog in the page flow — no stylesheet defines 'bt-overlay', so the ++ bot tree and workflows stayed legible under its rows. It is a modal now, on the same tier as the ++ Board and Settings layers, with kanban's own 'bt-scrim' sibling and 'bt-mem' surface. */ ++.bt-project-overlay{position:fixed;inset:0;z-index:121;isolation:isolate;display:flex;align-items:center;justify-content:center;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif} +.bt-mem.bt-project-dialog{width:min(1080px,calc(100vw - 32px));height:min(760px,calc(100vh - 48px))} +.bt-project-body{flex:1 1 auto;min-height:0;overflow:auto} +.bt-project-board{padding:16px 18px} @@ -14744,16 +15731,7 @@ diff --git a/client.js b/client.js + return id === "" ? null : { kind: "bot", id }; + } + return null; - }; --function mentionRows(roster, sessionId, query = "") { -- const here = conversationOf(roster, sessionId); -- if (here === null) return null; -- const bots = here.room ? here.room.members.map((id) => roster.byId[id]).filter(Boolean) : roster.bots.filter((bot) => bot.id !== here.self.id); -- const needle = query.trim().toLowerCase(); -- const rows = bots.filter((bot) => bot.name.toLowerCase().includes(needle)).map((bot) => ({ bot, text: `@${bot.name} ` })); -- const everyone = t("Everyone"); -- if (here.room && bots.length > 1 && [everyone, ...ROOM_ALL].some((word) => word.toLowerCase().startsWith(needle))) { -- rows.push({ room: here.room, text: `@${everyone} ` }); ++}; +var decisionOf = (file) => { + if (file === null || typeof file !== "object") return null; + const path = text(file.path); @@ -14801,8 +15779,7 @@ diff --git a/client.js b/client.js + if (named !== null && typeof named === "object") { + const key = text(named.key); + if (key !== "") return named.params !== null && typeof named.params === "object" ? { key, params: named.params } : { key }; - } -- return rows; ++ } + const prose = text(record?.reason); + if (prose.startsWith("unreadable: ")) return { host: prose }; + return fallbackParams === void 0 ? { key: fallbackKey } : { key: fallbackKey, params: fallbackParams }; @@ -14837,1123 +15814,2341 @@ diff --git a/client.js b/client.js + pendingHidden: hiddenOf(pendingTotal, pending.length), + empty: decided.length === 0 && pending.length === 0, + emptyText: emptyLineOf(meetings, NO_MEETING) -+ } + } +- tops.current = { layout, map: next }; +- }, [layout, key]); + }; } --function chatRows(roster, list, sessionId) { -- const here = conversationOf(roster, sessionId); -- if (here === null) return []; -- const byId = list?.byId ?? {}; -- const bots = roster.bots.filter((bot) => bot.id !== here.self?.id).map((bot) => { -- const id = currentPart(bot); -- return { sessionId: id, label: t("Chat with {name}", { name: bot.name }), bot, updatedAt: byId[id]?.updatedAt }; +-function TeamSidebar(props) { +- const { wide, useRoster, useUi, useSessions, actions } = props; +- const listRef = (0, import_react8.useRef)(null); +- const roster = useRoster((value) => value); +- const markedUnread = useUi((value) => value.unread); +- props.useRegistry((value) => value); +- const updated = useSessions((list) => { +- const stamps = {}; +- for (const id of list.ids) stamps[id] = list.byId[id]?.updatedAt ?? 0; +- return JSON.stringify(stamps); +function projectBoardView({ project, rows, done, canManage, tasks, decisions, meetings, queues, metrics } = {}) { + const isRow = (row) => row !== null && typeof row === "object" && text(row.id) !== ""; + const byId = new Map((Array.isArray(tasks) ? tasks : []).filter((task) => task !== null && typeof task === "object" && text(task.id) !== "").map((task) => [text(task.id), task])); -+ const list = []; -+ const archived = []; -+ const seen = /* @__PURE__ */ new Set(); -+ for (const row of [...Array.isArray(done) ? done : [], ...Array.isArray(rows) ? rows : []]) { -+ if (!isRow(row)) continue; ++ const list = []; ++ const archived = []; ++ const seen = /* @__PURE__ */ new Set(); ++ for (const row of [...Array.isArray(done) ? done : [], ...Array.isArray(rows) ? rows : []]) { ++ if (!isRow(row)) continue; ++ const id = text(row.id); ++ if (seen.has(id)) continue; ++ seen.add(id); ++ const column = text(row.column) || "not-started"; ++ (column === DONE_COLUMN ? archived : list).push(row); ++ } ++ const projectRow = (row) => { ++ const task = byId.get(text(row.id)); ++ return { ++ id: text(row.id), ++ key: `task:${text(row.id)}`, ++ column: text(row.column) || "not-started", ++ assignee: text(row.assignee) || null, ++ runId: text(row.runId) || null, ++ nodeId: text(row.nodeId) || null, ++ title: text(row.title) || text(task?.title) || text(task?.note) || null, ++ priority: text(row.priority) || text(task?.priority) || null, ++ audit: text(row.audit) || null, ++ // #1831: who is doing the card, and who is speaking for whom. Both are host truth; ++ // a card carrying neither renders exactly as before. ++ holder: text(row.holder) || null, ++ speaksFor: text(row.speaksFor) || null, ++ board: boardOfRow(row, task) ++ }; ++ }; ++ const groups = PROJECT_SOURCES.map((source) => ({ ++ source, ++ label: SOURCE_LABELS[source], ++ rows: list.filter((row) => row.source === source).map(projectRow) ++ })).filter((group) => group.rows.length > 0); ++ const countOf = (value) => value === void 0 || value === null ? null : value; ++ const queueItems = (items, annotate) => (Array.isArray(items) ? items : []).filter((item) => item !== null && typeof item === "object" && text(item.id) !== "").map((item) => { ++ const id = text(item.id); ++ const source = text([...list, ...archived].find((row) => text(row.id) === id)?.source); ++ const task = byId.get(id); ++ return { id, key: `task:${id}`, title: text(task?.title) || text(task?.note) || null, priority: text(task?.priority) || null, board: boardOfRow({ source }, task), ...annotate(item) }; + }); +- const order = (0, import_react8.useMemo)(() => { +- const stamps = JSON.parse(updated); +- const entries2 = [ +- ...roster.bots.filter((bot) => bot.id !== roster.mainBotId).map((bot) => ({ kind: "bot", item: bot, at: stamps[currentPart(bot)] ?? bot.createdAt })), +- ...roster.rooms.map((room2) => ({ kind: "room", item: room2, at: stamps[room2.id] ?? room2.createdAt })), +- // The Agent sorts by its most recent Session, falling back to when it was added. +- ...(roster.agents ?? []).map((agent) => ({ kind: "agent", item: agent, at: Math.max(0, ...agent.sessions.map((id) => stamps[id] ?? 0)) || agent.createdAt })) +- ]; +- 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(",")); +- useLandOnMainBot(roster, useSessions, actions); +- const rowProps = { roster, actions, useSessions, useUi, useSessionStatus: props.useSessionStatus, useSessionRetainInfo: props.useSessionRetainInfo, useActivity: props.useActivity, useWork: props.useWork, wide }; +- const typeToSearch = (event) => { +- if (event.defaultPrevented || event.key.length !== 1 || event.key === " " || event.metaKey || event.ctrlKey || event.altKey || event.nativeEvent.isComposing) return; +- if (event.target instanceof Element && event.target.closest("input,textarea,[contenteditable]")) return; +- event.preventDefault(); +- actions.openPalette(event.key); ++ const waiting = queueItems(queues?.waiting, (item) => ({ role: text(item.role) || null, waitedMs: Number.isFinite(item.waitedMs) ? item.waitedMs : null })); ++ const inflight = queueItems(queues?.inflight, (item) => ({ holder: text(item.holder) || null, state: item.stalled === true ? "stalled" : "running" })); ++ const blocked = queueItems(queues?.blocked, (item) => ({ reason: text(item.reason) || null, waitedMs: Number.isFinite(item.waitedMs) ? item.waitedMs : null })); ++ const queueGroups = [ ++ { group: "waiting", label: "Waiting", items: waiting }, ++ { group: "inflight", label: "In flight", items: inflight }, ++ { group: "blocked", label: "Blocked", items: blocked } ++ ].filter((entry) => entry.items.length > 0); ++ const rawCounts = queues?.counts ?? null; ++ return { ++ projectId: text(project?.id) || null, ++ title: text(project?.name) || "Project", ++ canManage: canManage === true, ++ groups, ++ // #1855: one group, closed until the reader opens it. Rows keep the row shape above, so a ++ // finished card is still a card — only its place on the board changed. ++ done: { group: "done", label: "Done cards", collapsed: true, rows: archived.map(projectRow) }, ++ queues: queueGroups, ++ counts: rawCounts === null ? null : { waiting: countOf(rawCounts.waiting), inflight: countOf(rawCounts.inflight), blocked: countOf(rawCounts.blocked), done: countOf(rawCounts.done) }, ++ count: list.length, ++ empty: list.length === 0 && queueGroups.length === 0 && archived.length === 0, ++ emptyText: "No cards yet.", ++ record: projectBoardRecord({ decisions, meetings }), ++ metrics: metricsView(metrics, { tasks }) + }; +- return (0, import_react8.createElement)( ++} ++function projectRowNode(row, onOpen) { ++ const open = row.board === null ? void 0 : () => onOpen?.(row.board); ++ return (0, import_react23.createElement)( + "div", +- { className: wide ? "bt-side" : "bt-side bt-rail", onKeyDown: typeToSearch }, +- wide ? (0, import_react8.createElement)( +- "div", +- { className: "bt-side-top" }, +- (0, import_react8.createElement)("span", { className: "bt-brand" }, (0, import_react8.createElement)(BrandMark, { size: 22 }), (0, import_react8.createElement)(BrandName)), +- (0, import_react8.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }), +- (0, import_react8.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react8.createElement)(SearchIcon)), +- (0, import_react8.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react8.createElement)(PlusIcon)) +- ) : (0, import_react8.createElement)( +- import_react8.Fragment, +- null, +- (0, import_react8.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }), +- (0, import_react8.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react8.createElement)(PlusIcon)) ++ { ++ key: row.key, ++ className: "bt-project-row", ++ "data-task-id": row.id, ++ "data-column": row.column, ++ "data-priority": row.priority ?? void 0, ++ role: open === void 0 ? void 0 : "button", ++ tabIndex: open === void 0 ? void 0 : 0, ++ onClick: open, ++ onKeyDown: open === void 0 ? void 0 : (event) => { ++ if (event.key === "Enter" || event.key === " ") open(); ++ } ++ }, ++ (0, import_react23.createElement)("span", { className: "bt-project-column" }, t(row.column)), ++ (0, import_react23.createElement)( ++ "span", ++ { className: "bt-project-title-wrap" }, ++ (0, import_react23.createElement)("span", { className: "bt-project-title" }, row.title ?? (row.assignee ? `@${row.assignee}` : "—")), ++ // The audit text the row already carries (#1730): shown inside the card detail, never a ++ // second read. A row without one renders exactly as before. ++ row.audit === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-audit" }, row.audit) + ), +- wide && roster.readOnly ? (0, import_react8.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null, +- (0, import_react8.createElement)( +- "div", +- { ref: listRef, className: "bt-list", role: "region", "aria-label": t("Bot list") }, +- main ? (0, import_react8.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react8.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")), +- order.map((entry) => entry.kind === "bot" ? (0, import_react8.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react8.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react8.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true })) +- ) ++ // "Who is doing" is the claim, never the assignee label; a card the Assistant speaks for ++ // says so, so the three identities (Bot, Assistant, user) never read as one. ++ row.holder === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-holder", "data-holder": row.holder }, `@${row.holder}`), ++ row.speaksFor === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-speaks-for", "data-speaks-for": row.speaksFor }, t("for {user}", { user: row.speaksFor })), ++ row.priority === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-priority" }, row.priority), ++ row.runId === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-ref" }, row.nodeId === null ? row.runId : `${row.runId} · ${row.nodeId}`) + ); + } +-function UpdateButton({ useUpdate, actions }) { +- const update = useUpdate((value) => value); +- const [open, setOpen] = (0, import_react8.useState)(false); +- const [box, setBox] = (0, import_react8.useState)(null); +- const [error, setError] = (0, import_react8.useState)(""); +- const [dshError, setDshError] = (0, import_react8.useState)(""); +- const button = (0, import_react8.useRef)(null); +- (0, import_react8.useEffect)(() => { +- if (!open) return void 0; +- const onDown = (event) => { +- if (event.target instanceof Element && (event.target.closest(".bt-update-pop") || button.current?.contains(event.target))) return; +- setOpen(false); +- }; +- const onKey = (event) => { +- if (event.key === "Escape") { +- event.stopPropagation(); +- setOpen(false); +- button.current?.focus(); +- } +- }; +- window.addEventListener("mousedown", onDown); +- window.addEventListener("keydown", onKey, true); +- return () => { +- window.removeEventListener("mousedown", onDown); +- window.removeEventListener("keydown", onKey, true); ++function ProjectBoardRows({ view, onOpen }) { ++ if (view.empty) return (0, import_react23.createElement)("div", { className: "bt-project-empty" }, t(view.emptyText)); ++ return view.groups.map((group) => (0, import_react23.createElement)( ++ "section", ++ { key: group.source, className: "bt-project-group", "data-source": group.source }, ++ (0, import_react23.createElement)("h4", null, t(group.label)), ++ group.rows.map((row) => projectRowNode(row, onOpen)) ++ )); ++} ++function ProjectDoneGroup({ view, onOpen }) { ++ if (view.done.rows.length === 0) return null; ++ return (0, import_react23.createElement)( ++ "details", ++ { className: "bt-project-group bt-project-done", "data-group": "done" }, ++ (0, import_react23.createElement)("summary", { className: "bt-project-done-summary" }, `${t(view.done.label)} · ${view.done.rows.length}`), ++ view.done.rows.map((row) => projectRowNode(row, onOpen)) ++ ); ++} ++function waitedLabel(ms) { ++ if (!Number.isFinite(ms) || ms < 0) return null; ++ if (ms < 6e4) return `${ms === 0 ? 0 : Math.max(1, Math.floor(ms / 1e3))}s`; ++ const minutes = Math.floor(ms / 6e4); ++ if (minutes < 60) return `${minutes}m`; ++ const hours = Math.floor(minutes / 60); ++ if (hours < 24) return `${hours}h`; ++ return `${Math.floor(hours / 24)}d`; ++} ++var METRIC_CARDS = [ ++ { key: "prsOpenedToday", label: "PRs opened today", caption: "Natural day in your time zone, by created_at." }, ++ { key: "prsMergedToday", label: "PRs merged today", caption: "Natural day in your time zone, by merged_at." }, ++ { key: "issuesOpenedToday", label: "Issues opened today", caption: "Natural day in your time zone, by created_at." }, ++ { key: "issuesClosedToday", label: "Issues closed today", caption: "Natural day in your time zone, by closed_at." }, ++ { key: "prMergeMedianMs", label: "PR merge time", caption: "Median of the last 7 days, opened to merged." }, ++ { key: "issueCloseMedianMs", label: "Issue close time", caption: "Median of the last 7 days, opened to closed." }, ++ { key: "taskDoneMedianMs", label: "Task completion", caption: "Median of the last 7 days, created to done." } ++]; ++var METRIC_DASH = "—"; ++var DURATION_KEYS = /* @__PURE__ */ new Set(["prMergeMedianMs", "issueCloseMedianMs", "taskDoneMedianMs"]); ++var RUNNING_OVERDUE_MS = 2 * 60 * 60 * 1e3; ++var metricText = (key, value) => { ++ if (!Number.isFinite(value)) return METRIC_DASH; ++ if (DURATION_KEYS.has(key)) return waitedLabel(value) ?? METRIC_DASH; ++ return String(value); ++}; ++function metricsView(metrics, { tasks } = {}) { ++ const source = metrics !== null && typeof metrics === "object" ? metrics : null; ++ const values = source?.metrics !== null && typeof source?.metrics === "object" ? source.metrics : {}; ++ const byId = new Map((Array.isArray(tasks) ? tasks : []).filter((task) => task !== null && typeof task === "object" && text(task.id) !== "").map((task) => [text(task.id), task])); ++ const running = (Array.isArray(source?.running) ? source.running : []).filter((row) => row !== null && typeof row === "object" && text(row.id) !== "").map((row) => { + const id = text(row.id); -+ if (seen.has(id)) continue; -+ seen.add(id); -+ const column = text(row.column) || "not-started"; -+ (column === DONE_COLUMN ? archived : list).push(row); -+ } -+ const projectRow = (row) => { -+ const task = byId.get(text(row.id)); ++ const task = byId.get(id); + return { -+ id: text(row.id), -+ key: `task:${text(row.id)}`, -+ column: text(row.column) || "not-started", -+ assignee: text(row.assignee) || null, -+ runId: text(row.runId) || null, -+ nodeId: text(row.nodeId) || null, -+ title: text(row.title) || text(task?.title) || text(task?.note) || null, -+ priority: text(row.priority) || text(task?.priority) || null, -+ audit: text(row.audit) || null, -+ // #1831: who is doing the card, and who is speaking for whom. Both are host truth; -+ // a card carrying neither renders exactly as before. -+ holder: text(row.holder) || null, -+ speaksFor: text(row.speaksFor) || null, -+ board: boardOfRow(row, task) -+ }; ++ id, ++ key: "task:" + id, ++ title: text(row.title) || text(task?.title) || text(task?.note) || id, ++ status: text(row.status), ++ who: text(row.who) || null, ++ sinceMs: Number.isFinite(row.sinceMs) ? row.sinceMs : null, ++ source: text(row.source) || null, ++ lastActivityAt: Number.isFinite(row.lastActivityAt) ? row.lastActivityAt : null, ++ overdue: Number.isFinite(row.sinceMs) && row.sinceMs > RUNNING_OVERDUE_MS, ++ board: boardOfRow({ source: text(row.source) }, task) + }; +- }, [open]); +- const phase = update?.phase ?? "idle"; +- const dsh = update?.dsh; +- const dshPhase = dsh?.phase ?? "idle"; +- const dshRow = showsDshRow(dsh, update?.app); +- if (!update?.available && !dshRow && phase === "idle" && dshPhase === "idle") return null; +- const cloudPhase = phase === "installing" || dshPhase === "installing" ? "installing" : phase !== "idle" ? phase : dshPhase; +- const toggle = () => { +- const rect = button.current?.getBoundingClientRect(); +- if (rect) setBox({ left: Math.max(8, Math.min(rect.left, window.innerWidth - 288)), top: rect.bottom + 6 }); +- setOpen((value) => !value); +- }; +- const start = () => { +- setError(""); +- void actions.installUpdate().catch((failure) => setError(hostText(failure?.message ?? String(failure)))); +- }; +- const startDsh = () => { +- setDshError(""); +- void actions.installDshUpdate().catch((failure) => setDshError(hostText(failure?.message ?? String(failure)))); ++ }); ++ return { ++ available: source?.ok === true, ++ reason: text(source?.reason) || null, ++ cards: METRIC_CARDS.map((card) => ({ ...card, value: metricText(card.key, values[card.key]) })), ++ running, ++ empty: source === null, ++ emptyText: "No metrics read yet." + }; +- const label = phase === "installing" ? t("Updating DS Bot…") : dshPhase === "installing" ? t("Updating DSH…") : phase === "installed" ? t("DS Bot {version} is installed. Restart DSH to use it.", { version: update.installed ?? update.latest }) : dshPhase === "installed" ? t("Restart DSH to start using DSH {version}.", { version: dsh.installed ?? dsh.verified }) : update?.available ? t("DS Bot {version} is available", { version: update.latest }) : t("DSH {version} is available", { version: dsh?.verified }); +- const message = error || (phase === "failed" ? update.error : ""); +- const dshMessage = dshError || (dshPhase === "failed" ? dsh?.error : ""); +- const dshText = dshPhase === "installed" ? t("Restart DSH to start using DSH {version}.", { version: dsh.installed ?? dsh.verified }) : dsh?.available === false && dsh?.blockedBy ? t("Update DS Bot {version} first.", { version: dsh.blockedBy }) : t("You have {version}.", { version: dsh?.current }); +- return (0, import_react8.createElement)( +- import_react8.Fragment, +- null, +- (0, import_react8.createElement)("button", { +- ref: button, +- type: "button", +- className: "bt-round bt-update", +- "data-phase": cloudPhase, +- "aria-label": label, +- title: label, +- "aria-haspopup": "dialog", +- "aria-expanded": open, +- onClick: toggle +- }, (0, import_react8.createElement)(CloudDownloadIcon, { done: phase === "installed" }), phase === "failed" || dshPhase === "failed" ? (0, import_react8.createElement)("span", { className: "bt-update-dot", "aria-hidden": true }) : null), +- open && box ? (0, import_react_dom3.createPortal)((0, import_react8.createElement)( ++} ++var METRICS_REASON_KEYS = [ ++ [/^no-credentials$/, "this machine has no GitHub token yet"], ++ [/^no-fetch$/, "this machine has no way to read GitHub yet"], ++ [/^no-source$/, "this Project has no source to read yet"], ++ [/^source-unavailable$/, "the metrics source cannot be read right now"], ++ [/^no Project: /, "this Project has nothing to read yet"] ++]; ++var READ_FAILED = /^read-failed:\s*(.+)$/; ++var READ_DETAIL_MAX = 60; ++var shortDetail = (detail) => { ++ const line2 = text(detail); ++ return line2.length <= READ_DETAIL_MAX ? line2 : line2.slice(0, READ_DETAIL_MAX - 1) + "…"; ++}; ++function metricsReasonText(reason) { ++ const code = text(reason); ++ if (code === "" || !language().startsWith("zh")) return hostText(code); ++ const readFailed = READ_FAILED.exec(code); ++ if (readFailed !== null) return t("reading GitHub failed ({detail})", { detail: shortDetail(readFailed[1]) }); ++ const named = METRICS_REASON_KEYS.find(([pattern]) => pattern.test(code)); ++ return named === void 0 ? hostText(code) : t(named[1]); ++} ++function ProjectMetrics({ view }) { ++ return (0, import_react23.createElement)( ++ "section", ++ { className: "bt-project-metrics", "data-available": view.available ? "true" : "false" }, ++ view.available || view.reason === null ? null : (0, import_react23.createElement)("p", { className: "bt-project-metrics-note" }, t("Metrics unavailable: {reason}", { reason: metricsReasonText(view.reason) })), ++ (0, import_react23.createElement)( + "div", +- { className: "bt-update-pop", role: "dialog", "aria-label": update?.available || phase !== "idle" ? t("DS Bot update") : t("DSH update"), style: box }, +- update?.available || phase !== "idle" ? (0, import_react8.createElement)( +- import_react8.Fragment, +- null, +- (0, import_react8.createElement)("div", { className: "bt-update-title" }, phase === "installed" ? t("Update installed") : t("DS Bot {version}", { version: update.latest })), +- (0, import_react8.createElement)("div", { className: "bt-update-text" }, phase === "installed" ? t("Restart DSH to start using DS Bot {version}.", { version: update.installed ?? update.latest }) : t("You have {version}.", { version: update.current })), +- message ? (0, import_react8.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: message })) : null, +- (0, import_react8.createElement)( +- "div", +- { className: "bt-update-actions" }, +- update.notesUrl ? (0, import_react8.createElement)("a", { className: "bt-update-notes", href: update.notesUrl, target: "_blank", rel: "noopener noreferrer" }, t("What's new")) : null, +- phase === "installed" ? null : (0, import_react8.createElement)("button", { +- type: "button", +- className: "bt-update-go", +- disabled: phase === "installing", +- onClick: start +- }, phase === "installing" ? t("Updating…") : phase === "failed" ? t("Try again") : t("Update")) +- ) +- ) : null, +- dshRow ? (0, import_react8.createElement)( ++ { className: "bt-project-metric-cards" }, ++ view.cards.map((card) => (0, import_react23.createElement)( + "div", +- { className: "bt-update-dsh" }, +- (0, import_react8.createElement)("div", { className: "bt-update-title" }, t("DSH {version}", { version: dsh.verified })), +- (0, import_react8.createElement)("div", { className: "bt-update-text" }, dshText), +- dshMessage ? (0, import_react8.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: dshMessage })) : null, +- (0, import_react8.createElement)( +- "div", +- { className: "bt-update-actions" }, +- dsh.kind === "app" ? dsh.available ? (0, import_react8.createElement)("button", { type: "button", className: "bt-update-go", onClick: () => void actions.openAppUpdates(dsh.verified).catch(() => { +- }) }, t("Open updates")) : null : !dsh.available && dshPhase === "idle" ? null : dshPhase === "installed" ? null : (0, import_react8.createElement)("button", { +- type: "button", +- className: "bt-update-go", +- disabled: dshPhase === "installing", +- onClick: startDsh +- }, dshPhase === "installing" ? t("Updating…") : dshPhase === "failed" ? t("Try again") : t("Update")) +- ) +- ) : null +- ), document.body) : null ++ { key: card.key, className: "bt-project-metric", "data-metric": card.key }, ++ (0, import_react23.createElement)("span", { className: "bt-project-metric-value" }, card.value), ++ (0, import_react23.createElement)("span", { className: "bt-project-metric-label" }, t(card.label)), ++ (0, import_react23.createElement)("span", { className: "bt-project-metric-caption" }, t(card.caption)) ++ )) ++ ) + ); + } +-function ConnectPlugins({ wide, actions }) { +- const tipId = (0, import_react8.useId)(); +- const [tip, setTip] = (0, import_react8.useState)(false); +- const timer = (0, import_react8.useRef)(0); +- const button = (0, import_react8.useRef)(null); +- const [box, setBox] = (0, import_react8.useState)(null); +- (0, import_react8.useEffect)(() => () => clearTimeout(timer.current), []); +- if (!wide) return null; +- const show = () => { +- clearTimeout(timer.current); +- timer.current = setTimeout(() => { +- const rect = button.current?.getBoundingClientRect(); +- if (!rect) return; +- const left = Math.max(8, Math.min(rect.left, window.innerWidth - 268)); +- setBox({ left, bottom: window.innerHeight - rect.top + 10 }); +- setTip(true); +- }, 250); ++function ProjectRunningTable({ view, onOpen }) { ++ if (view.running.length === 0) return (0, import_react23.createElement)("section", { className: "bt-project-running", "data-running": "0" }, (0, import_react23.createElement)("h4", null, t("Running tasks")), (0, import_react23.createElement)("div", { className: "bt-project-empty" }, t("Nothing is running."))); ++ return (0, import_react23.createElement)( ++ "section", ++ { className: "bt-project-running", "data-running": String(view.running.length) }, ++ (0, import_react23.createElement)("h4", null, t("Running tasks")), ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-running-head" }, ++ (0, import_react23.createElement)("span", null, t("Task")), ++ (0, import_react23.createElement)("span", null, t("Status")), ++ (0, import_react23.createElement)("span", null, t("Who")), ++ (0, import_react23.createElement)("span", null, t("Claimed for")), ++ (0, import_react23.createElement)("span", null, t("Source")), ++ (0, import_react23.createElement)("span", null, t("Last activity")) ++ ), ++ view.running.map((row) => { ++ const open = row.board === null ? void 0 : () => onOpen?.(row.board); ++ return (0, import_react23.createElement)( ++ "div", ++ { ++ key: row.key, ++ className: "bt-project-running-row", ++ "data-task-id": row.id, ++ "data-overdue": row.overdue ? "true" : "false", ++ role: open === void 0 ? void 0 : "button", ++ tabIndex: open === void 0 ? void 0 : 0, ++ onClick: open ++ }, ++ (0, import_react23.createElement)("span", { className: "bt-project-running-title" }, row.title), ++ (0, import_react23.createElement)("span", { className: "bt-project-running-status" }, t(row.status)), ++ (0, import_react23.createElement)("span", null, row.who ?? METRIC_DASH), ++ (0, import_react23.createElement)("span", null, metricText("since", row.sinceMs)), ++ (0, import_react23.createElement)("span", null, row.source === null ? METRIC_DASH : t(SOURCE_LABELS[row.source] ?? row.source)), ++ (0, import_react23.createElement)("span", null, row.lastActivityAt === null ? METRIC_DASH : new Date(row.lastActivityAt).toLocaleString(dateLocale())) ++ ); ++ }) ++ ); ++} ++function ProjectQueueGroups({ view, onOpen }) { ++ return view.queues.map((entry) => (0, import_react23.createElement)( ++ "section", ++ { key: `queue:${entry.group}`, className: "bt-project-group", "data-queue": entry.group }, ++ (0, import_react23.createElement)("h4", null, t(entry.label)), ++ entry.items.map((row) => { ++ const open = row.board === null ? void 0 : () => onOpen?.(row.board); ++ const note = entry.group === "waiting" ? (0, import_react23.createElement)("span", { className: "bt-project-wait" }, [row.role === null ? null : (0, import_react23.createElement)("span", { key: "role", className: "bt-project-role" }, row.role), waitedLabel(row.waitedMs) === null ? null : ` · ${waitedLabel(row.waitedMs)}`]) : entry.group === "inflight" ? (0, import_react23.createElement)("span", { className: "bt-project-state" }, row.holder === null ? t(row.state) : `${row.holder} · ${t(row.state)}`) : (0, import_react23.createElement)("span", { className: "bt-project-reason" }, row.reason === null ? null : waitedLabel(row.waitedMs) === null ? row.reason : `${row.reason} · ${waitedLabel(row.waitedMs)}`); ++ return (0, import_react23.createElement)( ++ "div", ++ { ++ key: row.key, ++ className: "bt-project-row", ++ "data-task-id": row.id, ++ "data-state": row.state ?? void 0, ++ role: open === void 0 ? void 0 : "button", ++ tabIndex: open === void 0 ? void 0 : 0, ++ onClick: open, ++ onKeyDown: open === void 0 ? void 0 : (event) => { ++ if (event.key === "Enter" || event.key === " ") open(); ++ } ++ }, ++ (0, import_react23.createElement)( ++ "span", ++ { className: "bt-project-title-wrap" }, ++ (0, import_react23.createElement)("span", { className: "bt-project-title" }, row.title ?? `#${row.id}`) ++ ), ++ note ++ ); ++ }) ++ )); ++} ++var countText = (value) => value === null ? t("unknown") : String(value); ++function ProjectBoardRecord({ record, projectId, call: call4 }) { ++ const { decisions, meetings } = record; ++ const [open, setOpen] = (0, import_react23.useState)(null); ++ const toggle = (path) => { ++ if (open !== null && open.path === path) { ++ setOpen(null); ++ return; ++ } ++ if (typeof call4 !== "function") return; ++ setOpen({ path, answer: null }); ++ const settle = (answer) => setOpen((current) => current !== null && current.path === path ? { path, answer } : current); ++ call4("project-decision", { id: projectId, path }).then(settle, (error) => settle({ ok: false, reason: String(error?.message ?? error) })); + }; +- const hide = () => { +- clearTimeout(timer.current); +- setTip(false); ++ const decisionBody = (file) => { ++ if (open === null || open.path !== file.path) return null; ++ const answer = open.answer; ++ if (answer === null) return (0, import_react23.createElement)("div", { className: "bt-project-decision-text", "data-open-decision": file.path }, t("Reading the decision…")); ++ if (answer.ok !== true) return (0, import_react23.createElement)("div", { className: "bt-project-decision-text bt-project-decision-refusal", "data-open-decision": file.path, "data-refused": "true" }, text(answer.reason) || t("not listed")); ++ return (0, import_react23.createElement)("pre", { className: "bt-project-decision-text", "data-open-decision": file.path }, typeof answer.text === "string" ? answer.text : ""); + }; +- return (0, import_react8.createElement)( +- "span", +- { className: "bt-connect-wrap" }, +- (0, import_react8.createElement)( ++ const decisionRows = decisions.files.map((file) => (0, import_react23.createElement)( ++ "div", ++ { key: file.key, className: "bt-project-decision-wrap" }, ++ (0, import_react23.createElement)( + "button", + { +- ref: button, + type: "button", +- className: "bt-connect bt-connect-foot", +- "aria-describedby": tip ? tipId : void 0, +- onMouseEnter: show, +- onMouseLeave: hide, +- onFocus: show, +- onBlur: hide, +- onClick: () => actions.selectPanel("plugins") ++ className: "bt-project-decision", ++ "data-path": file.path, ++ "data-sha256": file.sha256, ++ "data-open": open !== null && open.path === file.path ? "true" : void 0, ++ "aria-expanded": open !== null && open.path === file.path ? "true" : "false", ++ onClick: () => toggle(file.path) + }, +- (0, import_react8.createElement)(PlugIcon), +- t("Connect plugins"), +- (0, import_react8.createElement)("span", { className: "bt-connect-warn", "aria-hidden": true }, "!") ++ (0, import_react23.createElement)("span", { className: "bt-project-date" }, file.date), ++ (0, import_react23.createElement)("span", { className: "bt-project-title" }, file.title === "" ? file.name : file.title), ++ (0, import_react23.createElement)("span", { className: "bt-project-hash", title: file.sha256 }, file.shortHash) + ), +- tip && box ? (0, import_react_dom3.createPortal)((0, import_react8.createElement)( +- "span", +- { role: "tooltip", id: tipId, className: "bt-connect-tip", style: box }, +- t("Plugin compatibility is not fully verified.") +- ), document.body) : null ++ decisionBody(file) ++ )); ++ const recipientText = (list) => list.length === 0 ? null : list.map((name) => `@${name}`).join(", "); ++ const proxyText = (meeting) => meeting.participants.filter((participant) => participant.speaksFor !== null).map((participant) => `${participant.name} ${t("for {user}", { user: participant.speaksFor })}`).join(", "); ++ const proxyRow = (meeting) => proxyText(meeting) === "" ? null : (0, import_react23.createElement)("span", { className: "bt-project-speaks-for", "data-speaks-for": meeting.participants.filter((p) => p.speaksFor !== null).map((p) => p.speaksFor).join(", ") }, proxyText(meeting)); ++ const levelOf = (meeting) => (0, import_react23.createElement)("span", { className: "bt-project-level", "data-level": meeting.level }, t(meeting.level)); ++ const decidedRows = meetings.decided.map((meeting) => (0, import_react23.createElement)( ++ "div", ++ { key: meeting.key, className: "bt-project-meeting", "data-status": "decided" }, ++ (0, import_react23.createElement)("span", { className: "bt-project-date" }, meeting.date), ++ (0, import_react23.createElement)("span", { className: "bt-project-title" }, meeting.question), ++ meeting.owner === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-owner" }, `@${meeting.owner}`), ++ proxyRow(meeting), ++ // A decided meeting whose file is gone still reads as decided; the missing path says so ++ // instead of the row disappearing with the file. ++ meeting.path === "" ? (0, import_react23.createElement)("span", { className: "bt-project-missing" }, "decision file gone") : (0, import_react23.createElement)("span", { className: "bt-project-path" }, meeting.path) ++ )); ++ const pendingRows = meetings.pending.map((meeting) => (0, import_react23.createElement)( ++ "div", ++ { key: meeting.key, className: "bt-project-meeting", "data-status": meeting.status, "data-level": meeting.level }, ++ (0, import_react23.createElement)("span", { className: "bt-project-date" }, meeting.date), ++ (0, import_react23.createElement)("span", { className: "bt-project-title" }, meeting.blockingQuestion === null ? meeting.question : meeting.blockingQuestion), ++ levelOf(meeting), ++ recipientText(meeting.recipients) === null ? null : (0, import_react23.createElement)("span", { className: "bt-project-recipients" }, recipientText(meeting.recipients)), ++ meeting.advance.allowed ? null : (0, import_react23.createElement)("span", { className: "bt-project-paused" }, meeting.advance.reason), ++ proxyRow(meeting), ++ (0, import_react23.createElement)("span", { className: "bt-project-status" }, meeting.status) ++ )); ++ const moreLine = (hidden, key) => hidden > 0 ? (0, import_react23.createElement)("div", { key, className: "bt-project-more" }, t("{count} more not shown", { count: hidden })) : null; ++ const emptyLine = (state) => text(state?.host) !== "" ? hostText(state.host) : t(state?.key ?? "", state?.params); ++ return (0, import_react23.createElement)( ++ "section", ++ { ++ className: "bt-project-record", ++ // `data-decisions` stays "rows drawn"; the total rides beside it so the view can be asserted. ++ "data-decisions": String(decisions.count), ++ ...decisions.total === null ? {} : { "data-decisions-total": String(decisions.total) }, ++ "data-meetings": String(meetings.count) ++ }, ++ (0, import_react23.createElement)("h4", null, t("Decisions")), ++ decisions.empty ? (0, import_react23.createElement)("div", { className: "bt-project-empty bt-project-record-empty" }, emptyLine(decisions.emptyText)) : decisionRows, ++ moreLine(decisions.hidden, "decisions-more"), ++ (0, import_react23.createElement)("h4", null, t("Meetings")), ++ meetings.empty ? (0, import_react23.createElement)("div", { className: "bt-project-empty bt-project-record-empty" }, emptyLine(meetings.emptyText)) : decidedRows, ++ moreLine(meetings.decidedHidden, "decided-more"), ++ meetings.pending.length === 0 ? null : (0, import_react23.createElement)("h5", null, t("Not decided")), ++ meetings.pending.length === 0 ? null : pendingRows, ++ moreLine(meetings.pendingHidden, "pending-more") + ); + } +-function YouAvatar() { +- return (0, import_react8.createElement)( ++var botIdOf = (entry) => entry !== null && typeof entry === "object" ? text(entry.botId) : ""; ++var idList = (value) => Array.isArray(value) ? value.map((id) => text(id)).filter((id) => id !== "") : []; ++function projectTeamView(project) { ++ const stored = project?.roles !== null && typeof project?.roles === "object" ? project.roles : {}; ++ const owner = []; ++ const addOwner = (id) => { ++ const clean = text(id); ++ if (clean !== "" && !owner.includes(clean)) owner.push(clean); + }; -+ const groups = PROJECT_SOURCES.map((source) => ({ -+ source, -+ label: SOURCE_LABELS[source], -+ rows: list.filter((row) => row.source === source).map(projectRow) -+ })).filter((group) => group.rows.length > 0); -+ const countOf = (value) => value === void 0 || value === null ? null : value; -+ const queueItems = (items, annotate) => (Array.isArray(items) ? items : []).filter((item) => item !== null && typeof item === "object" && text(item.id) !== "").map((item) => { -+ const id = text(item.id); -+ const source = text([...list, ...archived].find((row) => text(row.id) === id)?.source); -+ const task = byId.get(id); -+ return { id, key: `task:${id}`, title: text(task?.title) || text(task?.note) || null, priority: text(task?.priority) || null, board: boardOfRow({ source }, task), ...annotate(item) }; - }); -- const team = /* @__PURE__ */ new Set([ -- ...roster.bots.flatMap((bot) => [bot.id, currentPart(bot), ...bot.parts ?? []]), -- ...roster.rooms.flatMap((room2) => [room2.id, ...room2.parts ?? []]) -- ]); -- const others = (list?.ids ?? []).map((id) => byId[id]).filter((row) => row !== void 0 && row.id !== sessionId && !team.has(row.id) && row.origin !== "subagent" && row.blank !== true).sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0)).slice(0, OTHER_CHATS_MAX).map((row) => ({ sessionId: row.id, label: row.displayTitle || row.title || row.id, updatedAt: row.updatedAt })); -- return [...bots, ...others]; --} --function sessionMention(sessionId, label) { -- let binary = ""; -- for (const byte of new TextEncoder().encode(JSON.stringify(sessionId))) binary += String.fromCharCode(byte); -- const payload = btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, ""); -- return `@[${label.replace(/[\\\]]/g, (mark) => `\\${mark}`)}](dsh-session:${payload})`; --} --function atSources({ roster, sessions, launched, iconFor }) { -- const bots = { -- trigger: "@", -- name: BOTS_SOURCE, -- order: -20, -- showGroupTitle: false, -- async candidates(session, { query }) { -- return (mentionRows(roster.getSnapshot(), session.sessionId, query) ?? []).map((row) => ({ -- name: row.bot ? row.bot.name : t("Everyone"), -- ...row.bot?.role ? { description: row.bot.role } : {}, -- ...row.room ? { description: t("{count} members", { count: row.room.members.length }) } : {}, -- icon: iconFor(row), -- section: t("Bots"), -- value: row.text -- })); -- }, -- onPick: ({ candidate }) => candidate.value ? { text: candidate.value } : void 0 -+ const waiting = queueItems(queues?.waiting, (item) => ({ role: text(item.role) || null, waitedMs: Number.isFinite(item.waitedMs) ? item.waitedMs : null })); -+ const inflight = queueItems(queues?.inflight, (item) => ({ holder: text(item.holder) || null, state: item.stalled === true ? "stalled" : "running" })); -+ const blocked = queueItems(queues?.blocked, (item) => ({ reason: text(item.reason) || null, waitedMs: Number.isFinite(item.waitedMs) ? item.waitedMs : null })); -+ const queueGroups = [ -+ { group: "waiting", label: "Waiting", items: waiting }, -+ { group: "inflight", label: "In flight", items: inflight }, -+ { group: "blocked", label: "Blocked", items: blocked } -+ ].filter((entry) => entry.items.length > 0); -+ const rawCounts = queues?.counts ?? null; ++ addOwner(project?.ownerUserId); ++ for (const id of idList(project?.ownerUserIds)) addOwner(id); ++ const maintainers = idList(stored.maintainers).filter((id) => !owner.includes(id)); ++ const members = idList(stored.members).filter((id) => !owner.includes(id) && !maintainers.includes(id)); + return { -+ projectId: text(project?.id) || null, -+ title: text(project?.name) || "Project", -+ canManage: canManage === true, -+ groups, -+ // #1855: one group, closed until the reader opens it. Rows keep the row shape above, so a -+ // finished card is still a card — only its place on the board changed. -+ done: { group: "done", label: "Done cards", collapsed: true, rows: archived.map(projectRow) }, -+ queues: queueGroups, -+ counts: rawCounts === null ? null : { waiting: countOf(rawCounts.waiting), inflight: countOf(rawCounts.inflight), blocked: countOf(rawCounts.blocked), done: countOf(rawCounts.done) }, -+ count: list.length, -+ empty: list.length === 0 && queueGroups.length === 0 && archived.length === 0, -+ emptyText: "No cards yet.", -+ record: projectBoardRecord({ decisions, meetings }), -+ metrics: metricsView(metrics, { tasks }) - }; -- const chats = { -- trigger: "@", -- name: CHATS_SOURCE, -- order: -10, -- showGroupTitle: false, -- async candidates(session) { -- if (!launched(session.sessionId)) return []; -- return chatRows(roster.getSnapshot(), sessions.list.getSnapshot(), session.sessionId).map((row) => ({ -- name: row.bot ? row.bot.name : row.label, -- ...row.updatedAt ? { description: relativeShort(row.updatedAt) } : {}, -- icon: row.bot ? iconFor(row) : "session", -- section: row.bot ? t("Bots") : t("Conversations"), -- value: JSON.stringify({ sessionId: row.sessionId, label: row.label }) -- })); -- }, -- onPick({ candidate }) { -- const { sessionId, label } = JSON.parse(candidate.value); -- const mention = sessionMention(sessionId, label); -- return { insert: { source: CHATS_SOURCE, ref: mention, label, appearance: "session", clipboardText: mention } }; ++ chief: botIdOf(project?.chief), ++ agent: botIdOf(project?.assistant), ++ roles: { owner, maintainers, members }, ++ empty: owner.length === 0 && maintainers.length === 0 && members.length === 0, ++ // Both come from the `projects` listing (#1828), which the overlay keeps on the record: the ++ // `project-read` record answers no rank, and the panel never re-derives the host's policy. ++ role: text(project?.role), ++ choices: idList(project?.choices) ++ }; +} -+function projectRowNode(row, onOpen) { -+ const open = row.board === null ? void 0 : () => onOpen?.(row.board); -+ return (0, import_react21.createElement)( -+ "div", -+ { -+ key: row.key, -+ className: "bt-project-row", -+ "data-task-id": row.id, -+ "data-column": row.column, -+ "data-priority": row.priority ?? void 0, -+ role: open === void 0 ? void 0 : "button", -+ tabIndex: open === void 0 ? void 0 : 0, -+ onClick: open, -+ onKeyDown: open === void 0 ? void 0 : (event) => { -+ if (event.key === "Enter" || event.key === " ") open(); ++var teamRow = (role, label, botId, onOpenBot, onOpenDossier) => (0, import_react23.createElement)( ++ "div", ++ { ++ key: role, ++ className: "bt-project-team-row", ++ "data-team-role": role, ++ // A row with no Bot is the fallback the slice specifies: still drawn, with nothing to open. ++ ...botId === "" ? { "data-team-state": "not-set" } : { ++ "data-open-bot": botId, ++ role: "button", ++ tabIndex: 0, ++ "aria-label": t("Open {name}'s chat", { name: botId }), ++ onClick: () => onOpenBot?.(botId), ++ onKeyDown: (event) => { ++ if (event.key === "Enter" || event.key === " ") { ++ event.preventDefault(); ++ onOpenBot?.(botId); ++ } + } - }, -- codec: { clipboardText: (ref) => ref, serialize: (ref) => Promise.resolve(ref) } -+ (0, import_react21.createElement)("span", { className: "bt-project-column" }, t(row.column)), -+ (0, import_react21.createElement)( ++ } ++ }, ++ (0, import_react23.createElement)("span", { key: "label", className: "bt-project-team-label" }, label), ++ botId === "" ? (0, import_react23.createElement)("span", { key: "value", className: "bt-project-missing" }, t("Not set")) : (0, import_react23.createElement)("span", { key: "value", className: "bt-project-team-bot" }, `@${botId}`), ++ // #1864: the dossier control sits inside the row, so the row still opens the chat (#1860) and a ++ // reader can look a Bot up first. A row with no Bot keeps the control: its panel reads "not set". ++ (0, import_react23.createElement)("button", { ++ key: "dossier", ++ type: "button", ++ className: "bt-project-team-dossier", ++ "data-dossier-role": role, ++ ...botId === "" ? {} : { "data-dossier-bot": botId }, ++ "aria-label": t("Open {name}'s dossier", { name: botId === "" ? label : botId }), ++ onClick: (event) => { ++ event?.stopPropagation(); ++ onOpenDossier?.({ role, label, botId }); ++ }, ++ onKeyDown: (event) => { ++ if (event.key === "Enter" || event.key === " ") { ++ event?.stopPropagation(); ++ onOpenDossier?.({ role, label, botId }); ++ } ++ } ++ }, t("Dossier")) ++); ++var POOL_RANKS = [["owner", "owner"], ["maintainer", "maintainers"], ["member", "members"]]; ++function ProjectTeam({ project, onOpenBot, onOpenDossier }) { ++ const view = projectTeamView(project); ++ const poolId = (id) => (0, import_react23.createElement)("span", { key: id }, `@${id}`); ++ const ranks = view.empty ? (0, import_react23.createElement)("span", { className: "bt-project-missing" }, t("No one in this pool yet.")) : (0, import_react23.createElement)( + "span", +- { className: "bt-you-wrap" }, +- (0, import_react8.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react8.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })), +- (0, import_react8.createElement)("span", { style: { position: "absolute", width: 1, height: 1, overflow: "hidden", clip: "rect(0 0 0 0)" } }, t("Settings")) ++ { className: "bt-project-team-roles" }, ++ POOL_RANKS.map(([role, key]) => view.roles[key].length === 0 ? null : (0, import_react23.createElement)( + "span", -+ { className: "bt-project-title-wrap" }, -+ (0, import_react21.createElement)("span", { className: "bt-project-title" }, row.title ?? (row.assignee ? `@${row.assignee}` : "—")), -+ // The audit text the row already carries (#1730): shown inside the card detail, never a -+ // second read. A row without one renders exactly as before. -+ row.audit === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-audit" }, row.audit) -+ ), -+ // "Who is doing" is the claim, never the assignee label; a card the Assistant speaks for -+ // says so, so the three identities (Bot, Assistant, user) never read as one. -+ row.holder === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-holder", "data-holder": row.holder }, `@${row.holder}`), -+ row.speaksFor === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-speaks-for", "data-speaks-for": row.speaksFor }, t("for {user}", { user: row.speaksFor })), -+ row.priority === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-priority" }, row.priority), -+ row.runId === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-ref" }, row.nodeId === null ? row.runId : `${row.runId} · ${row.nodeId}`) ++ { key: role, className: "bt-project-team-role", "data-pool-role": role }, ++ `${roleText(role)}: `, ++ view.roles[key].map((id) => poolId(id)) ++ )) + ); -+} -+function ProjectBoardRows({ view, onOpen }) { -+ if (view.empty) return (0, import_react21.createElement)("div", { className: "bt-project-empty" }, t(view.emptyText)); -+ return view.groups.map((group) => (0, import_react21.createElement)( ++ return (0, import_react23.createElement)( + "section", -+ { key: group.source, className: "bt-project-group", "data-source": group.source }, -+ (0, import_react21.createElement)("h4", null, t(group.label)), -+ group.rows.map((row) => projectRowNode(row, onOpen)) -+ )); ++ { className: "bt-project-team", "data-team": "chief,agent,pool" }, ++ (0, import_react23.createElement)("h4", null, t("Project team")), ++ teamRow("chief", t("Project Chief"), view.chief, onOpenBot, onOpenDossier), ++ teamRow("agent", t("My agent"), view.agent, onOpenBot, onOpenDossier), ++ (0, import_react23.createElement)( ++ "div", ++ { key: "pool", className: "bt-project-team-row", "data-team-role": "pool" }, ++ (0, import_react23.createElement)("span", { key: "label", className: "bt-project-team-label" }, t("Role pool")), ++ ranks, ++ // The caller's own rank and what the host said they may switch to: the same answer the ++ // sidebar menu reads, printed where the pool is. ++ view.role === "" ? null : (0, import_react23.createElement)( ++ "span", ++ { key: "mine", className: "bt-project-team-myrole", "data-team-my-role": view.role }, ++ [ ++ t("My role"), ++ ": ", ++ roleText(view.role), ++ view.choices.length === 0 ? null : ` · ${t("Can switch to {roles}", { roles: view.choices.map(roleText).join(", ") })}` ++ ] ++ ) ++ ) ++ ); ++} ++function dossierRowOf(team, botId) { ++ const id = text(botId); ++ if (id === "") return null; ++ const rows = Array.isArray(team?.rows) ? team.rows : []; ++ return rows.find((row) => row !== null && typeof row === "object" && text(row.botId) === id) ?? null; ++} ++var dossierSection = (title, children) => (0, import_react23.createElement)( ++ "div", ++ { key: title, className: "bt-project-dossier-section" }, ++ (0, import_react23.createElement)("h4", null, title), ++ children ++); ++function ProjectDossierPanel({ row, label, onClose, onOpenBot } = {}) { ++ const known = row !== null && typeof row === "object"; ++ const botId = known ? text(row.botId) : ""; ++ const topics = known && Array.isArray(row.memory?.topics) ? row.memory.topics.map((name) => text(name)).filter((name) => name !== "") : []; ++ const skills = known && Array.isArray(row.skills) ? row.skills.map((name) => text(name)).filter((name) => name !== "") : []; ++ const meta = known ? [text(row.role), text(row.model)].filter((value) => value !== "") : []; ++ return (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-panel bt-project-dossier", "data-panel": "project-dossier", "data-dossier-bot": botId === "" ? void 0 : botId }, ++ (0, import_react23.createElement)("h3", null, label === "" || label === void 0 ? t("Dossier") : `${label} · ${t("Dossier")}`), ++ known ? [ ++ dossierSection(t("Persona"), [ ++ meta.length === 0 ? null : (0, import_react23.createElement)("div", { key: "meta", className: "bt-project-dossier-meta" }, meta.map((value) => (0, import_react23.createElement)("span", { key: value }, value))), ++ (0, import_react23.createElement)("p", { key: "persona", className: "bt-project-dossier-text" }, text(row.persona) || t("Not set")) ++ ]), ++ dossierSection(t("Memory"), [ ++ (0, import_react23.createElement)("p", { key: "head", className: "bt-project-dossier-text" }, text(row.memory?.head) || t("No memory yet.")), ++ topics.length === 0 ? null : (0, import_react23.createElement)("div", { key: "topics", className: "bt-project-dossier-topics" }, topics.map((topic) => (0, import_react23.createElement)("span", { key: topic, className: "bt-project-dossier-topic" }, topic))) ++ ]), ++ dossierSection(t("Skills"), (0, import_react23.createElement)("p", { key: "skills", className: "bt-project-dossier-text" }, skills.length === 0 ? t("No skills attached.") : skills.join(", "))) ++ ] : (0, import_react23.createElement)("p", { className: "bt-project-missing" }, t("Not set")), ++ botId === "" || !known ? null : (0, import_react23.createElement)( ++ "div", ++ { key: "actions", className: "bt-project-row-actions" }, ++ (0, import_react23.createElement)("button", { ++ type: "button", ++ className: "bt-soft bt-soft-sm", ++ "data-open-bot": botId, ++ onClick: () => onOpenBot?.(botId) ++ }, t("Open chat")) ++ ), ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-row-actions" }, ++ (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) ++ ) + ); + } +-var openShellSettings = null; +-var openShellOnboarding = null; +-var shellShortcuts = null; +-function holdShellShortcuts(shortcuts) { +- shellShortcuts = shortcuts; +- return () => { +- if (shellShortcuts === shortcuts) shellShortcuts = null; +- }; +-} +-function openHarnessSettings() { +- requestAnimationFrame(() => { +- if (openShellSettings) { +- openShellSettings(); +- return; ++function projectAgentFor(bot, selfId) { ++ if (bot === null || typeof bot !== "object" || bot.remote !== void 0) return null; ++ const projectId = text(bot.projectId); ++ if (projectId === "") return null; ++ const owner = text(bot.ownerId); ++ const self = text(selfId); ++ if (self !== "" && owner !== "" && owner !== self) return null; ++ return { projectId }; ++} ++function ProjectAgentEntry({ projectId, read, onOpen } = {}) { ++ const present = useProjectPresent(); ++ const [agentId, setAgentId] = (0, import_react23.useState)(""); ++ const id = text(projectId); ++ const open = async () => { ++ let target = agentId; ++ if (target === "") { ++ try { ++ const record = await (read ?? call)("project-read", { id }); ++ target = botIdOf(record?.project?.assistant); ++ } catch { ++ target = ""; ++ } ++ if (target !== "") setAgentId(target); + } +- const desktop = document.querySelector('button[aria-haspopup="menu"][data-signed-out]'); +- if (desktop) openThroughMenu(desktop); +- else pressSettingsShortcut(); +- }); +-} +-function openHarnessOnboarding(id) { +- requestAnimationFrame(() => { +- if (openShellOnboarding) openShellOnboarding(id); +- else openHarnessSettings(); +- }); +-} +-function openThroughMenu(trigger) { +- const before = new Set(document.querySelectorAll('[role="menu"]')); +- trigger.click(); +- let frames = 0; +- const look = () => { +- const menu = [...document.querySelectorAll('[role="menu"]')].find((node) => !before.has(node)); +- const item = menu?.querySelector('button[role="menuitem"]'); +- if (item) item.click(); +- else if (++frames < 30) requestAnimationFrame(look); +- else pressSettingsShortcut(); ++ if (target !== "") onOpen?.(target); + }; +- requestAnimationFrame(look); +-} +-function pressSettingsShortcut() { +- const binding = shellShortcuts?.catalog.getSnapshot().find((row) => row.id === "settings.open")?.binding; +- if (!binding) return; +- const held = new Set(binding.modifiers); +- window.dispatchEvent(new KeyboardEvent("keydown", { +- code: binding.code, +- key: binding.code === "Comma" ? "," : "", +- bubbles: true, +- cancelable: true, +- ctrlKey: held.has("control"), +- altKey: held.has("alt"), +- shiftKey: held.has("shift"), +- metaKey: held.has("meta") +- })); ++ if (id === "" || !present) return null; ++ return (0, import_react23.createElement)("button", { ++ type: "button", ++ className: "bt-project-agent-entry", ++ "data-project-agent": id, ++ "data-open-bot": agentId === "" ? void 0 : agentId, ++ title: t("Open my agent"), ++ "aria-label": t("Open my agent"), ++ onClick: open ++ }, t("My agent")); +} -+function ProjectDoneGroup({ view, onOpen }) { -+ if (view.done.rows.length === 0) return null; -+ return (0, import_react21.createElement)( -+ "details", -+ { className: "bt-project-group bt-project-done", "data-group": "done" }, -+ (0, import_react21.createElement)("summary", { className: "bt-project-done-summary" }, `${t(view.done.label)} · ${view.done.rows.length}`), -+ view.done.rows.map((row) => projectRowNode(row, onOpen)) ++function ProjectBoardPane({ project, rows, done, canManage, tasks, decisions, meetings, queues, metrics, onOpen, onSettings, onMembers, onOpenBot, onOpenDossier, call: call4 }) { ++ const view = projectBoardView({ project, rows, done, canManage, tasks, decisions, meetings, queues, metrics }); ++ return (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-board", "data-can-manage": view.canManage ? "true" : "false" }, ++ (0, import_react23.createElement)("h3", null, view.title), ++ (0, import_react23.createElement)(ProjectTeam, { project, onOpenBot, onOpenDossier }), ++ // Header counts (#1768): four numbers read from the host, an unreadable one shown as unknown. ++ view.counts === null ? null : (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-counts", "data-counts": "waiting,inflight,blocked,done" }, ++ (0, import_react23.createElement)("span", null, [t("Waiting"), ": ", (0, import_react23.createElement)("b", { key: "w" }, countText(view.counts.waiting))]), ++ (0, import_react23.createElement)("span", null, [t("In flight"), ": ", (0, import_react23.createElement)("b", { key: "f" }, countText(view.counts.inflight))]), ++ (0, import_react23.createElement)("span", null, [t("Blocked"), ": ", (0, import_react23.createElement)("b", { key: "b" }, countText(view.counts.blocked))]), ++ (0, import_react23.createElement)("span", null, [t("Done"), ": ", (0, import_react23.createElement)("b", { key: "d" }, countText(view.counts.done))]) ++ ), ++ // #1749: both buttons open a panel and neither is hidden from a non-owner. The host refuses ++ // every write a non-owner attempts, so the refusal is an answer the reader sees, not a ++ // control that silently disappeared. ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-actions" }, ++ (0, import_react23.createElement)("button", { type: "button", "data-action": "project-settings", onClick: () => onSettings?.() }, t("Project settings")), ++ (0, import_react23.createElement)("button", { type: "button", "data-action": "project-members", onClick: () => onMembers?.() }, t("Members")) ++ ), ++ (0, import_react23.createElement)(ProjectMetrics, { view: view.metrics }), ++ (0, import_react23.createElement)(ProjectRunningTable, { view: view.metrics, onOpen }), ++ (0, import_react23.createElement)(ProjectBoardRows, { view, onOpen }), ++ (0, import_react23.createElement)(ProjectQueueGroups, { view, onOpen }), ++ (0, import_react23.createElement)(ProjectDoneGroup, { view, onOpen }), ++ (0, import_react23.createElement)(ProjectBoardRecord, { record: view.record, projectId: view.projectId, call: call4 }) + ); -+} -+function waitedLabel(ms) { -+ if (!Number.isFinite(ms) || ms < 0) return null; -+ if (ms < 6e4) return `${ms === 0 ? 0 : Math.max(1, Math.floor(ms / 1e3))}s`; -+ const minutes = Math.floor(ms / 6e4); -+ if (minutes < 60) return `${minutes}m`; -+ const hours = Math.floor(minutes / 60); -+ if (hours < 24) return `${hours}h`; -+ return `${Math.floor(hours / 24)}d`; -+} -+var METRIC_CARDS = [ -+ { key: "prsOpenedToday", label: "PRs opened today", caption: "Natural day in your time zone, by created_at." }, -+ { key: "prsMergedToday", label: "PRs merged today", caption: "Natural day in your time zone, by merged_at." }, -+ { key: "issuesOpenedToday", label: "Issues opened today", caption: "Natural day in your time zone, by created_at." }, -+ { key: "issuesClosedToday", label: "Issues closed today", caption: "Natural day in your time zone, by closed_at." }, -+ { key: "prMergeMedianMs", label: "PR merge time", caption: "Median of the last 7 days, opened to merged." }, -+ { key: "issueCloseMedianMs", label: "Issue close time", caption: "Median of the last 7 days, opened to closed." }, -+ { key: "taskDoneMedianMs", label: "Task completion", caption: "Median of the last 7 days, created to done." } -+]; -+var METRIC_DASH = "—"; -+var DURATION_KEYS = /* @__PURE__ */ new Set(["prMergeMedianMs", "issueCloseMedianMs", "taskDoneMedianMs"]); -+var RUNNING_OVERDUE_MS = 2 * 60 * 60 * 1e3; -+var metricText = (key, value) => { -+ if (!Number.isFinite(value)) return METRIC_DASH; -+ if (DURATION_KEYS.has(key)) return waitedLabel(value) ?? METRIC_DASH; -+ return String(value); -+}; -+function metricsView(metrics, { tasks } = {}) { -+ const source = metrics !== null && typeof metrics === "object" ? metrics : null; -+ const values = source?.metrics !== null && typeof source?.metrics === "object" ? source.metrics : {}; -+ const byId = new Map((Array.isArray(tasks) ? tasks : []).filter((task) => task !== null && typeof task === "object" && text(task.id) !== "").map((task) => [text(task.id), task])); -+ const running = (Array.isArray(source?.running) ? source.running : []).filter((row) => row !== null && typeof row === "object" && text(row.id) !== "").map((row) => { -+ const id = text(row.id); -+ const task = byId.get(id); -+ return { -+ id, -+ key: "task:" + id, -+ title: text(row.title) || text(task?.title) || text(task?.note) || id, -+ status: text(row.status), -+ who: text(row.who) || null, -+ sinceMs: Number.isFinite(row.sinceMs) ? row.sinceMs : null, -+ source: text(row.source) || null, -+ lastActivityAt: Number.isFinite(row.lastActivityAt) ? row.lastActivityAt : null, -+ overdue: Number.isFinite(row.sinceMs) && row.sinceMs > RUNNING_OVERDUE_MS, -+ board: boardOfRow({ source: text(row.source) }, task) -+ }; -+ }); -+ return { -+ available: source?.ok === true, -+ reason: text(source?.reason) || null, -+ cards: METRIC_CARDS.map((card) => ({ ...card, value: metricText(card.key, values[card.key]) })), -+ running, -+ empty: source === null, -+ emptyText: "No metrics read yet." - }; -- return [bots, chats]; } -- --// src/client/speech.js --var VOICE_BUNDLE = "@deepseek-ai/dsh-experimental-voice-input-bundle"; --var USABLE = /* @__PURE__ */ new Set(["ready", "standby", "waking"]); --async function speechCatalog(speech) { -- const result = await speech.catalog(); -- if (!result?.ok) throw new Error(result?.error?.message ?? "Speech catalog failed"); -- const catalog = result.value; -- const provider = catalog.providers.find((item) => item.id === catalog.selection.providerId); -- return { catalog, usable: USABLE.has(provider?.preparation?.phase) }; -+var METRICS_REASON_KEYS = [ -+ [/^no-credentials$/, "this machine has no GitHub token yet"], -+ [/^no-fetch$/, "this machine has no way to read GitHub yet"], -+ [/^no-source$/, "this Project has no source to read yet"], -+ [/^source-unavailable$/, "the metrics source cannot be read right now"], -+ [/^no Project: /, "this Project has nothing to read yet"] -+]; -+var READ_FAILED = /^read-failed:\s*(.+)$/; -+var READ_DETAIL_MAX = 60; -+var shortDetail = (detail) => { -+ const line2 = text(detail); -+ return line2.length <= READ_DETAIL_MAX ? line2 : line2.slice(0, READ_DETAIL_MAX - 1) + "…"; -+}; -+function metricsReasonText(reason) { -+ const code = text(reason); -+ if (code === "" || !language().startsWith("zh")) return hostText(code); -+ const readFailed = READ_FAILED.exec(code); -+ if (readFailed !== null) return t("reading GitHub failed ({detail})", { detail: shortDetail(readFailed[1]) }); -+ const named = METRICS_REASON_KEYS.find(([pattern]) => pattern.test(code)); -+ return named === void 0 ? hostText(code) : t(named[1]); -+} -+function ProjectMetrics({ view }) { -+ return (0, import_react21.createElement)( -+ "section", -+ { className: "bt-project-metrics", "data-available": view.available ? "true" : "false" }, -+ view.available || view.reason === null ? null : (0, import_react21.createElement)("p", { className: "bt-project-metrics-note" }, t("Metrics unavailable: {reason}", { reason: metricsReasonText(view.reason) })), -+ (0, import_react21.createElement)( +-function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboarding, actions }) { +- const [open, setOpen] = (0, import_react8.useState)(false); +- (0, import_react8.useLayoutEffect)(() => { +- if (!seat) return void 0; +- actions.seatAccount(true); +- return () => actions.seatAccount(false); +- }, [seat]); +- const [box, setBox] = (0, import_react8.useState)(null); +- const button = (0, import_react8.useRef)(null); +- (0, import_react8.useEffect)(() => { +- if (settingsOpen) setOpen(false); +- }, [settingsOpen]); +- (0, import_react8.useEffect)(() => { +- if (!openSettings) return void 0; +- openShellSettings = openSettings; +- return () => { +- if (openShellSettings === openSettings) openShellSettings = null; +- }; +- }, [openSettings]); +- (0, import_react8.useEffect)(() => { +- if (!openOnboarding) return void 0; +- openShellOnboarding = openOnboarding; +- return () => { +- if (openShellOnboarding === openOnboarding) openShellOnboarding = null; +- }; +- }, [openOnboarding]); +- (0, import_react8.useEffect)(() => { +- if (!open) return void 0; +- const onDown = (event) => { +- if (event.target instanceof Element && (event.target.closest(".bt-account-menu") || button.current?.contains(event.target))) return; +- setOpen(false); +- }; +- const onKey = (event) => { +- if (event.key === "Escape") { +- event.stopPropagation(); +- setOpen(false); +- button.current?.focus(); +- } +- }; +- window.addEventListener("mousedown", onDown); +- window.addEventListener("keydown", onKey, true); +- return () => { +- window.removeEventListener("mousedown", onDown); +- window.removeEventListener("keydown", onKey, true); +- }; +- }, [open]); +- const toggle = () => { +- const rect = button.current?.getBoundingClientRect(); +- if (rect) setBox({ left: rect.left, bottom: window.innerHeight - rect.top + 5 }); +- setOpen((value) => !value); ++function ProjectSettingsPanel({ project, assistantMine, actions, call: request, onClose, onSaved, locked = false, readOnly = "" } = {}) { ++ const save = request ?? call; ++ const [kind, setKind] = (0, import_react23.useState)("bot"); ++ const [memberId, setMemberId] = (0, import_react23.useState)(""); ++ const [note, setNote] = (0, import_react23.useState)(""); ++ const noteLength = memoryLength(note); ++ const noteOver = noteLength > MEMORY_TEXT_MAX; ++ const noteSaveDisabled = text(note) === "" || noteOver; ++ const [assistantOff, setAssistantOff] = (0, import_react23.useState)(assistantMine === void 0 ? project?.assistant?.off === true : assistantMine?.off === true); ++ const [status, setStatus] = (0, import_react23.useState)(""); ++ const id = text(project?.id); ++ if (locked) { ++ return (0, import_react23.createElement)( + "div", -+ { className: "bt-project-metric-cards" }, -+ view.cards.map((card) => (0, import_react21.createElement)( ++ { className: "bt-project-panel", "data-panel": "project-settings" }, ++ (0, import_react23.createElement)("h3", null, t("Project settings")), ++ readOnlyLine(import_react23.createElement, { readOnly }, actions, { key: "readonly" }), ++ (0, import_react23.createElement)( + "div", -+ { key: card.key, className: "bt-project-metric", "data-metric": card.key }, -+ (0, import_react21.createElement)("span", { className: "bt-project-metric-value" }, card.value), -+ (0, import_react21.createElement)("span", { className: "bt-project-metric-label" }, t(card.label)), -+ (0, import_react21.createElement)("span", { className: "bt-project-metric-caption" }, t(card.caption)) -+ )) ++ { className: "bt-project-row-actions" }, ++ (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) ++ ) ++ ); ++ } ++ const run = async (endpoint, payload, done) => { ++ try { ++ const result = await save(endpoint, payload); ++ setStatus(done); ++ onSaved?.(result); ++ return result; ++ } catch (error) { ++ setStatus(hostText(error?.message ?? String(error))); ++ return null; ++ } + }; +- const groups = [ +- [ +- [t("Usage"), GaugeIcon, () => actions.openSettings("usage")], +- [t("Connectors"), ConnectorIcon, () => actions.openConnectors()], +- [t("Automation tasks"), ClockIcon, () => actions.selectPanel("schedules")], +- [t("Bot settings"), GearIcon, () => actions.openSettings("general")] +- ], +- [ +- [t("Switch to classic Agent mode"), SwitchIcon, () => actions.setSurface("agent")] +- ] +- ]; +- return (0, import_react8.createElement)( +- import_react8.Fragment, +- null, +- (0, import_react8.createElement)( +- "button", +- { ref: button, type: "button", className: "bt-account", "aria-label": t("Account"), "aria-haspopup": "menu", "aria-expanded": open, onClick: toggle }, +- (0, import_react8.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react8.createElement)(BotMark, { look: MAIN_LOOK, size: 24 })) ++ return (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-panel", "data-panel": "project-settings" }, ++ (0, import_react23.createElement)("h3", null, t("Project settings")), ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-field" }, ++ (0, import_react23.createElement)("label", { htmlFor: "bt-project-member-id" }, t("Bind a member to this Project")), ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-row-actions" }, ++ (0, import_react23.createElement)( ++ "select", ++ { "aria-label": t("Member kind"), value: kind, onChange: (event) => setKind(event.target.value) }, ++ (0, import_react23.createElement)("option", { value: "bot" }, t("Bot")), ++ (0, import_react23.createElement)("option", { value: "group" }, t("Group")) ++ ), ++ (0, import_react23.createElement)("input", { id: "bt-project-member-id", value: memberId, placeholder: t("Member id"), onChange: (event) => setMemberId(event.target.value) }), ++ (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-bind", onClick: () => run("project-bind", { kind, id: text(memberId), projectId: id }, t("Member bound.")) }, t("Bind")), ++ (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-unbind", onClick: () => run("project-bind", { kind, id: text(memberId), projectId: null }, t("Member unbound.")) }, t("Unbind")) ++ ) ++ ), ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-field" }, ++ (0, import_react23.createElement)("label", null, t("Project Assistant")), ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-row-actions" }, ++ (0, import_react23.createElement)("label", null, (0, import_react23.createElement)("input", { type: "checkbox", "data-action": "assistant-off", checked: assistantOff, onChange: (event) => setAssistantOff(event.target.checked) }), " ", t("Pause the daily digest")), ++ (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-assistant-save", onClick: () => run("project-assistant-owner", { id, settings: { off: assistantOff === true } }, t("Assistant settings saved.")) }, t("Save")) ++ ) + ), +- open && box ? (0, import_react_dom3.createPortal)((0, import_react8.createElement)( ++ (0, import_react23.createElement)( + "div", +- { className: "bt-menu bt-menu-up bt-account-menu", role: "menu", "aria-label": t("Account"), style: box }, +- groups.map((group, index) => (0, import_react8.createElement)( +- import_react8.Fragment, +- { key: index }, +- index > 0 ? (0, import_react8.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, +- group.map(([label, Icon, run, hint]) => (0, import_react8.createElement)("button", { +- key: label, ++ { className: "bt-project-field" }, ++ // The host knows two memory kinds; the free text the panel takes is recorded as a decision, ++ // never as a third kind the host would refuse (#1820). ++ (0, import_react23.createElement)("label", { htmlFor: "bt-project-note" }, t("Add to the assistant memory")), ++ (0, import_react23.createElement)("textarea", { id: "bt-project-note", value: note, onChange: (event) => setNote(event.target.value) }), ++ (0, import_react23.createElement)("div", { className: "bt-project-count", "data-role": "project-memory-count", "data-over": noteOver ? "true" : "false" }, `${noteLength}/${MEMORY_TEXT_MAX}`), ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-row-actions" }, ++ (0, import_react23.createElement)("button", { + type: "button", +- role: "menuitem", ++ className: "bt-soft bt-soft-sm", ++ "data-action": "project-memory-save", ++ disabled: noteSaveDisabled, ++ // A disabled button draws no click, but the guard is what a keyboard or a stale tree ++ // could still reach: neither state sends a request or writes anything. + onClick: () => { +- setOpen(false); +- void Promise.resolve(run()).catch((error) => actions.reportError(error, "menu")); ++ if (noteSaveDisabled) return; ++ run("project-memory-write", { id, kind: "decision", text: text(note) }, t("Memory saved.")); + } +- }, (0, import_react8.createElement)(Icon), (0, import_react8.createElement)("span", { className: "bt-menu-label" }, label), hint ? (0, import_react8.createElement)("span", { className: "bt-menu-hint" }, hint) : null)) ++ }, t("Save memory")) ++ ) ++ ), ++ (0, import_react23.createElement)("div", { className: "bt-project-status-line", role: "status" }, status), ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-row-actions" }, ++ (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) ++ ) ++ ); ++} ++function ProjectMembersPanel({ project, rows, onClose } = {}) { ++ const owners = []; ++ const add = (id) => { ++ const clean = text(id); ++ if (clean !== "" && !owners.includes(clean)) owners.push(clean); ++ }; ++ add(project?.ownerUserId); ++ for (const id of Array.isArray(project?.ownerUserIds) ? project.ownerUserIds : []) add(id); ++ const boardMembers = []; ++ for (const row of Array.isArray(rows) ? rows : []) { ++ const name = text(row?.assignee); ++ if (name !== "" && !boardMembers.includes(name)) boardMembers.push(name); ++ } ++ const chief = text(project?.chief?.botId); ++ return (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-panel", "data-panel": "project-members" }, ++ (0, import_react23.createElement)("h3", null, t("Members")), ++ (0, import_react23.createElement)( ++ "ul", ++ { className: "bt-project-members" }, ++ owners.map((owner) => (0, import_react23.createElement)( ++ "li", ++ { key: `owner:${owner}`, className: "bt-project-member", "data-member-role": "owner", "data-member-id": owner }, ++ (0, import_react23.createElement)("span", null, `@${owner}`), ++ (0, import_react23.createElement)("span", { className: "bt-project-member-kind" }, t("Owner")) ++ )), ++ chief === "" ? null : (0, import_react23.createElement)( ++ "li", ++ { key: `chief:${chief}`, className: "bt-project-member", "data-member-role": "chief", "data-member-id": chief }, ++ (0, import_react23.createElement)("span", null, t("Project Chief")), ++ (0, import_react23.createElement)("span", { className: "bt-project-member-kind" }, t("Chief of this Project")) ++ ), ++ boardMembers.map((name) => (0, import_react23.createElement)( ++ "li", ++ { key: `board:${name}`, className: "bt-project-member", "data-member-role": "board", "data-member-id": name }, ++ (0, import_react23.createElement)("span", null, `@${name}`), ++ (0, import_react23.createElement)("span", { className: "bt-project-member-kind" }, t("On the board")) + )) +- ), document.body) : null ++ ), ++ owners.length === 0 && boardMembers.length === 0 && chief === "" ? (0, import_react23.createElement)("div", { className: "bt-project-empty" }, t("No member is named yet.")) : null, ++ (0, import_react23.createElement)("p", { className: "bt-project-note" }, t("Member management is not part of this slice; owners and the members their cards name are listed here.")), ++ (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-row-actions" }, ++ (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) + ) -+ ); + ); } --function waveBytes(samples, rate = 16e3) { -- const bytes = new Uint8Array(44 + samples.length * 2); -- const view = new DataView(bytes.buffer); -- const ascii = (at, text) => { -- for (let index = 0; index < text.length; index += 1) bytes[at + index] = text.charCodeAt(index); -- }; -- ascii(0, "RIFF"); -- view.setUint32(4, 36 + samples.length * 2, true); -- ascii(8, "WAVEfmt "); -- view.setUint32(16, 16, true); -- view.setUint16(20, 1, true); -- view.setUint16(22, 1, true); -- view.setUint32(24, rate, true); -- view.setUint32(28, rate * 2, true); -- view.setUint16(32, 2, true); -- view.setUint16(34, 16, true); -- ascii(36, "data"); -- view.setUint32(40, samples.length * 2, true); -- samples.forEach((sample, index) => { -- const value = Math.max(-1, Math.min(1, sample)); -- view.setInt16(44 + index * 2, value < 0 ? Math.round(value * 32768) : Math.round(value * 32767), true); +-function useLandOnMainBot(roster, useSessions, actions) { +- const mainView = useSessions((list) => { +- const row = Object.values(list.byId).find((session) => (session?.retainedBy?.mainView ?? 0) > 0); +- return row ? `${row.id}|${row.blank ? 1 : 0}` : ""; - }); -- return bytes; -+function ProjectRunningTable({ view, onOpen }) { -+ if (view.running.length === 0) return (0, import_react21.createElement)("section", { className: "bt-project-running", "data-running": "0" }, (0, import_react21.createElement)("h4", null, t("Running tasks")), (0, import_react21.createElement)("div", { className: "bt-project-empty" }, t("Nothing is running."))); -+ return (0, import_react21.createElement)( -+ "section", -+ { className: "bt-project-running", "data-running": String(view.running.length) }, -+ (0, import_react21.createElement)("h4", null, t("Running tasks")), -+ (0, import_react21.createElement)( +- const lastBot = (0, import_react8.useRef)(null); +- (0, import_react8.useEffect)(() => { +- if (!roster.ready || !roster.mainBotId) return void 0; +- const [id, blank3] = mainView.split("|"); +- const bot = id === "" ? void 0 : roster.byId[id]; +- if (bot !== void 0) { +- lastBot.current = { botId: bot.id, sessionId: id }; +- if (currentPart(bot) !== id) actions.landOn(bot.id); ++async function readProjectBoard(read, wanted, knownTeam) { ++ const listing = await read("projects"); ++ const projects = Array.isArray(listing?.projects) ? listing.projects : []; ++ const project = wanted === "" ? projects[0] : projects.find((item) => item.id === wanted); ++ if (project === void 0) return { project: null, rows: [], done: [], canManage: false, tasks: [], team: { rows: [] }, teamFresh: true }; ++ const zone = typeof Intl === "undefined" || typeof Intl.DateTimeFormat !== "function" ? void 0 : Intl.DateTimeFormat().resolvedOptions().timeZone; ++ const [record, board, taskList, dossier] = await Promise.all([ ++ read("project-read", { id: project.id }), ++ read("project-board", { id: project.id, timeZone: zone }), ++ read("tasks", {}), ++ // #1910: #1902 turned this failure into an ordinary empty team, which the poll then served for ++ // the rest of the open. Keep the two answers apart: a refusal is not fresh, so nothing is cached ++ // and the next tick asks again, while a real `{ rows: [] }` answer is fresh and frozen as usual. ++ knownTeam !== void 0 ? { answer: knownTeam, fresh: true } : read("project-team", { id: project.id }).then( ++ (answer) => ({ answer, fresh: answer !== null && typeof answer === "object" }), ++ () => ({ answer: null, fresh: false }) ++ ) ++ ]); ++ const tasks = Array.isArray(taskList) ? taskList : taskList?.tasks ?? []; ++ const queues = { waiting: board?.waiting, inflight: board?.inflight, blocked: board?.blocked, counts: board?.counts ?? null }; ++ const base = record?.project ?? project; ++ const withRole = { ...base, role: project.role ?? null, choices: Array.isArray(project.choices) ? project.choices : [] }; ++ return { ++ project: withRole, ++ assistantMine: record?.assistantMine ?? null, ++ rows: board?.tasks ?? [], ++ done: board?.done ?? [], ++ canManage: record?.canManage === true, ++ tasks, ++ decisions: board?.decisions, ++ meetings: board?.meetings, ++ queues, ++ metrics: board?.metrics ?? null, ++ team: dossier.answer !== null && typeof dossier.answer === "object" ? dossier.answer : { rows: [] }, ++ teamFresh: dossier.fresh ++ }; ++} ++var PROJECT_BOARD_POLL_MS = 5e3; ++var boardPollPaused = () => typeof document !== "undefined" && document.visibilityState === "hidden" || typeof window !== "undefined" && !window.location.hash.startsWith("#project"); ++function ProjectBoardOverlay({ actions, call: request, useRoster } = {}) { ++ const read = request ?? call; ++ const present = useProjectPresent(); ++ const roster = typeof useRoster === "function" ? useRoster((value) => value) : void 0; ++ const locked = lockedWindow(roster); ++ const [state, setState] = (0, import_react23.useState)(null); ++ const [panel, setPanel] = (0, import_react23.useState)(null); ++ const [dossier, setDossier] = (0, import_react23.useState)(null); ++ const team = (0, import_react23.useRef)(void 0); ++ const teamGen = (0, import_react23.useRef)(0); ++ const [hash, setHash] = (0, import_react23.useState)(() => typeof window === "undefined" ? "" : window.location.hash); ++ const close = (0, import_react23.useCallback)(() => { ++ if (typeof window !== "undefined") window.location.hash = ""; ++ setPanel(null); ++ setState(null); ++ }, []); ++ (0, import_react23.useEffect)(() => { ++ if (typeof window === "undefined") return void 0; ++ const onKey = (event) => { ++ if (event.key !== "Escape") return; ++ if (panel !== null) setPanel(null); ++ else close(); ++ }; ++ window.addEventListener("keydown", onKey); ++ return () => window.removeEventListener("keydown", onKey); ++ }, [panel, close]); ++ (0, import_react23.useEffect)(() => { ++ if (typeof window === "undefined") return void 0; ++ const sync = () => setHash(window.location.hash); ++ window.addEventListener("hashchange", sync); ++ sync(); ++ return () => window.removeEventListener("hashchange", sync); ++ }, []); ++ (0, import_react23.useEffect)(() => { ++ if (typeof window === "undefined") return void 0; ++ if (!present || !hash.startsWith("#project")) { ++ setState(null); + return void 0; + } +- if (id !== "" && (roster.roomsById[id] || (actions.isAgentSession?.(id) ?? roster.agentOf[id] !== void 0) || blank3 !== "1")) { +- lastBot.current = null; +- return void 0; ++ const wanted = hash.slice("#project".length).replace(/^=/, ""); ++ let gone = false; ++ team.current = void 0; ++ teamGen.current = 0; ++ const loadBoard = () => readProjectBoard(read, wanted, team.current); ++ const refresh = async (first) => { ++ const gen = teamGen.current; ++ try { ++ const next = await loadBoard(); ++ if (!gone) { ++ const newer = teamGen.current !== gen; ++ if (next.teamFresh !== false && !newer) team.current = next.team; ++ setState(newer && team.current !== void 0 ? { ...next, team: team.current } : next); ++ } ++ } catch { ++ if (!gone && first) setState({ project: null, rows: [], canManage: false, tasks: [] }); ++ } ++ }; ++ void refresh(true); ++ const timer = setInterval(() => { ++ if (!boardPollPaused()) void refresh(false); ++ }, PROJECT_BOARD_POLL_MS); ++ return () => { ++ gone = true; ++ clearInterval(timer); ++ }; ++ }, [hash, present]); ++ const openDossier = async (value) => { ++ setDossier(value); ++ setPanel("dossier"); ++ const id = state?.project?.id; ++ if (typeof id !== "string" || id === "") return; ++ const gen = teamGen.current + 1; ++ teamGen.current = gen; ++ try { ++ const answer = await read("project-team", { id }); ++ if (teamGen.current !== gen || answer === null || typeof answer !== "object") return; ++ team.current = answer; ++ setState((previous) => previous === null ? previous : { ...previous, team: answer }); ++ } catch { + } +- const last = lastBot.current; +- const timer = setTimeout(() => actions.landOn(roster.mainBotId, last), last ? 0 : 400); +- return () => clearTimeout(timer); +- }, [mainView, roster]); +-} +-function FooterAccount(props) { +- const seated = props.useUi((value) => value.accountSeated === true); +- if (seated) return null; +- return (0, import_react8.createElement)("span", { className: "bt-foot-account" }, (0, import_react8.createElement)(AccountLauncher, { ...props, seat: false })); +-} +-function BotReturn({ wide, useSurface, actions }) { +- const mode = useSurface((value) => value.mode); +- if (mode !== "agent") return null; +- return (0, import_react8.createElement)( +- "button", +- { type: "button", className: "bt-return", "aria-label": t("DS Bot"), title: t("DS Bot"), onClick: () => actions.setSurface("bot") }, +- (0, import_react8.createElement)(BotMark, { look: MAIN_LOOK, size: 20 }), +- wide ? (0, import_react8.createElement)("span", { className: "bt-return-name" }, t("DS Bot")) : null +- ); +-} +-var RETURN_CSS = ` +-.bt-return{display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;padding:0 14px;border:0;border-radius:999px;background:none;color:inherit;font:inherit;font-size:14px;line-height:20px;cursor:pointer;transition:background-color .12s ease} +-.bt-return:hover{background:rgba(127,127,127,.14)} +-.bt-return:active{transform:scale(.96)} +-.bt-return .bt-mark{display:inline-flex;flex:none;line-height:0} +-.bt-return .bt-mark svg{width:100%;height:100%;overflow:visible} +-/* Shell styles carry --bt-ink-deepseek and Agent mode withdraws them; pin it here. */ +-.bt-return .bt-mark{--bt-ink-deepseek:#4D6BFE} +-.bt-return-name{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-`; +-function BrandMark({ size = 24 }) { +- return (0, import_react8.createElement)("span", { className: "bt-brand-whale" }, (0, import_react8.createElement)(BotMark, { look: MAIN_LOOK, size })); +-} +-function BrandName() { +- return (0, import_react8.createElement)("span", { style: { fontWeight: 600, fontSize: 14 } }, "DS Bot"); ++ }; ++ if (state === null || !present) return null; ++ return (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-overlay" }, ++ (0, import_react23.createElement)("div", { className: "bt-scrim", onClick: close }), ++ (0, import_react23.createElement)( + "div", -+ { className: "bt-project-running-head" }, -+ (0, import_react21.createElement)("span", null, t("Task")), -+ (0, import_react21.createElement)("span", null, t("Status")), -+ (0, import_react21.createElement)("span", null, t("Who")), -+ (0, import_react21.createElement)("span", null, t("Claimed for")), -+ (0, import_react21.createElement)("span", null, t("Source")), -+ (0, import_react21.createElement)("span", null, t("Last activity")) -+ ), -+ view.running.map((row) => { -+ const open = row.board === null ? void 0 : () => onOpen?.(row.board); -+ return (0, import_react21.createElement)( ++ { className: "bt-mem bt-project-dialog", role: "dialog", "aria-modal": true, "aria-label": t("Project board") }, ++ (0, import_react23.createElement)( + "div", -+ { -+ key: row.key, -+ className: "bt-project-running-row", -+ "data-task-id": row.id, -+ "data-overdue": row.overdue ? "true" : "false", -+ role: open === void 0 ? void 0 : "button", -+ tabIndex: open === void 0 ? void 0 : 0, -+ onClick: open -+ }, -+ (0, import_react21.createElement)("span", { className: "bt-project-running-title" }, row.title), -+ (0, import_react21.createElement)("span", { className: "bt-project-running-status" }, t(row.status)), -+ (0, import_react21.createElement)("span", null, row.who ?? METRIC_DASH), -+ (0, import_react21.createElement)("span", null, metricText("since", row.sinceMs)), -+ (0, import_react21.createElement)("span", null, row.source === null ? METRIC_DASH : t(SOURCE_LABELS[row.source] ?? row.source)), -+ (0, import_react21.createElement)("span", null, row.lastActivityAt === null ? METRIC_DASH : new Date(row.lastActivityAt).toLocaleString(dateLocale())) -+ ); -+ }) -+ ); - } --function base64Of(bytes) { -- let text = ""; -- for (let index = 0; index < bytes.length; index += 32768) text += String.fromCharCode(...bytes.subarray(index, index + 32768)); -- return btoa(text); -+function ProjectQueueGroups({ view, onOpen }) { -+ return view.queues.map((entry) => (0, import_react21.createElement)( -+ "section", -+ { key: `queue:${entry.group}`, className: "bt-project-group", "data-queue": entry.group }, -+ (0, import_react21.createElement)("h4", null, t(entry.label)), -+ entry.items.map((row) => { -+ const open = row.board === null ? void 0 : () => onOpen?.(row.board); -+ const note = entry.group === "waiting" ? (0, import_react21.createElement)("span", { className: "bt-project-wait" }, [row.role === null ? null : (0, import_react21.createElement)("span", { key: "role", className: "bt-project-role" }, row.role), waitedLabel(row.waitedMs) === null ? null : ` · ${waitedLabel(row.waitedMs)}`]) : entry.group === "inflight" ? (0, import_react21.createElement)("span", { className: "bt-project-state" }, row.holder === null ? t(row.state) : `${row.holder} · ${t(row.state)}`) : (0, import_react21.createElement)("span", { className: "bt-project-reason" }, row.reason === null ? null : waitedLabel(row.waitedMs) === null ? row.reason : `${row.reason} · ${waitedLabel(row.waitedMs)}`); -+ return (0, import_react21.createElement)( ++ { className: "bt-mem-head" }, ++ (0, import_react23.createElement)("h2", {}, t("Project board")), ++ (0, import_react23.createElement)("span", { className: "bt-mem-head-gap" }), ++ (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-project-close", autoFocus: true, onClick: close }, t("Close")) ++ ), ++ (0, import_react23.createElement)( + "div", -+ { -+ key: row.key, -+ className: "bt-project-row", -+ "data-task-id": row.id, -+ "data-state": row.state ?? void 0, -+ role: open === void 0 ? void 0 : "button", -+ tabIndex: open === void 0 ? void 0 : 0, -+ onClick: open, -+ onKeyDown: open === void 0 ? void 0 : (event) => { -+ if (event.key === "Enter" || event.key === " ") open(); ++ { className: "bt-project-body" }, ++ state.project === null ? (0, import_react23.createElement)( ++ "div", ++ { className: "bt-project-empty" }, ++ locked ? null : (0, import_react23.createElement)("p", null, t("No Project yet — create one.")), ++ locked ? (0, import_react23.createElement)("p", null, t("No Project yet.")) : null, ++ locked ? readOnlyLine(import_react23.createElement, roster, actions, { key: "read-only" }) : null, ++ (0, import_react23.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { ++ close(); ++ actions?.openSettings?.("projects"); ++ } }, t("Open Projects in Settings")) ++ ) : panel === "dossier" ? (0, import_react23.createElement)(ProjectDossierPanel, { ++ row: dossierRowOf(state.team, dossier?.botId), ++ label: dossier?.label ?? "", ++ onClose: () => setPanel(null), ++ onOpenBot: (id) => { ++ close(); ++ actions?.openSession?.(id); + } -+ }, -+ (0, import_react21.createElement)( -+ "span", -+ { className: "bt-project-title-wrap" }, -+ (0, import_react21.createElement)("span", { className: "bt-project-title" }, row.title ?? `#${row.id}`) -+ ), -+ note -+ ); -+ }) -+ )); ++ }) : panel === "settings" ? (0, import_react23.createElement)(ProjectSettingsPanel, { project: state.project, assistantMine: state.assistantMine, actions, call: read, locked, readOnly: roster?.readOnly, onClose: () => setPanel(null) }) : panel === "members" ? (0, import_react23.createElement)(ProjectMembersPanel, { project: state.project, rows: state.rows, onClose: () => setPanel(null) }) : (0, import_react23.createElement)(ProjectBoardPane, { ++ project: state.project, ++ rows: state.rows, ++ done: state.done, ++ canManage: state.canManage, ++ tasks: state.tasks, ++ decisions: state.decisions, ++ meetings: state.meetings, ++ queues: state.queues, ++ metrics: state.metrics, ++ team: state.team, ++ // #2041: a decision row opens through the same channel read the page polls with. ++ call: read, ++ onSettings: () => setPanel("settings"), ++ onMembers: () => setPanel("members"), ++ // #1864: a team row's Dossier control opens the read-only panel, fed by the same read. ++ onOpenDossier: (value) => { ++ void openDossier(value); ++ }, ++ // #1860: a team row opens that Bot's chat. The board is a modal over the conversation, ++ // so it closes first — otherwise the chat opens behind it. ++ onOpenBot: (id) => { ++ close(); ++ actions?.openSession?.(id); ++ }, ++ // The task's own board is where a row leads: the Tasks dialog reads `#task=` on mount and ++ // lands on that Bot or group. Nothing here re-decides which board that is. ++ onOpen: (board) => { ++ if (typeof window !== "undefined") window.location.hash = `#task=${board.kind}:${board.id}`; ++ actions?.openBoard?.(); ++ setState(null); ++ } ++ }) ++ ) ++ ) ++ ); + } +-var SIDEBAR_CSS = ` +-.bt-side-top .bt-brand{cursor:default;padding-left:6px} +-.bt-side-top .bt-brand:hover{background:none} +-.bt-brand .bt-mark{flex:none} +-.bt-pin{flex:none;display:inline-flex;color:var(--bt-ink-3)} +-.bt-rail .bt-row{position:relative} +-.bt-rail .bt-pin{position:absolute;top:3px;left:calc(50% + 12px)} +-.bt-side .bt-read-only{margin:4px 8px 6px;padding:8px 10px;border-radius:10px;background:var(--bt-hover);font-size:12px;line-height:1.45;text-align:left} +-[class*="_footArea"]:has(.bt-foot-account){display:flex!important;flex-direction:row!important;align-items:center;gap:6px} +-[class*="_footArea"]:has(.bt-foot-account)>[class*="_footerActions"],[class*="_footArea"]:has(.bt-foot-account)>[class*="_footerActions"]>div{display:contents!important} +-.bt-foot-account{order:-1;flex:none;display:inline-flex} +-[class*="_footArea"]:has(.bt-foot-account) .bt-connect-foot{order:0;flex:1 1 auto;min-width:0;width:auto} +-[class*="_footArea"]:has(.bt-foot-account)>[class*="_settingsArea"]{order:1;flex:none} +-[class*="_footArea"]:has(.bt-foot-account)>[class*="_settingsArea"] button[class*="_trigger"] [class*="_label"]{display:none!important} +- +-/* The update cloud springs in when a newer DS Bot shows up; its arrow drops in a +- loop while the install runs. */ +-.bt-round.bt-update{position:relative;color:var(--bt-accent,#4D6BFE);animation:bt-update-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} +-.bt-round.bt-update svg{width:17px;height:17px} +-.bt-round.bt-update[data-phase=installed]{color:var(--bt-ink-2)} +-@keyframes bt-update-in{from{opacity:0;transform:scale(.6);filter:blur(4px)}} +-.bt-update[data-phase=installing] .bt-cloud-arrow{animation:bt-cloud-drop 1.1s cubic-bezier(.45,0,.55,1) infinite} +-@keyframes bt-cloud-drop{0%{transform:translateY(-3px);opacity:0}35%{opacity:1}70%{transform:translateY(1px);opacity:1}100%{transform:translateY(2px);opacity:0}} +-.bt-update-dot{position:absolute;top:6px;right:6px;width:7px;height:7px;border-radius:50%;background:#E5484D;box-shadow:0 0 0 1.5px var(--bt-sidebar)} +-.bt-update-pop{position:fixed;z-index:60;width:280px;padding:14px 14px 12px;border-radius:14px;background:var(--bt-main);border:.5px solid var(--bt-line-2);box-shadow:0 10px 20px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);color:var(--bt-ink);box-sizing:border-box;transform-origin:top left;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",system-ui,sans-serif;animation:bt-update-pop ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} +-@keyframes bt-update-pop{from{opacity:0;transform:scale(.96);filter:blur(4px)}} +-.bt-update-title{font-size:14px;line-height:20px;font-weight:600} +-.bt-update-text{margin-top:2px;font-size:12.5px;line-height:18px;color:var(--bt-ink-2)} +-.bt-update-error{margin-top:8px;font-size:12px;line-height:17px;color:#c21d2e;overflow-wrap:anywhere;max-height:90px;overflow:auto} +-.bt-update-actions{display:flex;align-items:center;justify-content:flex-end;gap:10px;margin-top:12px} +-.bt-update-notes{margin-right:auto;font-size:12.5px;color:var(--bt-ink-2);text-decoration:none} +-.bt-update-notes:hover{color:var(--bt-ink);text-decoration:underline} +-.bt-update-go{height:30px;padding:0 14px;border:0;border-radius:999px;background:var(--bt-accent,#4D6BFE);color:var(--bt-accent-ink,#fff);font:inherit;font-size:13px;font-weight:500;cursor:pointer;transition:opacity .12s ease,transform .12s ease} +-.bt-update-go:hover:not(:disabled){opacity:.9} +-.bt-update-go:active:not(:disabled){transform:scale(.96)} +-.bt-update-go:disabled{opacity:.6;cursor:default} +-.bt-update-dsh:not(:first-child){margin-top:12px;padding-top:12px;border-top:.5px solid var(--bt-line-2)} +-@media (prefers-reduced-motion:reduce){.bt-round.bt-update,.bt-update-pop,.bt-update .bt-cloud-arrow{animation:none}} + +-/* The DSH Agent row and its expanding Session list. The black whale is the +- harness's own mark, so the row reads as "plain dsh" next to the Bot marks. */ +-.bt-agent-ava{flex:none;width:36px;height:36px;border-radius:50%;display:inline-flex;align-items:center;justify-content:center;background:var(--bt-hover);color:var(--bt-ink)} +-.bt-agent-ava.bt-run{animation:bt-agent-pulse 1.4s ease-in-out infinite} +-@keyframes bt-agent-pulse{0%,100%{opacity:1}50%{opacity:.55}} +-.bt-agent-sub{display:grid;grid-template-rows:0fr;transition:grid-template-rows ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing}} +-.bt-agent-sub[data-open]{grid-template-rows:1fr} +-.bt-agent-sub-in{overflow:hidden;min-height:0;margin-left:44px} +-.bt-agent-sub-row{display:flex;align-items:center;gap:8px;width:100%;padding:5px 10px 5px 8px;border:0;border-radius:8px;background:none;color:var(--bt-ink-2);font:inherit;font-size:13px;line-height:20px;text-align:left;cursor:pointer} +-.bt-agent-sub-row:hover{background:var(--bt-hover);color:var(--bt-ink)} +-.bt-agent-sub-row[aria-current=page]{background:var(--bt-hover);color:var(--bt-ink);font-weight:500} +-.bt-agent-sub-title{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-.bt-agent-sub-time{flex:none;font-size:11px;color:var(--bt-ink-3)} +-.bt-agent-new{color:var(--bt-ink-3)} +-.bt-agent-new svg{width:14px;height:14px;flex:none} +-.bt-agent-edit{padding:3px 10px 3px 4px} +-.bt-agent-edit input{width:100%;border:0;border-radius:6px;background:var(--bt-hover);color:var(--bt-ink);font:inherit;font-size:13px;line-height:20px;padding:2px 8px;outline:none;box-shadow:inset 0 0 0 .5px var(--bt-line-2)} +-.bt-agent-sub[data-open] .bt-agent-sub-row{animation:bt-agent-row-in .24s ease both;animation-delay:calc(var(--i, 0)*30ms)} +-@keyframes bt-agent-row-in{from{opacity:0;filter:blur(4px)}to{opacity:1;filter:blur(0)}} +-@media (prefers-reduced-motion:reduce){.bt-agent-sub{transition:none}.bt-agent-sub .bt-agent-sub-row{animation:none}} +-`; ++// src/shared/session-pin.js ++function sessionPinTarget(roster, sessionId) { ++ if (sessionId == null || sessionId === "") return null; ++ return roster?.byId?.[sessionId] ?? roster?.roomsById?.[sessionId] ?? null; ++} ++function canPinSession(roster, sessionId) { ++ if (isLockedRoster(roster)) return false; ++ const entry = sessionPinTarget(roster, sessionId); ++ if (entry == null) return false; ++ if (roster?.byId?.[sessionId]?.remote) return false; ++ if (roster?.mainBotId === sessionId) return false; ++ return true; ++} ++function sessionPinned(roster, sessionId) { ++ return sessionPinTarget(roster, sessionId)?.pinned === true; ++} + + // src/client/header.js +-var import_react9 = require("react"); +-var import_react_dom4 = require("react-dom"); +-var GoArrow = () => (0, import_react9.createElement)("svg", { width: 14, height: 14, viewBox: "-12 -12 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2.2, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react9.createElement)("path", { d: "M-7 0H7M2 -5L7 0L2 5" })); ++var import_react24 = require("react"); ++var import_react_dom6 = require("react-dom"); ++var GoArrow = () => (0, import_react24.createElement)("svg", { width: 14, height: 14, viewBox: "-12 -12 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2.2, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react24.createElement)("path", { d: "M-7 0H7M2 -5L7 0L2 5" })); + var MEMORY_NOTICE_MS = 3200; + var noNews = (select) => select({}); + function useMemoryNotice(ids, useMemoryNews) { + const seen = useMemoryNews((map) => Math.max(0, ...ids.map((id) => map?.[id]?.seen ?? 0))); +- const [shown, setShown] = (0, import_react9.useState)(false); +- (0, import_react9.useEffect)(() => { ++ const [shown, setShown] = (0, import_react24.useState)(false); ++ (0, import_react24.useEffect)(() => { + const left = seen + MEMORY_NOTICE_MS - Date.now(); + setShown(seen > 0 && left > 0); + if (seen === 0 || left <= 0) return void 0; +@@ -5512,19 +5512,132 @@ function useMemoryNotice(ids, useMemoryNews) { + return shown; } --var captureError = (kind, cause) => Object.assign(new Error(kind), { kind, cause }); --async function openCapture() { -- const devices = navigator.mediaDevices; -- if (!devices?.getUserMedia || typeof MediaRecorder === "undefined") throw captureError("unavailable"); -- let stream; -- try { -- stream = await devices.getUserMedia({ audio: { echoCancellation: true, noiseSuppression: true }, video: false }); -- } catch (error) { -- throw captureError(error?.name === "NotAllowedError" ? "blocked" : "failed", error); -- } -- const audio = new AudioContext(); -- const analyser = audio.createAnalyser(); -- analyser.fftSize = 512; -- audio.createMediaStreamSource(stream).connect(analyser); -- const frame = new Float32Array(analyser.fftSize); -- const recorder = new MediaRecorder(stream); -- const chunks = []; -- recorder.ondataavailable = (event) => { -- if (event.data.size > 0) chunks.push(event.data); -+var countText = (value) => value === null ? t("unknown") : String(value); -+function ProjectBoardRecord({ record, projectId, call: call4 }) { -+ const { decisions, meetings } = record; -+ const [open, setOpen] = (0, import_react21.useState)(null); -+ const toggle = (path) => { -+ if (open !== null && open.path === path) { -+ setOpen(null); -+ return; + function MemoryNotice({ shown }) { +- const inner = (0, import_react9.useRef)(null); +- const [width, setWidth] = (0, import_react9.useState)(0); ++ const inner = (0, import_react24.useRef)(null); ++ const [width, setWidth] = (0, import_react24.useState)(0); + const label = t("Memory updated"); +- (0, import_react9.useLayoutEffect)(() => { ++ (0, import_react24.useLayoutEffect)(() => { + if (shown) setWidth(inner.current?.scrollWidth ?? 0); + }, [label, shown]); +- return (0, import_react9.createElement)( ++ return (0, import_react24.createElement)( + "span", + { className: "bt-pill-mem", "aria-hidden": true, style: { "--bt-mem-w": `${width}px` } }, +- (0, import_react9.createElement)("span", { className: "bt-pill-mem-in", ref: inner }, (0, import_react9.createElement)("span", { className: "bt-pill-mem-ico" }, (0, import_react9.createElement)(MemoryIcon)), label) ++ (0, import_react24.createElement)("span", { className: "bt-pill-mem-in", ref: inner }, (0, import_react24.createElement)("span", { className: "bt-pill-mem-ico" }, (0, import_react24.createElement)(MemoryIcon)), label) ++ ); ++} ++function SessionOverflow({ sessionId, roster, actions, unread }) { ++ const [open, setOpen] = (0, import_react24.useState)(false); ++ const [note, setNote] = (0, import_react24.useState)(""); ++ const button = (0, import_react24.useRef)(null); ++ const menu = (0, import_react24.useRef)(null); ++ const [box, setBox] = (0, import_react24.useState)(null); ++ const bot = roster.byId?.[sessionId]; ++ const targetId = unreadEntryId(roster, sessionId); ++ const marked = isManuallyUnread(unread, targetId); ++ const social = typeof globalThis !== "undefined" ? globalThis.__flybot__?.social : void 0; ++ const canInvite = Boolean(bot && !bot.remote && typeof social?.createInvite === "function" && social.canInvite?.(bot.id) !== false); ++ (0, import_react24.useEffect)(() => { ++ if (!open) return void 0; ++ const onDown = (event) => { ++ if ([button.current, menu.current].some((node) => node?.contains(event.target))) return; ++ setOpen(false); ++ }; ++ const onKey = (event) => { ++ if (event.key === "Escape") { ++ event.stopPropagation(); ++ setOpen(false); ++ button.current?.focus(); ++ } ++ }; ++ window.addEventListener("mousedown", onDown); ++ window.addEventListener("keydown", onKey, true); ++ return () => { ++ window.removeEventListener("mousedown", onDown); ++ window.removeEventListener("keydown", onKey, true); ++ }; ++ }, [open]); ++ (0, import_react24.useEffect)(() => { ++ if (!note) return void 0; ++ const timer = setTimeout(() => setNote(""), 2400); ++ return () => clearTimeout(timer); ++ }, [note]); ++ const toggle = () => { ++ const rect = button.current?.getBoundingClientRect(); ++ if (rect) setBox({ right: window.innerWidth - rect.right, top: rect.bottom + 6 }); ++ setOpen((value) => !value); ++ setNote(""); ++ }; ++ const openDetails = () => { ++ setOpen(false); ++ actions.toggleDetails(sessionId); ++ }; ++ const copyInvite = async () => { ++ try { ++ const invite = await social.createInvite(bot.id); ++ const link = invite?.link ?? invite?.url ?? invite?.text; ++ if (!link) throw new Error("missing link"); ++ await navigator.clipboard.writeText(link); ++ setNote(t("Invite link copied")); ++ } catch { ++ setNote(t("Could not copy the invite link")); + } -+ if (typeof call4 !== "function") return; -+ setOpen({ path, answer: null }); -+ const settle = (answer) => setOpen((current) => current !== null && current.path === path ? { path, answer } : current); -+ call4("project-decision", { id: projectId, path }).then(settle, (error) => settle({ ok: false, reason: String(error?.message ?? error) })); - }; -- recorder.start(); -- let closed = false; -- const close = () => { -- if (closed) return; -- closed = true; -- if (recorder.state !== "inactive") recorder.stop(); -- stream.getTracks().forEach((track) => track.stop()); -- void audio.close().catch(() => { -- }); -+ const decisionBody = (file) => { -+ if (open === null || open.path !== file.path) return null; -+ const answer = open.answer; -+ if (answer === null) return (0, import_react21.createElement)("div", { className: "bt-project-decision-text", "data-open-decision": file.path }, t("Reading the decision…")); -+ if (answer.ok !== true) return (0, import_react21.createElement)("div", { className: "bt-project-decision-text bt-project-decision-refusal", "data-open-decision": file.path, "data-refused": "true" }, text(answer.reason) || t("not listed")); -+ return (0, import_react21.createElement)("pre", { className: "bt-project-decision-text", "data-open-decision": file.path }, typeof answer.text === "string" ? answer.text : ""); + }; -+ const decisionRows = decisions.files.map((file) => (0, import_react21.createElement)( -+ "div", -+ { key: file.key, className: "bt-project-decision-wrap" }, -+ (0, import_react21.createElement)( -+ "button", -+ { ++ return (0, import_react24.createElement)( ++ import_react24.Fragment, ++ null, ++ (0, import_react24.createElement)( ++ "div", ++ { className: "bt-head-actions" }, ++ typeof actions?.openPalette === "function" ? (0, import_react24.createElement)("button", { + type: "button", -+ className: "bt-project-decision", -+ "data-path": file.path, -+ "data-sha256": file.sha256, -+ "data-open": open !== null && open.path === file.path ? "true" : void 0, -+ "aria-expanded": open !== null && open.path === file.path ? "true" : "false", -+ onClick: () => toggle(file.path) -+ }, -+ (0, import_react21.createElement)("span", { className: "bt-project-date" }, file.date), -+ (0, import_react21.createElement)("span", { className: "bt-project-title" }, file.title === "" ? file.name : file.title), -+ (0, import_react21.createElement)("span", { className: "bt-project-hash", title: file.sha256 }, file.shortHash) ++ className: "bt-head-more", ++ "aria-label": t("Search"), ++ title: t("Search"), ++ onClick: () => actions.openPalette() ++ }, (0, import_react24.createElement)(SearchIcon)) : null, ++ (0, import_react24.createElement)("button", { ++ ref: button, ++ type: "button", ++ className: "bt-head-more", ++ "aria-label": t("Conversation settings"), ++ title: t("Conversation settings"), ++ "aria-haspopup": "menu", ++ "aria-expanded": open, ++ onClick: toggle ++ }, (0, import_react24.createElement)(DotsIcon)) + ), -+ decisionBody(file) -+ )); -+ const recipientText = (list) => list.length === 0 ? null : list.map((name) => `@${name}`).join(", "); -+ const proxyText = (meeting) => meeting.participants.filter((participant) => participant.speaksFor !== null).map((participant) => `${participant.name} ${t("for {user}", { user: participant.speaksFor })}`).join(", "); -+ const proxyRow = (meeting) => proxyText(meeting) === "" ? null : (0, import_react21.createElement)("span", { className: "bt-project-speaks-for", "data-speaks-for": meeting.participants.filter((p) => p.speaksFor !== null).map((p) => p.speaksFor).join(", ") }, proxyText(meeting)); -+ const levelOf = (meeting) => (0, import_react21.createElement)("span", { className: "bt-project-level", "data-level": meeting.level }, t(meeting.level)); -+ const decidedRows = meetings.decided.map((meeting) => (0, import_react21.createElement)( -+ "div", -+ { key: meeting.key, className: "bt-project-meeting", "data-status": "decided" }, -+ (0, import_react21.createElement)("span", { className: "bt-project-date" }, meeting.date), -+ (0, import_react21.createElement)("span", { className: "bt-project-title" }, meeting.question), -+ meeting.owner === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-owner" }, `@${meeting.owner}`), -+ proxyRow(meeting), -+ // A decided meeting whose file is gone still reads as decided; the missing path says so -+ // instead of the row disappearing with the file. -+ meeting.path === "" ? (0, import_react21.createElement)("span", { className: "bt-project-missing" }, "decision file gone") : (0, import_react21.createElement)("span", { className: "bt-project-path" }, meeting.path) -+ )); -+ const pendingRows = meetings.pending.map((meeting) => (0, import_react21.createElement)( -+ "div", -+ { key: meeting.key, className: "bt-project-meeting", "data-status": meeting.status, "data-level": meeting.level }, -+ (0, import_react21.createElement)("span", { className: "bt-project-date" }, meeting.date), -+ (0, import_react21.createElement)("span", { className: "bt-project-title" }, meeting.blockingQuestion === null ? meeting.question : meeting.blockingQuestion), -+ levelOf(meeting), -+ recipientText(meeting.recipients) === null ? null : (0, import_react21.createElement)("span", { className: "bt-project-recipients" }, recipientText(meeting.recipients)), -+ meeting.advance.allowed ? null : (0, import_react21.createElement)("span", { className: "bt-project-paused" }, meeting.advance.reason), -+ proxyRow(meeting), -+ (0, import_react21.createElement)("span", { className: "bt-project-status" }, meeting.status) -+ )); -+ const moreLine = (hidden, key) => hidden > 0 ? (0, import_react21.createElement)("div", { key, className: "bt-project-more" }, t("{count} more not shown", { count: hidden })) : null; -+ const emptyLine = (state) => text(state?.host) !== "" ? hostText(state.host) : t(state?.key ?? "", state?.params); -+ return (0, import_react21.createElement)( -+ "section", -+ { -+ className: "bt-project-record", -+ // `data-decisions` stays "rows drawn"; the total rides beside it so the view can be asserted. -+ "data-decisions": String(decisions.count), -+ ...decisions.total === null ? {} : { "data-decisions-total": String(decisions.total) }, -+ "data-meetings": String(meetings.count) -+ }, -+ (0, import_react21.createElement)("h4", null, t("Decisions")), -+ decisions.empty ? (0, import_react21.createElement)("div", { className: "bt-project-empty bt-project-record-empty" }, emptyLine(decisions.emptyText)) : decisionRows, -+ moreLine(decisions.hidden, "decisions-more"), -+ (0, import_react21.createElement)("h4", null, t("Meetings")), -+ meetings.empty ? (0, import_react21.createElement)("div", { className: "bt-project-empty bt-project-record-empty" }, emptyLine(meetings.emptyText)) : decidedRows, -+ moreLine(meetings.decidedHidden, "decided-more"), -+ meetings.pending.length === 0 ? null : (0, import_react21.createElement)("h5", null, t("Not decided")), -+ meetings.pending.length === 0 ? null : pendingRows, -+ moreLine(meetings.pendingHidden, "pending-more") -+ ); -+} -+var botIdOf = (entry) => entry !== null && typeof entry === "object" ? text(entry.botId) : ""; -+var idList = (value) => Array.isArray(value) ? value.map((id) => text(id)).filter((id) => id !== "") : []; -+function projectTeamView(project) { -+ const stored = project?.roles !== null && typeof project?.roles === "object" ? project.roles : {}; -+ const owner = []; -+ const addOwner = (id) => { -+ const clean = text(id); -+ if (clean !== "" && !owner.includes(clean)) owner.push(clean); - }; -+ addOwner(project?.ownerUserId); -+ for (const id of idList(project?.ownerUserIds)) addOwner(id); -+ const maintainers = idList(stored.maintainers).filter((id) => !owner.includes(id)); -+ const members = idList(stored.members).filter((id) => !owner.includes(id) && !maintainers.includes(id)); - return { -- level() { -- if (closed) return 0; -- analyser.getFloatTimeDomainData(frame); -- let sum = 0; -- for (const sample of frame) sum += sample * sample; -- return Math.min(1, Math.sqrt(sum / frame.length) * 4); -+ chief: botIdOf(project?.chief), -+ agent: botIdOf(project?.assistant), -+ roles: { owner, maintainers, members }, -+ empty: owner.length === 0 && maintainers.length === 0 && members.length === 0, -+ // Both come from the `projects` listing (#1828), which the overlay keeps on the record: the -+ // `project-read` record answers no rank, and the panel never re-derives the host's policy. -+ role: text(project?.role), -+ choices: idList(project?.choices) -+ }; -+} -+var teamRow = (role, label, botId, onOpenBot, onOpenDossier) => (0, import_react21.createElement)( -+ "div", -+ { -+ key: role, -+ className: "bt-project-team-row", -+ "data-team-role": role, -+ // A row with no Bot is the fallback the slice specifies: still drawn, with nothing to open. -+ ...botId === "" ? { "data-team-state": "not-set" } : { -+ "data-open-bot": botId, -+ role: "button", -+ tabIndex: 0, -+ "aria-label": t("Open {name}'s chat", { name: botId }), -+ onClick: () => onOpenBot?.(botId), -+ onKeyDown: (event) => { -+ if (event.key === "Enter" || event.key === " ") { -+ event.preventDefault(); -+ onOpenBot?.(botId); -+ } ++ open && box ? (0, import_react_dom6.createPortal)((0, import_react24.createElement)( ++ "div", ++ { ++ ref: menu, ++ className: "bt-menu bt-head-menu", ++ role: "menu", ++ "aria-label": t("Conversation settings"), ++ style: { right: box.right, top: box.top } ++ }, ++ (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: openDetails }, (0, import_react24.createElement)(GearIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Conversation settings"))), ++ typeof actions?.openPalette === "function" ? (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { ++ setOpen(false); ++ actions.openPalette(); ++ } }, (0, import_react24.createElement)(SearchIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Search"))) : null, ++ marked ? (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { ++ setOpen(false); ++ actions.clearUnread?.(targetId); ++ } }, (0, import_react24.createElement)(UnreadIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Clear unread mark"))) : (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { ++ setOpen(false); ++ actions.markUnread?.(targetId); ++ } }, (0, import_react24.createElement)(UnreadIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Mark as Unread"))), ++ canPinSession(roster, sessionId) && typeof actions?.setFlags === "function" ? (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { ++ setOpen(false); ++ void Promise.resolve(actions.setFlags(sessionId, { pinned: !sessionPinned(roster, sessionId) })).catch((error) => actions.reportError?.(error, "menu")); ++ } }, (0, import_react24.createElement)(PinIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, sessionPinned(roster, sessionId) ? t("Unpin") : t("Pin"))) : null, ++ canInvite ? (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { ++ void copyInvite(); ++ } }, (0, import_react24.createElement)(ShareIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Copy invite link"))) : null, ++ note ? (0, import_react24.createElement)("div", { className: "bt-menu-hint", role: "status" }, note) : null ++ ), document.body) : null + ); + } +-function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSession, useActivity, useMemoryNews, useTurnClock, useUi, useLive, actions }) { ++function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSession, useActivity, useBusyAcks, useMemoryNews, useTurnClock, useUi, useLive, actions }) { + const roster = useRoster((value) => value); + const title = useSessions((list) => list.byId[sessionId]?.displayTitle ?? list.byId[sessionId]?.title ?? ""); + const firstTurns = useSessions((list) => { +@@ -5537,7 +5537,7 @@ function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSe + const first = openingTurn(state[sessionId], firstTurns, hiddenTurns); + return first && !unseenSince(visit, first.start) ? clockLabel(first.start) : ""; + }); +- (0, import_react9.useEffect)(() => { ++ (0, import_react24.useEffect)(() => { + if (opening) document.body.style.setProperty("--bt-first-sep", JSON.stringify(opening)); + else document.body.style.removeProperty("--bt-first-sep"); + return () => document.body.style.removeProperty("--bt-first-sep"); +@@ -5546,54 +5546,51 @@ function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSe + const owner = roster.byId[sessionId]?.id ?? sessionId; + const doing = useActivity((map) => map[owner]); + const bot = roster.byId[sessionId]; ++ const projectAgent = projectAgentFor(bot, roster.self?.memberId); + const room2 = roster.roomsById[sessionId]; + const detailsOpen = useUi((state) => state.details === sessionId); +- const name = bot?.name ?? room2?.name ?? ""; ++ const unread = useUi((state) => state.unread); ++ const full2 = bot?.remote ? friendBotTitle(bot) : roomTitle(room2) || bot?.name || ""; ++ const face = room2?.origin === "face-to-face"; ++ const name = face ? faceRowTitle(full2) : full2; + const useNews = useMemoryNews ?? noNews; + const memoryIds = bot ? [bot.id] : room2?.members ?? []; + const notice = useMemoryNotice(memoryIds, useNews); +- const changed = useNews((map) => latestMemoryChange(map, memoryIds)); +- (0, import_react9.useEffect)(() => { +- document.body.style.setProperty("--bt-placeholder", JSON.stringify(name ? t("Message {name}", { name }) : t("Message"))); +- }, [name, t("Message")]); +- (0, import_react9.useEffect)(() => { +- actions.beginVisit(sessionId); +- return () => actions.endVisit(sessionId); +- }, [sessionId]); +- (0, import_react9.useEffect)(() => { +- if (room2) document.body.dataset.btRoom = ""; +- else delete document.body.dataset.btRoom; +- return () => { +- delete document.body.dataset.btRoom; +- }; +- }, [Boolean(room2)]); +- const memoryNotice = notice && changed !== null && roster.memory !== false; +- return (0, import_react9.createElement)( ++ const changed2 = useNews((map) => latestMemoryChange(map, memoryIds)); ++ const memoryNotice = notice && changed2 !== null && roster.memory !== false; ++ return (0, import_react24.createElement)( + "div", + { className: "bt-head" }, +- (0, import_react9.createElement)( ++ (0, import_react24.createElement)( + "button", + { + type: "button", + className: "bt-pill", + "aria-expanded": detailsOpen, + "data-memory": memoryNotice ? "updated" : void 0, +- "aria-label": memoryNotice ? t("Memory updated. Open {name}'s memory", { name: roster.byId[changed]?.name ?? name }) : t("View conversation details"), +- onClick: () => memoryNotice ? actions.openMemory(changed) : actions.toggleDetails(sessionId) ++ "aria-label": memoryNotice ? t("Memory updated. Open {name}'s memory", { name: roster.byId[changed2]?.name ?? full2 }) : t("View conversation details"), ++ onClick: () => memoryNotice ? actions.openMemory(changed2) : actions.toggleDetails(sessionId) + }, +- bot ? (0, import_react9.createElement)(BotAvatar, { bot, size: 24, state: botState(running, doing, roster.questions?.[currentPart(bot)] !== void 0), badge: false }) : room2 ? (0, import_react9.createElement)(RoomAvatar, { room: room2, roster, size: 24 }) : null, +- (0, import_react9.createElement)("span", { className: "bt-pill-name" }, bot?.name ?? room2?.name ?? (title || t("New chat"))), +- (0, import_react9.createElement)(MemoryNotice, { shown: memoryNotice }), +- (0, import_react9.createElement)("span", { className: "bt-pill-go", "aria-hidden": true }, (0, import_react9.createElement)(GoArrow)) ++ bot ? (0, import_react24.createElement)(BotAvatar, { bot, size: 24, state: botState(running, doing, roster.questions?.[currentPart(bot)] !== void 0), badge: false }) : room2 ? (0, import_react24.createElement)(RoomAvatar, { room: room2, roster, size: 24 }) : null, ++ (0, import_react24.createElement)("span", { className: face ? "bt-pill-name bt-pill-name-face" : "bt-pill-name", title: face ? full2 : void 0 }, name || title || t("New chat")), ++ (0, import_react24.createElement)(MemoryNotice, { shown: memoryNotice }), ++ (0, import_react24.createElement)("span", { className: "bt-pill-go", "aria-hidden": true }, (0, import_react24.createElement)(GoArrow)) + ), +- (0, import_react9.createElement)("span", { className: "bt-sr", role: "status" }, memoryNotice ? t("Memory updated") : ""), +- (0, import_react9.createElement)(NewMessagePills, { key: sessionId, sessionId, useSessions, useUi, useTurnClock }), +- (0, import_react9.createElement)(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, actions }) ++ (0, import_react24.createElement)("span", { className: "bt-sr", role: "status" }, memoryNotice ? t("Memory updated") : ""), ++ projectAgent === null ? null : (0, import_react24.createElement)(ProjectAgentEntry, { ++ projectId: projectAgent.projectId, ++ read: call, ++ onOpen: (id) => actions?.openSession?.(id) ++ }), ++ (0, import_react24.createElement)(NewMessagePills, { key: sessionId, sessionId, hiddenTurns, useSessions, useUi, useTurnClock, actions }), ++ (0, import_react24.createElement)(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, actions }), ++ (0, import_react24.createElement)(BusyAckBubble, { key: `busy-ack:${sessionId}`, sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive }), ++ (0, import_react24.createElement)(SessionOverflow, { sessionId, roster, actions, unread }) + ); + } + function useTranscriptView() { +- const [view, setView] = (0, import_react9.useState)(null); +- (0, import_react9.useEffect)(() => { ++ const [view, setView] = (0, import_react24.useState)(null); ++ (0, import_react24.useEffect)(() => { + let frame = 0; + let watched = null; + const observer = new MutationObserver(() => schedule()); +@@ -5618,9 +5618,16 @@ function useTranscriptView() { + divider = at.bottom <= headerBottom ? "above" : at.top >= box.bottom ? "below" : "in-view"; + } + const composer = parseFloat(getComputedStyle(scroller).getPropertyValue("--dsh-composer-height")) || 152; ++ let tail; ++ for (const row of scroller.querySelectorAll("[data-chat-turn]")) { ++ const turn = Number(row.dataset.chatTurn); ++ const at = row.getBoundingClientRect(); ++ if (Number.isFinite(turn) && at.bottom > box.top && at.top < box.bottom && (tail === void 0 || turn > tail)) tail = turn; ++ } + const next = { + unpinned: scroller.querySelector('[class*="_toBottomSlot"]>button') !== null, + divider, ++ tail, + center: Math.round(box.left + box.width / 2), + top: Math.round(headerBottom + 8), + bottom: Math.round(window.innerHeight - box.bottom + composer + 8) +@@ -5642,7 +5642,7 @@ function useTranscriptView() { + }, []); + return view; + } +-function NewMessagePills({ sessionId, useSessions, useUi, useTurnClock }) { ++function NewMessagePills({ sessionId, hiddenTurns, useSessions, useUi, useTurnClock, actions }) { + const replies = useSessions((list) => { + const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline; + return Array.isArray(outline) ? outline.reduce((count, entry) => count + (entry.response ? 1 : 0), 0) : 0; +@@ -5657,19 +5657,31 @@ function NewMessagePills({ sessionId, useSessions, useUi, useTurnClock }) { + return count; + }); + const view = useTranscriptView(); ++ const tailAt = useTurnClock((state) => { ++ if (view?.tail === void 0) return null; ++ const entry = state[sessionId]?.[view.tail]; ++ return entry?.end ?? entry?.first ?? null; ++ }); ++ (0, import_react24.useEffect)(() => { ++ if (tailAt !== null) actions?.noteVisitTail?.(sessionId, tailAt); ++ }, [tailAt, sessionId]); + const unpinned = view?.unpinned === true; +- const [release, setRelease] = (0, import_react9.useState)({ base: null, dismissed: false }); +- const [above, setAbove] = (0, import_react9.useState)({ seen: false, dismissed: false }); +- (0, import_react9.useEffect)(() => { ++ const [release, setRelease] = (0, import_react24.useState)({ base: null, dismissed: false }); ++ const [above, setAbove] = (0, import_react24.useState)({ seen: false, dismissed: false }); ++ (0, import_react24.useEffect)(() => { + setRelease({ base: unpinned ? replies : null, dismissed: false }); + }, [unpinned]); +- (0, import_react9.useEffect)(() => { ++ (0, import_react24.useEffect)(() => { + if (view?.divider === "in-view") setAbove((state) => state.seen ? state : { ...state, seen: true }); + }, [view?.divider]); ++ const movedOn = useTurnClock((state) => movedOnSince(visit, state[sessionId], hiddenTurns)); ++ (0, import_react24.useEffect)(() => { ++ if (above.seen && movedOn) actions?.settleVisit?.(sessionId); ++ }, [above.seen, movedOn, sessionId]); + const fresh = release.base === null ? 0 : replies - release.base; + const showDown = unpinned && fresh > 0 && !release.dismissed; + const showUp = view?.divider === "above" && !above.seen && !above.dismissed; +- (0, import_react9.useEffect)(() => { ++ (0, import_react24.useEffect)(() => { + const scroller = document.querySelector("[data-conversation-scroll]"); + if (!scroller) return void 0; + scroller.toggleAttribute("data-bt-news", showDown); +@@ -5677,16 +5677,16 @@ function NewMessagePills({ sessionId, useSessions, useUi, useTurnClock }) { + }, [showDown]); + if (!view || !showDown && !showUp) return null; + const label = (count) => count === 1 ? t("1 new message") : count > 0 ? t("{count} new messages", { count }) : t("New messages"); +- const pill = (direction, count, style, onJump, onDismiss) => (0, import_react9.createElement)( ++ const pill = (direction, count, style, onJump, onDismiss) => (0, import_react24.createElement)( + "div", + { className: "bt-news", "data-direction": direction, style }, +- (0, import_react9.createElement)( ++ (0, import_react24.createElement)( + "button", + { type: "button", className: "bt-news-jump", onClick: onJump }, +- (0, import_react9.createElement)("span", { className: "bt-news-ico" }, (0, import_react9.createElement)(direction === "up" ? ArrowUpIcon : ArrowDownIcon)), ++ (0, import_react24.createElement)("span", { className: "bt-news-ico" }, (0, import_react24.createElement)(direction === "up" ? ArrowUpIcon : ArrowDownIcon)), + label(count) + ), +- (0, import_react9.createElement)("button", { ++ (0, import_react24.createElement)("button", { + type: "button", + className: "bt-news-x", + "aria-label": t("Dismiss new messages"), +@@ -5694,7 +5694,7 @@ function NewMessagePills({ sessionId, useSessions, useUi, useTurnClock }) { + event.stopPropagation(); + onDismiss(); + } +- }, (0, import_react9.createElement)(CloseIcon)) ++ }, (0, import_react24.createElement)(CloseIcon)) + ); + const toLatest = () => { + const scroller = document.querySelector("[data-conversation-scroll]"); +@@ -5703,9 +5703,9 @@ function NewMessagePills({ sessionId, useSessions, useUi, useTurnClock }) { + else scroller?.scrollTo({ top: scroller.scrollHeight, behavior: "smooth" }); + }; + const toDivider = () => document.querySelector("[data-conversation-scroll] .bt-new-sep")?.scrollIntoView({ block: "center", behavior: "smooth" }); +- return (0, import_react_dom4.createPortal)( +- (0, import_react9.createElement)( +- import_react9.Fragment, ++ return (0, import_react_dom6.createPortal)( ++ (0, import_react24.createElement)( ++ import_react24.Fragment, + null, + showUp ? pill("up", unread, { left: view.center, top: view.top }, toDivider, () => setAbove((state) => ({ ...state, dismissed: true }))) : null, + showDown ? pill("down", fresh, { left: view.center, bottom: view.bottom }, toLatest, () => setRelease((state) => ({ ...state, dismissed: true }))) : null +@@ -5714,19 +5714,156 @@ function NewMessagePills({ sessionId, useSessions, useUi, useTurnClock }) { + ); + } + ++// src/client/composer-label.js ++var ATTRIBUTES = ["aria-label", "data-placeholder"]; ++function holdComposerLabel(doc, label) { ++ doc.body.style.setProperty("--bt-placeholder", JSON.stringify(label)); ++ const shell = /* @__PURE__ */ new Map(); ++ const apply2 = () => { ++ for (const el of doc.querySelectorAll("[data-composer-input]")) { ++ for (const name of ATTRIBUTES) { ++ const current = el.getAttribute(name); ++ if (current === label) continue; ++ if (!shell.has(el)) shell.set(el, {}); ++ shell.get(el)[name] = current; ++ el.setAttribute(name, label); + } + } -+ }, -+ (0, import_react21.createElement)("span", { key: "label", className: "bt-project-team-label" }, label), -+ botId === "" ? (0, import_react21.createElement)("span", { key: "value", className: "bt-project-missing" }, t("Not set")) : (0, import_react21.createElement)("span", { key: "value", className: "bt-project-team-bot" }, `@${botId}`), -+ // #1864: the dossier control sits inside the row, so the row still opens the chat (#1860) and a -+ // reader can look a Bot up first. A row with no Bot keeps the control: its panel reads "not set". -+ (0, import_react21.createElement)("button", { -+ key: "dossier", -+ type: "button", -+ className: "bt-project-team-dossier", -+ "data-dossier-role": role, -+ ...botId === "" ? {} : { "data-dossier-bot": botId }, -+ "aria-label": t("Open {name}'s dossier", { name: botId === "" ? label : botId }), -+ onClick: (event) => { -+ event?.stopPropagation(); -+ onOpenDossier?.({ role, label, botId }); - }, -- cancel: close, -- async finish(maxSeconds) { -- if (closed || recorder.state === "inactive") { -- close(); -- return null; -+ onKeyDown: (event) => { -+ if (event.key === "Enter" || event.key === " ") { -+ event?.stopPropagation(); -+ onOpenDossier?.({ role, label, botId }); - } ++ }; ++ apply2(); ++ const Observer = doc.defaultView?.MutationObserver ?? globalThis.MutationObserver; ++ const watcher = typeof Observer === "function" ? new Observer(apply2) : null; ++ watcher?.observe(doc.body, { subtree: true, childList: true, attributes: true, attributeFilter: ATTRIBUTES }); ++ return () => { ++ watcher?.disconnect(); ++ for (const [el, values] of shell) { ++ if (!el.isConnected) continue; ++ for (const [name, value] of Object.entries(values)) { ++ if (value == null) el.removeAttribute(name); ++ else el.setAttribute(name, value); ++ } + } -+ }, t("Dossier")) -+); -+var POOL_RANKS = [["owner", "owner"], ["maintainer", "maintainers"], ["member", "members"]]; -+function ProjectTeam({ project, onOpenBot, onOpenDossier }) { -+ const view = projectTeamView(project); -+ const poolId = (id) => (0, import_react21.createElement)("span", { key: id }, `@${id}`); -+ const ranks = view.empty ? (0, import_react21.createElement)("span", { className: "bt-project-missing" }, t("No one in this pool yet.")) : (0, import_react21.createElement)( -+ "span", -+ { className: "bt-project-team-roles" }, -+ POOL_RANKS.map(([role, key]) => view.roles[key].length === 0 ? null : (0, import_react21.createElement)( -+ "span", -+ { key: role, className: "bt-project-team-role", "data-pool-role": role }, -+ `${roleText(role)}: `, -+ view.roles[key].map((id) => poolId(id)) -+ )) -+ ); -+ return (0, import_react21.createElement)( -+ "section", -+ { className: "bt-project-team", "data-team": "chief,agent,pool" }, -+ (0, import_react21.createElement)("h4", null, t("Project team")), -+ teamRow("chief", t("Project Chief"), view.chief, onOpenBot, onOpenDossier), -+ teamRow("agent", t("My agent"), view.agent, onOpenBot, onOpenDossier), -+ (0, import_react21.createElement)( -+ "div", -+ { key: "pool", className: "bt-project-team-row", "data-team-role": "pool" }, -+ (0, import_react21.createElement)("span", { key: "label", className: "bt-project-team-label" }, t("Role pool")), -+ ranks, -+ // The caller's own rank and what the host said they may switch to: the same answer the -+ // sidebar menu reads, printed where the pool is. -+ view.role === "" ? null : (0, import_react21.createElement)( -+ "span", -+ { key: "mine", className: "bt-project-team-myrole", "data-team-my-role": view.role }, -+ [ -+ t("My role"), -+ ": ", -+ roleText(view.role), -+ view.choices.length === 0 ? null : ` · ${t("Can switch to {roles}", { roles: view.choices.map(roleText).join(", ") })}` -+ ] -+ ) -+ ) -+ ); -+} -+function dossierRowOf(team, botId) { -+ const id = text(botId); -+ if (id === "") return null; -+ const rows = Array.isArray(team?.rows) ? team.rows : []; -+ return rows.find((row) => row !== null && typeof row === "object" && text(row.botId) === id) ?? null; -+} -+var dossierSection = (title, children) => (0, import_react21.createElement)( -+ "div", -+ { key: title, className: "bt-project-dossier-section" }, -+ (0, import_react21.createElement)("h4", null, title), -+ children -+); -+function ProjectDossierPanel({ row, label, onClose, onOpenBot } = {}) { -+ const known = row !== null && typeof row === "object"; -+ const botId = known ? text(row.botId) : ""; -+ const topics = known && Array.isArray(row.memory?.topics) ? row.memory.topics.map((name) => text(name)).filter((name) => name !== "") : []; -+ const skills = known && Array.isArray(row.skills) ? row.skills.map((name) => text(name)).filter((name) => name !== "") : []; -+ const meta = known ? [text(row.role), text(row.model)].filter((value) => value !== "") : []; -+ return (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-panel bt-project-dossier", "data-panel": "project-dossier", "data-dossier-bot": botId === "" ? void 0 : botId }, -+ (0, import_react21.createElement)("h3", null, label === "" || label === void 0 ? t("Dossier") : `${label} · ${t("Dossier")}`), -+ known ? [ -+ dossierSection(t("Persona"), [ -+ meta.length === 0 ? null : (0, import_react21.createElement)("div", { key: "meta", className: "bt-project-dossier-meta" }, meta.map((value) => (0, import_react21.createElement)("span", { key: value }, value))), -+ (0, import_react21.createElement)("p", { key: "persona", className: "bt-project-dossier-text" }, text(row.persona) || t("Not set")) -+ ]), -+ dossierSection(t("Memory"), [ -+ (0, import_react21.createElement)("p", { key: "head", className: "bt-project-dossier-text" }, text(row.memory?.head) || t("No memory yet.")), -+ topics.length === 0 ? null : (0, import_react21.createElement)("div", { key: "topics", className: "bt-project-dossier-topics" }, topics.map((topic) => (0, import_react21.createElement)("span", { key: topic, className: "bt-project-dossier-topic" }, topic))) -+ ]), -+ dossierSection(t("Skills"), (0, import_react21.createElement)("p", { key: "skills", className: "bt-project-dossier-text" }, skills.length === 0 ? t("No skills attached.") : skills.join(", "))) -+ ] : (0, import_react21.createElement)("p", { className: "bt-project-missing" }, t("Not set")), -+ botId === "" || !known ? null : (0, import_react21.createElement)( -+ "div", -+ { key: "actions", className: "bt-project-row-actions" }, -+ (0, import_react21.createElement)("button", { -+ type: "button", -+ className: "bt-soft bt-soft-sm", -+ "data-open-bot": botId, -+ onClick: () => onOpenBot?.(botId) -+ }, t("Open chat")) -+ ), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-row-actions" }, -+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) -+ ) -+ ); -+} -+function projectAgentFor(bot, selfId) { -+ if (bot === null || typeof bot !== "object" || bot.remote !== void 0) return null; -+ const projectId = text(bot.projectId); -+ if (projectId === "") return null; -+ const owner = text(bot.ownerId); -+ const self = text(selfId); -+ if (self !== "" && owner !== "" && owner !== self) return null; -+ return { projectId }; ++ }; +} -+function ProjectAgentEntry({ projectId, read, onOpen } = {}) { -+ const present = useProjectPresent(); -+ const [agentId, setAgentId] = (0, import_react21.useState)(""); -+ const id = text(projectId); -+ const open = async () => { -+ let target = agentId; -+ if (target === "") { - try { -- await new Promise((resolve) => { -- recorder.onstop = resolve; -- recorder.stop(); -- }); -- stream.getTracks().forEach((track) => track.stop()); -- const blob = new Blob(chunks, { type: recorder.mimeType }); -- if (blob.size === 0) return null; -- const decoded = await audio.decodeAudioData(await blob.arrayBuffer()); -- const length = Math.max(1, Math.floor(Math.min(decoded.duration, maxSeconds) * 16e3)); -- const offline = new OfflineAudioContext(1, length, 16e3); -- const source = offline.createBufferSource(); -- source.buffer = decoded; -- source.connect(offline.destination); -- source.start(); -- return waveBytes((await offline.startRendering()).getChannelData(0)); -- } finally { -- close(); -+ const record = await (read ?? call)("project-read", { id }); -+ target = botIdOf(record?.project?.assistant); -+ } catch { -+ target = ""; - } -+ if (target !== "") setAgentId(target); ++ ++// src/client/header-effects.js ++function installHeaderEffects({ sessions, roster, actions, doc = globalThis.document }) { ++ if (!doc) return () => { ++ }; ++ const slots = /* @__PURE__ */ new Map(); ++ const run = (id, dep, setup) => { ++ const held = slots.get(id); ++ if (held !== void 0 && held.dep === dep) return; ++ held?.off(); ++ slots.set(id, { dep, off: setup() ?? (() => { ++ }) }); ++ }; ++ let running = false; ++ let again = false; ++ const pass = () => { ++ const list = sessions.getSnapshot(); ++ const state = roster.getSnapshot(); ++ const row = Object.values(list?.byId ?? {}).find((entry) => (entry?.retainedBy?.mainView ?? 0) > 0); ++ const sessionId = row?.id; ++ const bot = sessionId === void 0 ? void 0 : state?.byId?.[sessionId]; ++ const room2 = sessionId === void 0 ? void 0 : state?.roomsById?.[sessionId]; ++ const name = bot?.remote ? friendBotTitle(bot) : roomTitle(room2) || bot?.name || ""; ++ run("friend-chat", `${sessionId}|${bot?.remote === true}`, () => { ++ if (!bot?.remote) return void 0; ++ doc.body.dataset.btFriendChat = ""; ++ return () => { ++ delete doc.body.dataset.btFriendChat; ++ }; ++ }); ++ run("remote-empty", `${sessionId}|${bot?.remote === true}|${row?.blank === true}`, () => { ++ if (!bot?.remote || row?.blank !== true) return void 0; ++ doc.body.dataset.btRemoteChat = "empty"; ++ doc.body.style.setProperty("--bt-remote-empty", JSON.stringify(t("Send a message. Your friend approves unless Auto-send is on."))); ++ return () => { ++ delete doc.body.dataset.btRemoteChat; ++ doc.body.style.removeProperty("--bt-remote-empty"); ++ }; ++ }); ++ run("composer-label", `${sessionId}|${name}`, () => holdComposerLabel(doc, name ? t("Message {name}", { name }) : t("Message"))); ++ run("visit", sessionId, () => { ++ if (sessionId === void 0) return void 0; ++ actions.beginVisit(sessionId); ++ return () => actions.endVisit(sessionId); ++ }); ++ run("face-at-menu", `${sessionId}|${room2?.origin === "face-to-face"}`, () => { ++ if (room2?.origin !== "face-to-face") return void 0; ++ const stop = actions.filterFaceAtMenu?.(sessionId); ++ return typeof stop === "function" ? stop : void 0; ++ }); ++ run("room-flag", `${sessionId}|${room2 !== void 0}`, () => { ++ if (room2 === void 0) return void 0; ++ doc.body.dataset.btRoom = ""; ++ return () => { ++ delete doc.body.dataset.btRoom; ++ }; ++ }); ++ }; ++ const apply2 = () => { ++ if (running) { ++ again = true; ++ return; + } -+ if (target !== "") onOpen?.(target); ++ running = true; ++ try { ++ pass(); ++ } finally { ++ running = false; ++ } ++ if (again) { ++ again = false; ++ apply2(); ++ } ++ }; ++ apply2(); ++ const offSessions = sessions.subscribe(apply2); ++ const offRoster = roster.subscribe(apply2); ++ return () => { ++ offSessions?.(); ++ offRoster?.(); ++ for (const held of slots.values()) held.off(); ++ slots.clear(); ++ }; ++} ++ + // src/client/composer.js +-var import_react10 = require("react"); +-var import_react_dom5 = require("react-dom"); ++var import_react25 = require("react"); ++var import_react_dom7 = require("react-dom"); + var speechApi = () => window.SpeechRecognition ?? window.webkitSpeechRecognition; + var keepComposerFocus = (event) => event.preventDefault(); ++function installSendShortcut(useRoster) { ++ const onKey = (event) => { ++ if (event.defaultPrevented) return; ++ const field = composerFieldOf(event); ++ if (!field) return; ++ const card = composerCardOf(field); ++ if (!card) return; ++ const snapshot = useRoster?.getSnapshot?.(); ++ if (lockedWindow(snapshot) || field.disabled || field.readOnly || field.getAttribute?.("aria-readonly") === "true") return; ++ const prefs = snapshot?.prefs ?? {}; ++ handleComposerSendKey(event, sendKeyOf(prefs), { ++ send: () => { ++ const button = findSendButton(card); ++ if (button && !button.disabled && button.getAttribute?.("aria-disabled") !== "true") button.click(); ++ }, ++ insertNewline: () => insertComposerNewline(field) ++ }); + }; -+ if (id === "" || !present) return null; -+ return (0, import_react21.createElement)("button", { -+ type: "button", -+ className: "bt-project-agent-entry", -+ "data-project-agent": id, -+ "data-open-bot": agentId === "" ? void 0 : agentId, -+ title: t("Open my agent"), -+ "aria-label": t("Open my agent"), -+ onClick: open -+ }, t("My agent")); ++ window.addEventListener("keydown", onKey, true); ++ return () => window.removeEventListener("keydown", onKey, true); +} -+function ProjectBoardPane({ project, rows, done, canManage, tasks, decisions, meetings, queues, metrics, onOpen, onSettings, onMembers, onOpenBot, onOpenDossier, call: call4 }) { -+ const view = projectBoardView({ project, rows, done, canManage, tasks, decisions, meetings, queues, metrics }); -+ return (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-board", "data-can-manage": view.canManage ? "true" : "false" }, -+ (0, import_react21.createElement)("h3", null, view.title), -+ (0, import_react21.createElement)(ProjectTeam, { project, onOpenBot, onOpenDossier }), -+ // Header counts (#1768): four numbers read from the host, an unreadable one shown as unknown. -+ view.counts === null ? null : (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-counts", "data-counts": "waiting,inflight,blocked,done" }, -+ (0, import_react21.createElement)("span", null, [t("Waiting"), ": ", (0, import_react21.createElement)("b", { key: "w" }, countText(view.counts.waiting))]), -+ (0, import_react21.createElement)("span", null, [t("In flight"), ": ", (0, import_react21.createElement)("b", { key: "f" }, countText(view.counts.inflight))]), -+ (0, import_react21.createElement)("span", null, [t("Blocked"), ": ", (0, import_react21.createElement)("b", { key: "b" }, countText(view.counts.blocked))]), -+ (0, import_react21.createElement)("span", null, [t("Done"), ": ", (0, import_react21.createElement)("b", { key: "d" }, countText(view.counts.done))]) -+ ), -+ // #1749: both buttons open a panel and neither is hidden from a non-owner. The host refuses -+ // every write a non-owner attempts, so the refusal is an answer the reader sees, not a -+ // control that silently disappeared. -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-actions" }, -+ (0, import_react21.createElement)("button", { type: "button", "data-action": "project-settings", onClick: () => onSettings?.() }, t("Project settings")), -+ (0, import_react21.createElement)("button", { type: "button", "data-action": "project-members", onClick: () => onMembers?.() }, t("Members")) -+ ), -+ (0, import_react21.createElement)(ProjectMetrics, { view: view.metrics }), -+ (0, import_react21.createElement)(ProjectRunningTable, { view: view.metrics, onOpen }), -+ (0, import_react21.createElement)(ProjectBoardRows, { view, onOpen }), -+ (0, import_react21.createElement)(ProjectQueueGroups, { view, onOpen }), -+ (0, import_react21.createElement)(ProjectDoneGroup, { view, onOpen }), -+ (0, import_react21.createElement)(ProjectBoardRecord, { record: view.record, projectId: view.projectId, call: call4 }) + function useDictation(onText) { +- const [listening, setListening] = (0, import_react10.useState)(false); +- const [note, setNote] = (0, import_react10.useState)(""); +- const recognition = (0, import_react10.useRef)(null); +- const latest = (0, import_react10.useRef)(onText); ++ const [listening, setListening] = (0, import_react25.useState)(false); ++ const [note, setNote] = (0, import_react25.useState)(""); ++ const recognition = (0, import_react25.useRef)(null); ++ const latest = (0, import_react25.useRef)(onText); + latest.current = onText; +- (0, import_react10.useEffect)(() => () => recognition.current?.abort(), []); +- (0, import_react10.useEffect)(() => { ++ (0, import_react25.useEffect)(() => () => recognition.current?.abort(), []); ++ (0, import_react25.useEffect)(() => { + if (!note) return void 0; + const timer = setTimeout(() => setNote(""), 2600); + return () => clearTimeout(timer); +@@ -5745,10 +5745,10 @@ function useDictation(onText) { + let interim = ""; + for (let index = event.resultIndex; index < event.results.length; index += 1) { + const result = event.results[index]; +- const text = result[0]?.transcript ?? ""; ++ const text2 = result[0]?.transcript ?? ""; + if (result.isFinal) { +- if (text.trim()) latest.current(text, true); +- } else interim += text; ++ if (text2.trim()) latest.current(text2, true); ++ } else interim += text2; + } + if (interim) latest.current(interim, false); + }; +@@ -5774,19 +5774,38 @@ function useDictation(onText) { + const stop = () => recognition.current?.stop(); + return { listening, note, start, stop }; + } ++function ComposerIdentity({ sessionId, useRoster }) { ++ const roster = useRoster((value) => value); ++ const room2 = roster.roomsById?.[sessionId]; ++ const self = roster.self; ++ const humans = (room2?.participants ?? []).filter((p) => p.kind === "human" && p.leftSeq === void 0); ++ if (room2?.viewerRole === "invited-owner") { ++ return (0, import_react25.createElement)( ++ "span", ++ { className: "bt-composer-as", title: t("You can remove your Bot from this room") }, ++ t("Shared room from {name}", { name: room2.sharedFrom?.inviterName || t("a friend") }) ++ ); ++ } ++ if (!self || !room2 || humans.length < 2) return null; ++ return (0, import_react25.createElement)( ++ "span", ++ { className: "bt-composer-as", title: t("Messages in this room are attributed to you") }, ++ t("Sending as {name}", { name: self.displayName || self.memberId }) + ); +} -+function ProjectSettingsPanel({ project, assistantMine, actions, call: request, onClose, onSaved, locked = false, readOnly = "" } = {}) { -+ const save = request ?? call; -+ const [kind, setKind] = (0, import_react21.useState)("bot"); -+ const [memberId, setMemberId] = (0, import_react21.useState)(""); -+ const [note, setNote] = (0, import_react21.useState)(""); -+ const noteLength = memoryLength(note); -+ const noteOver = noteLength > MEMORY_TEXT_MAX; -+ const noteSaveDisabled = text(note) === "" || noteOver; -+ const [assistantOff, setAssistantOff] = (0, import_react21.useState)(assistantMine === void 0 ? project?.assistant?.off === true : assistantMine?.off === true); -+ const [status, setStatus] = (0, import_react21.useState)(""); -+ const id = text(project?.id); -+ if (locked) { -+ return (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-panel", "data-panel": "project-settings" }, -+ (0, import_react21.createElement)("h3", null, t("Project settings")), -+ readOnlyLine(import_react21.createElement, { readOnly }, actions, { key: "readonly" }), -+ (0, import_react21.createElement)( + function ComposerVoice({ sessionId, inputActions, actions, useUi }) { +- const dictation = useDictation((text, final) => { +- if (final && inputActions) inputActions.insertText(text, inputActions.captureInsertion()); ++ const dictation = useDictation((text2, final) => { ++ if (final && inputActions) inputActions.insertText(text2, inputActions.captureInsertion()); + }); + const quote = useUi((state) => state.quote?.sessionId === sessionId ? state.quote : null); +- (0, import_react10.useEffect)(() => { ++ (0, import_react25.useEffect)(() => { + if (!quote || !inputActions) return; + actions.clearQuote(quote.token); + const excerpt = quote.text.replace(/\s+/g, " ").trim(); +- const line = `> ${excerpt.length > 200 ? `${excerpt.slice(0, 200)}…` : excerpt} ++ const line2 = `> ${excerpt.length > 200 ? `${excerpt.slice(0, 200)}…` : excerpt} + + `; +- inputActions.insertText(line, inputActions.captureInsertion()); ++ inputActions.insertText(line2, inputActions.captureInsertion()); + const box = document.querySelector('[class*="_centerCol"] [role=textbox][contenteditable=true]'); + if (box instanceof HTMLElement) { + box.focus(); +@@ -5797,10 +5797,10 @@ function ComposerVoice({ sessionId, inputActions, actions, useUi }) { + }, [quote?.token]); + if (sessionId === void 0) return null; + const pluginMic = actions.speech() !== void 0; +- return (0, import_react10.createElement)( +- import_react10.Fragment, ++ return (0, import_react25.createElement)( ++ import_react25.Fragment, + null, +- pluginMic ? null : (0, import_react10.createElement)("button", { ++ pluginMic ? null : (0, import_react25.createElement)("button", { + type: "button", + className: "bt-mic", + "aria-label": dictation.listening ? t("Stop dictation") : t("Dictate"), +@@ -5808,16 +5808,16 @@ function ComposerVoice({ sessionId, inputActions, actions, useUi }) { + title: dictation.listening ? t("Stop dictation") : t("Dictate"), + onMouseDown: keepComposerFocus, + onClick: () => dictation.listening ? dictation.stop() : dictation.start() +- }, (0, import_react10.createElement)(MicIcon)), +- (0, import_react10.createElement)("button", { ++ }, (0, import_react25.createElement)(MicIcon)), ++ (0, import_react25.createElement)("button", { + type: "button", + className: "bt-voice", + "aria-label": t("Start voice chat"), + title: t("Voice chat"), + onMouseDown: keepComposerFocus, + onClick: () => actions.openVoice(sessionId) +- }, (0, import_react10.createElement)(WaveIcon, { size: 18 })), +- dictation.note ? (0, import_react10.createElement)("span", { className: "bt-mic-note", role: "status" }, dictation.note) : null ++ }, (0, import_react25.createElement)(WaveIcon, { size: 18 })), ++ dictation.note ? (0, import_react25.createElement)("span", { className: "bt-mic-note", role: "status" }, dictation.note) : null + ); + } + function menuIcons(roster) { +@@ -5825,17 +5825,17 @@ function menuIcons(roster) { + return (row) => { + if (!row.bot) return PeopleIcon; + const id = row.bot.id; +- if (!marks.has(id)) marks.set(id, ({ size = 14 }) => (0, import_react10.createElement)(BotMark, { bot: roster.getSnapshot().byId[id] ?? row.bot, size })); ++ if (!marks.has(id)) marks.set(id, ({ size = 14 }) => (0, import_react25.createElement)(BotMark, { bot: markBotForMention(row.bot, roster.getSnapshot()), size })); + return marks.get(id); + }; + } + function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { + const roster = useRoster((value) => value); +- const [open, setOpen] = (0, import_react10.useState)(null); ++ const [open, setOpen] = (0, import_react25.useState)(null); + const [shown, leaving] = useLinger(open, 120); +- const button = (0, import_react10.useRef)(null); +- const menu = (0, import_react10.useRef)(null); +- (0, import_react10.useEffect)(() => { ++ const button = (0, import_react25.useRef)(null); ++ const menu = (0, import_react25.useRef)(null); ++ (0, import_react25.useEffect)(() => { + if (!open) return void 0; + const onDown = (event) => { + if (![button.current, menu.current].some((node) => node?.contains(event.target))) setOpen(null); +@@ -5855,6 +5855,7 @@ function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { + }, [open]); + const target = roster.byId?.[sessionId]?.id ?? roster.roomsById?.[sessionId]?.id; + if (sessionId === void 0 || target === void 0) return null; ++ const locked = lockedWindow(roster); + const toggle = () => { + if (open) { + setOpen(null); +@@ -5867,19 +5867,15 @@ function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { + setOpen(null); + button.current?.closest("[data-composer-card]")?.querySelector("input[type=file]")?.click(); + }; +- const schedule = () => { +- setOpen(null); +- actions.openSettings("schedules", target); +- }; + const reference = () => { + setOpen(null); + actions.referenceChat(sessionId, inputActions?.captureInsertion?.()); + }; + const canReference = typeof inputActions?.captureInsertion === "function" && actions.canReferenceChat(); +- return (0, import_react10.createElement)( +- import_react10.Fragment, ++ return (0, import_react25.createElement)( ++ import_react25.Fragment, + null, +- (0, import_react10.createElement)("button", { ++ (0, import_react25.createElement)("button", { + ref: button, + type: "button", + className: "bt-plus", +@@ -5889,8 +5889,8 @@ function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { + "aria-expanded": Boolean(open), + onMouseDown: keepComposerFocus, + onClick: toggle +- }, (0, import_react10.createElement)(PlusIcon)), +- shown ? (0, import_react_dom5.createPortal)((0, import_react10.createElement)( ++ }, (0, import_react25.createElement)(PlusIcon)), ++ shown ? (0, import_react_dom7.createPortal)((0, import_react25.createElement)( + "div", + { + ref: menu, +@@ -5900,9 +5900,36 @@ function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { + style: { left: shown.left, bottom: shown.bottom }, + "data-leaving": leaving || void 0 + }, +- (0, import_react10.createElement)("button", { type: "button", role: "menuitem", onClick: attach }, (0, import_react10.createElement)(PaperclipIcon), (0, import_react10.createElement)("span", { className: "bt-menu-label" }, t("Add files"))), +- canReference ? (0, import_react10.createElement)("button", { type: "button", role: "menuitem", onMouseDown: keepComposerFocus, onClick: reference }, (0, import_react10.createElement)(ChatsIcon), (0, import_react10.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat"))) : null, +- (0, import_react10.createElement)("button", { type: "button", role: "menuitem", onClick: schedule }, (0, import_react10.createElement)(ClockIcon), (0, import_react10.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task"))) ++ (0, import_react25.createElement)( + "div", -+ { className: "bt-project-row-actions" }, -+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) ++ { className: "bt-plus-group", role: "group", "aria-label": t("Attach") }, ++ (0, import_react25.createElement)("button", { type: "button", role: "menuitem", onClick: attach }, (0, import_react25.createElement)(PaperclipIcon), (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Add files"))) ++ ), ++ (0, import_react25.createElement)( ++ "div", ++ { className: "bt-plus-group", role: "group", "aria-label": t("Reference a chat") }, ++ canReference ? (0, import_react25.createElement)("button", { type: "button", role: "menuitem", onMouseDown: keepComposerFocus, onClick: reference }, (0, import_react25.createElement)(ChatsIcon), (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat"))) : (0, import_react25.createElement)( ++ "button", ++ { type: "button", role: "menuitem", disabled: true, title: t("Reference a chat is available in a Bot or group chat.") }, ++ (0, import_react25.createElement)(ChatsIcon), ++ (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat")), ++ (0, import_react25.createElement)("span", { className: "bt-menu-hint" }, t("Reference a chat is available in a Bot or group chat.")) ++ ) ++ ), ++ (0, import_react25.createElement)( ++ "div", ++ { className: "bt-plus-group", role: "group", "aria-label": t("Scheduled tasks") }, ++ locked ? (0, import_react25.createElement)( ++ "button", ++ { type: "button", role: "menuitem", disabled: true, title: t("A read-only window cannot create a scheduled task.") }, ++ (0, import_react25.createElement)(ClockIcon), ++ (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task")), ++ (0, import_react25.createElement)("span", { className: "bt-menu-hint" }, t("A read-only window cannot create a scheduled task.")) ++ ) : (0, import_react25.createElement)("button", { type: "button", role: "menuitem", onClick: () => { ++ setOpen(null); ++ actions.openSettings("schedules", target); ++ } }, (0, import_react25.createElement)(ClockIcon), (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task"))) + ) -+ ); + ), document.body) : null + ); + } +@@ -5922,15 +5922,57 @@ var conversationOf = (roster, sessionId) => { + function mentionRows(roster, sessionId, query = "") { + const here = conversationOf(roster, sessionId); + if (here === null) return null; +- const bots = here.room ? here.room.members.map((id) => roster.byId[id]).filter(Boolean) : roster.bots.filter((bot) => bot.id !== here.self.id); ++ const face = isFaceRoom(here.room); ++ const live = (here.room?.participants ?? []).filter((p) => p.leftSeq === void 0); ++ const bots = here.room ? [ ++ ...here.room.members.map((id) => roster.byId[id]).filter(Boolean).map((bot) => face ? { ...bot, label: faceLabel(myOwnerName(roster, live, bot), bot.name) } : bot), ++ ...live.filter((p) => p.kind === "human").map((p) => ({ id: p.id, name: p.displayName || p.id, kind: "human", role: p.role })), ++ // A remote seat already listed under its handle (a duplicate participant record) is offered once. ++ ...uniqueBy(live.filter((p) => p.remote), (p) => p.handle || p.id).map((p) => ({ ++ id: p.handle || p.id, ++ // A face room inserts the disambiguated title. An ordinary group inserts the name the ++ // room routes on (#1141): never "@@handle.home (owner)" and never "(Friend)". ++ name: face ? remoteBotTitle(p) : remoteCallName(p), ++ kind: "bot", ++ remote: p, ++ handle: p.handle, ++ label: face ? faceLabel(ownerNameOf(p), cleanPeerName(p.displayName || p.name, "Bot")) : remoteBotTitle(p) ++ })) ++ ] : listedChatBots(roster).filter((bot) => bot.id !== here.self.id); + const needle = query.trim().toLowerCase(); +- const rows = bots.filter((bot) => bot.name.toLowerCase().includes(needle)).map((bot) => ({ bot, text: `@${bot.name} ` })); ++ const rows = bots.filter((bot) => bot.name.toLowerCase().includes(needle) || String(bot.label ?? "").toLowerCase().includes(needle) || bot.remote && normHandle(remoteRecord(bot)?.handle || bot.handle).includes(normHandle(needle))).map((bot) => ({ bot, text: `@${bot.name} ` })); + const everyone = t("Everyone"); + if (here.room && bots.length > 1 && [everyone, ...ROOM_ALL].some((word) => word.toLowerCase().startsWith(needle))) { +- rows.push({ room: here.room, text: `@${everyone} ` }); ++ rows.push({ room: here.room, count: bots.filter((bot) => bot.kind !== "human").length, text: `@${everyone} ` }); + } +- return rows; ++ if (face) return rows; ++ const seatHandles = new Set(bots.filter((bot) => bot.remote).map((bot) => normHandle(remoteRecord(bot)?.handle)).filter(Boolean)); ++ if (here.room) return [...rows, ...remoteMentionRows(roster, query).filter((row) => !seatHandles.has(normHandle(row.remote.handle)))]; ++ const remoteHandles = new Set(remoteMentionRows(roster, "").map((row) => normHandle(row.remote.handle))); ++ return [ ++ ...rows.filter((row) => !(row.bot && remoteHandles.has(normHandle(remoteRecord(row.bot)?.handle)))), ++ ...remoteMentionRows(roster, query) ++ ]; + } ++var isFaceRoom = (room2) => room2?.origin === "face-to-face"; ++var memberCount = (count) => t(count === 1 ? "{count} member" : "{count} members", { count }); ++var botCount = (count) => count === 1 ? t("1 Bot") : t("{count} Bots", { count }); ++var normHandle = (handle) => String(handle ?? "").trim().replace(/^@+/, "").toLowerCase(); ++var remoteRecord = (bot) => bot?.remote ? bot.remote === true ? bot : bot.remote : null; ++var myOwnerName = (roster, live, bot) => { ++ const seat = live.find((p) => !p.remote && p.kind !== "human" && (p.id === bot.id || bot.handle && p.handle === bot.handle)); ++ return seatOwnerName(seat?.ownerName, seat?.handle) || cleanPeerName(roster.self?.displayName, ""); ++}; ++var uniqueBy = (list, key) => { ++ const seen = /* @__PURE__ */ new Set(); ++ return list.filter((item) => { ++ const k = key(item); ++ if (!k || seen.has(k)) return !k; ++ seen.add(k); ++ return true; ++ }); ++}; ++var faceLabel = (person, bot) => person ? `${bot} (${person})` : bot; + function chatRows(roster, list, sessionId) { + const here = conversationOf(roster, sessionId); + if (here === null) return []; +@@ -5959,14 +5959,31 @@ function atSources({ roster, sessions, launched, iconFor }) { + order: -20, + showGroupTitle: false, + async candidates(session, { query }) { +- return (mentionRows(roster.getSnapshot(), session.sessionId, query) ?? []).map((row) => ({ +- name: row.bot ? row.bot.name : t("Everyone"), +- ...row.bot?.role ? { description: row.bot.role } : {}, +- ...row.room ? { description: t("{count} members", { count: row.room.members.length }) } : {}, ++ const snapshot = roster.getSnapshot(); ++ const face = isFaceRoom(snapshot.roomsById?.[session.sessionId]); ++ const team = (mentionRows(snapshot, session.sessionId, query) ?? []).map((row) => ({ ++ // A friend's Bot by the one name the row inserts, "Chief (Bob)" (#967); its handle is the ++ // second line (#384). A seat carries its own name; a friend's chat is named as its sidebar ++ // row and header (#498). ++ name: row.bot?.remote && !face ? row.bot.kind === "bot" ? remoteBotTitle(remoteRecord(row.bot)) : friendBotTitle(row.bot) : row.bot ? row.bot.label ?? row.bot.name : row.remote ? row.text.replace(/^@/, "").trimEnd() : t("Everyone"), ++ ...row.bot?.role && !face ? { description: row.bot.role } : {}, ++ ...row.remote ? { description: row.remote.handle } : {}, ++ ...row.bot?.remote && !face && remoteRecord(row.bot).handle ? { description: remoteRecord(row.bot).handle } : {}, ++ // A face room counts the Bots in it, mine and everyone else's (#305, #457). ++ ...row.room ? { description: face ? botCount(row.count) : memberCount(row.count) } : {}, + icon: iconFor(row), + section: t("Bots"), + value: row.text + })); ++ if (mentionRows(snapshot, session.sessionId, "") === null || face) return team; ++ const extra = (await mentionCandidates(query, { sessionId: session.sessionId, roster: snapshot })).map((row) => ({ ++ name: row.name, ++ ...row.description ? { description: row.description } : {}, ++ icon: row.icon ?? "session", ++ section: row.section ?? "FlyBot", ++ value: row.value ++ })); ++ return [...team, ...extra]; + }, + onPick: ({ candidate }) => candidate.value ? { text: candidate.value } : void 0 + }; +@@ -5992,7 +5992,84 @@ function atSources({ roster, sessions, launched, iconFor }) { + }, + codec: { clipboardText: (ref) => ref, serialize: (ref) => Promise.resolve(ref) } + }; +- return [bots, chats]; ++ return [bots, chats]; ++} ++ ++// src/client/face-at-filter.js ++var REFERENCE_SOURCE = "reference"; ++var optionId = (source, index) => `dsh-slash-option-${source}-${index}`; ++var isSessionRow = (group, item) => group.source === REFERENCE_SOURCE && item?.icon === "session"; ++var same = (a, b) => a != null && b != null && a.source === b.source && a.index === b.index; ++function planFaceMenu(state, previous = null) { ++ const hidden = []; ++ const ready = []; ++ let shown = 0; ++ let loading = false; ++ for (const group of state?.groups ?? []) { ++ const items = group.items ?? []; ++ if (group.status !== "ready" && items.length === 0) loading = true; ++ items.forEach((item, index) => { ++ const hide = isSessionRow(group, item); ++ if (hide) hidden.push({ source: group.source, index, title: item.section !== void 0 && item.section !== items[index - 1]?.section }); ++ else shown += 1; ++ if (group.status === "ready") ready.push({ source: group.source, index, hide }); ++ }); + } -+ const run = async (endpoint, payload, done) => { -+ try { -+ const result = await save(endpoint, payload); -+ setStatus(done); -+ onSaved?.(result); -+ return result; -+ } catch (error) { -+ setStatus(hostText(error?.message ?? String(error))); -+ return null; - } - }; -+ return (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-panel", "data-panel": "project-settings" }, -+ (0, import_react21.createElement)("h3", null, t("Project settings")), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-field" }, -+ (0, import_react21.createElement)("label", { htmlFor: "bt-project-member-id" }, t("Bind a member to this Project")), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-row-actions" }, -+ (0, import_react21.createElement)( -+ "select", -+ { "aria-label": t("Member kind"), value: kind, onChange: (event) => setKind(event.target.value) }, -+ (0, import_react21.createElement)("option", { value: "bot" }, t("Bot")), -+ (0, import_react21.createElement)("option", { value: "group" }, t("Group")) -+ ), -+ (0, import_react21.createElement)("input", { id: "bt-project-member-id", value: memberId, placeholder: t("Member id"), onChange: (event) => setMemberId(event.target.value) }), -+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-bind", onClick: () => run("project-bind", { kind, id: text(memberId), projectId: id }, t("Member bound.")) }, t("Bind")), -+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-unbind", onClick: () => run("project-bind", { kind, id: text(memberId), projectId: null }, t("Member unbound.")) }, t("Unbind")) -+ ) -+ ), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-field" }, -+ (0, import_react21.createElement)("label", null, t("Project Assistant")), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-row-actions" }, -+ (0, import_react21.createElement)("label", null, (0, import_react21.createElement)("input", { type: "checkbox", "data-action": "assistant-off", checked: assistantOff, onChange: (event) => setAssistantOff(event.target.checked) }), " ", t("Pause the daily digest")), -+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "data-action": "project-assistant-save", onClick: () => run("project-assistant-owner", { id, settings: { off: assistantOff === true } }, t("Assistant settings saved.")) }, t("Save")) -+ ) -+ ), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-field" }, -+ // The host knows two memory kinds; the free text the panel takes is recorded as a decision, -+ // never as a third kind the host would refuse (#1820). -+ (0, import_react21.createElement)("label", { htmlFor: "bt-project-note" }, t("Add to the assistant memory")), -+ (0, import_react21.createElement)("textarea", { id: "bt-project-note", value: note, onChange: (event) => setNote(event.target.value) }), -+ (0, import_react21.createElement)("div", { className: "bt-project-count", "data-role": "project-memory-count", "data-over": noteOver ? "true" : "false" }, `${noteLength}/${MEMORY_TEXT_MAX}`), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-row-actions" }, -+ (0, import_react21.createElement)("button", { -+ type: "button", -+ className: "bt-soft bt-soft-sm", -+ "data-action": "project-memory-save", -+ disabled: noteSaveDisabled, -+ // A disabled button draws no click, but the guard is what a keyboard or a stale tree -+ // could still reach: neither state sends a request or writes anything. -+ onClick: () => { -+ if (noteSaveDisabled) return; -+ run("project-memory-write", { id, kind: "decision", text: text(note) }, t("Memory saved.")); -+ } -+ }, t("Save memory")) -+ ) -+ ), -+ (0, import_react21.createElement)("div", { className: "bt-project-status-line", role: "status" }, status), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-row-actions" }, -+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) -+ ) -+ ); ++ const open = state?.open === true; ++ const blank3 = open && hidden.length > 0 && shown === 0 && !loading; ++ const dismiss = blank3 && (state.groups ?? []).every((group) => group.status === "ready"); ++ return { hidden, blank: blank3, dismiss, target: dismiss ? null : steer(ready, state?.highlight ?? null, previous) }; +} -+function ProjectMembersPanel({ project, rows, onClose } = {}) { -+ const owners = []; -+ const add = (id) => { -+ const clean = text(id); -+ if (clean !== "" && !owners.includes(clean)) owners.push(clean); -+ }; -+ add(project?.ownerUserId); -+ for (const id of Array.isArray(project?.ownerUserIds) ? project.ownerUserIds : []) add(id); -+ const boardMembers = []; -+ for (const row of Array.isArray(rows) ? rows : []) { -+ const name = text(row?.assignee); -+ if (name !== "" && !boardMembers.includes(name)) boardMembers.push(name); ++function steer(ready, highlight, previous) { ++ const at = ready.findIndex((row) => same(row, highlight)); ++ if (at < 0 || !ready[at].hide) return null; ++ const from = ready.findIndex((row) => same(row, previous)); ++ const n = ready.length; ++ const dir = from >= 0 && from !== at && (from - at + n) % n === 1 ? -1 : 1; ++ for (let step = 1; step < n; step += 1) { ++ const row = ready[((at + dir * step) % n + n) % n]; ++ if (!row.hide) return { source: row.source, index: row.index }; + } -+ const chief = text(project?.chief?.botId); -+ return (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-panel", "data-panel": "project-members" }, -+ (0, import_react21.createElement)("h3", null, t("Members")), -+ (0, import_react21.createElement)( -+ "ul", -+ { className: "bt-project-members" }, -+ owners.map((owner) => (0, import_react21.createElement)( -+ "li", -+ { key: `owner:${owner}`, className: "bt-project-member", "data-member-role": "owner", "data-member-id": owner }, -+ (0, import_react21.createElement)("span", null, `@${owner}`), -+ (0, import_react21.createElement)("span", { className: "bt-project-member-kind" }, t("Owner")) -+ )), -+ chief === "" ? null : (0, import_react21.createElement)( -+ "li", -+ { key: `chief:${chief}`, className: "bt-project-member", "data-member-role": "chief", "data-member-id": chief }, -+ (0, import_react21.createElement)("span", null, t("Project Chief")), -+ (0, import_react21.createElement)("span", { className: "bt-project-member-kind" }, t("Chief of this Project")) -+ ), -+ boardMembers.map((name) => (0, import_react21.createElement)( -+ "li", -+ { key: `board:${name}`, className: "bt-project-member", "data-member-role": "board", "data-member-id": name }, -+ (0, import_react21.createElement)("span", null, `@${name}`), -+ (0, import_react21.createElement)("span", { className: "bt-project-member-kind" }, t("On the board")) -+ )) -+ ), -+ owners.length === 0 && boardMembers.length === 0 && chief === "" ? (0, import_react21.createElement)("div", { className: "bt-project-empty" }, t("No member is named yet.")) : null, -+ (0, import_react21.createElement)("p", { className: "bt-project-note" }, t("Member management is not part of this slice; owners and the members their cards name are listed here.")), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-row-actions" }, -+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => onClose?.() }, t("Back to board")) -+ ) -+ ); - } --async function transcribeWave(speech, catalog, wave, signal) { -- if (wave.byteLength > catalog.maxAudioBytes) throw captureError("too-long"); -- const result = await speech.transcribe({ audioBase64: base64Of(wave), ...catalog.selection }, signal); -- if (!result?.ok) throw Object.assign(new Error(result?.error?.message ?? "Transcription failed"), { kind: "service" }); -- return String(result.value?.text ?? "").trim(); -+async function readProjectBoard(read, wanted, knownTeam) { -+ const listing = await read("projects"); -+ const projects = Array.isArray(listing?.projects) ? listing.projects : []; -+ const project = wanted === "" ? projects[0] : projects.find((item) => item.id === wanted); -+ if (project === void 0) return { project: null, rows: [], done: [], canManage: false, tasks: [], team: { rows: [] }, teamFresh: true }; -+ const zone = typeof Intl === "undefined" || typeof Intl.DateTimeFormat !== "function" ? void 0 : Intl.DateTimeFormat().resolvedOptions().timeZone; -+ const [record, board, taskList, dossier] = await Promise.all([ -+ read("project-read", { id: project.id }), -+ read("project-board", { id: project.id, timeZone: zone }), -+ read("tasks", {}), -+ // #1910: #1902 turned this failure into an ordinary empty team, which the poll then served for -+ // the rest of the open. Keep the two answers apart: a refusal is not fresh, so nothing is cached -+ // and the next tick asks again, while a real `{ rows: [] }` answer is fresh and frozen as usual. -+ knownTeam !== void 0 ? { answer: knownTeam, fresh: true } : read("project-team", { id: project.id }).then( -+ (answer) => ({ answer, fresh: answer !== null && typeof answer === "object" }), -+ () => ({ answer: null, fresh: false }) -+ ) -+ ]); -+ const tasks = Array.isArray(taskList) ? taskList : taskList?.tasks ?? []; -+ const queues = { waiting: board?.waiting, inflight: board?.inflight, blocked: board?.blocked, counts: board?.counts ?? null }; -+ const base = record?.project ?? project; -+ const withRole = { ...base, role: project.role ?? null, choices: Array.isArray(project.choices) ? project.choices : [] }; -+ return { -+ project: withRole, -+ assistantMine: record?.assistantMine ?? null, -+ rows: board?.tasks ?? [], -+ done: board?.done ?? [], -+ canManage: record?.canManage === true, -+ tasks, -+ decisions: board?.decisions, -+ meetings: board?.meetings, -+ queues, -+ metrics: board?.metrics ?? null, -+ team: dossier.answer !== null && typeof dossier.answer === "object" ? dossier.answer : { rows: [] }, -+ teamFresh: dossier.fresh ++ return null; ++} ++function faceMenuCss({ hidden, blank: blank3 }) { ++ if (hidden.length === 0) return ""; ++ const rows = hidden.map((row) => `[data-trigger-menu] [id="${optionId(row.source, row.index)}"]`); ++ const titles = hidden.filter((row) => row.title).map((row) => `[data-trigger-menu] [role="presentation"]:has(+ [id="${optionId(row.source, row.index)}"])`); ++ const css = [`${[...rows, ...titles].join(",")}{display:none!important}`]; ++ if (blank3) css.push("[data-trigger-menu]{display:none!important}"); ++ return css.join("\n"); ++} ++function watchFaceMenu(controller, doc = globalThis.document) { ++ if (typeof controller?.menu?.subscribe !== "function" || !doc?.head) return () => { + }; - } --function turnDetector({ loud = 0.12, quiet = 0.06, quietMs = 1200 } = {}) { -- let spokeAt = 0; -- let quietSince = 0; -- return (level, now) => { -- if (level >= loud) { -- spokeAt ||= now; -- quietSince = 0; -- return "speech"; -+var PROJECT_BOARD_POLL_MS = 5e3; -+var boardPollPaused = () => typeof document !== "undefined" && document.visibilityState === "hidden" || typeof window !== "undefined" && !window.location.hash.startsWith("#project"); -+function ProjectBoardOverlay({ actions, call: request, useRoster } = {}) { -+ const read = request ?? call; -+ const present = useProjectPresent(); -+ const roster = typeof useRoster === "function" ? useRoster((value) => value) : void 0; -+ const locked = lockedWindow(roster); -+ const [state, setState] = (0, import_react21.useState)(null); -+ const [panel, setPanel] = (0, import_react21.useState)(null); -+ const [dossier, setDossier] = (0, import_react21.useState)(null); -+ const team = (0, import_react21.useRef)(void 0); -+ const teamGen = (0, import_react21.useRef)(0); -+ const [hash, setHash] = (0, import_react21.useState)(() => typeof window === "undefined" ? "" : window.location.hash); -+ const close = (0, import_react21.useCallback)(() => { -+ if (typeof window !== "undefined") window.location.hash = ""; -+ setPanel(null); -+ setState(null); -+ }, []); -+ (0, import_react21.useEffect)(() => { -+ if (typeof window === "undefined") return void 0; -+ const onKey = (event) => { -+ if (event.key !== "Escape") return; -+ if (panel !== null) setPanel(null); -+ else close(); -+ }; -+ window.addEventListener("keydown", onKey); -+ return () => window.removeEventListener("keydown", onKey); -+ }, [panel, close]); -+ (0, import_react21.useEffect)(() => { -+ if (typeof window === "undefined") return void 0; -+ const sync = () => setHash(window.location.hash); -+ window.addEventListener("hashchange", sync); -+ sync(); -+ return () => window.removeEventListener("hashchange", sync); -+ }, []); -+ (0, import_react21.useEffect)(() => { -+ if (typeof window === "undefined") return void 0; -+ if (!present || !hash.startsWith("#project")) { -+ setState(null); -+ return void 0; -+ } -+ const wanted = hash.slice("#project".length).replace(/^=/, ""); -+ let gone = false; -+ team.current = void 0; -+ teamGen.current = 0; -+ const loadBoard = () => readProjectBoard(read, wanted, team.current); -+ const refresh = async (first) => { -+ const gen = teamGen.current; -+ try { -+ const next = await loadBoard(); -+ if (!gone) { -+ const newer = teamGen.current !== gen; -+ if (next.teamFresh !== false && !newer) team.current = next.team; -+ setState(newer && team.current !== void 0 ? { ...next, team: team.current } : next); -+ } -+ } catch { -+ if (!gone && first) setState({ project: null, rows: [], canManage: false, tasks: [] }); -+ } -+ }; -+ void refresh(true); -+ const timer = setInterval(() => { -+ if (!boardPollPaused()) void refresh(false); -+ }, PROJECT_BOARD_POLL_MS); -+ return () => { -+ gone = true; -+ clearInterval(timer); -+ }; -+ }, [hash, present]); -+ const openDossier = async (value) => { -+ setDossier(value); -+ setPanel("dossier"); -+ const id = state?.project?.id; -+ if (typeof id !== "string" || id === "") return; -+ const gen = teamGen.current + 1; -+ teamGen.current = gen; -+ try { -+ const answer = await read("project-team", { id }); -+ if (teamGen.current !== gen || answer === null || typeof answer !== "object") return; -+ team.current = answer; -+ setState((previous) => previous === null ? previous : { ...previous, team: answer }); -+ } catch { - } -- if (!spokeAt) return "waiting"; -- if (level < quiet) quietSince ||= now; -- return quietSince && now - quietSince >= quietMs ? "done" : "speech"; ++ const style = doc.createElement("style"); ++ style.setAttribute("data-bt-face-at", ""); ++ doc.head.appendChild(style); ++ let previous = null; ++ let stopped = false; ++ const later = typeof queueMicrotask === "function" ? queueMicrotask : (fn) => Promise.resolve().then(fn); ++ const apply2 = () => { ++ if (stopped) return; ++ const state = controller.menu.getSnapshot(); ++ const plan = planFaceMenu(state, previous); ++ const css = faceMenuCss(plan); ++ if (style.textContent !== css) style.textContent = css; ++ if (plan.dismiss) later(() => { ++ if (!stopped && planFaceMenu(controller.menu.getSnapshot(), previous).dismiss) controller.dismiss(); ++ }); ++ else if (plan.target) later(() => { ++ if (!stopped) controller.hover(plan.target.source, plan.target.index); ++ }); ++ else previous = state.open ? state.highlight : null; ++ }; ++ const unsubscribe = controller.menu.subscribe(apply2); ++ apply2(); ++ return () => { ++ stopped = true; ++ unsubscribe?.(); ++ style.remove(); ++ }; + } + + // src/client/speech.js +@@ -6008,8 +6008,8 @@ async function speechCatalog(speech) { + function waveBytes(samples, rate = 16e3) { + const bytes = new Uint8Array(44 + samples.length * 2); + const view = new DataView(bytes.buffer); +- const ascii = (at, text) => { +- for (let index = 0; index < text.length; index += 1) bytes[at + index] = text.charCodeAt(index); ++ const ascii = (at, text2) => { ++ for (let index = 0; index < text2.length; index += 1) bytes[at + index] = text2.charCodeAt(index); + }; + ascii(0, "RIFF"); + view.setUint32(4, 36 + samples.length * 2, true); +@@ -6030,9 +6030,9 @@ function waveBytes(samples, rate = 16e3) { + return bytes; + } + function base64Of(bytes) { +- let text = ""; +- for (let index = 0; index < bytes.length; index += 32768) text += String.fromCharCode(...bytes.subarray(index, index + 32768)); +- return btoa(text); ++ let text2 = ""; ++ for (let index = 0; index < bytes.length; index += 32768) text2 += String.fromCharCode(...bytes.subarray(index, index + 32768)); ++ return btoa(text2); + } + var captureError = (kind, cause) => Object.assign(new Error(kind), { kind, cause }); + async function openCapture() { +@@ -6121,233 +6121,170 @@ function turnDetector({ loud = 0.12, quiet = 0.06, quietMs = 1200 } = {}) { }; -+ if (state === null || !present) return null; -+ return (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-overlay" }, -+ (0, import_react21.createElement)("div", { className: "bt-scrim", onClick: close }), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-mem bt-project-dialog", role: "dialog", "aria-modal": true, "aria-label": t("Project board") }, -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-mem-head" }, -+ (0, import_react21.createElement)("h2", {}, t("Project board")), -+ (0, import_react21.createElement)("span", { className: "bt-mem-head-gap" }), -+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-project-close", autoFocus: true, onClick: close }, t("Close")) -+ ), -+ (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-body" }, -+ state.project === null ? (0, import_react21.createElement)( -+ "div", -+ { className: "bt-project-empty" }, -+ locked ? null : (0, import_react21.createElement)("p", null, t("No Project yet — create one.")), -+ locked ? (0, import_react21.createElement)("p", null, t("No Project yet.")) : null, -+ locked ? readOnlyLine(import_react21.createElement, roster, actions, { key: "read-only" }) : null, -+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { -+ close(); -+ actions?.openSettings?.("projects"); -+ } }, t("Open Projects in Settings")) -+ ) : panel === "dossier" ? (0, import_react21.createElement)(ProjectDossierPanel, { -+ row: dossierRowOf(state.team, dossier?.botId), -+ label: dossier?.label ?? "", -+ onClose: () => setPanel(null), -+ onOpenBot: (id) => { -+ close(); -+ actions?.openSession?.(id); -+ } -+ }) : panel === "settings" ? (0, import_react21.createElement)(ProjectSettingsPanel, { project: state.project, assistantMine: state.assistantMine, actions, call: read, locked, readOnly: roster?.readOnly, onClose: () => setPanel(null) }) : panel === "members" ? (0, import_react21.createElement)(ProjectMembersPanel, { project: state.project, rows: state.rows, onClose: () => setPanel(null) }) : (0, import_react21.createElement)(ProjectBoardPane, { -+ project: state.project, -+ rows: state.rows, -+ done: state.done, -+ canManage: state.canManage, -+ tasks: state.tasks, -+ decisions: state.decisions, -+ meetings: state.meetings, -+ queues: state.queues, -+ metrics: state.metrics, -+ team: state.team, -+ // #2041: a decision row opens through the same channel read the page polls with. -+ call: read, -+ onSettings: () => setPanel("settings"), -+ onMembers: () => setPanel("members"), -+ // #1864: a team row's Dossier control opens the read-only panel, fed by the same read. -+ onOpenDossier: (value) => { -+ void openDossier(value); -+ }, -+ // #1860: a team row opens that Bot's chat. The board is a modal over the conversation, -+ // so it closes first — otherwise the chat opens behind it. -+ onOpenBot: (id) => { -+ close(); -+ actions?.openSession?.(id); -+ }, -+ // The task's own board is where a row leads: the Tasks dialog reads `#task=` on mount and -+ // lands on that Bot or group. Nothing here re-decides which board that is. -+ onOpen: (board) => { -+ if (typeof window !== "undefined") window.location.hash = `#task=${board.kind}:${board.id}`; -+ actions?.openBoard?.(); -+ setState(null); -+ } -+ }) -+ ) -+ ) -+ ); } -// src/client/overlay-hooks.js @@ -15968,159 +18163,39 @@ diff --git a/client.js b/client.js - (0, import_react11.useEffect)(() => { - if (escapeLayers.length === 0) window.addEventListener("keydown", onEscapeKey); - escapeLayers.push(ref); -+// src/client/header.js -+var import_react22 = require("react"); -+var import_react_dom6 = require("react-dom"); -+var GoArrow = () => (0, import_react22.createElement)("svg", { width: 14, height: 14, viewBox: "-12 -12 24 24", fill: "none", stroke: "currentColor", strokeWidth: 2.2, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react22.createElement)("path", { d: "M-7 0H7M2 -5L7 0L2 5" })); -+var MEMORY_NOTICE_MS = 3200; -+var noNews = (select) => select({}); -+function useMemoryNotice(ids, useMemoryNews) { -+ const seen = useMemoryNews((map) => Math.max(0, ...ids.map((id) => map?.[id]?.seen ?? 0))); -+ const [shown, setShown] = (0, import_react22.useState)(false); -+ (0, import_react22.useEffect)(() => { -+ const left = seen + MEMORY_NOTICE_MS - Date.now(); -+ setShown(seen > 0 && left > 0); -+ if (seen === 0 || left <= 0) return void 0; -+ const timer = setTimeout(() => setShown(false), left); -+ return () => clearTimeout(timer); -+ }, [seen]); -+ return shown; -+} -+function MemoryNotice({ shown }) { -+ const inner = (0, import_react22.useRef)(null); -+ const [width, setWidth] = (0, import_react22.useState)(0); -+ const label = t("Memory updated"); -+ (0, import_react22.useLayoutEffect)(() => { -+ if (shown) setWidth(inner.current?.scrollWidth ?? 0); -+ }, [label, shown]); -+ return (0, import_react22.createElement)( -+ "span", -+ { className: "bt-pill-mem", "aria-hidden": true, style: { "--bt-mem-w": `${width}px` } }, -+ (0, import_react22.createElement)("span", { className: "bt-pill-mem-in", ref: inner }, (0, import_react22.createElement)("span", { className: "bt-pill-mem-ico" }, (0, import_react22.createElement)(MemoryIcon)), label) -+ ); -+} -+function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSession, useActivity, useBusyAcks, useMemoryNews, useTurnClock, useUi, useLive, actions }) { -+ const roster = useRoster((value) => value); -+ const title = useSessions((list) => list.byId[sessionId]?.displayTitle ?? list.byId[sessionId]?.title ?? ""); -+ const firstTurns = useSessions((list) => { -+ const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline; -+ return Array.isArray(outline) ? outline.slice(0, 8).map((entry) => entry.turn).join(",") : ""; -+ }); -+ const hiddenTurns = roster.exchangeTurns?.[sessionId]; -+ const visit = useUi((state) => state.visits?.[sessionId]); -+ const opening = useTurnClock((state) => { -+ const first = openingTurn(state[sessionId], firstTurns, hiddenTurns); -+ return first && !unseenSince(visit, first.start) ? clockLabel(first.start) : ""; -+ }); -+ (0, import_react22.useEffect)(() => { -+ if (opening) document.body.style.setProperty("--bt-first-sep", JSON.stringify(opening)); -+ else document.body.style.removeProperty("--bt-first-sep"); -+ return () => document.body.style.removeProperty("--bt-first-sep"); -+ }, [opening]); -+ const running = useSessionStatus((map) => map.get(sessionId)?.running === true); -+ const owner = roster.byId[sessionId]?.id ?? sessionId; -+ const doing = useActivity((map) => map[owner]); -+ const bot = roster.byId[sessionId]; -+ const projectAgent = projectAgentFor(bot, roster.self?.memberId); -+ const room2 = roster.roomsById[sessionId]; -+ const detailsOpen = useUi((state) => state.details === sessionId); -+ const full2 = bot?.remote ? friendBotTitle(bot) : roomTitle(room2) || bot?.name || ""; -+ const face = room2?.origin === "face-to-face"; -+ const name = face ? faceRowTitle(full2) : full2; -+ const useNews = useMemoryNews ?? noNews; -+ const memoryIds = bot ? [bot.id] : room2?.members ?? []; -+ const notice = useMemoryNotice(memoryIds, useNews); -+ const changed2 = useNews((map) => latestMemoryChange(map, memoryIds)); -+ const memoryNotice = notice && changed2 !== null && roster.memory !== false; -+ return (0, import_react22.createElement)( -+ "div", -+ { className: "bt-head" }, -+ (0, import_react22.createElement)( -+ "button", -+ { -+ type: "button", -+ className: "bt-pill", -+ "aria-expanded": detailsOpen, -+ "data-memory": memoryNotice ? "updated" : void 0, -+ "aria-label": memoryNotice ? t("Memory updated. Open {name}'s memory", { name: roster.byId[changed2]?.name ?? full2 }) : t("View conversation details"), -+ onClick: () => memoryNotice ? actions.openMemory(changed2) : actions.toggleDetails(sessionId) -+ }, -+ bot ? (0, import_react22.createElement)(BotAvatar, { bot, size: 24, state: botState(running, doing, roster.questions?.[currentPart(bot)] !== void 0), badge: false }) : room2 ? (0, import_react22.createElement)(RoomAvatar, { room: room2, roster, size: 24 }) : null, -+ (0, import_react22.createElement)("span", { className: face ? "bt-pill-name bt-pill-name-face" : "bt-pill-name", title: face ? full2 : void 0 }, name || title || t("New chat")), -+ (0, import_react22.createElement)(MemoryNotice, { shown: memoryNotice }), -+ (0, import_react22.createElement)("span", { className: "bt-pill-go", "aria-hidden": true }, (0, import_react22.createElement)(GoArrow)) -+ ), -+ (0, import_react22.createElement)("span", { className: "bt-sr", role: "status" }, memoryNotice ? t("Memory updated") : ""), -+ projectAgent === null ? null : (0, import_react22.createElement)(ProjectAgentEntry, { -+ projectId: projectAgent.projectId, -+ read: call, -+ onOpen: (id) => actions?.openSession?.(id) -+ }), -+ (0, import_react22.createElement)(NewMessagePills, { key: sessionId, sessionId, hiddenTurns, useSessions, useUi, useTurnClock, actions }), -+ (0, import_react22.createElement)(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, actions }), -+ (0, import_react22.createElement)(BusyAckBubble, { key: `busy-ack:${sessionId}`, sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive }) -+ ); -+} -+function useTranscriptView() { -+ const [view, setView] = (0, import_react22.useState)(null); -+ (0, import_react22.useEffect)(() => { -+ let frame = 0; -+ let watched = null; -+ const observer = new MutationObserver(() => schedule()); -+ const measure = () => { -+ frame = 0; -+ const scroller = document.querySelector("[data-conversation-scroll]"); -+ if (scroller !== watched) { -+ observer.disconnect(); -+ watched = scroller; -+ if (scroller) observer.observe(scroller, { childList: true, subtree: true }); -+ } -+ if (!scroller) { -+ setView(null); -+ return; -+ } -+ const box = scroller.getBoundingClientRect(); -+ const headerBottom = document.querySelector('header[class*="_header"]')?.getBoundingClientRect().bottom ?? box.top + 50; -+ const sep = scroller.querySelector(".bt-new-sep"); -+ let divider = null; -+ if (sep) { -+ const at = sep.getBoundingClientRect(); -+ divider = at.bottom <= headerBottom ? "above" : at.top >= box.bottom ? "below" : "in-view"; -+ } -+ const composer = parseFloat(getComputedStyle(scroller).getPropertyValue("--dsh-composer-height")) || 152; -+ let tail; -+ for (const row of scroller.querySelectorAll("[data-chat-turn]")) { -+ const turn = Number(row.dataset.chatTurn); -+ const at = row.getBoundingClientRect(); -+ if (Number.isFinite(turn) && at.bottom > box.top && at.top < box.bottom && (tail === void 0 || turn > tail)) tail = turn; -+ } -+ const next = { -+ unpinned: scroller.querySelector('[class*="_toBottomSlot"]>button') !== null, -+ divider, -+ tail, -+ center: Math.round(box.left + box.width / 2), -+ top: Math.round(headerBottom + 8), -+ bottom: Math.round(window.innerHeight - box.bottom + composer + 8) ++// src/client/history-hit.js ++var import_react26 = require("react"); ++function useHistoryHit(read, hitToken, accessKey) { ++ const [attempt, setAttempt] = (0, import_react26.useState)(0); ++ const [state, setState] = (0, import_react26.useState)({ key: "", status: "loading", value: null }); ++ const serial = (0, import_react26.useRef)(0); ++ const key = `${hitToken ?? ""}:${accessKey}:${attempt}`; ++ (0, import_react26.useEffect)(() => { ++ const ticket = ++serial.current; ++ const abort = new AbortController(); ++ setState({ key, status: "loading", value: null }); ++ if (!hitToken || typeof read !== "function") { ++ setState({ key, status: "error", value: null }); ++ return () => { ++ serial.current += 1; ++ abort.abort(); + }; -+ setView((prev) => prev && Object.keys(next).every((key) => prev[key] === next[key]) ? prev : next); -+ }; -+ const schedule = () => { -+ if (!frame) frame = requestAnimationFrame(measure); -+ }; -+ document.addEventListener("scroll", schedule, true); -+ window.addEventListener("resize", schedule); -+ schedule(); ++ } ++ void Promise.resolve().then(() => read({ hitToken }, abort.signal)).then((value) => { ++ if (serial.current !== ticket || abort.signal.aborted) return; ++ if (value?.scope !== "read-only-history" || !Array.isArray(value.entries)) throw new Error("Invalid history response"); ++ setState({ key, status: "ready", value }); ++ }).catch(() => { ++ if (serial.current === ticket && !abort.signal.aborted) setState({ key, status: "error", value: null }); ++ }); return () => { - escapeLayers.splice(escapeLayers.indexOf(ref), 1); - if (escapeLayers.length === 0) window.removeEventListener("keydown", onEscapeKey); -+ cancelAnimationFrame(frame); -+ observer.disconnect(); -+ document.removeEventListener("scroll", schedule, true); -+ window.removeEventListener("resize", schedule); ++ serial.current += 1; ++ abort.abort(); }; - }, []); -+ return view; - } +- }, []); +-} -function usePaneLeft() { - const [paneLeft, setPaneLeft] = (0, import_react11.useState)(280); - (0, import_react11.useLayoutEffect)(() => { @@ -16128,90 +18203,10 @@ diff --git a/client.js b/client.js - if (column) setPaneLeft(Math.round(column.getBoundingClientRect().right)); - }, []); - return paneLeft; -+function NewMessagePills({ sessionId, hiddenTurns, useSessions, useUi, useTurnClock, actions }) { -+ const replies = useSessions((list) => { -+ const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline; -+ return Array.isArray(outline) ? outline.reduce((count, entry) => count + (entry.response ? 1 : 0), 0) : 0; -+ }); -+ const visit = useUi((state) => state.visits?.[sessionId]); -+ const unread = useTurnClock((state) => { -+ if (typeof visit?.seen !== "number") return 0; -+ let count = 0; -+ for (const entry of Object.values(state[sessionId] ?? {})) { -+ if (entry.first !== void 0 && entry.first > visit.seen && entry.first <= visit.entered) count += 1; -+ } -+ return count; -+ }); -+ const view = useTranscriptView(); -+ const tailAt = useTurnClock((state) => { -+ if (view?.tail === void 0) return null; -+ const entry = state[sessionId]?.[view.tail]; -+ return entry?.end ?? entry?.first ?? null; -+ }); -+ (0, import_react22.useEffect)(() => { -+ if (tailAt !== null) actions?.noteVisitTail?.(sessionId, tailAt); -+ }, [tailAt, sessionId]); -+ const unpinned = view?.unpinned === true; -+ const [release, setRelease] = (0, import_react22.useState)({ base: null, dismissed: false }); -+ const [above, setAbove] = (0, import_react22.useState)({ seen: false, dismissed: false }); -+ (0, import_react22.useEffect)(() => { -+ setRelease({ base: unpinned ? replies : null, dismissed: false }); -+ }, [unpinned]); -+ (0, import_react22.useEffect)(() => { -+ if (view?.divider === "in-view") setAbove((state) => state.seen ? state : { ...state, seen: true }); -+ }, [view?.divider]); -+ const movedOn = useTurnClock((state) => movedOnSince(visit, state[sessionId], hiddenTurns)); -+ (0, import_react22.useEffect)(() => { -+ if (above.seen && movedOn) actions?.settleVisit?.(sessionId); -+ }, [above.seen, movedOn, sessionId]); -+ const fresh = release.base === null ? 0 : replies - release.base; -+ const showDown = unpinned && fresh > 0 && !release.dismissed; -+ const showUp = view?.divider === "above" && !above.seen && !above.dismissed; -+ (0, import_react22.useEffect)(() => { -+ const scroller = document.querySelector("[data-conversation-scroll]"); -+ if (!scroller) return void 0; -+ scroller.toggleAttribute("data-bt-news", showDown); -+ return () => scroller.removeAttribute("data-bt-news"); -+ }, [showDown]); -+ if (!view || !showDown && !showUp) return null; -+ const label = (count) => count === 1 ? t("1 new message") : count > 0 ? t("{count} new messages", { count }) : t("New messages"); -+ const pill = (direction, count, style, onJump, onDismiss) => (0, import_react22.createElement)( -+ "div", -+ { className: "bt-news", "data-direction": direction, style }, -+ (0, import_react22.createElement)( -+ "button", -+ { type: "button", className: "bt-news-jump", onClick: onJump }, -+ (0, import_react22.createElement)("span", { className: "bt-news-ico" }, (0, import_react22.createElement)(direction === "up" ? ArrowUpIcon : ArrowDownIcon)), -+ label(count) -+ ), -+ (0, import_react22.createElement)("button", { -+ type: "button", -+ className: "bt-news-x", -+ "aria-label": t("Dismiss new messages"), -+ onClick: (event) => { -+ event.stopPropagation(); -+ onDismiss(); -+ } -+ }, (0, import_react22.createElement)(CloseIcon)) -+ ); -+ const toLatest = () => { -+ const scroller = document.querySelector("[data-conversation-scroll]"); -+ const back = scroller?.querySelector('[class*="_toBottomSlot"]>button'); -+ if (back) back.click(); -+ else scroller?.scrollTo({ top: scroller.scrollHeight, behavior: "smooth" }); -+ }; -+ const toDivider = () => document.querySelector("[data-conversation-scroll] .bt-new-sep")?.scrollIntoView({ block: "center", behavior: "smooth" }); -+ return (0, import_react_dom6.createPortal)( -+ (0, import_react22.createElement)( -+ import_react22.Fragment, -+ null, -+ showUp ? pill("up", unread, { left: view.center, top: view.top }, toDivider, () => setAbove((state) => ({ ...state, dismissed: true }))) : null, -+ showDown ? pill("down", fresh, { left: view.center, bottom: view.bottom }, toLatest, () => setRelease((state) => ({ ...state, dismissed: true }))) : null -+ ), -+ document.body -+ ); ++ }, [read, key]); ++ return { ...state.key === key ? state : { status: "loading", value: null }, reload: () => setAttempt((value) => value + 1) }; } - +- -// src/client/palette.js -var import_react12 = require("react"); -var import_dsh_client_ui_primitives3 = require("@deepseek-ai/dsh-client-ui-primitives"); @@ -16246,21 +18241,8 @@ diff --git a/client.js b/client.js - hits.push([id, entry.turn, (from > 0 ? "…" : "") + text.slice(from, at + wanted.length + 60)]); - break; - } -+// src/client/composer-label.js -+var ATTRIBUTES = ["aria-label", "data-placeholder"]; -+function holdComposerLabel(doc, label) { -+ doc.body.style.setProperty("--bt-placeholder", JSON.stringify(label)); -+ const shell = /* @__PURE__ */ new Map(); -+ const apply2 = () => { -+ for (const el of doc.querySelectorAll("[data-composer-input]")) { -+ for (const name of ATTRIBUTES) { -+ const current = el.getAttribute(name); -+ if (current === label) continue; -+ if (!shell.has(el)) shell.set(el, {}); -+ shell.get(el)[name] = current; -+ el.setAttribute(name, label); - } - } +- } +- } - return JSON.stringify(hits); - }); - const matchesName = (...fields) => wanted === "" || fields.some((field) => (field ?? "").toLowerCase().includes(wanted)); @@ -16286,19 +18268,7 @@ diff --git a/client.js b/client.js - run: async () => { - if (room2.hidden) await actions.setFlags(room2.id, { hidden: false }); - actions.openSession(room2.id); -+ }; -+ apply2(); -+ const Observer = doc.defaultView?.MutationObserver ?? globalThis.MutationObserver; -+ const watcher = typeof Observer === "function" ? new Observer(apply2) : null; -+ watcher?.observe(doc.body, { subtree: true, childList: true, attributes: true, attributeFilter: ATTRIBUTES }); -+ return () => { -+ watcher?.disconnect(); -+ for (const [el, values] of shell) { -+ if (!el.isConnected) continue; -+ for (const [name, value] of Object.entries(values)) { -+ if (value == null) el.removeAttribute(name); -+ else el.setAttribute(name, value); - } +- } - })) - ]; - if (people.length) sections.push([t("Bots"), people]); @@ -16343,11 +18313,19 @@ diff --git a/client.js b/client.js - if (!row || leaving) return; - void Promise.resolve(row.run()).catch((error) => actions.reportError(error, "menu")); - close(); -+ } - }; +- }; - let index = -1; - return (0, import_react12.createElement)( -- "div", ++function HistoryHitDialog({ hit, roster, actions, onBack }) { ++ const ref = (0, import_react26.useRef)(null); ++ useEscape(onBack); ++ useDialogFocus(ref); ++ const bot = roster.byId[hit.botId]; ++ const accessKey = JSON.stringify([Boolean(bot), bot?.ownerId, bot?.sessionId, bot?.parts, roster.self?.memberId]); ++ const state = useHistoryHit(actions.readHistoryHit, bot ? hit.hitToken : null, accessKey); ++ const view = state.status === "ready" ? state.value : null; ++ return (0, import_react26.createElement)( + "div", - { className: "bt-palette-layer", "data-leaving": leaving || void 0 }, - (0, import_react12.createElement)("div", { className: "bt-backdrop", onMouseDown: close }), - (0, import_react12.createElement)( @@ -16355,7 +18333,14 @@ diff --git a/client.js b/client.js - { className: "bt-palette", role: "dialog", "aria-label": t("Search"), "aria-modal": true }, - (0, import_react12.createElement)( - "div", -- { className: "bt-palette-head" }, ++ { className: "bt-palette-layer" }, ++ (0, import_react26.createElement)("div", { className: "bt-backdrop", onMouseDown: onBack }), ++ (0, import_react26.createElement)( ++ "section", ++ { className: "bt-palette bt-history-view", role: "dialog", "aria-modal": true, "aria-label": t("Read-only history match"), tabIndex: -1, ref }, ++ (0, import_react26.createElement)( ++ "header", + { className: "bt-palette-head" }, - (0, import_react12.createElement)("span", { className: "bt-palette-glyph", "aria-hidden": true }, (0, import_react12.createElement)(SearchIcon)), - (0, import_react12.createElement)("input", { - autoFocus: true, @@ -16387,13 +18372,22 @@ diff --git a/client.js b/client.js - setQuery(""); - setCursor(0); - } }, (0, import_react12.createElement)(CloseIcon)) : null -- ), ++ (0, import_react26.createElement)("h2", null, t("Read-only history match")), ++ (0, import_react26.createElement)("button", { type: "button", className: "bt-palette-clear", "aria-label": t("Back to search"), onClick: onBack }, (0, import_react26.createElement)(CloseIcon)) + ), - (0, import_react12.createElement)( -- "div", ++ (0, import_react26.createElement)("p", { className: "bt-history-disclaimer" }, t("This is segment history, not the current chat. No Bot is activated.")), ++ (0, import_react26.createElement)("p", { className: "bt-history-disclaimer" }, t("Shows the match and up to two nearby visible messages on each side.")), ++ (0, import_react26.createElement)( + "div", - { ref: listRef, id: "bt-palette-list", className: "bt-palette-list", role: "listbox", "aria-label": t("Results") }, - (0, import_react12.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), - rows.length === 0 ? (0, import_react12.createElement)( -- "div", ++ { className: "bt-history-content" }, ++ state.status === "loading" ? (0, import_react26.createElement)("p", { role: "status" }, t("Loading authorized history…")) : null, ++ state.status === "error" ? (0, import_react26.createElement)("p", { role: "alert" }, t("History changed, expired, or is no longer accessible. Search again.")) : null, ++ view ? (0, import_react26.createElement)( + "div", - { className: "bt-palette-empty" }, - (0, import_react12.createElement)("span", { className: "bt-palette-empty-icon", "aria-hidden": true }, (0, import_react12.createElement)(SearchIcon)), - (0, import_react12.createElement)("span", { className: "bt-palette-empty-label" }, t("No results")), @@ -16430,33 +18424,117 @@ diff --git a/client.js b/client.js - ); - }) - )) -- ) -- ) -- ); ++ null, ++ (0, import_react26.createElement)("p", null, t("Segment {part} of {count}", { part: view.part, count: view.partCount })), ++ (0, import_react26.createElement)("p", null, t("History session"), ": ", (0, import_react26.createElement)("code", null, view.sessionId)), ++ view.entries.map((entry) => (0, import_react26.createElement)( ++ "section", ++ { key: entry.seq, className: "bt-history-entry", "data-hit": entry.hit || void 0 }, ++ (0, import_react26.createElement)( ++ "h3", ++ null, ++ entry.hit ? t("Matched message") : t("Nearby message"), ++ " · ", ++ t(entry.role === "user" ? "You" : "Bot"), ++ " · ", ++ t("Sequence"), ++ " ", ++ entry.seq, ++ entry.turn === null ? null : ` · ${t("Turn")} ${entry.turn}` ++ ), ++ entry.omittedBefore ? (0, import_react26.createElement)("span", null, "…") : null, ++ (0, import_react26.createElement)("pre", null, entry.text), ++ entry.truncated ? (0, import_react26.createElement)("p", { className: "bt-hint" }, t("Text truncated by the byte limit; this is not complete history.")) : null ++ )) ++ ) : null ++ ), ++ (0, import_react26.createElement)( ++ "footer", ++ { className: "bt-history-foot" }, ++ (0, import_react26.createElement)("button", { type: "button", className: "bt-soft", onClick: onBack }, t("Back to search")), ++ (0, import_react26.createElement)("button", { type: "button", className: "bt-soft", disabled: state.status === "loading", onClick: state.reload }, t("Reload history context")) + ) + ) + ); } --// src/client/model-menu.js ++// src/client/history-search.js ++var import_react27 = require("react"); ++var HISTORY_DISPLAY_MAX = 100; ++function useHistorySearch(search, query) { ++ const [state, setState] = (0, import_react27.useState)({ query: "", items: [], status: "idle", cursor: null }); ++ const latest = (0, import_react27.useRef)(0); ++ const alive = (0, import_react27.useRef)(true); ++ const activeAbort = (0, import_react27.useRef)(null); ++ (0, import_react27.useEffect)(() => { ++ alive.current = true; ++ return () => { ++ alive.current = false; ++ latest.current += 1; ++ activeAbort.current?.abort(); ++ }; ++ }, []); ++ const request = async (wanted, previous, ticket) => { ++ activeAbort.current?.abort(); ++ const abort = new AbortController(); ++ activeAbort.current = abort; ++ try { ++ const reply = await search({ query: wanted, limit: Math.min(20, HISTORY_DISPLAY_MAX - previous.items.length), ...previous.cursor ? { cursor: previous.cursor } : {} }, abort.signal); ++ if (!alive.current || latest.current !== ticket) return; ++ if (reply?.scope !== "local-bot-chats" || !Array.isArray(reply.items)) throw new Error("Unsupported history response"); ++ const items = [...previous.items, ...reply.items].slice(0, HISTORY_DISPLAY_MAX); ++ setState({ ++ query: wanted, ++ items, ++ status: "ready", ++ cursor: items.length < HISTORY_DISPLAY_MAX ? reply.cursor : null, ++ incomplete: reply.incomplete, ++ limited: reply.limited || items.length >= HISTORY_DISPLAY_MAX && Boolean(reply.cursor) ++ }); ++ } catch { ++ if (alive.current && latest.current === ticket) setState({ query: wanted, items: [], status: "error", cursor: null }); ++ } finally { ++ if (activeAbort.current === abort) activeAbort.current = null; ++ } ++ }; ++ (0, import_react27.useEffect)(() => { ++ const ticket = ++latest.current; ++ const initial = { query, items: [], cursor: null }; ++ if (typeof search !== "function" || !query.trim() || [...query].length > 256) { ++ setState({ ...initial, status: "idle" }); ++ return void 0; ++ } ++ setState({ ...initial, status: "loading" }); ++ const timer = setTimeout(() => { ++ void request(query, initial, ticket); ++ }, 250); ++ return () => { ++ clearTimeout(timer); ++ activeAbort.current?.abort(); ++ }; ++ }, [search, query]); ++ const current = state.query === query ? state : { query, items: [], cursor: null, status: typeof search === "function" && query.trim() ? "loading" : "idle" }; ++ const more = () => { ++ if (current.status !== "ready" || !current.cursor) return; ++ const ticket = ++latest.current; ++ setState({ ...current, status: "loading" }); ++ void request(query, current, ticket); ++ }; ++ return { ...current, more }; ++} ++ + // src/client/model-menu.js -var import_react13 = require("react"); -var import_react_dom6 = require("react-dom"); --var MENU_EXIT_MS = 120; --function groupModels(models) { -- const groups = /* @__PURE__ */ new Map(); -- for (const model of models ?? []) { -- const provider = model.provider ?? model.providerName ?? model.ref.split("/")[0]; -- if (!groups.has(provider)) groups.set(provider, []); -- groups.get(provider).push(model); -- } -- const names = /* @__PURE__ */ new Map(); -- for (const [provider, list] of groups) { -- const name = list[0].providerName ?? provider; -- names.set(name, (names.get(name) ?? 0) + 1); -- } -- return [...groups].map(([provider, list]) => { -- const name = list[0].providerName ?? provider; -- return [names.get(name) > 1 ? `${name} (${provider})` : name, list]; -- }); --} --var servedOf = (roster, ref) => (roster.models ?? []).find((model) => model.ref === ref); ++var import_react28 = require("react"); ++var import_react_dom8 = require("react-dom"); + var MENU_EXIT_MS = 120; + function groupModels(models) { + const groups = /* @__PURE__ */ new Map(); +@@ -6367,17 +6367,10 @@ function groupModels(models) { + }); + } + var servedOf = (roster, ref) => (roster.models ?? []).find((model) => model.ref === ref); -function modelOf(bot, roster) { - const ref = bot.model ?? bot.appliedModel; - if (!ref) return void 0; @@ -16464,952 +18542,438 @@ diff --git a/client.js b/client.js - const [provider, ...rest] = ref.split("/"); - return { ref, name: served?.name ?? rest.join("/"), provider: served?.providerName ?? provider, served: served !== void 0 }; -} --var effortCache = /* @__PURE__ */ new Map(); --function useEfforts(served, ref, actions) { + var effortCache = /* @__PURE__ */ new Map(); + function useEfforts(served, ref, actions) { - const [fetched, setFetched] = (0, import_react13.useState)(void 0); - (0, import_react13.useEffect)(() => { -- setFetched(void 0); -- if (ref === void 0 || served?.reasoning !== void 0 || actions?.efforts === void 0) return void 0; -- let live = true; -- if (effortCache.has(ref)) setFetched(effortCache.get(ref)); -- else void Promise.resolve(actions.efforts(ref)).then((value) => { -- const reasoning = value?.efforts ? value : null; -- effortCache.set(ref, reasoning); -- if (live) setFetched(reasoning); -- }).catch(() => { -+// src/client/header-effects.js -+function installHeaderEffects({ sessions, roster, actions, doc = globalThis.document }) { -+ if (!doc) return () => { -+ }; -+ const slots = /* @__PURE__ */ new Map(); -+ const run = (id, dep, setup) => { -+ const held = slots.get(id); -+ if (held !== void 0 && held.dep === dep) return; -+ held?.off(); -+ slots.set(id, { dep, off: setup() ?? (() => { -+ }) }); -+ }; -+ let running = false; -+ let again = false; -+ const pass = () => { -+ const list = sessions.getSnapshot(); -+ const state = roster.getSnapshot(); -+ const row = Object.values(list?.byId ?? {}).find((entry) => (entry?.retainedBy?.mainView ?? 0) > 0); -+ const sessionId = row?.id; -+ const bot = sessionId === void 0 ? void 0 : state?.byId?.[sessionId]; -+ const room2 = sessionId === void 0 ? void 0 : state?.roomsById?.[sessionId]; -+ const name = bot?.remote ? friendBotTitle(bot) : roomTitle(room2) || bot?.name || ""; -+ run("friend-chat", `${sessionId}|${bot?.remote === true}`, () => { -+ if (!bot?.remote) return void 0; -+ doc.body.dataset.btFriendChat = ""; -+ return () => { -+ delete doc.body.dataset.btFriendChat; -+ }; - }); -- return () => { -- live = false; -+ run("remote-empty", `${sessionId}|${bot?.remote === true}|${row?.blank === true}`, () => { -+ if (!bot?.remote || row?.blank !== true) return void 0; -+ doc.body.dataset.btRemoteChat = "empty"; -+ doc.body.style.setProperty("--bt-remote-empty", JSON.stringify(t("Send a message. Your friend approves unless Auto-send is on."))); -+ return () => { -+ delete doc.body.dataset.btRemoteChat; -+ doc.body.style.removeProperty("--bt-remote-empty"); -+ }; -+ }); -+ run("composer-label", `${sessionId}|${name}`, () => holdComposerLabel(doc, name ? t("Message {name}", { name }) : t("Message"))); -+ run("visit", sessionId, () => { -+ if (sessionId === void 0) return void 0; -+ actions.beginVisit(sessionId); -+ return () => actions.endVisit(sessionId); -+ }); -+ run("face-at-menu", `${sessionId}|${room2?.origin === "face-to-face"}`, () => { -+ if (room2?.origin !== "face-to-face") return void 0; -+ const stop = actions.filterFaceAtMenu?.(sessionId); -+ return typeof stop === "function" ? stop : void 0; -+ }); -+ run("room-flag", `${sessionId}|${room2 !== void 0}`, () => { -+ if (room2 === void 0) return void 0; -+ doc.body.dataset.btRoom = ""; -+ return () => { -+ delete doc.body.dataset.btRoom; -+ }; -+ }); -+ }; -+ const apply2 = () => { -+ if (running) { -+ again = true; -+ return; -+ } -+ running = true; -+ try { -+ pass(); -+ } finally { -+ running = false; -+ } -+ if (again) { -+ again = false; -+ apply2(); -+ } -+ }; -+ apply2(); -+ const offSessions = sessions.subscribe(apply2); -+ const offRoster = roster.subscribe(apply2); -+ return () => { -+ offSessions?.(); -+ offRoster?.(); -+ for (const held of slots.values()) held.off(); -+ slots.clear(); -+ }; -+} -+ -+// src/client/composer.js -+var import_react23 = require("react"); -+var import_react_dom7 = require("react-dom"); -+var speechApi = () => window.SpeechRecognition ?? window.webkitSpeechRecognition; -+var keepComposerFocus = (event) => event.preventDefault(); -+function useDictation(onText) { -+ const [listening, setListening] = (0, import_react23.useState)(false); -+ const [note, setNote] = (0, import_react23.useState)(""); -+ const recognition = (0, import_react23.useRef)(null); -+ const latest = (0, import_react23.useRef)(onText); -+ latest.current = onText; -+ (0, import_react23.useEffect)(() => () => recognition.current?.abort(), []); -+ (0, import_react23.useEffect)(() => { -+ if (!note) return void 0; -+ const timer = setTimeout(() => setNote(""), 2600); -+ return () => clearTimeout(timer); -+ }, [note]); -+ const start = ({ continuous = true, onEnd } = {}) => { -+ const Api = speechApi(); -+ if (!Api) { -+ setNote(t("Dictation is not available in this browser")); -+ return false; -+ } -+ const engine = new Api(); -+ engine.lang = navigator.language || "zh-CN"; -+ engine.interimResults = true; -+ engine.continuous = continuous; -+ engine.onresult = (event) => { -+ let interim = ""; -+ for (let index = event.resultIndex; index < event.results.length; index += 1) { -+ const result = event.results[index]; -+ const text2 = result[0]?.transcript ?? ""; -+ if (result.isFinal) { -+ if (text2.trim()) latest.current(text2, true); -+ } else interim += text2; -+ } -+ if (interim) latest.current(interim, false); -+ }; -+ engine.onerror = (event) => { -+ if (event.error === "aborted" || event.error === "no-speech") return; -+ setNote(event.error === "not-allowed" || event.error === "service-not-allowed" ? t("Microphone access is blocked") : t("Couldn't hear that")); -+ }; -+ engine.onend = () => { -+ setListening(false); -+ recognition.current = null; -+ onEnd?.(); - }; -- }, [ref, served?.reasoning !== void 0, actions]); -- return served?.reasoning ?? fetched; -+ recognition.current = engine; -+ try { -+ engine.start(); -+ setListening(true); -+ return true; -+ } catch { -+ setNote(t("Couldn't start dictation")); -+ return false; -+ } -+ }; -+ const stop = () => recognition.current?.stop(); -+ return { listening, note, start, stop }; - } --function effortRows(reasoning) { -- if (reasoning?.efforts === void 0 || reasoning.efforts.length === 0) return []; -- return [ -- { effort: void 0, label: t("Default") }, -- ...reasoning.efforts.map((effort) => ({ effort: effort.id, label: effort.name })) -- ]; -+function ComposerIdentity({ sessionId, useRoster }) { -+ const roster = useRoster((value) => value); -+ const room2 = roster.roomsById?.[sessionId]; -+ const self = roster.self; -+ const humans = (room2?.participants ?? []).filter((p) => p.kind === "human" && p.leftSeq === void 0); -+ if (room2?.viewerRole === "invited-owner") { -+ return (0, import_react23.createElement)( -+ "span", -+ { className: "bt-composer-as", title: t("You can remove your Bot from this room") }, -+ t("Shared room from {name}", { name: room2.sharedFrom?.inviterName || t("a friend") }) -+ ); -+ } -+ if (!self || !room2 || humans.length < 2) return null; -+ return (0, import_react23.createElement)( -+ "span", -+ { className: "bt-composer-as", title: t("Messages in this room are attributed to you") }, -+ t("Sending as {name}", { name: self.displayName || self.memberId }) -+ ); ++ const [fetched, setFetched] = (0, import_react28.useState)(void 0); ++ (0, import_react28.useEffect)(() => { + setFetched(void 0); + if (ref === void 0 || served?.reasoning !== void 0 || actions?.efforts === void 0) return void 0; + let live = true; +@@ -6402,12 +6402,12 @@ function effortRows(reasoning) { + ]; } --function EffortRows({ reasoning, current, onPick }) { + function EffortRows({ reasoning, current, onPick }) { - return (0, import_react13.createElement)( - import_react13.Fragment, -+function ComposerVoice({ sessionId, inputActions, actions, useUi }) { -+ const dictation = useDictation((text2, final) => { -+ if (final && inputActions) inputActions.insertText(text2, inputActions.captureInsertion()); -+ }); -+ const quote = useUi((state) => state.quote?.sessionId === sessionId ? state.quote : null); -+ (0, import_react23.useEffect)(() => { -+ if (!quote || !inputActions) return; -+ actions.clearQuote(quote.token); -+ const excerpt = quote.text.replace(/\s+/g, " ").trim(); -+ const line2 = `> ${excerpt.length > 200 ? `${excerpt.slice(0, 200)}…` : excerpt} -+ -+`; -+ inputActions.insertText(line2, inputActions.captureInsertion()); -+ const box = document.querySelector('[class*="_centerCol"] [role=textbox][contenteditable=true]'); -+ if (box instanceof HTMLElement) { -+ box.focus(); -+ const selection = window.getSelection(); -+ selection?.selectAllChildren(box); -+ selection?.collapseToEnd(); -+ } -+ }, [quote?.token]); -+ if (sessionId === void 0) return null; -+ const pluginMic = actions.speech() !== void 0; -+ return (0, import_react23.createElement)( -+ import_react23.Fragment, ++ return (0, import_react28.createElement)( ++ import_react28.Fragment, null, - (0, import_react13.createElement)("div", { className: "bt-menu-sep", role: "separator" }), - (0, import_react13.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Thinking level")), - effortRows(reasoning).map((row) => (0, import_react13.createElement)( -- "button", -- { -- key: row.effort ?? "default", -- type: "button", -- role: "menuitemradio", -- "aria-checked": row.effort === current, -- onClick: () => onPick(row.effort) -- }, ++ (0, import_react28.createElement)("div", { className: "bt-menu-sep", role: "separator" }), ++ (0, import_react28.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Thinking level")), ++ effortRows(reasoning).map((row) => (0, import_react28.createElement)( + "button", + { + key: row.effort ?? "default", +@@ -6416,17 +6416,17 @@ function EffortRows({ reasoning, current, onPick }) { + "aria-checked": row.effort === current, + onClick: () => onPick(row.effort) + }, - (0, import_react13.createElement)("span", { className: "bt-menu-label" }, row.label), - (0, import_react13.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, row.effort === current ? (0, import_react13.createElement)(CheckIcon) : null) -- )) -+ pluginMic ? null : (0, import_react23.createElement)("button", { -+ type: "button", -+ className: "bt-mic", -+ "aria-label": dictation.listening ? t("Stop dictation") : t("Dictate"), -+ "aria-pressed": dictation.listening, -+ title: dictation.listening ? t("Stop dictation") : t("Dictate"), -+ onMouseDown: keepComposerFocus, -+ onClick: () => dictation.listening ? dictation.stop() : dictation.start() -+ }, (0, import_react23.createElement)(MicIcon)), -+ (0, import_react23.createElement)("button", { -+ type: "button", -+ className: "bt-voice", -+ "aria-label": t("Start voice chat"), -+ title: t("Voice chat"), -+ onMouseDown: keepComposerFocus, -+ onClick: () => actions.openVoice(sessionId) -+ }, (0, import_react23.createElement)(WaveIcon, { size: 18 })), -+ dictation.note ? (0, import_react23.createElement)("span", { className: "bt-mic-note", role: "status" }, dictation.note) : null ++ (0, import_react28.createElement)("span", { className: "bt-menu-label" }, row.label), ++ (0, import_react28.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, row.effort === current ? (0, import_react28.createElement)(CheckIcon) : null) + )) ); } --function ModelRows({ roster, current, onPick }) { + function ModelRows({ roster, current, onPick }) { - return groupModels(roster.models).map(([provider, list]) => (0, import_react13.createElement)( - import_react13.Fragment, -- { key: list[0].provider ?? provider }, ++ return groupModels(roster.models).map(([provider, list]) => (0, import_react28.createElement)( ++ import_react28.Fragment, + { key: list[0].provider ?? provider }, - (0, import_react13.createElement)("div", { className: "bt-model-group", role: "presentation" }, provider), - list.map((model) => (0, import_react13.createElement)( -- "button", -- { -- key: model.ref, -- type: "button", -- role: "menuitemradio", -- "aria-checked": model.ref === current, -- title: model.ref, -- onClick: () => onPick(model.ref) -- }, ++ (0, import_react28.createElement)("div", { className: "bt-model-group", role: "presentation" }, provider), ++ list.map((model) => (0, import_react28.createElement)( + "button", + { + key: model.ref, +@@ -6436,20 +6436,20 @@ function ModelRows({ roster, current, onPick }) { + title: model.ref, + onClick: () => onPick(model.ref) + }, - (0, import_react13.createElement)("span", { className: "bt-menu-label" }, model.name), - model.ref === roster.defaultModel ? (0, import_react13.createElement)("span", { className: "bt-menu-hint" }, t("Default")) : null, - (0, import_react13.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, model.ref === current ? (0, import_react13.createElement)(CheckIcon) : null) -- )) -- )); -+function menuIcons(roster) { -+ const marks = /* @__PURE__ */ new Map(); -+ return (row) => { -+ if (!row.bot) return PeopleIcon; -+ const id = row.bot.id; -+ if (!marks.has(id)) marks.set(id, ({ size = 14 }) => (0, import_react23.createElement)(BotMark, { bot: markBotForMention(row.bot, roster.getSnapshot()), size })); -+ return marks.get(id); -+ }; ++ (0, import_react28.createElement)("span", { className: "bt-menu-label" }, model.name), ++ model.ref === roster.defaultModel ? (0, import_react28.createElement)("span", { className: "bt-menu-hint" }, t("Default")) : null, ++ (0, import_react28.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, model.ref === current ? (0, import_react28.createElement)(CheckIcon) : null) + )) + )); } -var Caret = () => (0, import_react13.createElement)("svg", { className: "bt-model-caret", width: 12, height: 12, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react13.createElement)("path", { d: "M5.5 8l4.5 4.5L14.5 8" })); --function useAnchoredMenu() { ++var Caret = () => (0, import_react28.createElement)("svg", { className: "bt-model-caret", width: 12, height: 12, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react28.createElement)("path", { d: "M5.5 8l4.5 4.5L14.5 8" })); + function useAnchoredMenu() { - const [place, setPlace] = (0, import_react13.useState)(null); -- const [shownPlace, leaving] = useLinger(place, MENU_EXIT_MS); ++ const [place, setPlace] = (0, import_react28.useState)(null); + const [shownPlace, leaving] = useLinger(place, MENU_EXIT_MS); - const button = (0, import_react13.useRef)(null); - const menu = (0, import_react13.useRef)(null); -- const close = () => setPlace(null); ++ const button = (0, import_react28.useRef)(null); ++ const menu = (0, import_react28.useRef)(null); + const close = () => setPlace(null); - (0, import_react13.useEffect)(() => { -- if (place === null) return void 0; -+function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { -+ const roster = useRoster((value) => value); -+ const [open, setOpen] = (0, import_react23.useState)(null); -+ const [shown, leaving] = useLinger(open, 120); -+ const button = (0, import_react23.useRef)(null); -+ const menu = (0, import_react23.useRef)(null); -+ (0, import_react23.useEffect)(() => { -+ if (!open) return void 0; ++ (0, import_react28.useEffect)(() => { + if (place === null) return void 0; const onDown = (event) => { -- if (menu.current?.contains(event.target) || button.current?.contains(event.target)) return; -- close(); -+ if (![button.current, menu.current].some((node) => node?.contains(event.target))) setOpen(null); - }; - const onKey = (event) => { - if (event.key === "Escape") { - event.stopPropagation(); -- close(); -- button.current?.focus(); -+ setOpen(null); - } - }; -- const onScroll = (event) => { -- if (!menu.current?.contains(event.target)) close(); -- }; -- window.addEventListener("mousedown", onDown); -+ window.addEventListener("mousedown", onDown, true); - window.addEventListener("keydown", onKey, true); -- window.addEventListener("scroll", onScroll, true); - return () => { -- window.removeEventListener("mousedown", onDown); -+ window.removeEventListener("mousedown", onDown, true); - window.removeEventListener("keydown", onKey, true); -- window.removeEventListener("scroll", onScroll, true); - }; -- }, [place]); -- const open = () => { -- const rect = button.current.getBoundingClientRect(); -- const width = Math.max(240, rect.width); -- const left = Math.max(8, Math.min(rect.right - width, window.innerWidth - width - 8)); -- const below = window.innerHeight - rect.bottom; -- setPlace(below >= 260 || below >= rect.top ? { left, width, top: rect.bottom + 4, maxHeight: below - 16, "--bt-origin": "top right" } : { left, width, bottom: window.innerHeight - rect.top + 4, maxHeight: rect.top - 16, "--bt-origin": "bottom right" }); -- }; -- return { isOpen: place !== null, shownPlace, leaving, button, menu, open, close }; --} --function ModelMenu({ bot, roster, actions, run, wide = false, onPick, onPickEffort }) { -- const { isOpen, shownPlace, leaving, button, menu, open, close } = useAnchoredMenu(); -- const shown = modelOf(bot, roster); -- const current = bot.model ?? bot.appliedModel; -- const served = servedOf(roster, current); -- const reasoning = useEfforts(served, current, actions); -- const picked = reasoning?.efforts?.some((effort) => effort.id === bot.effort) ? bot.effort : void 0; -- const currentEffort = picked ?? reasoning?.defaultEffort; -- const effortLabel = currentEffort === void 0 ? reasoning?.efforts?.length > 0 ? t("Default") : void 0 : reasoning.efforts.find((effort) => effort.id === currentEffort)?.name ?? currentEffort; -+ }, [open]); -+ const target = roster.byId?.[sessionId]?.id ?? roster.roomsById?.[sessionId]?.id; -+ if (sessionId === void 0 || target === void 0) return null; -+ const locked = lockedWindow(roster); - const toggle = () => { -- if (isOpen) { -- close(); -+ if (open) { -+ setOpen(null); - return; - } -- void actions?.refreshModels?.(); -- open(); -+ const rect = button.current.getBoundingClientRect(); -+ setOpen({ left: rect.left, bottom: window.innerHeight - rect.top + 8 }); - }; -- const pick2 = (ref) => { -- close(); -- if (onPick) onPick(ref); -- else if (ref !== current || !bot.model) void run(actions.updateBot(bot.id, { model: ref })); -+ const attach = () => { -+ setOpen(null); -+ button.current?.closest("[data-composer-card]")?.querySelector("input[type=file]")?.click(); - }; -- const pickEffort = (effort) => { -- close(); -- if (onPickEffort) onPickEffort(effort); -- else if (effort !== bot.effort) void run(actions.updateBot(bot.id, { effort: effort ?? null })); -+ const reference = () => { -+ setOpen(null); -+ actions.referenceChat(sessionId, inputActions?.captureInsertion?.()); + if (menu.current?.contains(event.target) || button.current?.contains(event.target)) return; +@@ -6484,6 +6484,7 @@ function useAnchoredMenu() { + return { isOpen: place !== null, shownPlace, leaving, button, menu, open, close }; + } + function ModelMenu({ bot, roster, actions, run, wide = false, onPick, onPickEffort }) { ++ if (bot?.remote !== void 0) return null; + const { isOpen, shownPlace, leaving, button, menu, open, close } = useAnchoredMenu(); + const shown = modelOf(bot, roster); + const current = bot.model ?? bot.appliedModel; +@@ -6511,10 +6511,10 @@ function ModelMenu({ bot, roster, actions, run, wide = false, onPick, onPickEffo + else if (effort !== bot.effort) void run(actions.updateBot(bot.id, { effort: effort ?? null })); }; -- const models = roster.models ?? []; + const models = roster.models ?? []; - return (0, import_react13.createElement)( - import_react13.Fragment, -+ const canReference = typeof inputActions?.captureInsertion === "function" && actions.canReferenceChat(); -+ return (0, import_react23.createElement)( -+ import_react23.Fragment, ++ return (0, import_react28.createElement)( ++ import_react28.Fragment, null, - (0, import_react13.createElement)( -- "button", -+ (0, import_react23.createElement)("button", { -+ ref: button, -+ type: "button", -+ className: "bt-plus", -+ "aria-label": t("Add"), -+ title: t("Add"), -+ "aria-haspopup": "menu", -+ "aria-expanded": Boolean(open), -+ onMouseDown: keepComposerFocus, -+ onClick: toggle -+ }, (0, import_react23.createElement)(PlusIcon)), -+ shown ? (0, import_react_dom7.createPortal)((0, import_react23.createElement)( -+ "div", ++ (0, import_react28.createElement)( + "button", { -- ref: button, -- type: "button", -- className: "bt-model-trigger", -- "data-wide": wide || void 0, -- "aria-haspopup": "menu", -- "aria-expanded": isOpen, -- "aria-label": t("Model: {model}", { model: shown?.name ?? t("none") }), -- "data-missing": shown !== void 0 && !shown.served && models.length > 0 ? "" : void 0, -- onClick: toggle -+ ref: menu, -+ className: "bt-menu bt-menu-up bt-plus-menu", -+ role: "menu", -+ "aria-label": t("Add"), -+ style: { left: shown.left, bottom: shown.bottom }, -+ "data-leaving": leaving || void 0 + ref: button, +@@ -6527,37 +6527,38 @@ function ModelMenu({ bot, roster, actions, run, wide = false, onPick, onPickEffo + "data-missing": shown !== void 0 && !shown.served && models.length > 0 ? "" : void 0, + onClick: toggle }, - (0, import_react13.createElement)( -- "span", -- { className: "bt-model-copy" }, ++ (0, import_react28.createElement)( + "span", + { className: "bt-model-copy" }, - (0, import_react13.createElement)("span", { className: "bt-model-name" }, shown?.name ?? t("Choose a model")), - shown ? (0, import_react13.createElement)("span", { className: "bt-model-provider" }, shown.served || models.length === 0 ? effortLabel === void 0 ? shown.provider : `${shown.provider} · ${effortLabel}` : t("{provider} · not available", { provider: shown.provider })) : null -- ), ++ (0, import_react28.createElement)("span", { className: "bt-model-name" }, shown?.name ?? t("Choose a model")), ++ shown ? (0, import_react28.createElement)("span", { className: "bt-model-provider" }, shown.served || models.length === 0 ? effortLabel === void 0 ? shown.provider : `${shown.provider} · ${effortLabel}` : t("{provider} · not available", { provider: shown.provider })) : null + ), - (0, import_react13.createElement)(Caret) -- ), ++ (0, import_react28.createElement)(Caret) + ), - shownPlace ? (0, import_react_dom6.createPortal)((0, import_react13.createElement)( -- "div", -- { ref: menu, className: `bt-menu bt-model-menu${shownPlace.bottom !== void 0 ? " bt-menu-up" : ""}`, role: "menu", "aria-label": t("Model for {name}", { name: bot.name }), style: shownPlace, "data-leaving": leaving || void 0 }, ++ shownPlace ? (0, import_react_dom8.createPortal)((0, import_react28.createElement)( + "div", + { ref: menu, className: `bt-menu bt-model-menu${shownPlace.bottom !== void 0 ? " bt-menu-up" : ""}`, role: "menu", "aria-label": t("Model for {name}", { name: bot.name }), style: shownPlace, "data-leaving": leaving || void 0 }, - models.length > 0 ? (0, import_react13.createElement)(ModelRows, { roster, current, onPick: pick2 }) : (0, import_react13.createElement)("div", { className: "bt-model-none" }, t("No models are set up in DeepSeek Harness yet.")), - effortRows(reasoning).length > 0 ? (0, import_react13.createElement)(EffortRows, { reasoning, current: picked, onPick: pickEffort }) : null, - (0, import_react13.createElement)("div", { className: "bt-menu-sep", role: "separator" }), - (0, import_react13.createElement)("button", { type: "button", role: "menuitem", onClick: () => { -- close(); ++ models.length > 0 ? (0, import_react28.createElement)(ModelRows, { roster, current, onPick: pick2 }) : (0, import_react28.createElement)("div", { className: "bt-model-none" }, t("No models are set up in DeepSeek Harness yet.")), ++ effortRows(reasoning).length > 0 ? (0, import_react28.createElement)(EffortRows, { reasoning, current: picked, onPick: pickEffort }) : null, ++ (0, import_react28.createElement)("div", { className: "bt-menu-sep", role: "separator" }), ++ (0, import_react28.createElement)("button", { type: "button", role: "menuitem", onClick: () => { + close(); - openHarnessSettings(); - } }, (0, import_react13.createElement)(SlidersIcon), (0, import_react13.createElement)("span", { className: "bt-menu-label" }, t("Models and providers…"))) -+ (0, import_react23.createElement)("button", { type: "button", role: "menuitem", onClick: attach }, (0, import_react23.createElement)(PaperclipIcon), (0, import_react23.createElement)("span", { className: "bt-menu-label" }, t("Add files"))), -+ canReference ? (0, import_react23.createElement)("button", { type: "button", role: "menuitem", onMouseDown: keepComposerFocus, onClick: reference }, (0, import_react23.createElement)(ChatsIcon), (0, import_react23.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat"))) : null, -+ locked ? null : (0, import_react23.createElement)("button", { type: "button", role: "menuitem", onClick: () => { -+ setOpen(null); -+ actions.openSettings("schedules", target); -+ } }, (0, import_react23.createElement)(ClockIcon), (0, import_react23.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task"))) ++ openHarnessModels(); ++ } }, (0, import_react28.createElement)(SlidersIcon), (0, import_react28.createElement)("span", { className: "bt-menu-label" }, t("Models and providers…"))) ), document.body) : null ); } --function ModelChoiceDock({ sessionId, useRoster, actions }) { -- const roster = useRoster((value) => value); -- const bot = roster.byId[sessionId]; + function ModelChoiceDock({ sessionId, useRoster, actions }) { + const roster = useRoster((value) => value); + const bot = roster.byId[sessionId]; - const [busy, setBusy] = (0, import_react13.useState)(""); - const [error, setError] = (0, import_react13.useState)(""); -- const shown = Boolean(bot) && currentPart(bot) === sessionId && roster.ready; ++ const [busy, setBusy] = (0, import_react28.useState)(""); ++ const [error, setError] = (0, import_react28.useState)(""); + const shown = Boolean(bot) && currentPart(bot) === sessionId && roster.ready; - (0, import_react13.useEffect)(() => { -- if (shown) void actions.refreshModels?.(); -- }, [shown, sessionId]); -- if (!bot || currentPart(bot) !== sessionId || !roster.ready) return null; -- const models = roster.models ?? []; -- const lost = bot.model ? !models.some((model) => model.ref === bot.model) : false; -- if (bot.model && (!lost || models.length === 0)) return null; -- const pick2 = (ref) => { -- setBusy(ref); -- setError(""); -- void Promise.resolve(actions.updateBot(bot.id, { model: ref })).catch((failure) => { -- setError(failure?.message ?? String(failure)); -- void actions.refreshModels?.(); -- }).finally(() => setBusy("")); -+ -+// src/client/at-menu.js -+var BOTS_SOURCE = "ds-bot"; -+var CHATS_SOURCE = "ds-bot-chats"; -+var ROOM_ALL = ["all", "everyone", "所有人", "全体"]; -+var OTHER_CHATS_MAX = 8; -+var conversationOf = (roster, sessionId) => { -+ if (!roster.ready) return null; -+ const room2 = roster.roomsById[sessionId]; -+ if (room2) return { room: room2 }; -+ const self = roster.byId[sessionId]; -+ return self ? { self } : null; -+}; -+function mentionRows(roster, sessionId, query = "") { -+ const here = conversationOf(roster, sessionId); -+ if (here === null) return null; -+ const face = isFaceRoom(here.room); -+ const live = (here.room?.participants ?? []).filter((p) => p.leftSeq === void 0); -+ const bots = here.room ? [ -+ ...here.room.members.map((id) => roster.byId[id]).filter(Boolean).map((bot) => face ? { ...bot, label: faceLabel(myOwnerName(roster, live, bot), bot.name) } : bot), -+ ...live.filter((p) => p.kind === "human").map((p) => ({ id: p.id, name: p.displayName || p.id, kind: "human", role: p.role })), -+ // A remote seat already listed under its handle (a duplicate participant record) is offered once. -+ ...uniqueBy(live.filter((p) => p.remote), (p) => p.handle || p.id).map((p) => ({ -+ id: p.handle || p.id, -+ // A face room inserts the disambiguated title. An ordinary group inserts the name the -+ // room routes on (#1141): never "@@handle.home (owner)" and never "(Friend)". -+ name: face ? remoteBotTitle(p) : remoteCallName(p), -+ kind: "bot", -+ remote: p, -+ handle: p.handle, -+ label: face ? faceLabel(ownerNameOf(p), cleanPeerName(p.displayName || p.name, "Bot")) : remoteBotTitle(p) -+ })) -+ ] : listedChatBots(roster).filter((bot) => bot.id !== here.self.id); -+ const needle = query.trim().toLowerCase(); -+ const rows = bots.filter((bot) => bot.name.toLowerCase().includes(needle) || String(bot.label ?? "").toLowerCase().includes(needle) || bot.remote && normHandle(remoteRecord(bot)?.handle || bot.handle).includes(normHandle(needle))).map((bot) => ({ bot, text: `@${bot.name} ` })); -+ const everyone = t("Everyone"); -+ if (here.room && bots.length > 1 && [everyone, ...ROOM_ALL].some((word) => word.toLowerCase().startsWith(needle))) { -+ rows.push({ room: here.room, count: bots.filter((bot) => bot.kind !== "human").length, text: `@${everyone} ` }); -+ } -+ if (face) return rows; -+ const seatHandles = new Set(bots.filter((bot) => bot.remote).map((bot) => normHandle(remoteRecord(bot)?.handle)).filter(Boolean)); -+ if (here.room) return [...rows, ...remoteMentionRows(roster, query).filter((row) => !seatHandles.has(normHandle(row.remote.handle)))]; -+ const remoteHandles = new Set(remoteMentionRows(roster, "").map((row) => normHandle(row.remote.handle))); -+ return [ -+ ...rows.filter((row) => !(row.bot && remoteHandles.has(normHandle(remoteRecord(row.bot)?.handle)))), -+ ...remoteMentionRows(roster, query) -+ ]; -+} -+var isFaceRoom = (room2) => room2?.origin === "face-to-face"; -+var memberCount = (count) => t(count === 1 ? "{count} member" : "{count} members", { count }); -+var botCount = (count) => count === 1 ? t("1 Bot") : t("{count} Bots", { count }); -+var normHandle = (handle) => String(handle ?? "").trim().replace(/^@+/, "").toLowerCase(); -+var remoteRecord = (bot) => bot?.remote ? bot.remote === true ? bot : bot.remote : null; -+var myOwnerName = (roster, live, bot) => { -+ const seat = live.find((p) => !p.remote && p.kind !== "human" && (p.id === bot.id || bot.handle && p.handle === bot.handle)); -+ return seatOwnerName(seat?.ownerName, seat?.handle) || cleanPeerName(roster.self?.displayName, ""); -+}; -+var uniqueBy = (list, key) => { -+ const seen = /* @__PURE__ */ new Set(); -+ return list.filter((item) => { -+ const k = key(item); -+ if (!k || seen.has(k)) return !k; -+ seen.add(k); -+ return true; -+ }); -+}; -+var faceLabel = (person, bot) => person ? `${bot} (${person})` : bot; -+function chatRows(roster, list, sessionId) { -+ const here = conversationOf(roster, sessionId); -+ if (here === null) return []; -+ const byId = list?.byId ?? {}; -+ const bots = roster.bots.filter((bot) => bot.id !== here.self?.id).map((bot) => { -+ const id = currentPart(bot); -+ return { sessionId: id, label: t("Chat with {name}", { name: bot.name }), bot, updatedAt: byId[id]?.updatedAt }; -+ }); -+ const team = /* @__PURE__ */ new Set([ -+ ...roster.bots.flatMap((bot) => [bot.id, currentPart(bot), ...bot.parts ?? []]), -+ ...roster.rooms.flatMap((room2) => [room2.id, ...room2.parts ?? []]) -+ ]); -+ const others = (list?.ids ?? []).map((id) => byId[id]).filter((row) => row !== void 0 && row.id !== sessionId && !team.has(row.id) && row.origin !== "subagent" && row.blank !== true).sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0)).slice(0, OTHER_CHATS_MAX).map((row) => ({ sessionId: row.id, label: row.displayTitle || row.title || row.id, updatedAt: row.updatedAt })); -+ return [...bots, ...others]; -+} -+function sessionMention(sessionId, label) { -+ let binary = ""; -+ for (const byte of new TextEncoder().encode(JSON.stringify(sessionId))) binary += String.fromCharCode(byte); -+ const payload = btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, ""); -+ return `@[${label.replace(/[\\\]]/g, (mark) => `\\${mark}`)}](dsh-session:${payload})`; -+} -+function atSources({ roster, sessions, launched, iconFor }) { -+ const bots = { -+ trigger: "@", -+ name: BOTS_SOURCE, -+ order: -20, -+ showGroupTitle: false, -+ async candidates(session, { query }) { -+ const snapshot = roster.getSnapshot(); -+ const face = isFaceRoom(snapshot.roomsById?.[session.sessionId]); -+ const team = (mentionRows(snapshot, session.sessionId, query) ?? []).map((row) => ({ -+ // A friend's Bot by the one name the row inserts, "Chief (Bob)" (#967); its handle is the -+ // second line (#384). A seat carries its own name; a friend's chat is named as its sidebar -+ // row and header (#498). -+ name: row.bot?.remote && !face ? row.bot.kind === "bot" ? remoteBotTitle(remoteRecord(row.bot)) : friendBotTitle(row.bot) : row.bot ? row.bot.label ?? row.bot.name : row.remote ? row.text.replace(/^@/, "").trimEnd() : t("Everyone"), -+ ...row.bot?.role && !face ? { description: row.bot.role } : {}, -+ ...row.remote ? { description: row.remote.handle } : {}, -+ ...row.bot?.remote && !face && remoteRecord(row.bot).handle ? { description: remoteRecord(row.bot).handle } : {}, -+ // A face room counts the Bots in it, mine and everyone else's (#305, #457). -+ ...row.room ? { description: face ? botCount(row.count) : memberCount(row.count) } : {}, -+ icon: iconFor(row), -+ section: t("Bots"), -+ value: row.text -+ })); -+ if (mentionRows(snapshot, session.sessionId, "") === null || face) return team; -+ const extra = (await mentionCandidates(query, { sessionId: session.sessionId, roster: snapshot })).map((row) => ({ -+ name: row.name, -+ ...row.description ? { description: row.description } : {}, -+ icon: row.icon ?? "session", -+ section: row.section ?? "FlyBot", -+ value: row.value -+ })); -+ return [...team, ...extra]; -+ }, -+ onPick: ({ candidate }) => candidate.value ? { text: candidate.value } : void 0 ++ (0, import_react28.useEffect)(() => { + if (shown) void actions.refreshModels?.(); + }, [shown, sessionId]); + if (!bot || currentPart(bot) !== sessionId || !roster.ready) return null; ++ if (bot.remote) return bot.remote.gone ? (0, import_react28.createElement)(RemoteGoneDock, { bot }) : null; + const models = roster.models ?? []; + const lost = bot.model ? !models.some((model) => model.ref === bot.model) : false; + if (bot.model && (!lost || models.length === 0)) return null; +@@ -6569,13 +6569,13 @@ function ModelChoiceDock({ sessionId, useRoster, actions }) { + void actions.refreshModels?.(); + }).finally(() => setBusy("")); }; - const text = lost ? t("{model} is not available anymore. Pick another model for me.", { model: bot.model.split("/").slice(1).join("/") }) : models.length === 0 ? t("Hi, I'm {name}. I don't have a model yet. How do you want to set one up?", { name: bot.name }) : t("Hi, I'm {name}. Pick a model for me first. You can change it later in my details.", { name: bot.name }); - const choices = models.length === 0 ? setupChoices(actions).map(([label, run]) => (0, import_react13.createElement)("button", { key: label, type: "button", className: "bt-model-chip", onClick: run }, label)) : [ - ...groupModels(models).map(([provider, list]) => (0, import_react13.createElement)( -- "div", -- { key: list[0].provider ?? provider, className: "bt-model-choice-group", role: "group", "aria-label": provider }, ++ const text2 = lost ? t("{model} is not available anymore. Pick another model for me.", { model: bot.model.split("/").slice(1).join("/") }) : models.length === 0 ? t("Hi, I'm {name}. I don't have a model yet. How do you want to set one up?", { name: bot.name }) : t("Hi, I'm {name}. Pick a model for me first. You can change it later in my details.", { name: bot.name }); ++ const choices = models.length === 0 ? [...setupChoices(actions).map(([label, run]) => (0, import_react28.createElement)("button", { key: label, type: "button", className: "bt-model-chip", onClick: run }, label)), (0, import_react28.createElement)(KeyHelpLink, { key: "key-help" })] : [ ++ ...groupModels(models).map(([provider, list]) => (0, import_react28.createElement)( + "div", + { key: list[0].provider ?? provider, className: "bt-model-choice-group", role: "group", "aria-label": provider }, - (0, import_react13.createElement)("div", { className: "bt-model-choice-provider", "aria-hidden": true }, provider), - (0, import_react13.createElement)("div", { className: "bt-model-choice-chips" }, list.map((model) => (0, import_react13.createElement)("button", { -- key: model.ref, -- type: "button", -- className: "bt-model-chip", -- disabled: busy !== "", -- "aria-busy": busy === model.ref || void 0, -- "aria-label": `${model.name} · ${provider}`, -- title: model.ref === roster.defaultModel ? `${model.ref} · ${t("Harness default")}` : model.ref, -- onClick: () => pick2(model.ref) ++ (0, import_react28.createElement)("div", { className: "bt-model-choice-provider", "aria-hidden": true }, provider), ++ (0, import_react28.createElement)("div", { className: "bt-model-choice-chips" }, list.map((model) => (0, import_react28.createElement)("button", { + key: model.ref, + type: "button", + className: "bt-model-chip", +@@ -6584,50 +6584,115 @@ function ModelChoiceDock({ sessionId, useRoster, actions }) { + "aria-label": `${model.name} · ${provider}`, + title: model.ref === roster.defaultModel ? `${model.ref} · ${t("Harness default")}` : model.ref, + onClick: () => pick2(model.ref) - }, model.name, busy === model.ref ? (0, import_react13.createElement)("span", { className: "bt-model-spin", "aria-label": t("Saving…") }) : null))) -- )), ++ }, model.name, busy === model.ref ? (0, import_react28.createElement)("span", { className: "bt-model-spin", "aria-label": t("Saving…") }) : null))) + )), - (0, import_react13.createElement)("button", { key: "manage", type: "button", className: "bt-model-chip bt-model-chip-quiet", onClick: openHarnessSettings }, (0, import_react13.createElement)(SlidersIcon), t("Manage models")) -- ]; ++ (0, import_react28.createElement)("button", { key: "manage", type: "button", className: "bt-model-chip bt-model-chip-quiet", onClick: openHarnessModels }, (0, import_react28.createElement)(SlidersIcon), t("Manage models")) + ]; - return (0, import_react13.createElement)( -- "div", -- { className: "bt-model-dock" }, ++ return (0, import_react28.createElement)( + "div", + { className: "bt-model-dock" }, - (0, import_react13.createElement)( -- "div", -- { className: "bt-astack", "data-lead": "" }, ++ (0, import_react28.createElement)( + "div", + { className: "bt-astack", "data-lead": "" }, - (0, import_react13.createElement)( -- "div", -- { className: "bt-msg" }, ++ (0, import_react28.createElement)( + "div", + { className: "bt-msg" }, - (0, import_react13.createElement)( -- "div", -- { className: "bt-msg-line" }, ++ (0, import_react28.createElement)( + "div", + { className: "bt-msg-line" }, - (0, import_react13.createElement)(BotMark, { bot, size: 22 }), - (0, import_react13.createElement)("div", { className: "bt-bubble" }, text) -- ) -- ) -- ), ++ (0, import_react28.createElement)(BotMark, { bot, size: 22 }), ++ (0, import_react28.createElement)("div", { className: "bt-bubble" }, text2) + ) + ) + ), - (0, import_react13.createElement)("div", { className: "bt-model-chips", role: "group", "aria-label": t("Choose a model") }, choices), - error ? (0, import_react13.createElement)("div", { className: "bt-secret-error bt-model-error", role: "alert" }, error) : null -- ); -+ const chats = { -+ trigger: "@", -+ name: CHATS_SOURCE, -+ order: -10, -+ showGroupTitle: false, -+ async candidates(session) { -+ if (!launched(session.sessionId)) return []; -+ return chatRows(roster.getSnapshot(), sessions.list.getSnapshot(), session.sessionId).map((row) => ({ -+ name: row.bot ? row.bot.name : row.label, -+ ...row.updatedAt ? { description: relativeShort(row.updatedAt) } : {}, -+ icon: row.bot ? iconFor(row) : "session", -+ section: row.bot ? t("Bots") : t("Conversations"), -+ value: JSON.stringify({ sessionId: row.sessionId, label: row.label }) -+ })); -+ }, -+ onPick({ candidate }) { -+ const { sessionId, label } = JSON.parse(candidate.value); -+ const mention = sessionMention(sessionId, label); -+ return { insert: { source: CHATS_SOURCE, ref: mention, label, appearance: "session", clipboardText: mention } }; -+ }, -+ codec: { clipboardText: (ref) => ref, serialize: (ref) => Promise.resolve(ref) } -+ }; -+ return [bots, chats]; ++ (0, import_react28.createElement)("div", { className: "bt-model-chips", role: "group", "aria-label": t("Choose a model") }, choices), ++ error ? (0, import_react28.createElement)("div", { className: "bt-secret-error bt-model-error", role: "alert" }, error) : null ++ ); ++} ++function RemoteGoneDock({ bot }) { ++ return (0, import_react28.createElement)( ++ "div", ++ { className: "bt-model-dock", "data-flybot": "remote-gone" }, ++ (0, import_react28.createElement)( ++ "div", ++ { className: "bt-astack", "data-lead": "" }, ++ (0, import_react28.createElement)( ++ "div", ++ { className: "bt-msg" }, ++ (0, import_react28.createElement)( ++ "div", ++ { className: "bt-msg-line" }, ++ (0, import_react28.createElement)(BotMark, { bot, size: 22 }), ++ (0, import_react28.createElement)("div", { className: "bt-bubble" }, t("{name} ({handle}) is no longer shared with you, so messages to it cannot be delivered. It runs on its owner's machine, so another model cannot stand in. Ask its owner for a new invite.", { name: bot.name, handle: bot.remote.handle })) ++ ) ++ ) ++ ) + ); } --function setupChoices(actions) { -- return [ -- actions.canSignIn?.() ? [t("Sign in to DeepSeek"), () => actions.signIn()] : null, -- [t("Enter a DeepSeek API key"), () => openHarnessOnboarding("deepseek-official")], + function setupChoices(actions) { + return [ + actions.canSignIn?.() ? [t("Sign in to DeepSeek"), () => actions.signIn()] : null, + [t("Enter a DeepSeek API key"), () => openHarnessOnboarding("deepseek-official")], - [t("Open settings to set up a custom model"), openHarnessSettings] -- ].filter(Boolean); -+ -+// src/client/face-at-filter.js -+var REFERENCE_SOURCE = "reference"; -+var optionId = (source, index) => `dsh-slash-option-${source}-${index}`; -+var isSessionRow = (group, item) => group.source === REFERENCE_SOURCE && item?.icon === "session"; -+var same = (a, b) => a != null && b != null && a.source === b.source && a.index === b.index; -+function planFaceMenu(state, previous = null) { -+ const hidden = []; -+ const ready = []; -+ let shown = 0; -+ let loading = false; -+ for (const group of state?.groups ?? []) { -+ const items = group.items ?? []; -+ if (group.status !== "ready" && items.length === 0) loading = true; -+ items.forEach((item, index) => { -+ const hide = isSessionRow(group, item); -+ if (hide) hidden.push({ source: group.source, index, title: item.section !== void 0 && item.section !== items[index - 1]?.section }); -+ else shown += 1; -+ if (group.status === "ready") ready.push({ source: group.source, index, hide }); -+ }); -+ } -+ const open = state?.open === true; -+ const blank3 = open && hidden.length > 0 && shown === 0 && !loading; -+ const dismiss = blank3 && (state.groups ?? []).every((group) => group.status === "ready"); -+ return { hidden, blank: blank3, dismiss, target: dismiss ? null : steer(ready, state?.highlight ?? null, previous) }; -+} -+function steer(ready, highlight, previous) { -+ const at = ready.findIndex((row) => same(row, highlight)); -+ if (at < 0 || !ready[at].hide) return null; -+ const from = ready.findIndex((row) => same(row, previous)); -+ const n = ready.length; -+ const dir = from >= 0 && from !== at && (from - at + n) % n === 1 ? -1 : 1; -+ for (let step = 1; step < n; step += 1) { -+ const row = ready[((at + dir * step) % n + n) % n]; -+ if (!row.hide) return { source: row.source, index: row.index }; -+ } -+ return null; ++ [t("Open settings to set up a custom model"), openHarnessModels] + ].filter(Boolean); } --function DeepSeekSignIn({ useUi, actions }) { -- const open = useUi((state) => state.signIn); -- const entry = open ? actions.signInEntry?.() : null; -- if (!entry) return null; ++var KEY_HELP_URL = "https://github.com/ThinkFlowLab/FlyBot/blob/main/docs/deepseek-api-key.md"; ++function KeyHelpLink() { ++ return (0, import_react28.createElement)("a", { className: "bt-model-help", href: KEY_HELP_URL, target: "_blank", rel: "noopener noreferrer" }, t("How to set a DeepSeek API key")); ++} ++function missingModelKey(message) { ++ const text2 = String(message ?? ""); ++ if (!/\bno api key\b|\bmissing (?:an? )?api key\b|\bapi key (?:is )?(?:missing|not set|not configured)\b/i.test(text2)) return void 0; ++ return { route: /provider route "([^"]+)"/i.exec(text2)?.[1] ?? "" }; ++} ++function modelKeyChoices(actions, route) { ++ if (/^deepseek/i.test(route)) return setupChoices(actions); ++ return [[t("Manage models"), openHarnessModels]]; ++} ++function TurnErrorCell({ node, t: chatT, actions }) { ++ const data = node?.data ?? {}; ++ const code = typeof data.code === "string" && data.code ? data.code : void 0; ++ const raw = String(data.message ?? ""); ++ const shell = (key, fallback) => { ++ const text2 = typeof chatT === "function" ? chatT(key) : void 0; ++ return typeof text2 === "string" && text2 !== "" && text2 !== key ? text2 : fallback; ++ }; ++ const missing = missingModelKey(raw); ++ const title = code === "ACCOUNT_SIGNED_OUT" ? shell("message.accountStopped", t("This turn failed")) : shell("message.turnError", t("This turn failed")); ++ const message = missing ? t("This Bot's model has no API key yet. Set one up, then send your message again.") : code === "ACCOUNT_SIGNED_OUT" ? shell("message.failure.accountSignedOut", raw) : code === "ACCOUNT_SIGN_IN_REQUIRED" ? shell("message.failure.accountSignInRequired", raw) : code === "QUOTA" || code === "ACCOUNT_QUOTA" ? shell("message.failure.quota", raw) : code === "AUTH" ? shell("message.failure.auth", raw) : raw; ++ const choices = missing ? modelKeyChoices(actions ?? {}, missing.route) : []; ++ const deepseek = missing ? /^deepseek/i.test(missing.route) : false; ++ return (0, import_react28.createElement)( ++ "div", ++ { className: "bt-turn-error", role: "status", "data-missing-key": missing ? "" : void 0 }, ++ (0, import_react28.createElement)("span", { className: "bt-turn-error-dot", "aria-hidden": true }), ++ (0, import_react28.createElement)( ++ "div", ++ { className: "bt-turn-error-copy" }, ++ (0, import_react28.createElement)("span", { className: "bt-turn-error-title" }, title), ++ (0, import_react28.createElement)("span", { className: "bt-turn-error-message" }, message), ++ code ? (0, import_react28.createElement)("code", { className: "bt-turn-error-code" }, code) : null ++ ), ++ choices.length > 0 ? (0, import_react28.createElement)( ++ "div", ++ { className: "bt-turn-error-actions" }, ++ choices.map(([label, run]) => (0, import_react28.createElement)("button", { key: label, type: "button", className: "bt-model-chip", onClick: run }, label)), ++ deepseek ? (0, import_react28.createElement)(KeyHelpLink, { key: "key-help" }) : null ++ ) : null ++ ); ++} + function DeepSeekSignIn({ useUi, actions }) { + const open = useUi((state) => state.signIn); + const entry = open ? actions.signInEntry?.() : null; + if (!entry) return null; - return (0, import_react13.createElement)(SignInHost, { key: open, entry, actions }); -+function faceMenuCss({ hidden, blank: blank3 }) { -+ if (hidden.length === 0) return ""; -+ const rows = hidden.map((row) => `[data-trigger-menu] [id="${optionId(row.source, row.index)}"]`); -+ const titles = hidden.filter((row) => row.title).map((row) => `[data-trigger-menu] [role="presentation"]:has(+ [id="${optionId(row.source, row.index)}"])`); -+ const css = [`${[...rows, ...titles].join(",")}{display:none!important}`]; -+ if (blank3) css.push("[data-trigger-menu]{display:none!important}"); -+ return css.join("\n"); ++ return (0, import_react28.createElement)(SignInHost, { key: open, entry, actions }); } --function SignInHost({ entry, actions }) { + function SignInHost({ entry, actions }) { - const [ops] = (0, import_react13.useState)(() => entry.inject?.() ?? {}); -- const close = () => actions.closeSignIn(); ++ const [ops] = (0, import_react28.useState)(() => entry.inject?.() ?? {}); + const close = () => actions.closeSignIn(); - const useHook = (source) => (selector) => (0, import_react13.useSyncExternalStore)(source.subscribe, () => selector(source.getSnapshot())); - const [hooks] = (0, import_react13.useState)(() => ({ useAccount: useHook(ops.hooks.account), useTheme: useHook(ops.hooks.theme) })); - return (0, import_react13.createElement)(entry.component, { -- ...ops, -- ...hooks, -- t: actions.accountT(), -- complete: close, -- useApiKey: () => { -- close(); -- openHarnessOnboarding("deepseek-official"); -- } -- }); -+function watchFaceMenu(controller, doc = globalThis.document) { -+ if (typeof controller?.menu?.subscribe !== "function" || !doc?.head) return () => { -+ }; -+ const style = doc.createElement("style"); -+ style.setAttribute("data-bt-face-at", ""); -+ doc.head.appendChild(style); -+ let previous = null; -+ let stopped = false; -+ const later = typeof queueMicrotask === "function" ? queueMicrotask : (fn) => Promise.resolve().then(fn); -+ const apply2 = () => { -+ if (stopped) return; -+ const state = controller.menu.getSnapshot(); -+ const plan = planFaceMenu(state, previous); -+ const css = faceMenuCss(plan); -+ if (style.textContent !== css) style.textContent = css; -+ if (plan.dismiss) later(() => { -+ if (!stopped && planFaceMenu(controller.menu.getSnapshot(), previous).dismiss) controller.dismiss(); -+ }); -+ else if (plan.target) later(() => { -+ if (!stopped) controller.hover(plan.target.source, plan.target.index); ++ const useHook = (source) => (selector) => (0, import_react28.useSyncExternalStore)(source.subscribe, () => selector(source.getSnapshot())); ++ const [hooks] = (0, import_react28.useState)(() => ({ useAccount: useHook(ops.hooks.account), useTheme: useHook(ops.hooks.theme) })); ++ return (0, import_react28.createElement)(entry.component, { + ...ops, + ...hooks, + t: actions.accountT(), +@@ -6639,6 +6639,16 @@ function SignInHost({ entry, actions }) { + }); + } + var MODEL_CSS = ` ++.bt-turn-error{display:grid;grid-template-columns:10px minmax(0,1fr);column-gap:8px;row-gap:8px;padding:2px 0;font-size:13px;line-height:20px} ++.bt-turn-error-dot{width:6px;height:6px;margin-top:7px;border-radius:50%;background:#e02135} ++.bt-turn-error-copy{min-width:0;overflow-wrap:anywhere} ++.bt-turn-error-title{margin-right:6px;font-weight:600;color:#e02135} ++.bt-turn-error-message{color:var(--bt-ink-2)} ++.bt-turn-error-code{margin-left:6px;font-size:11px;color:var(--bt-ink-3)} ++.bt-turn-error-actions{grid-column:2;display:flex;flex-wrap:wrap;align-items:center;gap:6px} ++.bt-model-help{display:inline-flex;align-items:center;min-height:28px;padding:0 4px;font-size:12px;line-height:16px;color:var(--bt-ink-2);text-decoration:underline;text-underline-offset:2px} ++.bt-model-help:hover{color:var(--bt-ink)} ++.bt-model-help:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px;border-radius:4px} + .bt-model-trigger{display:inline-flex;align-items:center;gap:8px;max-width:100%;min-width:0;height:auto;min-height:32px;padding:4px 8px 4px 10px;border:0;border-radius:8px;background:var(--bt-hover);color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer;transition:background-color .12s ease} + .bt-model-trigger:hover,.bt-model-trigger[aria-expanded=true]{background:var(--bt-active)} + .bt-model-trigger:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px} +@@ -6675,18 +6675,96 @@ var MODEL_CSS = ` + @media (prefers-reduced-motion:reduce){.bt-model-dock{animation:none}.bt-model-spin{animation-duration:2s}.bt-model-caret{transition:none}.bt-model-tick svg{animation:none}} + `; + ++// src/client/model-test.js ++var import_react29 = require("react"); ++var FAILURE_COPY = { ++ NO_MODEL: "Pick a model first.", ++ NO_KEY: "This model has no API key yet. Set one up in the model settings.", ++ AUTH: "The API key was rejected. Check it in the model settings.", ++ QUOTA: "The account is out of quota.", ++ RATE_LIMIT: "Too many requests right now. Try again in a moment.", ++ TIMEOUT: "The model did not answer within 30 seconds.", ++ NOT_SERVED: "This model is not available now. Check its provider in the model settings.", ++ MODEL_NOT_FOUND: "The provider does not know this model. Check the model name.", ++ TRANSPORT: "Could not reach the model service. Check the endpoint address and your network.", ++ SERVER: "The model service failed. Try again later.", ++ INVALID_REQUEST: "The model service refused the request. Check the endpoint and the model.", ++ UNKNOWN: "The test failed." ++}; ++function testOutcome(result, modelName) { ++ if (result?.ok === true) { ++ const seconds = typeof result.ms === "number" ? Math.max(0.1, Math.round(result.ms / 100) / 10) : void 0; ++ return { ok: true, text: seconds === void 0 ? t("Works. {model} answered.", { model: modelName }) : t("Works. {model} answered in {seconds} s.", { model: modelName, seconds }) }; ++ } ++ const code = Object.hasOwn(FAILURE_COPY, result?.code) ? result.code : "UNKNOWN"; ++ return { ok: false, code, text: t(FAILURE_COPY[code]) }; ++} ++var testModel = (id) => call("test-model", { id }); ++function ModelTestRow({ bot, modelName, test = testModel }) { ++ const [state, setState] = (0, import_react29.useState)({ busy: false, outcome: void 0 }); ++ const live = (0, import_react29.useRef)(true); ++ (0, import_react29.useEffect)(() => () => { ++ live.current = false; ++ }, []); ++ (0, import_react29.useEffect)(() => { ++ setState({ busy: false, outcome: void 0 }); ++ }, [bot.id, bot.model]); ++ const start = () => { ++ if (state.busy) return; ++ setState({ busy: true, outcome: void 0 }); ++ Promise.resolve().then(() => test(bot.id)).then( ++ (result) => testOutcome(result, modelName ?? result?.ref ?? ""), ++ (error) => ({ ok: false, text: String(error?.message ?? t("The test failed.")) }) ++ ).then((outcome2) => { ++ if (live.current) setState({ busy: false, outcome: outcome2 }); + }); -+ else previous = state.open ? state.highlight : null; -+ }; -+ const unsubscribe = controller.menu.subscribe(apply2); -+ apply2(); -+ return () => { -+ stopped = true; -+ unsubscribe?.(); -+ style.remove(); + }; - } --var MODEL_CSS = ` --.bt-model-trigger{display:inline-flex;align-items:center;gap:8px;max-width:100%;min-width:0;height:auto;min-height:32px;padding:4px 8px 4px 10px;border:0;border-radius:8px;background:var(--bt-hover);color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer;transition:background-color .12s ease} --.bt-model-trigger:hover,.bt-model-trigger[aria-expanded=true]{background:var(--bt-active)} --.bt-model-trigger:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px} --.bt-model-trigger[data-missing] .bt-model-provider{color:#c21d2e} --.bt-model-trigger[data-wide]{display:flex;width:100%;min-height:48px;padding:7px 12px;justify-content:space-between;border-radius:12px;background:var(--bt-card);box-shadow:inset 0 0 0 1px var(--bt-line)} --.bt-model-trigger[data-wide]:hover,.bt-model-trigger[data-wide][aria-expanded=true]{background:var(--bt-hover)} --.bt-model-copy{display:flex;flex-direction:column;min-width:0} --.bt-model-name{font-size:13px;line-height:18px;font-weight:500;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-model-provider{font-size:11px;line-height:14px;color:var(--bt-ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} --.bt-model-caret{flex:none;color:var(--bt-ink-3);transition:${spring(SPRING_SHAPE, "transform")}} --.bt-model-trigger[aria-expanded=true] .bt-model-caret{transform:rotate(180deg)} --.bt-model-menu{overflow-y:auto;scrollbar-width:thin} --.bt-model-group{flex:none;padding:8px 8px 2px;font-size:11px;line-height:14px;font-weight:500;color:var(--bt-ink-3);text-transform:none} --.bt-model-group:first-child{padding-top:2px} --.bt-model-tick{flex:none;width:16px;height:16px;display:inline-flex;color:var(--bt-ink-2)} --.bt-model-tick svg{animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} 60ms backwards} --.bt-model-none{padding:8px;font-size:13px;line-height:18px;color:var(--bt-ink-2)} --.bt-model-dock{width:100%;max-width:var(--dsh-chat-content-width,748px);margin:0 auto;display:flex;flex-direction:column;align-items:flex-start;gap:8px;padding:0 0 10px;box-sizing:border-box;animation:bt-model-in ${SPRING_POP.duration}ms ${SPRING_POP.easing} backwards} --.bt-model-chips{display:flex;flex-wrap:wrap;gap:6px;margin-left:30px;max-width:min(560px,calc(100% - 30px));max-height:min(240px,36vh);overflow-y:auto;scrollbar-width:thin} --.bt-model-choice-group{display:flex;flex-direction:column;gap:6px;width:100%;min-width:0} --.bt-model-choice-provider{padding-top:4px;font-size:12px;line-height:16px;font-weight:500;color:var(--bt-ink-2);overflow-wrap:anywhere} --.bt-model-choice-chips{display:flex;flex-wrap:wrap;gap:6px} --.bt-model-chip{display:inline-flex;align-items:center;gap:6px;min-height:30px;padding:5px 12px;border:.5px solid var(--bt-line-2);border-radius:999px;background:var(--bt-surface,transparent);color:var(--bt-ink);font:inherit;font-size:13px;line-height:18px;cursor:pointer;transition:background-color .12s ease,border-color .12s ease} --.bt-model-chip:hover:not(:disabled){background:var(--bt-hover)} --.bt-model-chip:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px} --.bt-model-chip-quiet{color:var(--bt-ink-2)} --.bt-model-chip svg{width:14px;height:14px} --.bt-model-chip:disabled{cursor:default} --.bt-model-chip:disabled:not([aria-busy]){opacity:.5} --.bt-model-error{margin-left:30px} --@keyframes bt-model-in{from{opacity:0;transform:translateY(6px)}} --.bt-model-spin{flex:none;width:14px;height:14px;border-radius:50%;border:1.5px solid var(--bt-line-2);border-top-color:var(--bt-ink-2);animation:bt-model-spin .7s linear infinite} --@keyframes bt-model-spin{to{transform:rotate(360deg)}} --@media (prefers-reduced-motion:reduce){.bt-model-dock{animation:none}.bt-model-spin{animation-duration:2s}.bt-model-caret{transition:none}.bt-model-tick svg{animation:none}} --`; - --// src/client/folder-menu.js ++ const { busy, outcome } = state; ++ return (0, import_react29.createElement)( ++ "div", ++ { className: "bt-set-row bt-bs-row bt-model-test" }, ++ (0, import_react29.createElement)( ++ "span", ++ { className: "bt-set-copy" }, ++ (0, import_react29.createElement)("span", { className: "bt-set-hint" }, t("Sends one short request to this model. It may be billed.")), ++ (0, import_react29.createElement)( ++ "span", ++ { className: "bt-model-test-result", role: "status", "aria-live": "polite", "data-ok": outcome === void 0 ? void 0 : String(outcome.ok) }, ++ busy ? t("Testing…") : outcome === void 0 ? null : outcome.text, ++ outcome?.code ? (0, import_react29.createElement)("code", { className: "bt-model-test-code" }, outcome.code) : null ++ ) ++ ), ++ (0, import_react29.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, "aria-busy": busy || void 0, onClick: start }, t("Test connection")) ++ ); ++} ++var MODEL_TEST_CSS = ` ++.bt-model-test-result{font-size:13px;line-height:18px;color:var(--bt-ink-2)} ++.bt-model-test-result:empty{display:none} ++.bt-model-test-result[data-ok=true]{color:#1a7f37} ++.bt-model-test-result[data-ok=false]{color:#c21d2e} ++.bt-model-test-code{margin-left:6px;font-size:11px;color:var(--bt-ink-3)} ++/* #1347: the hint beside "Test connection" is prose and wraps; the button next to it keeps its own ++ words ("Test connection" on one line) and takes the room it needs. */ ++.bt-model-test>.bt-set-copy{flex:1 1 12ch;min-width:12ch} ++.bt-model-test>.bt-soft{flex:none;white-space:nowrap} ++@container bt-panel (max-width:300px){ ++ .bt-model-test{flex-wrap:wrap;row-gap:6px} ++ .bt-model-test>.bt-set-copy{flex:1 1 100%} ++} ++`; ++ + // src/client/folder-menu.js -var import_react14 = require("react"); -var import_react_dom7 = require("react-dom"); --var folderName = (path) => String(path).replace(/[\\/]+$/, "").split(/[\\/]/).pop() || String(path); ++var import_react30 = require("react"); ++var import_react_dom9 = require("react-dom"); + var folderName = (path) => String(path).replace(/[\\/]+$/, "").split(/[\\/]/).pop() || String(path); -var Tick = ({ on }) => (0, import_react14.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, on ? (0, import_react14.createElement)(CheckIcon) : null); --function FolderMenu({ value, group = false, actions, run, onPick, wide = false }) { -- const { isOpen, shownPlace, leaving, button, menu, open, close } = useAnchoredMenu(); ++var Tick = ({ on }) => (0, import_react30.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, on ? (0, import_react30.createElement)(CheckIcon) : null); + function FolderMenu({ value, group = false, actions, run, onPick, wide = false }) { + const { isOpen, shownPlace, leaving, button, menu, open, close } = useAnchoredMenu(); - const [info, setInfo] = (0, import_react14.useState)(null); - const [view, setView] = (0, import_react14.useState)("list"); - const [draft, setDraft] = (0, import_react14.useState)(""); - const [listing, setListing] = (0, import_react14.useState)(null); - const [problem, setProblem] = (0, import_react14.useState)(""); -- const fallback = group ? t("Each Bot's own folder") : t("Team workspace"); -- const toggle = () => { -- if (isOpen) { -- close(); -- return; -- } -- setView("list"); -- setProblem(""); -- void Promise.resolve(actions.folders()).then(setInfo).catch(() => setInfo((last) => last ?? { team: null, picker: null, folders: [] })); -- open(); -+// src/client/speech.js -+var VOICE_BUNDLE = "@deepseek-ai/dsh-experimental-voice-input-bundle"; -+var USABLE = /* @__PURE__ */ new Set(["ready", "standby", "waking"]); -+async function speechCatalog(speech) { -+ const result = await speech.catalog(); -+ if (!result?.ok) throw new Error(result?.error?.message ?? "Speech catalog failed"); -+ const catalog = result.value; -+ const provider = catalog.providers.find((item) => item.id === catalog.selection.providerId); -+ return { catalog, usable: USABLE.has(provider?.preparation?.phase) }; -+} -+function waveBytes(samples, rate = 16e3) { -+ const bytes = new Uint8Array(44 + samples.length * 2); -+ const view = new DataView(bytes.buffer); -+ const ascii = (at, text2) => { -+ for (let index = 0; index < text2.length; index += 1) bytes[at + index] = text2.charCodeAt(index); - }; -- const choose = (path) => { -- close(); -- if (path !== (value ?? "")) void onPick(path); -+ ascii(0, "RIFF"); -+ view.setUint32(4, 36 + samples.length * 2, true); -+ ascii(8, "WAVEfmt "); -+ view.setUint32(16, 16, true); -+ view.setUint16(20, 1, true); -+ view.setUint16(22, 1, true); -+ view.setUint32(24, rate, true); -+ view.setUint32(28, rate * 2, true); -+ view.setUint16(32, 2, true); -+ view.setUint16(34, 16, true); -+ ascii(36, "data"); -+ view.setUint32(40, samples.length * 2, true); -+ samples.forEach((sample, index) => { -+ const value = Math.max(-1, Math.min(1, sample)); -+ view.setInt16(44 + index * 2, value < 0 ? Math.round(value * 32768) : Math.round(value * 32767), true); -+ }); -+ return bytes; -+} -+function base64Of(bytes) { -+ let text2 = ""; -+ for (let index = 0; index < bytes.length; index += 32768) text2 += String.fromCharCode(...bytes.subarray(index, index + 32768)); -+ return btoa(text2); -+} -+var captureError = (kind, cause) => Object.assign(new Error(kind), { kind, cause }); -+async function openCapture() { -+ const devices = navigator.mediaDevices; -+ if (!devices?.getUserMedia || typeof MediaRecorder === "undefined") throw captureError("unavailable"); -+ let stream; -+ try { -+ stream = await devices.getUserMedia({ audio: { echoCancellation: true, noiseSuppression: true }, video: false }); -+ } catch (error) { -+ throw captureError(error?.name === "NotAllowedError" ? "blocked" : "failed", error); -+ } -+ const audio = new AudioContext(); -+ const analyser = audio.createAnalyser(); -+ analyser.fftSize = 512; -+ audio.createMediaStreamSource(stream).connect(analyser); -+ const frame = new Float32Array(analyser.fftSize); -+ const recorder = new MediaRecorder(stream); -+ const chunks = []; -+ recorder.ondataavailable = (event) => { -+ if (event.data.size > 0) chunks.push(event.data); - }; -- const browse = (path) => { -- setProblem(""); -- void Promise.resolve(actions.folderList(path)).then((next) => { -- setListing(next); -- setView("browse"); -- }).catch((failure) => setProblem(failure?.message ?? String(failure))); -+ recorder.start(); -+ let closed = false; -+ const close = () => { -+ if (closed) return; -+ closed = true; -+ if (recorder.state !== "inactive") recorder.stop(); -+ stream.getTracks().forEach((track) => track.stop()); -+ void audio.close().catch(() => { -+ }); - }; -- const pickNative = () => { -- close(); -- void run(Promise.resolve(actions.folderPick()).then((path) => path ? onPick(path) : void 0)); -+ return { -+ level() { -+ if (closed) return 0; -+ analyser.getFloatTimeDomainData(frame); -+ let sum = 0; -+ for (const sample of frame) sum += sample * sample; -+ return Math.min(1, Math.sqrt(sum / frame.length) * 4); -+ }, -+ cancel: close, -+ async finish(maxSeconds) { -+ if (closed || recorder.state === "inactive") { -+ close(); -+ return null; -+ } -+ try { -+ await new Promise((resolve) => { -+ recorder.onstop = resolve; -+ recorder.stop(); -+ }); -+ stream.getTracks().forEach((track) => track.stop()); -+ const blob = new Blob(chunks, { type: recorder.mimeType }); -+ if (blob.size === 0) return null; -+ const decoded = await audio.decodeAudioData(await blob.arrayBuffer()); -+ const length = Math.max(1, Math.floor(Math.min(decoded.duration, maxSeconds) * 16e3)); -+ const offline = new OfflineAudioContext(1, length, 16e3); -+ const source = offline.createBufferSource(); -+ source.buffer = decoded; -+ source.connect(offline.destination); -+ source.start(); -+ return waveBytes((await offline.startRendering()).getChannelData(0)); -+ } finally { -+ close(); -+ } -+ } - }; -- const typed = () => { -- const path = draft.trim(); -- if (path !== "") choose(path); -+} -+async function transcribeWave(speech, catalog, wave, signal) { -+ if (wave.byteLength > catalog.maxAudioBytes) throw captureError("too-long"); -+ const result = await speech.transcribe({ audioBase64: base64Of(wave), ...catalog.selection }, signal); -+ if (!result?.ok) throw Object.assign(new Error(result?.error?.message ?? "Transcription failed"), { kind: "service" }); -+ return String(result.value?.text ?? "").trim(); -+} -+function turnDetector({ loud = 0.12, quiet = 0.06, quietMs = 1200 } = {}) { -+ let spokeAt = 0; -+ let quietSince = 0; -+ return (level, now) => { -+ if (level >= loud) { -+ spokeAt ||= now; -+ quietSince = 0; -+ return "speech"; -+ } -+ if (!spokeAt) return "waiting"; -+ if (level < quiet) quietSince ||= now; -+ return quietSince && now - quietSince >= quietMs ? "done" : "speech"; ++ const [info, setInfo] = (0, import_react30.useState)(null); ++ const [view, setView] = (0, import_react30.useState)("list"); ++ const [draft, setDraft] = (0, import_react30.useState)(""); ++ const [listing, setListing] = (0, import_react30.useState)(null); ++ const [problem, setProblem] = (0, import_react30.useState)(""); + const fallback = group ? t("Each Bot's own folder") : t("Team workspace"); + const toggle = () => { + if (isOpen) { +@@ -6718,452 +6718,124 @@ function FolderMenu({ value, group = false, actions, run, onPick, wide = false } + if (path !== "") choose(path); }; -- const known = info?.folders ?? []; + const known = info?.folders ?? []; - const folders = value && !known.some((folder) => folder.path === value) ? [{ path: value, title: folderName(value) }, ...known] : known; - const listView = (0, import_react14.createElement)( - "div", @@ -17505,7 +19069,7 @@ diff --git a/client.js b/client.js - problem ? (0, import_react14.createElement)("div", { className: "bt-folder-error", role: "alert" }, problem) : null - ), document.body) : null - ); - } +-} -var FOLDER_CSS = ` -.bt-folder-view{display:flex;flex-direction:column;gap:2px;animation:bt-veil-in .14s ease-out} -.bt-folder-copy{flex:1;display:flex;flex-direction:column;min-width:0} @@ -17520,7 +19084,7 @@ diff --git a/client.js b/client.js -.bt-folder-error{padding:4px 8px;font-size:12px;line-height:16px;color:#c21d2e;overflow-wrap:anywhere} -@media (prefers-reduced-motion:reduce){.bt-folder-view{animation:none}} -`; - +- -// src/client/schedules.js -var import_react15 = require("react"); -var POLL_MS = 3e4; @@ -17529,27 +19093,7 @@ diff --git a/client.js b/client.js -function publish(view) { - shared = view; - for (const listener of listeners) listener(view); -+// src/client/model-menu.js -+var import_react24 = require("react"); -+var import_react_dom8 = require("react-dom"); -+var MENU_EXIT_MS = 120; -+function groupModels(models) { -+ const groups = /* @__PURE__ */ new Map(); -+ for (const model of models ?? []) { -+ const provider = model.provider ?? model.providerName ?? model.ref.split("/")[0]; -+ if (!groups.has(provider)) groups.set(provider, []); -+ groups.get(provider).push(model); -+ } -+ const names = /* @__PURE__ */ new Map(); -+ for (const [provider, list] of groups) { -+ const name = list[0].providerName ?? provider; -+ names.set(name, (names.get(name) ?? 0) + 1); -+ } -+ return [...groups].map(([provider, list]) => { -+ const name = list[0].providerName ?? provider; -+ return [names.get(name) > 1 ? `${name} (${provider})` : name, list]; -+ }); - } +-} -function useSchedules(actions) { - const [view, setView] = (0, import_react15.useState)(shared); - (0, import_react15.useEffect)(() => { @@ -17558,96 +19102,35 @@ diff --git a/client.js b/client.js - let timer; - const load = () => actions.schedules?.().then((next) => { - if (!stopped) publish(next); -+var servedOf = (roster, ref) => (roster.models ?? []).find((model) => model.ref === ref); -+var effortCache = /* @__PURE__ */ new Map(); -+function useEfforts(served, ref, actions) { -+ const [fetched, setFetched] = (0, import_react24.useState)(void 0); -+ (0, import_react24.useEffect)(() => { -+ setFetched(void 0); -+ if (ref === void 0 || served?.reasoning !== void 0 || actions?.efforts === void 0) return void 0; -+ let live = true; -+ if (effortCache.has(ref)) setFetched(effortCache.get(ref)); -+ else void Promise.resolve(actions.efforts(ref)).then((value) => { -+ const reasoning = value?.efforts ? value : null; -+ effortCache.set(ref, reasoning); -+ if (live) setFetched(reasoning); - }).catch(() => { +- }).catch(() => { - }).finally(() => { - if (!stopped) timer = setTimeout(load, POLL_MS); - }); +- }); - load(); - return () => { +- return () => { - stopped = true; - clearTimeout(timer); - listeners.delete(setView); -+ live = false; - }; +- }; - }, []); - return view; -+ }, [ref, served?.reasoning !== void 0, actions]); -+ return served?.reasoning ?? fetched; - } +-} -var localZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone; -var clock2 = (time) => String(time ?? "").slice(0, 5); -var when2 = (ms, options) => new Intl.DateTimeFormat(dateLocale(), options).format(ms); -function dayAndTime(ms) { - const sameYear = new Date(ms).getFullYear() === (/* @__PURE__ */ new Date()).getFullYear(); - return when2(ms, { ...sameYear ? {} : { year: "numeric" }, month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" }); -+function effortRows(reasoning) { -+ if (reasoning?.efforts === void 0 || reasoning.efforts.length === 0) return []; -+ return [ -+ { effort: void 0, label: t("Default") }, -+ ...reasoning.efforts.map((effort) => ({ effort: effort.id, label: effort.name })) -+ ]; - } +-} -function weekdayNames(days) { - const names = days.map((day) => when2(Date.UTC(2024, 0, day), { weekday: "short", timeZone: "UTC" })); - return names.join(dateLocale().startsWith("zh") ? "、" : ", "); -+function EffortRows({ reasoning, current, onPick }) { -+ return (0, import_react24.createElement)( -+ import_react24.Fragment, -+ null, -+ (0, import_react24.createElement)("div", { className: "bt-menu-sep", role: "separator" }), -+ (0, import_react24.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Thinking level")), -+ effortRows(reasoning).map((row) => (0, import_react24.createElement)( -+ "button", -+ { -+ key: row.effort ?? "default", -+ type: "button", -+ role: "menuitemradio", -+ "aria-checked": row.effort === current, -+ onClick: () => onPick(row.effort) -+ }, -+ (0, import_react24.createElement)("span", { className: "bt-menu-label" }, row.label), -+ (0, import_react24.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, row.effort === current ? (0, import_react24.createElement)(CheckIcon) : null) -+ )) -+ ); - } +-} -function everyText(seconds) { - if (seconds % 86400 === 0) return seconds === 86400 ? t("Every day") : t("Every {count} days", { count: seconds / 86400 }); - if (seconds % 3600 === 0) return seconds === 3600 ? t("Every hour") : t("Every {count} hours", { count: seconds / 3600 }); - return t("Every {count} minutes", { count: Math.round(seconds / 60) }); -+function ModelRows({ roster, current, onPick }) { -+ return groupModels(roster.models).map(([provider, list]) => (0, import_react24.createElement)( -+ import_react24.Fragment, -+ { key: list[0].provider ?? provider }, -+ (0, import_react24.createElement)("div", { className: "bt-model-group", role: "presentation" }, provider), -+ list.map((model) => (0, import_react24.createElement)( -+ "button", -+ { -+ key: model.ref, -+ type: "button", -+ role: "menuitemradio", -+ "aria-checked": model.ref === current, -+ title: model.ref, -+ onClick: () => onPick(model.ref) -+ }, -+ (0, import_react24.createElement)("span", { className: "bt-menu-label" }, model.name), -+ model.ref === roster.defaultModel ? (0, import_react24.createElement)("span", { className: "bt-menu-hint" }, t("Default")) : null, -+ (0, import_react24.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, model.ref === current ? (0, import_react24.createElement)(CheckIcon) : null) -+ )) -+ )); - } +-} -function timingText(task) { - const zone = task.timeZone && task.timeZone !== localZone() ? ` (${task.timeZone})` : ""; - switch (task.kind) { @@ -17668,47 +19151,7 @@ diff --git a/client.js b/client.js - default: - return ""; - } -+var Caret = () => (0, import_react24.createElement)("svg", { className: "bt-model-caret", width: 12, height: 12, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react24.createElement)("path", { d: "M5.5 8l4.5 4.5L14.5 8" })); -+function useAnchoredMenu() { -+ const [place, setPlace] = (0, import_react24.useState)(null); -+ const [shownPlace, leaving] = useLinger(place, MENU_EXIT_MS); -+ const button = (0, import_react24.useRef)(null); -+ const menu = (0, import_react24.useRef)(null); -+ const close = () => setPlace(null); -+ (0, import_react24.useEffect)(() => { -+ if (place === null) return void 0; -+ const onDown = (event) => { -+ if (menu.current?.contains(event.target) || button.current?.contains(event.target)) return; -+ close(); -+ }; -+ const onKey = (event) => { -+ if (event.key === "Escape") { -+ event.stopPropagation(); -+ close(); -+ button.current?.focus(); -+ } -+ }; -+ const onScroll = (event) => { -+ if (!menu.current?.contains(event.target)) close(); -+ }; -+ window.addEventListener("mousedown", onDown); -+ window.addEventListener("keydown", onKey, true); -+ window.addEventListener("scroll", onScroll, true); -+ return () => { -+ window.removeEventListener("mousedown", onDown); -+ window.removeEventListener("keydown", onKey, true); -+ window.removeEventListener("scroll", onScroll, true); -+ }; -+ }, [place]); -+ const open = () => { -+ const rect = button.current.getBoundingClientRect(); -+ const width = Math.max(240, rect.width); -+ const left = Math.max(8, Math.min(rect.right - width, window.innerWidth - width - 8)); -+ const below = window.innerHeight - rect.bottom; -+ setPlace(below >= 260 || below >= rect.top ? { left, width, top: rect.bottom + 4, maxHeight: below - 16, "--bt-origin": "top right" } : { left, width, bottom: window.innerHeight - rect.top + 4, maxHeight: rect.top - 16, "--bt-origin": "bottom right" }); -+ }; -+ return { isOpen: place !== null, shownPlace, leaving, button, menu, open, close }; - } +-} -var nextText = (task) => task.status === "active" ? t("Next: {time}", { time: dayAndTime(Date.parse(task.scheduledAt)) }) : t("Finished"); -function TaskRow({ task, actions, onView, showBot, roster }) { - const [confirming, setConfirming] = (0, import_react15.useState)(false); @@ -17721,26 +19164,11 @@ diff --git a/client.js b/client.js - const remove = () => { - if (!confirming) { - setConfirming(true); -+function ModelMenu({ bot, roster, actions, run, wide = false, onPick, onPickEffort }) { -+ if (bot?.remote !== void 0) return null; -+ const { isOpen, shownPlace, leaving, button, menu, open, close } = useAnchoredMenu(); -+ const shown = modelOf(bot, roster); -+ const current = bot.model ?? bot.appliedModel; -+ const served = servedOf(roster, current); -+ const reasoning = useEfforts(served, current, actions); -+ const picked = reasoning?.efforts?.some((effort) => effort.id === bot.effort) ? bot.effort : void 0; -+ const currentEffort = picked ?? reasoning?.defaultEffort; -+ const effortLabel = currentEffort === void 0 ? reasoning?.efforts?.length > 0 ? t("Default") : void 0 : reasoning.efforts.find((effort) => effort.id === currentEffort)?.name ?? currentEffort; -+ const toggle = () => { -+ if (isOpen) { -+ close(); - return; - } +- return; +- } - setBusy(true); - void actions.scheduleDelete(task.sessionId, task.id).then(onView, () => setBusy(false)); -+ void actions?.refreshModels?.(); -+ open(); - }; +- }; - const room2 = task.roomId ? roster.roomsById[task.roomId] : void 0; - return (0, import_react15.createElement)( - "div", @@ -17752,41 +19180,7 @@ diff --git a/client.js b/client.js - (0, import_react15.createElement)("span", { className: "bt-task-title" }, task.title), - (0, import_react15.createElement)("span", { className: "bt-set-hint" }, [timingText(task), room2 ? t("in {name}", { name: room2.name }) : ""].filter(Boolean).join(" · ")), - task.prompt && task.prompt !== task.title ? (0, import_react15.createElement)("span", { className: "bt-task-prompt" }, task.prompt) : null -+ const pick2 = (ref) => { -+ close(); -+ if (onPick) onPick(ref); -+ else if (ref !== current || !bot.model) void run(actions.updateBot(bot.id, { model: ref })); -+ }; -+ const pickEffort = (effort) => { -+ close(); -+ if (onPickEffort) onPickEffort(effort); -+ else if (effort !== bot.effort) void run(actions.updateBot(bot.id, { effort: effort ?? null })); -+ }; -+ const models = roster.models ?? []; -+ return (0, import_react24.createElement)( -+ import_react24.Fragment, -+ null, -+ (0, import_react24.createElement)( -+ "button", -+ { -+ ref: button, -+ type: "button", -+ className: "bt-model-trigger", -+ "data-wide": wide || void 0, -+ "aria-haspopup": "menu", -+ "aria-expanded": isOpen, -+ "aria-label": t("Model: {model}", { model: shown?.name ?? t("none") }), -+ "data-missing": shown !== void 0 && !shown.served && models.length > 0 ? "" : void 0, -+ onClick: toggle -+ }, -+ (0, import_react24.createElement)( -+ "span", -+ { className: "bt-model-copy" }, -+ (0, import_react24.createElement)("span", { className: "bt-model-name" }, shown?.name ?? t("Choose a model")), -+ shown ? (0, import_react24.createElement)("span", { className: "bt-model-provider" }, shown.served || models.length === 0 ? effortLabel === void 0 ? shown.provider : `${shown.provider} · ${effortLabel}` : t("{provider} · not available", { provider: shown.provider })) : null -+ ), -+ (0, import_react24.createElement)(Caret) - ), +- ), - (0, import_react15.createElement)("span", { className: "bt-task-next" }, nextText(task)), - (0, import_react15.createElement)("button", { - type: "button", @@ -17797,19 +19191,8 @@ diff --git a/client.js b/client.js - title: confirming ? void 0 : t("Delete task"), - onClick: remove - }, confirming ? t("Delete") : (0, import_react15.createElement)(TrashIcon)) -+ shownPlace ? (0, import_react_dom8.createPortal)((0, import_react24.createElement)( -+ "div", -+ { ref: menu, className: `bt-menu bt-model-menu${shownPlace.bottom !== void 0 ? " bt-menu-up" : ""}`, role: "menu", "aria-label": t("Model for {name}", { name: bot.name }), style: shownPlace, "data-leaving": leaving || void 0 }, -+ models.length > 0 ? (0, import_react24.createElement)(ModelRows, { roster, current, onPick: pick2 }) : (0, import_react24.createElement)("div", { className: "bt-model-none" }, t("No models are set up in DeepSeek Harness yet.")), -+ effortRows(reasoning).length > 0 ? (0, import_react24.createElement)(EffortRows, { reasoning, current: picked, onPick: pickEffort }) : null, -+ (0, import_react24.createElement)("div", { className: "bt-menu-sep", role: "separator" }), -+ (0, import_react24.createElement)("button", { type: "button", role: "menuitem", onClick: () => { -+ close(); -+ openHarnessModels(); -+ } }, (0, import_react24.createElement)(SlidersIcon), (0, import_react24.createElement)("span", { className: "bt-menu-label" }, t("Models and providers…"))) -+ ), document.body) : null - ); - } +- ); +-} -var pad = (number) => String(number).padStart(2, "0"); -function inAnHour() { - const date = new Date(Date.now() + 36e5); @@ -17839,23 +19222,7 @@ diff --git a/client.js b/client.js - event.preventDefault(); - if (busy) return; - setBusy(true); -+function ModelChoiceDock({ sessionId, useRoster, actions }) { -+ const roster = useRoster((value) => value); -+ const bot = roster.byId[sessionId]; -+ const [busy, setBusy] = (0, import_react24.useState)(""); -+ const [error, setError] = (0, import_react24.useState)(""); -+ const shown = Boolean(bot) && currentPart(bot) === sessionId && roster.ready; -+ (0, import_react24.useEffect)(() => { -+ if (shown) void actions.refreshModels?.(); -+ }, [shown, sessionId]); -+ if (!bot || currentPart(bot) !== sessionId || !roster.ready) return null; -+ if (bot.remote) return bot.remote.gone ? (0, import_react24.createElement)(RemoteGoneDock, { bot }) : null; -+ const models = roster.models ?? []; -+ const lost = bot.model ? !models.some((model) => model.ref === bot.model) : false; -+ if (bot.model && (!lost || models.length === 0)) return null; -+ const pick2 = (ref) => { -+ setBusy(ref); - setError(""); +- setError(""); - let when3; - try { - when3 = timing(); @@ -17868,60 +19235,22 @@ diff --git a/client.js b/client.js - setError(hostText(failure?.message ?? String(failure))); - setBusy(false); - }); -+ void Promise.resolve(actions.updateBot(bot.id, { model: ref })).catch((failure) => { -+ setError(failure?.message ?? String(failure)); -+ void actions.refreshModels?.(); -+ }).finally(() => setBusy("")); - }; +- }; - const toggleDay = (day) => setWeekdays((days) => days.includes(day) ? days.filter((item) => item !== day) : [...days, day].sort()); - return (0, import_react15.createElement)( -- "form", -- { className: "bt-set-card bt-task-form", onSubmit: submit }, -- (0, import_react15.createElement)( -- "label", -- { className: "bt-set-row bt-bs-row" }, -- (0, import_react15.createElement)("span", { className: "bt-set-copy" }, (0, import_react15.createElement)("span", { className: "bt-bs-label" }, t("Send to"))), -- (0, import_react15.createElement)( -- "select", -- { className: "bt-select bt-task-bot", value: target, onChange: (event) => setTarget(event.target.value) }, -- (0, import_react15.createElement)("optgroup", { label: t("Bots") }, roster.bots.map((bot) => (0, import_react15.createElement)("option", { key: bot.id, value: bot.id }, bot.name))), -- roster.rooms.length > 0 ? (0, import_react15.createElement)("optgroup", { label: t("Group chats") }, roster.rooms.map((room2) => (0, import_react15.createElement)("option", { key: room2.id, value: room2.id }, room2.name))) : null -+ const text2 = lost ? t("{model} is not available anymore. Pick another model for me.", { model: bot.model.split("/").slice(1).join("/") }) : models.length === 0 ? t("Hi, I'm {name}. I don't have a model yet. How do you want to set one up?", { name: bot.name }) : t("Hi, I'm {name}. Pick a model for me first. You can change it later in my details.", { name: bot.name }); -+ const choices = models.length === 0 ? [...setupChoices(actions).map(([label, run]) => (0, import_react24.createElement)("button", { key: label, type: "button", className: "bt-model-chip", onClick: run }, label)), (0, import_react24.createElement)(KeyHelpLink, { key: "key-help" })] : [ -+ ...groupModels(models).map(([provider, list]) => (0, import_react24.createElement)( -+ "div", -+ { key: list[0].provider ?? provider, className: "bt-model-choice-group", role: "group", "aria-label": provider }, -+ (0, import_react24.createElement)("div", { className: "bt-model-choice-provider", "aria-hidden": true }, provider), -+ (0, import_react24.createElement)("div", { className: "bt-model-choice-chips" }, list.map((model) => (0, import_react24.createElement)("button", { -+ key: model.ref, -+ type: "button", -+ className: "bt-model-chip", -+ disabled: busy !== "", -+ "aria-busy": busy === model.ref || void 0, -+ "aria-label": `${model.name} · ${provider}`, -+ title: model.ref === roster.defaultModel ? `${model.ref} · ${t("Harness default")}` : model.ref, -+ onClick: () => pick2(model.ref) -+ }, model.name, busy === model.ref ? (0, import_react24.createElement)("span", { className: "bt-model-spin", "aria-label": t("Saving…") }) : null))) -+ )), -+ (0, import_react24.createElement)("button", { key: "manage", type: "button", className: "bt-model-chip bt-model-chip-quiet", onClick: openHarnessModels }, (0, import_react24.createElement)(SlidersIcon), t("Manage models")) -+ ]; -+ return (0, import_react24.createElement)( -+ "div", -+ { className: "bt-model-dock" }, -+ (0, import_react24.createElement)( -+ "div", -+ { className: "bt-astack", "data-lead": "" }, -+ (0, import_react24.createElement)( -+ "div", -+ { className: "bt-msg" }, -+ (0, import_react24.createElement)( -+ "div", -+ { className: "bt-msg-line" }, -+ (0, import_react24.createElement)(BotMark, { bot, size: 22 }), -+ (0, import_react24.createElement)("div", { className: "bt-bubble" }, text2) -+ ) - ) - ), +- "form", +- { className: "bt-set-card bt-task-form", onSubmit: submit }, +- (0, import_react15.createElement)( +- "label", +- { className: "bt-set-row bt-bs-row" }, +- (0, import_react15.createElement)("span", { className: "bt-set-copy" }, (0, import_react15.createElement)("span", { className: "bt-bs-label" }, t("Send to"))), +- (0, import_react15.createElement)( +- "select", +- { className: "bt-select bt-task-bot", value: target, onChange: (event) => setTarget(event.target.value) }, +- (0, import_react15.createElement)("optgroup", { label: t("Bots") }, roster.bots.map((bot) => (0, import_react15.createElement)("option", { key: bot.id, value: bot.id }, bot.name))), +- roster.rooms.length > 0 ? (0, import_react15.createElement)("optgroup", { label: t("Group chats") }, roster.rooms.map((room2) => (0, import_react15.createElement)("option", { key: room2.id, value: room2.id }, room2.name))) : null +- ) +- ), - (0, import_react15.createElement)( - "label", - { className: "bt-set-row bt-bs-row" }, @@ -17935,23 +19264,12 @@ diff --git a/client.js b/client.js - (0, import_react15.createElement)("textarea", { className: "bt-bs-input bt-bs-area", value: prompt, rows: 3, placeholder: t("Sum up what changed since yesterday and what needs me today."), onChange: (event) => setPrompt(event.target.value) }) - ), - (0, import_react15.createElement)( -+ (0, import_react24.createElement)("div", { className: "bt-model-chips", role: "group", "aria-label": t("Choose a model") }, choices), -+ error ? (0, import_react24.createElement)("div", { className: "bt-secret-error bt-model-error", role: "alert" }, error) : null -+ ); -+} -+function RemoteGoneDock({ bot }) { -+ return (0, import_react24.createElement)( -+ "div", -+ { className: "bt-model-dock", "data-flybot": "remote-gone" }, -+ (0, import_react24.createElement)( - "div", +- "div", - { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react15.createElement)("span", { className: "bt-set-copy" }, (0, import_react15.createElement)("span", { className: "bt-bs-label" }, t("When"))), - (0, import_react15.createElement)(Segmented, { label: t("When"), value: kind }, KINDS.map(([id, label]) => (0, import_react15.createElement)("button", { key: id, type: "button", "aria-pressed": kind === id, onClick: () => setKind(id) }, t(label)))), - (0, import_react15.createElement)( -+ { className: "bt-astack", "data-lead": "" }, -+ (0, import_react24.createElement)( - "div", +- "div", - { key: kind, className: "bt-task-when bt-veil" }, - kind === "at" ? (0, import_react15.createElement)("input", { className: "bt-input", type: "datetime-local", value: at, "aria-label": t("Date and time"), onChange: (event) => setAt(event.target.value) }) : null, - kind === "weekly" ? (0, import_react15.createElement)("div", { className: "bt-task-days", role: "group", "aria-label": t("Days") }, [1, 2, 3, 4, 5, 6, 7].map((day) => (0, import_react15.createElement)("button", { @@ -17973,196 +19291,16 @@ diff --git a/client.js b/client.js - UNITS.map(([id, , label]) => (0, import_react15.createElement)("option", { key: id, value: id }, t(label))) - ) - ) : null -+ { className: "bt-msg" }, -+ (0, import_react24.createElement)( -+ "div", -+ { className: "bt-msg-line" }, -+ (0, import_react24.createElement)(BotMark, { bot, size: 22 }), -+ (0, import_react24.createElement)("div", { className: "bt-bubble" }, t("{name} ({handle}) is no longer shared with you, so messages to it cannot be delivered. It runs on its owner's machine, so another model cannot stand in. Ask its owner for a new invite.", { name: bot.name, handle: bot.remote.handle })) -+ ) -+ ) -+ ) -+ ); -+} -+function setupChoices(actions) { -+ return [ -+ actions.canSignIn?.() ? [t("Sign in to DeepSeek"), () => actions.signIn()] : null, -+ [t("Enter a DeepSeek API key"), () => openHarnessOnboarding("deepseek-official")], -+ [t("Open settings to set up a custom model"), openHarnessModels] -+ ].filter(Boolean); -+} -+var KEY_HELP_URL = "https://github.com/ThinkFlowLab/FlyBot/blob/main/docs/deepseek-api-key.md"; -+function KeyHelpLink() { -+ return (0, import_react24.createElement)("a", { className: "bt-model-help", href: KEY_HELP_URL, target: "_blank", rel: "noopener noreferrer" }, t("How to set a DeepSeek API key")); -+} -+function missingModelKey(message) { -+ const text2 = String(message ?? ""); -+ if (!/\bno api key\b|\bmissing (?:an? )?api key\b|\bapi key (?:is )?(?:missing|not set|not configured)\b/i.test(text2)) return void 0; -+ return { route: /provider route "([^"]+)"/i.exec(text2)?.[1] ?? "" }; -+} -+function modelKeyChoices(actions, route) { -+ if (/^deepseek/i.test(route)) return setupChoices(actions); -+ return [[t("Manage models"), openHarnessModels]]; -+} -+function TurnErrorCell({ node, t: chatT, actions }) { -+ const data = node?.data ?? {}; -+ const code = typeof data.code === "string" && data.code ? data.code : void 0; -+ const raw = String(data.message ?? ""); -+ const shell = (key, fallback) => { -+ const text2 = typeof chatT === "function" ? chatT(key) : void 0; -+ return typeof text2 === "string" && text2 !== "" && text2 !== key ? text2 : fallback; -+ }; -+ const missing = missingModelKey(raw); -+ const title = code === "ACCOUNT_SIGNED_OUT" ? shell("message.accountStopped", t("This turn failed")) : shell("message.turnError", t("This turn failed")); -+ const message = missing ? t("This Bot's model has no API key yet. Set one up, then send your message again.") : code === "ACCOUNT_SIGNED_OUT" ? shell("message.failure.accountSignedOut", raw) : code === "ACCOUNT_SIGN_IN_REQUIRED" ? shell("message.failure.accountSignInRequired", raw) : code === "QUOTA" || code === "ACCOUNT_QUOTA" ? shell("message.failure.quota", raw) : code === "AUTH" ? shell("message.failure.auth", raw) : raw; -+ const choices = missing ? modelKeyChoices(actions ?? {}, missing.route) : []; -+ const deepseek = missing ? /^deepseek/i.test(missing.route) : false; -+ return (0, import_react24.createElement)( -+ "div", -+ { className: "bt-turn-error", role: "status", "data-missing-key": missing ? "" : void 0 }, -+ (0, import_react24.createElement)("span", { className: "bt-turn-error-dot", "aria-hidden": true }), -+ (0, import_react24.createElement)( -+ "div", -+ { className: "bt-turn-error-copy" }, -+ (0, import_react24.createElement)("span", { className: "bt-turn-error-title" }, title), -+ (0, import_react24.createElement)("span", { className: "bt-turn-error-message" }, message), -+ code ? (0, import_react24.createElement)("code", { className: "bt-turn-error-code" }, code) : null -+ ), -+ choices.length > 0 ? (0, import_react24.createElement)( -+ "div", -+ { className: "bt-turn-error-actions" }, -+ choices.map(([label, run]) => (0, import_react24.createElement)("button", { key: label, type: "button", className: "bt-model-chip", onClick: run }, label)), -+ deepseek ? (0, import_react24.createElement)(KeyHelpLink, { key: "key-help" }) : null -+ ) : null -+ ); -+} -+function DeepSeekSignIn({ useUi, actions }) { -+ const open = useUi((state) => state.signIn); -+ const entry = open ? actions.signInEntry?.() : null; -+ if (!entry) return null; -+ return (0, import_react24.createElement)(SignInHost, { key: open, entry, actions }); -+} -+function SignInHost({ entry, actions }) { -+ const [ops] = (0, import_react24.useState)(() => entry.inject?.() ?? {}); -+ const close = () => actions.closeSignIn(); -+ const useHook = (source) => (selector) => (0, import_react24.useSyncExternalStore)(source.subscribe, () => selector(source.getSnapshot())); -+ const [hooks] = (0, import_react24.useState)(() => ({ useAccount: useHook(ops.hooks.account), useTheme: useHook(ops.hooks.theme) })); -+ return (0, import_react24.createElement)(entry.component, { -+ ...ops, -+ ...hooks, -+ t: actions.accountT(), -+ complete: close, -+ useApiKey: () => { -+ close(); -+ openHarnessOnboarding("deepseek-official"); -+ } -+ }); -+} -+var MODEL_CSS = ` -+.bt-turn-error{display:grid;grid-template-columns:10px minmax(0,1fr);column-gap:8px;row-gap:8px;padding:2px 0;font-size:13px;line-height:20px} -+.bt-turn-error-dot{width:6px;height:6px;margin-top:7px;border-radius:50%;background:#e02135} -+.bt-turn-error-copy{min-width:0;overflow-wrap:anywhere} -+.bt-turn-error-title{margin-right:6px;font-weight:600;color:#e02135} -+.bt-turn-error-message{color:var(--bt-ink-2)} -+.bt-turn-error-code{margin-left:6px;font-size:11px;color:var(--bt-ink-3)} -+.bt-turn-error-actions{grid-column:2;display:flex;flex-wrap:wrap;align-items:center;gap:6px} -+.bt-model-help{display:inline-flex;align-items:center;min-height:28px;padding:0 4px;font-size:12px;line-height:16px;color:var(--bt-ink-2);text-decoration:underline;text-underline-offset:2px} -+.bt-model-help:hover{color:var(--bt-ink)} -+.bt-model-help:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px;border-radius:4px} -+.bt-model-trigger{display:inline-flex;align-items:center;gap:8px;max-width:100%;min-width:0;height:auto;min-height:32px;padding:4px 8px 4px 10px;border:0;border-radius:8px;background:var(--bt-hover);color:var(--bt-ink);font:inherit;text-align:left;cursor:pointer;transition:background-color .12s ease} -+.bt-model-trigger:hover,.bt-model-trigger[aria-expanded=true]{background:var(--bt-active)} -+.bt-model-trigger:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px} -+.bt-model-trigger[data-missing] .bt-model-provider{color:#c21d2e} -+.bt-model-trigger[data-wide]{display:flex;width:100%;min-height:48px;padding:7px 12px;justify-content:space-between;border-radius:12px;background:var(--bt-card);box-shadow:inset 0 0 0 1px var(--bt-line)} -+.bt-model-trigger[data-wide]:hover,.bt-model-trigger[data-wide][aria-expanded=true]{background:var(--bt-hover)} -+.bt-model-copy{display:flex;flex-direction:column;min-width:0} -+.bt-model-name{font-size:13px;line-height:18px;font-weight:500;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -+.bt-model-provider{font-size:11px;line-height:14px;color:var(--bt-ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -+.bt-model-caret{flex:none;color:var(--bt-ink-3);transition:${spring(SPRING_SHAPE, "transform")}} -+.bt-model-trigger[aria-expanded=true] .bt-model-caret{transform:rotate(180deg)} -+.bt-model-menu{overflow-y:auto;scrollbar-width:thin} -+.bt-model-group{flex:none;padding:8px 8px 2px;font-size:11px;line-height:14px;font-weight:500;color:var(--bt-ink-3);text-transform:none} -+.bt-model-group:first-child{padding-top:2px} -+.bt-model-tick{flex:none;width:16px;height:16px;display:inline-flex;color:var(--bt-ink-2)} -+.bt-model-tick svg{animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing} 60ms backwards} -+.bt-model-none{padding:8px;font-size:13px;line-height:18px;color:var(--bt-ink-2)} -+.bt-model-dock{width:100%;max-width:var(--dsh-chat-content-width,748px);margin:0 auto;display:flex;flex-direction:column;align-items:flex-start;gap:8px;padding:0 0 10px;box-sizing:border-box;animation:bt-model-in ${SPRING_POP.duration}ms ${SPRING_POP.easing} backwards} -+.bt-model-chips{display:flex;flex-wrap:wrap;gap:6px;margin-left:30px;max-width:min(560px,calc(100% - 30px));max-height:min(240px,36vh);overflow-y:auto;scrollbar-width:thin} -+.bt-model-choice-group{display:flex;flex-direction:column;gap:6px;width:100%;min-width:0} -+.bt-model-choice-provider{padding-top:4px;font-size:12px;line-height:16px;font-weight:500;color:var(--bt-ink-2);overflow-wrap:anywhere} -+.bt-model-choice-chips{display:flex;flex-wrap:wrap;gap:6px} -+.bt-model-chip{display:inline-flex;align-items:center;gap:6px;min-height:30px;padding:5px 12px;border:.5px solid var(--bt-line-2);border-radius:999px;background:var(--bt-surface,transparent);color:var(--bt-ink);font:inherit;font-size:13px;line-height:18px;cursor:pointer;transition:background-color .12s ease,border-color .12s ease} -+.bt-model-chip:hover:not(:disabled){background:var(--bt-hover)} -+.bt-model-chip:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px} -+.bt-model-chip-quiet{color:var(--bt-ink-2)} -+.bt-model-chip svg{width:14px;height:14px} -+.bt-model-chip:disabled{cursor:default} -+.bt-model-chip:disabled:not([aria-busy]){opacity:.5} -+.bt-model-error{margin-left:30px} -+@keyframes bt-model-in{from{opacity:0;transform:translateY(6px)}} -+.bt-model-spin{flex:none;width:14px;height:14px;border-radius:50%;border:1.5px solid var(--bt-line-2);border-top-color:var(--bt-ink-2);animation:bt-model-spin .7s linear infinite} -+@keyframes bt-model-spin{to{transform:rotate(360deg)}} -+@media (prefers-reduced-motion:reduce){.bt-model-dock{animation:none}.bt-model-spin{animation-duration:2s}.bt-model-caret{transition:none}.bt-model-tick svg{animation:none}} -+`; -+ -+// src/client/model-test.js -+var import_react25 = require("react"); -+var FAILURE_COPY = { -+ NO_MODEL: "Pick a model first.", -+ NO_KEY: "This model has no API key yet. Set one up in the model settings.", -+ AUTH: "The API key was rejected. Check it in the model settings.", -+ QUOTA: "The account is out of quota.", -+ RATE_LIMIT: "Too many requests right now. Try again in a moment.", -+ TIMEOUT: "The model did not answer within 30 seconds.", -+ NOT_SERVED: "This model is not available now. Check its provider in the model settings.", -+ MODEL_NOT_FOUND: "The provider does not know this model. Check the model name.", -+ TRANSPORT: "Could not reach the model service. Check the endpoint address and your network.", -+ SERVER: "The model service failed. Try again later.", -+ INVALID_REQUEST: "The model service refused the request. Check the endpoint and the model.", -+ UNKNOWN: "The test failed." -+}; -+function testOutcome(result, modelName) { -+ if (result?.ok === true) { -+ const seconds = typeof result.ms === "number" ? Math.max(0.1, Math.round(result.ms / 100) / 10) : void 0; -+ return { ok: true, text: seconds === void 0 ? t("Works. {model} answered.", { model: modelName }) : t("Works. {model} answered in {seconds} s.", { model: modelName, seconds }) }; -+ } -+ const code = Object.hasOwn(FAILURE_COPY, result?.code) ? result.code : "UNKNOWN"; -+ return { ok: false, code, text: t(FAILURE_COPY[code]) }; -+} -+var testModel = (id) => call("test-model", { id }); -+function ModelTestRow({ bot, modelName, test = testModel }) { -+ const [state, setState] = (0, import_react25.useState)({ busy: false, outcome: void 0 }); -+ const live = (0, import_react25.useRef)(true); -+ (0, import_react25.useEffect)(() => () => { -+ live.current = false; -+ }, []); -+ (0, import_react25.useEffect)(() => { -+ setState({ busy: false, outcome: void 0 }); -+ }, [bot.id, bot.model]); -+ const start = () => { -+ if (state.busy) return; -+ setState({ busy: true, outcome: void 0 }); -+ Promise.resolve().then(() => test(bot.id)).then( -+ (result) => testOutcome(result, modelName ?? result?.ref ?? ""), -+ (error) => ({ ok: false, text: String(error?.message ?? t("The test failed.")) }) -+ ).then((outcome2) => { -+ if (live.current) setState({ busy: false, outcome: outcome2 }); -+ }); -+ }; -+ const { busy, outcome } = state; -+ return (0, import_react25.createElement)( +- ) ++ const folders = value && !known.some((folder) => folder.path === value) ? [{ path: value, title: folderName(value) }, ...known] : known; ++ const listView = (0, import_react30.createElement)( + "div", -+ { className: "bt-set-row bt-bs-row bt-model-test" }, -+ (0, import_react25.createElement)( -+ "span", -+ { className: "bt-set-copy" }, -+ (0, import_react25.createElement)("span", { className: "bt-set-hint" }, t("Sends one short request to this model. It may be billed.")), -+ (0, import_react25.createElement)( -+ "span", -+ { className: "bt-model-test-result", role: "status", "aria-live": "polite", "data-ok": outcome === void 0 ? void 0 : String(outcome.ok) }, -+ busy ? t("Testing…") : outcome === void 0 ? null : outcome.text, -+ outcome?.code ? (0, import_react25.createElement)("code", { className: "bt-model-test-code" }, outcome.code) : null - ) ++ { key: "list", className: "bt-folder-view" }, ++ (0, import_react30.createElement)( ++ "button", ++ { type: "button", role: "menuitemradio", "aria-checked": !value, title: group ? void 0 : info?.team ?? void 0, onClick: () => choose("") }, ++ (0, import_react30.createElement)("span", { className: "bt-menu-label" }, fallback), ++ (0, import_react30.createElement)(Tick, { on: !value }) ), - error ? (0, import_react15.createElement)("div", { className: "bt-set-row" }, (0, import_react15.createElement)("span", { className: "bt-danger bt-set-hint" }, error)) : null, - (0, import_react15.createElement)( @@ -18171,32 +19309,33 @@ diff --git a/client.js b/client.js - (0, import_react15.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onCancel }, t("Cancel")), - (0, import_react15.createElement)("button", { type: "submit", className: "bt-send bt-soft-sm", disabled: busy || !target || title.trim() === "" || prompt.trim() === "" }, busy ? t("Creating…") : t("Create task")) - ) -+ (0, import_react25.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, "aria-busy": busy || void 0, onClick: start }, t("Test connection")) ++ folders.length > 0 ? (0, import_react30.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Folders")) : null, ++ folders.map((folder) => (0, import_react30.createElement)( ++ "button", ++ { key: folder.path, type: "button", role: "menuitemradio", "aria-checked": folder.path === value, title: folder.path, onClick: () => choose(folder.path) }, ++ (0, import_react30.createElement)("span", { className: "bt-folder-copy" }, (0, import_react30.createElement)("span", { className: "bt-menu-label" }, folder.title), (0, import_react30.createElement)("span", { className: "bt-folder-path" }, folder.path)), ++ (0, import_react30.createElement)(Tick, { on: folder.path === value }) ++ )), ++ (0, import_react30.createElement)("div", { className: "bt-menu-sep", role: "separator" }), ++ info?.picker === "native" ? (0, import_react30.createElement)("button", { type: "button", role: "menuitem", onClick: pickNative }, (0, import_react30.createElement)(FolderIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Choose a folder…"))) : null, ++ info?.picker === "browse" ? (0, import_react30.createElement)("button", { type: "button", role: "menuitem", onClick: () => browse(value) }, (0, import_react30.createElement)(FolderIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Browse folders…"))) : null, ++ (0, import_react30.createElement)("button", { type: "button", role: "menuitem", onClick: () => { ++ setDraft(value ?? ""); ++ setView("type"); ++ } }, (0, import_react30.createElement)(PencilIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Enter a path…"))) ); - } +-} -function AutomationOff() { - return (0, import_react15.createElement)( -- "div", ++ const typeView = (0, import_react30.createElement)( + "div", - { className: "bt-set-card bt-task-off" }, - (0, import_react15.createElement)("span", { className: "bt-task-off-mark" }, (0, import_react15.createElement)(ClockIcon)), - (0, import_react15.createElement)("span", { className: "bt-task-off-title" }, t("Turn on Automation tasks in DSH")), - (0, import_react15.createElement)("span", { className: "bt-set-hint" }, t("Switch on Automation tasks on the Plugins page in Harness settings.")), - (0, import_react15.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: openHarnessSettings }, t("Open Harness settings")) - ); -+var MODEL_TEST_CSS = ` -+.bt-model-test-result{font-size:13px;line-height:18px;color:var(--bt-ink-2)} -+.bt-model-test-result:empty{display:none} -+.bt-model-test-result[data-ok=true]{color:#1a7f37} -+.bt-model-test-result[data-ok=false]{color:#c21d2e} -+.bt-model-test-code{margin-left:6px;font-size:11px;color:var(--bt-ink-3)} -+/* #1347: the hint beside "Test connection" is prose and wraps; the button next to it keeps its own -+ words ("Test connection" on one line) and takes the room it needs. */ -+.bt-model-test>.bt-set-copy{flex:1 1 12ch;min-width:12ch} -+.bt-model-test>.bt-soft{flex:none;white-space:nowrap} -+@container bt-panel (max-width:300px){ -+ .bt-model-test{flex-wrap:wrap;row-gap:6px} -+ .bt-model-test>.bt-set-copy{flex:1 1 100%} - } +-} -function SchedulesPage({ roster, actions, start }) { - const view = useSchedules(actions); - const [adding, setAdding] = (0, import_react15.useState)(Boolean(start)); @@ -18205,31 +19344,7 @@ diff --git a/client.js b/client.js - const shown = (next) => { - publish(next); - setAdding(false); -+`; -+ -+// src/client/folder-menu.js -+var import_react26 = require("react"); -+var import_react_dom9 = require("react-dom"); -+var folderName = (path) => String(path).replace(/[\\/]+$/, "").split(/[\\/]/).pop() || String(path); -+var Tick = ({ on }) => (0, import_react26.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, on ? (0, import_react26.createElement)(CheckIcon) : null); -+function FolderMenu({ value, group = false, actions, run, onPick, wide = false }) { -+ const { isOpen, shownPlace, leaving, button, menu, open, close } = useAnchoredMenu(); -+ const [info, setInfo] = (0, import_react26.useState)(null); -+ const [view, setView] = (0, import_react26.useState)("list"); -+ const [draft, setDraft] = (0, import_react26.useState)(""); -+ const [listing, setListing] = (0, import_react26.useState)(null); -+ const [problem, setProblem] = (0, import_react26.useState)(""); -+ const fallback = group ? t("Each Bot's own folder") : t("Team workspace"); -+ const toggle = () => { -+ if (isOpen) { -+ close(); -+ return; -+ } -+ setView("list"); -+ setProblem(""); -+ void Promise.resolve(actions.folders()).then(setInfo).catch(() => setInfo((last) => last ?? { team: null, picker: null, folders: [] })); -+ open(); - }; +- }; - const byChat = [ - ...roster.bots.map((bot) => [bot.id, (0, import_react15.createElement)(BotAvatar, { bot, size: 18, badge: false, live: false }), bot.name, view.tasks.filter((task) => task.botId === bot.id)]), - ...roster.rooms.map((room2) => [room2.id, (0, import_react15.createElement)(RoomAvatar, { room: room2, roster, size: 18 }), room2.name, view.tasks.filter((task) => task.botId === void 0 && task.roomId === room2.id)]) @@ -18265,61 +19380,9 @@ diff --git a/client.js b/client.js - (0, import_react15.createElement)("button", { key: "new", type: "button", className: "bt-set-row bt-bs-row bt-gs-add", onClick: () => actions.openSettings("schedules", bot.id) }, (0, import_react15.createElement)(PlusIcon), t("New task")) - ] - ) -+ const choose = (path) => { -+ close(); -+ if (path !== (value ?? "")) void onPick(path); -+ }; -+ const browse = (path) => { -+ setProblem(""); -+ void Promise.resolve(actions.folderList(path)).then((next) => { -+ setListing(next); -+ setView("browse"); -+ }).catch((failure) => setProblem(failure?.message ?? String(failure))); -+ }; -+ const pickNative = () => { -+ close(); -+ void run(Promise.resolve(actions.folderPick()).then((path) => path ? onPick(path) : void 0)); -+ }; -+ const typed = () => { -+ const path = draft.trim(); -+ if (path !== "") choose(path); -+ }; -+ const known = info?.folders ?? []; -+ const folders = value && !known.some((folder) => folder.path === value) ? [{ path: value, title: folderName(value) }, ...known] : known; -+ const listView = (0, import_react26.createElement)( -+ "div", -+ { key: "list", className: "bt-folder-view" }, -+ (0, import_react26.createElement)( -+ "button", -+ { type: "button", role: "menuitemradio", "aria-checked": !value, title: group ? void 0 : info?.team ?? void 0, onClick: () => choose("") }, -+ (0, import_react26.createElement)("span", { className: "bt-menu-label" }, fallback), -+ (0, import_react26.createElement)(Tick, { on: !value }) -+ ), -+ folders.length > 0 ? (0, import_react26.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Folders")) : null, -+ folders.map((folder) => (0, import_react26.createElement)( -+ "button", -+ { key: folder.path, type: "button", role: "menuitemradio", "aria-checked": folder.path === value, title: folder.path, onClick: () => choose(folder.path) }, -+ (0, import_react26.createElement)("span", { className: "bt-folder-copy" }, (0, import_react26.createElement)("span", { className: "bt-menu-label" }, folder.title), (0, import_react26.createElement)("span", { className: "bt-folder-path" }, folder.path)), -+ (0, import_react26.createElement)(Tick, { on: folder.path === value }) -+ )), -+ (0, import_react26.createElement)("div", { className: "bt-menu-sep", role: "separator" }), -+ info?.picker === "native" ? (0, import_react26.createElement)("button", { type: "button", role: "menuitem", onClick: pickNative }, (0, import_react26.createElement)(FolderIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Choose a folder…"))) : null, -+ info?.picker === "browse" ? (0, import_react26.createElement)("button", { type: "button", role: "menuitem", onClick: () => browse(value) }, (0, import_react26.createElement)(FolderIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Browse folders…"))) : null, -+ (0, import_react26.createElement)("button", { type: "button", role: "menuitem", onClick: () => { -+ setDraft(value ?? ""); -+ setView("type"); -+ } }, (0, import_react26.createElement)(PencilIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Enter a path…"))) - ); --} --function ScheduleSummary({ bot, actions }) { -- const view = useSchedules(actions); -- const tasks = view?.available ? view.tasks.filter((task) => task.botId === bot.id && task.status === "active") : []; -- return (0, import_react15.createElement)( -+ const typeView = (0, import_react26.createElement)( -+ "div", + { key: "type", className: "bt-folder-view" }, -+ (0, import_react26.createElement)("button", { type: "button", className: "bt-folder-back", onClick: () => setView("list") }, (0, import_react26.createElement)(ChevronLeftIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Back"))), -+ (0, import_react26.createElement)("input", { ++ (0, import_react30.createElement)("button", { type: "button", className: "bt-folder-back", onClick: () => setView("list") }, (0, import_react30.createElement)(ChevronLeftIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Back"))), ++ (0, import_react30.createElement)("input", { + className: "bt-folder-input", + autoFocus: true, + value: draft, @@ -18331,35 +19394,40 @@ diff --git a/client.js b/client.js + if (event.key === "Enter" && !event.nativeEvent.isComposing) typed(); + } + }), -+ (0, import_react26.createElement)("button", { type: "button", className: "bt-folder-use", disabled: draft.trim() === "", onClick: typed }, t("Use this folder")) -+ ); ++ (0, import_react30.createElement)("button", { type: "button", className: "bt-folder-use", disabled: draft.trim() === "", onClick: typed }, t("Use this folder")) + ); +-} +-function ScheduleSummary({ bot, actions }) { +- const view = useSchedules(actions); +- const tasks = view?.available ? view.tasks.filter((task) => task.botId === bot.id && task.status === "active") : []; +- return (0, import_react15.createElement)( + const parent = listing?.crumbs?.length > 1 ? listing.crumbs.at(-2) : void 0; + const inside = listing?.entries?.filter((entry) => !entry.hidden) ?? []; -+ const browseView = listing ? (0, import_react26.createElement)( ++ const browseView = listing ? (0, import_react30.createElement)( "div", + { key: `browse:${listing.path}`, className: "bt-folder-view" }, -+ (0, import_react26.createElement)("button", { type: "button", className: "bt-folder-back", onClick: () => setView("list") }, (0, import_react26.createElement)(ChevronLeftIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Back"))), -+ (0, import_react26.createElement)("div", { className: "bt-folder-path bt-folder-here" }, listing.path), -+ parent ? (0, import_react26.createElement)("button", { type: "button", role: "menuitem", title: parent.path, onClick: () => browse(parent.path) }, (0, import_react26.createElement)(FolderIcon), (0, import_react26.createElement)("span", { className: "bt-menu-label" }, t("Up one level"))) : null, -+ inside.map((entry) => (0, import_react26.createElement)( ++ (0, import_react30.createElement)("button", { type: "button", className: "bt-folder-back", onClick: () => setView("list") }, (0, import_react30.createElement)(ChevronLeftIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Back"))), ++ (0, import_react30.createElement)("div", { className: "bt-folder-path bt-folder-here" }, listing.path), ++ parent ? (0, import_react30.createElement)("button", { type: "button", role: "menuitem", title: parent.path, onClick: () => browse(parent.path) }, (0, import_react30.createElement)(FolderIcon), (0, import_react30.createElement)("span", { className: "bt-menu-label" }, t("Up one level"))) : null, ++ inside.map((entry) => (0, import_react30.createElement)( + "button", + { key: entry.path, type: "button", role: "menuitem", onClick: () => browse(entry.path) }, -+ (0, import_react26.createElement)(FolderIcon), -+ (0, import_react26.createElement)("span", { className: "bt-menu-label" }, entry.name), -+ (0, import_react26.createElement)(ChevronRightIcon) ++ (0, import_react30.createElement)(FolderIcon), ++ (0, import_react30.createElement)("span", { className: "bt-menu-label" }, entry.name), ++ (0, import_react30.createElement)(ChevronRightIcon) + )), -+ inside.length === 0 ? (0, import_react26.createElement)("div", { className: "bt-model-none" }, t("No folders inside.")) : null, -+ listing.truncated ? (0, import_react26.createElement)("div", { className: "bt-folder-path bt-folder-here" }, t("Some folders are not shown.")) : null, -+ (0, import_react26.createElement)("div", { className: "bt-menu-sep", role: "separator" }), -+ (0, import_react26.createElement)("button", { type: "button", className: "bt-folder-use", onClick: () => choose(listing.path) }, t("Use this folder")) ++ inside.length === 0 ? (0, import_react30.createElement)("div", { className: "bt-model-none" }, t("No folders inside.")) : null, ++ listing.truncated ? (0, import_react30.createElement)("div", { className: "bt-folder-path bt-folder-here" }, t("Some folders are not shown.")) : null, ++ (0, import_react30.createElement)("div", { className: "bt-menu-sep", role: "separator" }), ++ (0, import_react30.createElement)("button", { type: "button", className: "bt-folder-use", onClick: () => choose(listing.path) }, t("Use this folder")) + ) : null; + const shownView = view === "type" ? typeView : view === "browse" && browseView ? browseView : listView; -+ return (0, import_react26.createElement)( -+ import_react26.Fragment, ++ return (0, import_react30.createElement)( ++ import_react30.Fragment, null, - (0, import_react15.createElement)("div", { className: "bt-section-title" }, t("Scheduled tasks")), - tasks.length === 0 ? (0, import_react15.createElement)("button", { type: "button", className: "bt-more", onClick: () => actions.openSettings("schedules", bot.id) }, view?.available === false ? t("Switch on Automation tasks on the Plugins page in Harness settings.") : t("No scheduled tasks yet. Add one")) : (0, import_react15.createElement)("div", { className: "bt-task-list" }, tasks.slice(0, 3).map((task) => (0, import_react15.createElement)( -+ (0, import_react26.createElement)( ++ (0, import_react30.createElement)( "button", - { key: task.id, type: "button", className: "bt-task-line", onClick: () => actions.openSettings("schedules") }, - (0, import_react15.createElement)(ClockIcon), @@ -18377,19 +19445,19 @@ diff --git a/client.js b/client.js + title: value, + onClick: toggle + }, -+ (0, import_react26.createElement)( ++ (0, import_react30.createElement)( + "span", + { className: "bt-model-copy" }, -+ (0, import_react26.createElement)("span", { className: "bt-model-name" }, value ? folderName(value) : fallback), -+ value ? (0, import_react26.createElement)("span", { className: "bt-model-provider" }, value) : null ++ (0, import_react30.createElement)("span", { className: "bt-model-name" }, value ? folderName(value) : fallback), ++ value ? (0, import_react30.createElement)("span", { className: "bt-model-provider" }, value) : null + ), -+ (0, import_react26.createElement)(Caret) ++ (0, import_react30.createElement)(Caret) + ), -+ shownPlace ? (0, import_react_dom9.createPortal)((0, import_react26.createElement)( ++ shownPlace ? (0, import_react_dom9.createPortal)((0, import_react30.createElement)( + "div", + { ref: menu, className: `bt-menu bt-model-menu bt-folder-menu${shownPlace.bottom !== void 0 ? " bt-menu-up" : ""}`, role: "menu", "aria-label": t("Working folder"), style: shownPlace, "data-leaving": leaving || void 0 }, + shownView, -+ problem ? (0, import_react26.createElement)("div", { className: "bt-folder-error", role: "alert" }, problem) : null ++ problem ? (0, import_react30.createElement)("div", { className: "bt-folder-error", role: "alert" }, problem) : null + ), document.body) : null ); } @@ -18447,7 +19515,7 @@ diff --git a/client.js b/client.js // src/client/capability-settings.js -var import_react16 = require("react"); -+var import_react27 = require("react"); ++var import_react31 = require("react"); var blank = () => ({ name: "", kind: "mcp", description: "", transport: "stdio", command: "", argsText: "", envText: "{}", url: "", headersText: "{}", content: "", items: [] }); -var parseMap = (text, label) => { +var parseMap = (text2, label) => { @@ -18463,13 +19531,13 @@ diff --git a/client.js b/client.js var statusText = (status) => !status ? void 0 : status.state === "ready" ? t("Ready") : status.state === "needs-approval" ? t("Needs approval") : status.state === "error" ? t("Could not connect: {error}", { error: status.error ?? "" }) : t("Connecting…"); function Field({ label, value, onChange, multiline = false, disabled = false, placeholder }) { - return (0, import_react16.createElement)( -+ return (0, import_react27.createElement)( ++ return (0, import_react31.createElement)( "label", { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react16.createElement)("span", { className: "bt-set-copy" }, (0, import_react16.createElement)("span", { className: "bt-bs-label" }, t(label))), - (0, import_react16.createElement)(multiline ? "textarea" : "input", { -+ (0, import_react27.createElement)("span", { className: "bt-set-copy" }, (0, import_react27.createElement)("span", { className: "bt-bs-label" }, t(label))), -+ (0, import_react27.createElement)(multiline ? "textarea" : "input", { ++ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t(label))), ++ (0, import_react31.createElement)(multiline ? "textarea" : "input", { className: multiline ? "bt-input bt-input-area" : "bt-input", value, disabled, @@ -18478,7 +19546,7 @@ diff --git a/client.js b/client.js } function CapabilityForm({ draft, setDraft, items, actions, onClose }) { - const [error, setError] = (0, import_react16.useState)(""); -+ const [error, setError] = (0, import_react27.useState)(""); ++ const [error, setError] = (0, import_react31.useState)(""); const set = (key, value) => setDraft((previous) => ({ ...previous, [key]: value })); const submit = async (event) => { event.preventDefault(); @@ -18496,89 +19564,89 @@ diff --git a/client.js b/client.js }; const available = items.filter((item) => item.name !== draft.name && ["mcp", "skill"].includes(item.kind)); - return (0, import_react16.createElement)( -+ return (0, import_react27.createElement)( ++ return (0, import_react31.createElement)( "form", { className: "bt-connector-form", onSubmit: submit }, - (0, import_react16.createElement)(Field, { label: "Name", value: draft.name, disabled: draft.originalName !== void 0, onChange: (value) => set("name", value), placeholder: "my-tool" }), - (0, import_react16.createElement)( -+ (0, import_react27.createElement)(Field, { label: "Name", value: draft.name, disabled: draft.originalName !== void 0, onChange: (value) => set("name", value), placeholder: "my-tool" }), -+ (0, import_react27.createElement)( ++ (0, import_react31.createElement)(Field, { label: "Name", value: draft.name, disabled: draft.originalName !== void 0, onChange: (value) => set("name", value), placeholder: "my-tool" }), ++ (0, import_react31.createElement)( "label", { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react16.createElement)("span", { className: "bt-set-copy" }, (0, import_react16.createElement)("span", { className: "bt-bs-label" }, t("Type"))), - (0, import_react16.createElement)( -+ (0, import_react27.createElement)("span", { className: "bt-set-copy" }, (0, import_react27.createElement)("span", { className: "bt-bs-label" }, t("Type"))), -+ (0, import_react27.createElement)( ++ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Type"))), ++ (0, import_react31.createElement)( "select", { className: "bt-input", value: draft.kind, disabled: draft.originalName !== void 0, onChange: (event) => set("kind", event.target.value) }, - ["mcp", "skill", "pack"].map((kind) => (0, import_react16.createElement)("option", { key: kind, value: kind }, t(kind === "mcp" ? "MCP server" : kind === "skill" ? "Skill" : "Pack"))) -+ ["mcp", "skill", "pack"].map((kind) => (0, import_react27.createElement)("option", { key: kind, value: kind }, t(kind === "mcp" ? "MCP server" : kind === "skill" ? "Skill" : "Pack"))) ++ ["mcp", "skill", "pack"].map((kind) => (0, import_react31.createElement)("option", { key: kind, value: kind }, t(kind === "mcp" ? "MCP server" : kind === "skill" ? "Skill" : "Pack"))) ) ), - (0, import_react16.createElement)(Field, { label: "Description", value: draft.description, onChange: (value) => set("description", value) }), - draft.kind === "mcp" ? (0, import_react16.createElement)( -+ (0, import_react27.createElement)(Field, { label: "Description", value: draft.description, onChange: (value) => set("description", value) }), -+ draft.kind === "mcp" ? (0, import_react27.createElement)( ++ (0, import_react31.createElement)(Field, { label: "Description", value: draft.description, onChange: (value) => set("description", value) }), ++ draft.kind === "mcp" ? (0, import_react31.createElement)( "label", { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react16.createElement)("span", { className: "bt-set-copy" }, (0, import_react16.createElement)("span", { className: "bt-bs-label" }, t("Connection"))), - (0, import_react16.createElement)( -+ (0, import_react27.createElement)("span", { className: "bt-set-copy" }, (0, import_react27.createElement)("span", { className: "bt-bs-label" }, t("Connection"))), -+ (0, import_react27.createElement)( ++ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Connection"))), ++ (0, import_react31.createElement)( "select", { className: "bt-input", value: draft.transport, onChange: (event) => set("transport", event.target.value) }, - (0, import_react16.createElement)("option", { value: "stdio" }, t("Local command")), - (0, import_react16.createElement)("option", { value: "streamable-http" }, t("HTTP server")) -+ (0, import_react27.createElement)("option", { value: "stdio" }, t("Local command")), -+ (0, import_react27.createElement)("option", { value: "streamable-http" }, t("HTTP server")) ++ (0, import_react31.createElement)("option", { value: "stdio" }, t("Local command")), ++ (0, import_react31.createElement)("option", { value: "streamable-http" }, t("HTTP server")) ) ) : null, - draft.kind === "mcp" && draft.transport === "stdio" ? (0, import_react16.createElement)( -+ draft.kind === "mcp" && draft.transport === "stdio" ? (0, import_react27.createElement)( ++ draft.kind === "mcp" && draft.transport === "stdio" ? (0, import_react31.createElement)( "div", null, - (0, import_react16.createElement)(Field, { label: "Command", value: draft.command, onChange: (value) => set("command", value) }), - (0, import_react16.createElement)(Field, { label: "Arguments (one per line)", value: draft.argsText, onChange: (value) => set("argsText", value), multiline: true }), - (0, import_react16.createElement)(Field, { label: "Environment (JSON)", value: draft.envText, onChange: (value) => set("envText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) -+ (0, import_react27.createElement)(Field, { label: "Command", value: draft.command, onChange: (value) => set("command", value) }), -+ (0, import_react27.createElement)(Field, { label: "Arguments (one per line)", value: draft.argsText, onChange: (value) => set("argsText", value), multiline: true }), -+ (0, import_react27.createElement)(Field, { label: "Environment (JSON)", value: draft.envText, onChange: (value) => set("envText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) ++ (0, import_react31.createElement)(Field, { label: "Command", value: draft.command, onChange: (value) => set("command", value) }), ++ (0, import_react31.createElement)(Field, { label: "Arguments (one per line)", value: draft.argsText, onChange: (value) => set("argsText", value), multiline: true }), ++ (0, import_react31.createElement)(Field, { label: "Environment (JSON)", value: draft.envText, onChange: (value) => set("envText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) ) : null, - draft.kind === "mcp" && draft.transport === "streamable-http" ? (0, import_react16.createElement)( -+ draft.kind === "mcp" && draft.transport === "streamable-http" ? (0, import_react27.createElement)( ++ draft.kind === "mcp" && draft.transport === "streamable-http" ? (0, import_react31.createElement)( "div", null, - (0, import_react16.createElement)(Field, { label: "URL", value: draft.url, onChange: (value) => set("url", value) }), - (0, import_react16.createElement)(Field, { label: "Headers (JSON)", value: draft.headersText, onChange: (value) => set("headersText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) -+ (0, import_react27.createElement)(Field, { label: "URL", value: draft.url, onChange: (value) => set("url", value) }), -+ (0, import_react27.createElement)(Field, { label: "Headers (JSON)", value: draft.headersText, onChange: (value) => set("headersText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) ++ (0, import_react31.createElement)(Field, { label: "URL", value: draft.url, onChange: (value) => set("url", value) }), ++ (0, import_react31.createElement)(Field, { label: "Headers (JSON)", value: draft.headersText, onChange: (value) => set("headersText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') }) ) : null, - draft.kind === "skill" ? (0, import_react16.createElement)(Field, { label: "Skill instructions", value: draft.content, onChange: (value) => set("content", value), multiline: true }) : null, - draft.kind === "pack" ? (0, import_react16.createElement)( -+ draft.kind === "skill" ? (0, import_react27.createElement)(Field, { label: "Skill instructions", value: draft.content, onChange: (value) => set("content", value), multiline: true }) : null, -+ draft.kind === "pack" ? (0, import_react27.createElement)( ++ draft.kind === "skill" ? (0, import_react31.createElement)(Field, { label: "Skill instructions", value: draft.content, onChange: (value) => set("content", value), multiline: true }) : null, ++ draft.kind === "pack" ? (0, import_react31.createElement)( "div", { className: "bt-set-card" }, - available.length === 0 ? (0, import_react16.createElement)("div", { className: "bt-set-row" }, (0, import_react16.createElement)("span", { className: "bt-set-hint" }, t("Save an MCP server or skill first."))) : available.map((item) => (0, import_react16.createElement)( -+ available.length === 0 ? (0, import_react27.createElement)("div", { className: "bt-set-row" }, (0, import_react27.createElement)("span", { className: "bt-set-hint" }, t("Save an MCP server or skill first."))) : available.map((item) => (0, import_react27.createElement)( ++ available.length === 0 ? (0, import_react31.createElement)("div", { className: "bt-set-row" }, (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("Save an MCP server or skill first."))) : available.map((item) => (0, import_react31.createElement)( "label", { key: item.name, className: "bt-set-row bt-bs-row" }, - (0, import_react16.createElement)("span", { className: "bt-set-copy" }, (0, import_react16.createElement)("span", { className: "bt-bs-label" }, item.name)), - (0, import_react16.createElement)("input", { type: "checkbox", checked: draft.items.includes(item.name), onChange: (event) => set("items", event.target.checked ? [...draft.items, item.name] : draft.items.filter((name) => name !== item.name)) }) -+ (0, import_react27.createElement)("span", { className: "bt-set-copy" }, (0, import_react27.createElement)("span", { className: "bt-bs-label" }, item.name)), -+ (0, import_react27.createElement)("input", { type: "checkbox", checked: draft.items.includes(item.name), onChange: (event) => set("items", event.target.checked ? [...draft.items, item.name] : draft.items.filter((name) => name !== item.name)) }) ++ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, item.name)), ++ (0, import_react31.createElement)("input", { type: "checkbox", checked: draft.items.includes(item.name), onChange: (event) => set("items", event.target.checked ? [...draft.items, item.name] : draft.items.filter((name) => name !== item.name)) }) )) ) : null, - error ? (0, import_react16.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null, - (0, import_react16.createElement)( -+ error ? (0, import_react27.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null, -+ (0, import_react27.createElement)( ++ error ? (0, import_react31.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null, ++ (0, import_react31.createElement)( "div", { className: "bt-connector-form-row" }, - (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onClose }, t("Cancel")), - (0, import_react16.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, draft.originalName ? t("Save changes") : t("Add capability")) -+ (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onClose }, t("Cancel")), -+ (0, import_react27.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, draft.originalName ? t("Save changes") : t("Add capability")) ++ (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onClose }, t("Cancel")), ++ (0, import_react31.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, draft.originalName ? t("Save changes") : t("Add capability")) ) ); } @@ -18586,32 +19654,32 @@ diff --git a/client.js b/client.js const detail = item.kind === "pack" ? `${t("Pack")}: ${(item.items ?? []).join(", ") || t("No items")}` : item.kind === "mcp" ? item.transport === "stdio" ? t("Local command") : t("HTTP server") : t("Skill"); const secondary = item.kind === "pack" ? [item.description, (item.items ?? []).join(", ") || t("No items")].filter(Boolean).join(" · ") : item.description || detail; - return (0, import_react16.createElement)( -+ return (0, import_react27.createElement)( ++ return (0, import_react31.createElement)( "div", { className: "bt-connector" }, - (0, import_react16.createElement)( -+ (0, import_react27.createElement)( ++ (0, import_react31.createElement)( "div", { className: "bt-connector-head" }, - (0, import_react16.createElement)( -+ (0, import_react27.createElement)( ++ (0, import_react31.createElement)( "span", { className: "bt-connector-text" }, - (0, import_react16.createElement)("span", { className: "bt-connector-name" }, item.name), - (0, import_react16.createElement)("span", { className: "bt-connector-status" }, secondary) -+ (0, import_react27.createElement)("span", { className: "bt-connector-name" }, item.name), -+ (0, import_react27.createElement)("span", { className: "bt-connector-status" }, secondary) ++ (0, import_react31.createElement)("span", { className: "bt-connector-name" }, item.name), ++ (0, import_react31.createElement)("span", { className: "bt-connector-status" }, secondary) ), - (0, import_react16.createElement)( -+ (0, import_react27.createElement)( ++ (0, import_react31.createElement)( "span", { className: "bt-connector-actions" }, - item.kind === "mcp" && item.transport === "stdio" && !item.approved ? (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onApprove }, t("Allow")) : null, - (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onEdit }, t("Edit")), - (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDelete }, confirming ? t("Click again to delete.") : t("Delete")) -+ item.kind === "mcp" && item.transport === "stdio" && !item.approved ? (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onApprove }, t("Allow")) : null, -+ (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onEdit }, t("Edit")), -+ (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDelete }, confirming ? t("Click again to delete.") : t("Delete")) ++ item.kind === "mcp" && item.transport === "stdio" && !item.approved ? (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onApprove }, t("Allow")) : null, ++ (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onEdit }, t("Edit")), ++ (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onDelete }, confirming ? t("Click again to delete.") : t("Delete")) ) ) ); @@ -18621,9 +19689,9 @@ diff --git a/client.js b/client.js - const [draft, setDraft] = (0, import_react16.useState)(null); - const [confirming, setConfirming] = (0, import_react16.useState)(""); - (0, import_react16.useEffect)(() => { -+ const [draft, setDraft] = (0, import_react27.useState)(null); -+ const [confirming, setConfirming] = (0, import_react27.useState)(""); -+ (0, import_react27.useEffect)(() => { ++ const [draft, setDraft] = (0, import_react31.useState)(null); ++ const [confirming, setConfirming] = (0, import_react31.useState)(""); ++ (0, import_react31.useEffect)(() => { if (!confirming) return void 0; const timer = setTimeout(() => setConfirming(""), 4e3); return () => clearTimeout(timer); @@ -18633,69 +19701,68 @@ diff --git a/client.js b/client.js }; - return (0, import_react16.createElement)( + if (lockedWindow(roster)) { -+ return (0, import_react27.createElement)( ++ return (0, import_react31.createElement)( + "section", + { className: "bt-set-section" }, -+ (0, import_react27.createElement)("h3", null, t("Shared capabilities")), -+ (0, import_react27.createElement)( ++ (0, import_react31.createElement)("h3", null, t("Shared capabilities")), ++ (0, import_react31.createElement)( + "div", + { className: "bt-set-card bt-connectors-card" }, -+ items.length === 0 ? (0, import_react27.createElement)("div", { className: "bt-set-row" }, (0, import_react27.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react27.createElement)( ++ items.length === 0 ? (0, import_react31.createElement)("div", { className: "bt-set-row" }, (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react31.createElement)( + "div", + { key: item.name, className: "bt-set-row" }, -+ (0, import_react27.createElement)( ++ (0, import_react31.createElement)( + "span", + { className: "bt-set-copy" }, -+ (0, import_react27.createElement)("span", { className: "bt-bs-label" }, item.name), -+ (0, import_react27.createElement)("span", { className: "bt-set-hint" }, item.description || (item.kind === "pack" ? `${t("Pack")}: ${(item.items ?? []).join(", ") || t("No items")}` : item.kind === "mcp" ? item.transport === "stdio" ? t("Local command") : t("HTTP server") : t("Skill"))) ++ (0, import_react31.createElement)("span", { className: "bt-bs-label" }, item.name), ++ (0, import_react31.createElement)("span", { className: "bt-set-hint" }, item.description || (item.kind === "pack" ? `${t("Pack")}: ${(item.items ?? []).join(", ") || t("No items")}` : item.kind === "mcp" ? item.transport === "stdio" ? t("Local command") : t("HTTP server") : t("Skill"))) + ) + )) + ) + ); + } -+ return (0, import_react27.createElement)( ++ return (0, import_react31.createElement)( "section", { className: "bt-set-section" }, - (0, import_react16.createElement)("h3", null, t("Shared capabilities")), - (0, import_react16.createElement)( -+ (0, import_react27.createElement)("h3", null, t("Shared capabilities")), -+ (0, import_react27.createElement)( ++ (0, import_react31.createElement)("h3", null, t("Shared capabilities")), ++ (0, import_react31.createElement)( "div", { className: "bt-actions" }, - (0, import_react16.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: startNew }, t("Add capability")) -+ (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: startNew }, t("Add capability")) ++ (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: startNew }, t("Add capability")) ), - draft ? (0, import_react16.createElement)(CapabilityForm, { draft, setDraft, items, actions, onClose: () => setDraft(null) }) : null, - (0, import_react16.createElement)( -+ draft ? (0, import_react27.createElement)(CapabilityForm, { draft, setDraft, items, actions, onClose: () => setDraft(null) }) : null, -+ (0, import_react27.createElement)( ++ draft ? (0, import_react31.createElement)(CapabilityForm, { draft, setDraft, items, actions, onClose: () => setDraft(null) }) : null, ++ (0, import_react31.createElement)( "div", { className: "bt-set-card bt-connectors-card" }, - items.length === 0 ? (0, import_react16.createElement)("div", { className: "bt-set-row" }, (0, import_react16.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react16.createElement)(CapabilityRow, { -+ items.length === 0 ? (0, import_react27.createElement)("div", { className: "bt-set-row" }, (0, import_react27.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react27.createElement)(CapabilityRow, { ++ items.length === 0 ? (0, import_react31.createElement)("div", { className: "bt-set-row" }, (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react31.createElement)(CapabilityRow, { key: item.name, item, confirming: confirming === item.name, -@@ -7359,62 +7359,142 @@ function BotCapabilitiesCard({ bot, roster, actions, run, Card: Card2, SwitchRow +@@ -7359,10 +7359,10 @@ function BotCapabilitiesCard({ bot, roster, actions, run, Card: Card2, SwitchRow const attached = new Set(bot.capabilities ?? []); const statuses = roster.capabilityStatuses?.[bot.id] ?? {}; if (items.length === 0) return null; - return (0, import_react16.createElement)( -+ return (0, import_react27.createElement)( -+ Card2, -+ { title: t("Capabilities") }, -+ items.map((item) => (0, import_react27.createElement)(SwitchRow2, { -+ key: item.name, -+ label: item.name, -+ hint: attached.has(item.name) ? statusText(statuses[item.name]) : void 0, -+ on: attached.has(item.name), -+ onChange: (enabled) => void run(actions.setBotCapability(bot.id, item.name, enabled)) -+ })) -+ ); -+} -+ ++ return (0, import_react31.createElement)( + Card2, + { title: t("Capabilities") }, +- items.map((item) => (0, import_react16.createElement)(SwitchRow2, { ++ items.map((item) => (0, import_react31.createElement)(SwitchRow2, { + key: item.name, + label: item.name, + hint: attached.has(item.name) ? statusText(statuses[item.name]) : void 0, +@@ -7372,49 +7372,170 @@ function BotCapabilitiesCard({ bot, roster, actions, run, Card: Card2, SwitchRow + ); + } + +// src/client/connector-bots.js -+var import_react28 = require("react"); ++var import_react32 = require("react"); +function ownBots(roster) { + const me = roster?.self?.memberId; + return (roster?.bots ?? []).filter((bot) => !bot.remote && (me === void 0 || me === null || bot.ownerId === void 0 || bot.ownerId === me)); @@ -18710,43 +19777,35 @@ diff --git a/client.js b/client.js + return own === 0 ? t("Off for every Bot. Choose which Bots may use it.") : own === bots.length ? t("On for all {total} Bots", { total: bots.length }) : t("On for {count} of {total} Bots", { count: own, total: bots.length }); +} +function BotSwitch({ bot, connector, name, actions, run, SwitchRow: SwitchRow2 }) { -+ return (0, import_react28.createElement)(SwitchRow2, { label: name, hint: ownHint(bot, connector.id), on: isOn(bot, connector.id), disabled: false, onChange: (on) => void run(actions.setBotConnector(bot.id, connector.id, on)) }); ++ return (0, import_react32.createElement)(SwitchRow2, { label: name, hint: ownHint(bot, connector.id), on: isOn(bot, connector.id), disabled: false, onChange: (on) => void run(actions.setBotConnector(bot.id, connector.id, on)) }); +} +function ConnectorBots({ connector, roster, actions, run, SwitchRow: SwitchRow2 }) { + const bots = ownBots(roster); -+ return (0, import_react28.createElement)( ++ return (0, import_react32.createElement)( + "div", + { className: "bt-connector-bots" }, -+ bots.length === 0 ? (0, import_react28.createElement)("span", { className: "bt-set-hint" }, t("No Bots")) : bots.map((bot) => (0, import_react28.createElement)( ++ bots.length === 0 ? (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("No Bots")) : bots.map((bot) => (0, import_react32.createElement)( + "div", + { key: bot.id, className: "bt-connector-bot" }, -+ (0, import_react28.createElement)(BotSwitch, { bot, connector, name: bot.name, actions, run, SwitchRow: SwitchRow2 }) ++ (0, import_react32.createElement)(BotSwitch, { bot, connector, name: bot.name, actions, run, SwitchRow: SwitchRow2 }) + )), -+ (0, import_react28.createElement)("span", { className: "bt-set-hint" }, t("On by default for each of your Bots, on every turn: in its own chat, in groups, on schedules and when a friend uses it. A friend's own Bot never gets it.")) ++ (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("On by default for each of your Bots, on every turn: in its own chat, in groups, on schedules and when a friend uses it. A friend's own Bot never gets it.")) + ); +} -+function BotConnectorsCard({ bot, roster, actions, run, Card: Card2, SwitchRow: SwitchRow2 }) { -+ const connected = connectedConnectors(roster); -+ if (connected.length === 0) return null; -+ return (0, import_react28.createElement)( - Card2, -- { title: t("Capabilities") }, -- items.map((item) => (0, import_react16.createElement)(SwitchRow2, { -- key: item.name, -- label: item.name, -- hint: attached.has(item.name) ? statusText(statuses[item.name]) : void 0, -- on: attached.has(item.name), -- onChange: (enabled) => void run(actions.setBotCapability(bot.id, item.name, enabled)) -- })) ++function BotConnectorsCard({ bot, roster, actions, run, Card: Card2, SwitchRow: SwitchRow2 }) { ++ const connected = connectedConnectors(roster); ++ if (connected.length === 0) return null; ++ return (0, import_react32.createElement)( ++ Card2, + { title: t("Connectors") }, -+ connected.map((connector) => (0, import_react28.createElement)( ++ connected.map((connector) => (0, import_react32.createElement)( + "div", + { key: connector.id, className: "bt-connector-bot" }, -+ (0, import_react28.createElement)(BotSwitch, { bot, connector, name: connector.name, actions, run, SwitchRow: SwitchRow2 }) ++ (0, import_react32.createElement)(BotSwitch, { bot, connector, name: connector.name, actions, run, SwitchRow: SwitchRow2 }) + )) - ); - } - ++ ); ++} ++ +// src/client/memory-empty.js +var blockedPaths = (view) => [...new Set((view?.blocked ?? []).map((item) => typeof item?.path === "string" ? item.path : "").filter((path) => path !== ""))]; +var blockedSentence = (paths) => t("The memory folder {path} is not a plain directory, so it cannot be read.", { path: paths.join(", ") }); @@ -18759,11 +19818,52 @@ diff --git a/client.js b/client.js + if (paths.length === 0) return null; + return blockedSentence(paths); +} ++ ++// src/shared/memory-catalog.js ++function memoryTopics(entries2) { ++ const map = /* @__PURE__ */ new Map(); ++ for (const entry of entries2 ?? []) { ++ const scope = entry.scope === "team" ? "team" : "own"; ++ const topic = typeof entry.topic === "string" && entry.topic.trim() !== "" ? entry.topic : null; ++ const key = `${scope}:${topic ?? ""}`; ++ const item = map.get(key); ++ if (item) item.count += 1; ++ else map.set(key, { scope, topic, count: 1 }); ++ } ++ return [...map.values()].sort((a, b) => { ++ if (a.scope !== b.scope) return a.scope === "own" ? -1 : 1; ++ if (a.topic === null !== (b.topic === null)) return a.topic === null ? -1 : 1; ++ return String(a.topic ?? "").localeCompare(String(b.topic ?? "")); ++ }); ++} ++function memoryStats(entries2) { ++ const list = entries2 ?? []; ++ const topics = /* @__PURE__ */ new Set(); ++ for (const entry of list) { ++ if (typeof entry.topic === "string" && entry.topic.trim() !== "") topics.add(`${entry.scope === "team" ? "team" : "own"}:${entry.topic.trim()}`); ++ } ++ return { entries: list.length, topics: topics.size }; ++} ++function filterMemoryEntries(entries2, query) { ++ const terms = String(query ?? "").trim().toLowerCase().split(/\s+/).filter(Boolean); ++ if (terms.length === 0) return [...entries2 ?? []]; ++ return (entries2 ?? []).filter((entry) => { ++ const hay = `${entry.text ?? ""} ${entry.topic ?? ""} ${entry.by ?? ""}`.toLowerCase(); ++ return terms.every((term) => hay.includes(term)); ++ }); ++} ++function topicKey(item) { ++ if (!item) return ""; ++ return `${item.scope === "team" ? "team" : "own"}:${item.topic ?? ""}`; ++} ++function sameTopic(a, b) { ++ return Boolean(a) && Boolean(b) && topicKey(a) === topicKey(b); ++} + // src/client/memory-panel.js -var import_react17 = require("react"); -var POLL_MS2 = 1500; -+var import_react29 = require("react"); ++var import_react33 = require("react"); +var POLL_MS5 = 1500; var MENU_EXIT_MS2 = 120; var counts = /* @__PURE__ */ new Map(); @@ -18790,8 +19890,8 @@ diff --git a/client.js b/client.js - const [count, setCount] = (0, import_react17.useState)(counts.get(botId) ?? null); - (0, import_react17.useEffect)(() => { - const listener = () => setCount(counts.get(botId) ?? null); -+ const [state, setState] = (0, import_react29.useState)(() => countState(botId)); -+ (0, import_react29.useEffect)(() => { ++ const [state, setState] = (0, import_react33.useState)(() => countState(botId)); ++ (0, import_react33.useEffect)(() => { + const listener = () => setState(countState(botId)); countListeners.add(listener); listener(); @@ -18828,24 +19928,24 @@ diff --git a/client.js b/client.js - return (0, import_react17.createElement)( + const { count, failure } = useMemoryCount(bot.id, actions); + const label = memoryCountText({ count, failure }); -+ return (0, import_react29.createElement)( ++ return (0, import_react33.createElement)( "div", null, - (0, import_react17.createElement)("div", { className: "bt-section-title" }, t("Memory")), - (0, import_react17.createElement)( -+ (0, import_react29.createElement)("div", { className: "bt-section-title" }, t("Memory")), -+ (0, import_react29.createElement)( ++ (0, import_react33.createElement)("div", { className: "bt-section-title" }, t("Memory")), ++ (0, import_react33.createElement)( "button", { type: "button", className: "bt-mem-row", "aria-label": t("Manage {name}'s memory", { name: bot.name }), onClick: () => actions.openMemory(bot.id) }, - (0, import_react17.createElement)(MemoryIcon), - (0, import_react17.createElement)("span", { className: "bt-mem-row-copy" }, label), - (0, import_react17.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react17.createElement)(ChevronRightIcon)) - ) -+ (0, import_react29.createElement)(MemoryIcon), -+ (0, import_react29.createElement)("span", { className: "bt-mem-row-copy" }, label), -+ (0, import_react29.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react29.createElement)(ChevronRightIcon)) ++ (0, import_react33.createElement)(MemoryIcon), ++ (0, import_react33.createElement)("span", { className: "bt-mem-row-copy" }, label), ++ (0, import_react33.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react33.createElement)(ChevronRightIcon)) + ), -+ failure === null ? null : (0, import_react29.createElement)("div", { className: "bt-note", role: "status" }, label) ++ failure === null ? null : (0, import_react33.createElement)("div", { className: "bt-note", role: "status" }, label) ); } function ago(at, now) { @@ -18854,68 +19954,68 @@ diff --git a/client.js b/client.js } function Skeleton({ label }) { - return (0, import_react17.createElement)( -+ return (0, import_react29.createElement)( ++ return (0, import_react33.createElement)( "div", { className: "bt-mem-skel", "aria-busy": true }, - [0, 1].map((block) => (0, import_react17.createElement)( -+ [0, 1].map((block) => (0, import_react29.createElement)( ++ [0, 1].map((block) => (0, import_react33.createElement)( "div", { key: block, className: "bt-mem-skel-block" }, - (0, import_react17.createElement)("span", { className: "bt-mem-skel-head" }), - (0, import_react17.createElement)("span", null), - (0, import_react17.createElement)("span", null), - (0, import_react17.createElement)("span", { style: { width: block === 0 ? "62%" : "48%" } }) -+ (0, import_react29.createElement)("span", { className: "bt-mem-skel-head" }), -+ (0, import_react29.createElement)("span", null), -+ (0, import_react29.createElement)("span", null), -+ (0, import_react29.createElement)("span", { style: { width: block === 0 ? "62%" : "48%" } }) ++ (0, import_react33.createElement)("span", { className: "bt-mem-skel-head" }), ++ (0, import_react33.createElement)("span", null), ++ (0, import_react33.createElement)("span", null), ++ (0, import_react33.createElement)("span", { style: { width: block === 0 ? "62%" : "48%" } }) )), - label ? (0, import_react17.createElement)("div", { className: "bt-mem-skel-label" }, label) : null -+ label ? (0, import_react29.createElement)("div", { className: "bt-mem-skel-label" }, label) : null ++ label ? (0, import_react33.createElement)("div", { className: "bt-mem-skel-label" }, label) : null ); } function Summary({ bot, view, regenerate }) { if (view.entries.length === 0) { - return (0, import_react17.createElement)( + const notice = memoryEmptyNotice(view); -+ return (0, import_react29.createElement)( ++ return (0, import_react33.createElement)( "div", { className: "bt-mem-empty" }, - (0, import_react17.createElement)("div", { className: "bt-mem-empty-mark" }, (0, import_react17.createElement)(MemoryIcon)), - (0, import_react17.createElement)("div", { className: "bt-mem-empty-title" }, t("{name} has not saved anything yet", { name: bot.name })), - (0, import_react17.createElement)("div", { className: "bt-mem-empty-text" }, t("Bots keep lasting preferences, decisions, and what you ask them to remember. Tell {name} below, or in its chat.", { name: bot.name })) -+ (0, import_react29.createElement)("div", { className: "bt-mem-empty-mark" }, (0, import_react29.createElement)(MemoryIcon)), -+ notice === null ? null : (0, import_react29.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, notice), -+ (0, import_react29.createElement)("div", { className: "bt-mem-empty-title" }, t("{name} has not saved anything yet", { name: bot.name })), -+ (0, import_react29.createElement)("div", { className: "bt-mem-empty-text" }, t("Bots keep lasting preferences, decisions, and what you ask them to remember. Tell {name} below, or in its chat.", { name: bot.name })) ++ (0, import_react33.createElement)("div", { className: "bt-mem-empty-mark" }, (0, import_react33.createElement)(MemoryIcon)), ++ notice === null ? null : (0, import_react33.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, notice), ++ (0, import_react33.createElement)("div", { className: "bt-mem-empty-title" }, t("{name} has not saved anything yet", { name: bot.name })), ++ (0, import_react33.createElement)("div", { className: "bt-mem-empty-text" }, t("Bots keep lasting preferences, decisions, and what you ask them to remember. Tell {name} below, or in its chat.", { name: bot.name })) ); } - const failed = view.error && !view.summarizing ? (0, import_react17.createElement)( -+ const failed = view.error && !view.summarizing ? (0, import_react29.createElement)( ++ const failed = view.error && !view.summarizing ? (0, import_react33.createElement)( "div", { className: "bt-mem-failed", role: "alert" }, - (0, import_react17.createElement)("span", null, view.summary ? t("The summary is out of date: {reason}", { reason: hostText(view.error) }) : t("The summary could not be written: {reason}", { reason: hostText(view.error) })), - (0, import_react17.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: regenerate }, t("Try again")) -+ (0, import_react29.createElement)("span", null, view.summary ? t("The summary is out of date: {reason}", { reason: hostText(view.error) }) : t("The summary could not be written: {reason}", { reason: hostText(view.error) })), -+ (0, import_react29.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: regenerate }, t("Try again")) ++ (0, import_react33.createElement)("span", null, view.summary ? t("The summary is out of date: {reason}", { reason: hostText(view.error) }) : t("The summary could not be written: {reason}", { reason: hostText(view.error) })), ++ (0, import_react33.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: regenerate }, t("Try again")) ) : null; - if (!view.summary) return (0, import_react17.createElement)(import_react17.Fragment, null, failed, failed ? null : (0, import_react17.createElement)(Skeleton, { label: t("Writing the summary…") })); - return (0, import_react17.createElement)( - import_react17.Fragment, + const refused = memoryBlockedNotice(view); -+ const blocked = refused === null ? null : (0, import_react29.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, refused); -+ if (!view.summary) return (0, import_react29.createElement)(import_react29.Fragment, null, blocked, failed, failed ? null : (0, import_react29.createElement)(Skeleton, { label: t("Writing the summary…") })); -+ return (0, import_react29.createElement)( -+ import_react29.Fragment, ++ const blocked = refused === null ? null : (0, import_react33.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, refused); ++ if (!view.summary) return (0, import_react33.createElement)(import_react33.Fragment, null, blocked, failed, failed ? null : (0, import_react33.createElement)(Skeleton, { label: t("Writing the summary…") })); ++ return (0, import_react33.createElement)( ++ import_react33.Fragment, null, + blocked, failed, - (0, import_react17.createElement)( -+ (0, import_react29.createElement)( ++ (0, import_react33.createElement)( "div", { key: view.summary.at, className: "bt-mem-summary", "data-stale": !view.fresh || void 0 }, - summaryBlocks(view.summary.text).map((block, index) => block.kind === "h" ? (0, import_react17.createElement)("h3", { key: index }, block.text) : (0, import_react17.createElement)("p", { key: index }, block.text)) -+ summaryBlocks(view.summary.text).map((block, index) => block.kind === "h" ? (0, import_react29.createElement)("h3", { key: index }, block.text) : (0, import_react29.createElement)("p", { key: index }, block.text)) ++ summaryBlocks(view.summary.text).map((block, index) => block.kind === "h" ? (0, import_react33.createElement)("h3", { key: index }, block.text) : (0, import_react33.createElement)("p", { key: index }, block.text)) ) ); } @@ -18926,9 +20026,9 @@ diff --git a/client.js b/client.js - const [confirming, setConfirming] = (0, import_react17.useState)(false); - const [busy, setBusy] = (0, import_react17.useState)(false); - (0, import_react17.useEffect)(() => { -+ const [confirming, setConfirming] = (0, import_react29.useState)(false); -+ const [busy, setBusy] = (0, import_react29.useState)(false); -+ (0, import_react29.useEffect)(() => { ++ const [confirming, setConfirming] = (0, import_react33.useState)(false); ++ const [busy, setBusy] = (0, import_react33.useState)(false); ++ (0, import_react33.useEffect)(() => { if (!confirming) return void 0; const timer = setTimeout(() => setConfirming(false), 3e3); return () => clearTimeout(timer); @@ -18937,20 +20037,20 @@ diff --git a/client.js b/client.js if (!await remove(entry)) setBusy(false); }; - return (0, import_react17.createElement)( -+ return (0, import_react29.createElement)( ++ return (0, import_react33.createElement)( "li", { className: "bt-mem-entry", "data-busy": busy || void 0 }, - (0, import_react17.createElement)( -+ (0, import_react29.createElement)( ++ (0, import_react33.createElement)( "div", { className: "bt-mem-entry-copy" }, - (0, import_react17.createElement)("span", { className: "bt-mem-entry-text" }, entry.text), - meta ? (0, import_react17.createElement)("span", { className: "bt-mem-entry-meta" }, meta) : null -+ (0, import_react29.createElement)("span", { className: "bt-mem-entry-text" }, entry.text), -+ meta ? (0, import_react29.createElement)("span", { className: "bt-mem-entry-meta" }, meta) : null ++ (0, import_react33.createElement)("span", { className: "bt-mem-entry-text" }, entry.text), ++ meta ? (0, import_react33.createElement)("span", { className: "bt-mem-entry-meta" }, meta) : null ), - (0, import_react17.createElement)("button", { -+ remove ? (0, import_react29.createElement)("button", { ++ remove ? (0, import_react33.createElement)("button", { type: "button", className: "bt-mem-remove", "data-confirm": confirming || void 0, @@ -18959,47 +20059,49 @@ diff --git a/client.js b/client.js title: confirming ? void 0 : t("Remove from memory"), onClick: click - }, confirming ? t("Remove") : (0, import_react17.createElement)(TrashIcon)) -+ }, confirming ? t("Remove") : (0, import_react29.createElement)(TrashIcon)) : null ++ }, confirming ? t("Remove") : (0, import_react33.createElement)(TrashIcon)) : null ); } - function Entries({ bot, view, remove }) { +-function Entries({ bot, view, remove }) { ++function Entries({ bot, view, remove, subset = false }) { const groups = groupEntries(view.entries); + const refused = memoryBlockedNotice(view); const sections = [ { scope: "own", title: t("{name}'s memory", { name: bot.name }), size: view.sizes.own }, { scope: "team", title: t("Team memory"), hint: t("Every Bot reads it"), size: view.sizes.team } - ]; +- ]; - return (0, import_react17.createElement)( -+ return (0, import_react29.createElement)( ++ ].filter((section) => !subset || groups.some((group) => group.scope === section.scope)); ++ return (0, import_react33.createElement)( "div", { className: "bt-mem-entries" }, - sections.map((section) => (0, import_react17.createElement)( -+ refused === null ? null : (0, import_react29.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, refused), -+ sections.map((section) => (0, import_react29.createElement)( ++ refused === null ? null : (0, import_react33.createElement)("div", { className: "bt-mem-empty-text", role: "status" }, refused), ++ sections.map((section) => (0, import_react33.createElement)( "section", { key: section.scope, className: "bt-mem-section" }, - (0, import_react17.createElement)( -+ (0, import_react29.createElement)( ++ (0, import_react33.createElement)( "div", { className: "bt-mem-section-head" }, - (0, import_react17.createElement)("h3", null, section.title), - section.hint ? (0, import_react17.createElement)("span", null, section.hint) : null, - (0, import_react17.createElement)("span", { className: "bt-mem-size", title: t("MEMORY.md, which every conversation reads") }, t("{used} of {limit} characters", { used: section.size.toLocaleString(dateLocale()), limit: view.limits.main.toLocaleString(dateLocale()) })) -+ (0, import_react29.createElement)("h3", null, section.title), -+ section.hint ? (0, import_react29.createElement)("span", null, section.hint) : null, -+ (0, import_react29.createElement)("span", { className: "bt-mem-size", title: t("MEMORY.md, which every conversation reads") }, t("{used} of {limit} characters", { used: section.size.toLocaleString(dateLocale()), limit: view.limits.main.toLocaleString(dateLocale()) })) ++ (0, import_react33.createElement)("h3", null, section.title), ++ section.hint ? (0, import_react33.createElement)("span", null, section.hint) : null, ++ (0, import_react33.createElement)("span", { className: "bt-mem-size", title: t("MEMORY.md, which every conversation reads") }, t("{used} of {limit} characters", { used: section.size.toLocaleString(dateLocale()), limit: view.limits.main.toLocaleString(dateLocale()) })) ), - groups.some((group) => group.scope === section.scope) ? groups.filter((group) => group.scope === section.scope).map((group) => (0, import_react17.createElement)( - import_react17.Fragment, -+ groups.some((group) => group.scope === section.scope) ? groups.filter((group) => group.scope === section.scope).map((group) => (0, import_react29.createElement)( -+ import_react29.Fragment, ++ groups.some((group) => group.scope === section.scope) ? groups.filter((group) => group.scope === section.scope).map((group) => (0, import_react33.createElement)( ++ import_react33.Fragment, { key: group.key }, - group.topic ? (0, import_react17.createElement)("div", { className: "bt-mem-topic" }, group.topic) : null, - (0, import_react17.createElement)("ul", { className: "bt-mem-list" }, group.entries.map((entry) => (0, import_react17.createElement)(EntryRow, { key: `${entry.topic ?? ""}:${entry.text}`, entry, remove }))) - )) : (0, import_react17.createElement)("div", { className: "bt-mem-none" }, t("Nothing saved yet")) -+ group.topic ? (0, import_react29.createElement)("div", { className: "bt-mem-topic" }, group.topic) : null, -+ (0, import_react29.createElement)("ul", { className: "bt-mem-list" }, group.entries.map((entry) => (0, import_react29.createElement)(EntryRow, { key: `${entry.topic ?? ""}:${entry.text}`, entry, remove }))) -+ )) : (0, import_react29.createElement)("div", { className: "bt-mem-none" }, t("Nothing saved yet")) ++ group.topic ? (0, import_react33.createElement)("div", { className: "bt-mem-topic" }, group.topic) : null, ++ (0, import_react33.createElement)("ul", { className: "bt-mem-list" }, group.entries.map((entry) => (0, import_react33.createElement)(EntryRow, { key: `${entry.topic ?? ""}:${entry.text}`, entry, remove }))) ++ )) : (0, import_react33.createElement)("div", { className: "bt-mem-none" }, t("Nothing saved yet")) )) ); } @@ -19017,33 +20119,33 @@ diff --git a/client.js b/client.js } function Reply({ answer, dismiss }) { - return (0, import_react17.createElement)( -+ return (0, import_react29.createElement)( ++ return (0, import_react33.createElement)( "div", { className: "bt-mem-reply", role: "status" }, - (0, import_react17.createElement)( -+ (0, import_react29.createElement)( ++ (0, import_react33.createElement)( "div", { className: "bt-mem-reply-head" }, - (0, import_react17.createElement)("span", { className: "bt-mem-reply-asked" }, answer.asked), - answer.pending ? null : (0, import_react17.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Dismiss"), onClick: dismiss }, (0, import_react17.createElement)(CloseIcon)) -+ (0, import_react29.createElement)("span", { className: "bt-mem-reply-asked" }, answer.asked), -+ answer.pending ? null : (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Dismiss"), onClick: dismiss }, (0, import_react29.createElement)(CloseIcon)) ++ (0, import_react33.createElement)("span", { className: "bt-mem-reply-asked" }, answer.asked), ++ answer.pending ? null : (0, import_react33.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Dismiss"), onClick: dismiss }, (0, import_react33.createElement)(CloseIcon)) ), - answer.pending ? (0, import_react17.createElement)("div", { className: "bt-mem-reply-text bt-shimmer" }, t("Thinking…")) : answer.error ? (0, import_react17.createElement)("div", { className: "bt-mem-reply-text bt-danger" }, hostText(answer.error)) : (0, import_react17.createElement)( - import_react17.Fragment, -+ answer.pending ? (0, import_react29.createElement)("div", { className: "bt-mem-reply-text bt-shimmer" }, t("Thinking…")) : answer.error ? (0, import_react29.createElement)("div", { className: "bt-mem-reply-text bt-danger" }, hostText(answer.error)) : (0, import_react29.createElement)( -+ import_react29.Fragment, ++ answer.pending ? (0, import_react33.createElement)("div", { className: "bt-mem-reply-text bt-shimmer" }, t("Thinking…")) : answer.error ? (0, import_react33.createElement)("div", { className: "bt-mem-reply-text bt-danger" }, hostText(answer.error)) : (0, import_react33.createElement)( ++ import_react33.Fragment, null, - answer.reply ? (0, import_react17.createElement)("div", { className: "bt-mem-reply-text" }, answer.reply) : null, - answer.changes.length > 0 ? (0, import_react17.createElement)("ul", { className: "bt-mem-changes" }, answer.changes.map((change, index) => (0, import_react17.createElement)( -+ answer.reply ? (0, import_react29.createElement)("div", { className: "bt-mem-reply-text" }, answer.reply) : null, -+ answer.changes.length > 0 ? (0, import_react29.createElement)("ul", { className: "bt-mem-changes" }, answer.changes.map((change, index) => (0, import_react29.createElement)( ++ answer.reply ? (0, import_react33.createElement)("div", { className: "bt-mem-reply-text" }, answer.reply) : null, ++ answer.changes.length > 0 ? (0, import_react33.createElement)("ul", { className: "bt-mem-changes" }, answer.changes.map((change, index) => (0, import_react33.createElement)( "li", { key: index, "data-ok": change.ok || void 0 }, - change.ok ? (0, import_react17.createElement)(CheckIcon) : (0, import_react17.createElement)(CloseIcon), - (0, import_react17.createElement)("span", null, changeLine(change)) -+ change.ok ? (0, import_react29.createElement)(CheckIcon) : (0, import_react29.createElement)(CloseIcon), -+ (0, import_react29.createElement)("span", null, changeLine(change)) ++ change.ok ? (0, import_react33.createElement)(CheckIcon) : (0, import_react33.createElement)(CloseIcon), ++ (0, import_react33.createElement)("span", null, changeLine(change)) ))) : null ) ); @@ -19055,18 +20157,18 @@ diff --git a/client.js b/client.js - const latest = (0, import_react17.useRef)(0); - const alive = (0, import_react17.useRef)(true); - const show = (0, import_react17.useCallback)((next) => { -+ const [view, setView] = (0, import_react29.useState)(null); -+ const [error, setError] = (0, import_react29.useState)(""); -+ const timer = (0, import_react29.useRef)(0); -+ const latest = (0, import_react29.useRef)(0); -+ const alive = (0, import_react29.useRef)(true); -+ const show = (0, import_react29.useCallback)((next) => { ++ const [view, setView] = (0, import_react33.useState)(null); ++ const [error, setError] = (0, import_react33.useState)(""); ++ const timer = (0, import_react33.useRef)(0); ++ const latest = (0, import_react33.useRef)(0); ++ const alive = (0, import_react33.useRef)(true); ++ const show = (0, import_react33.useCallback)((next) => { setView(next); setError(""); noteCount(botId, next.entries.length); }, [botId]); - const load = (0, import_react17.useCallback)(async (flags = {}) => { -+ const load = (0, import_react29.useCallback)(async (flags = {}) => { ++ const load = (0, import_react33.useCallback)(async (flags = {}) => { clearTimeout(timer.current); const ticket = ++latest.current; try { @@ -19080,11 +20182,11 @@ diff --git a/client.js b/client.js } }, [botId]); - (0, import_react17.useEffect)(() => { -+ (0, import_react29.useEffect)(() => { ++ (0, import_react33.useEffect)(() => { alive.current = true; void load({ summarize: true }); return () => { -@@ -7606,38 +7606,333 @@ function useMemoryView(botId, actions) { +@@ -7606,28 +7606,85 @@ function useMemoryView(botId, actions) { }, [botId]); return { view, error, load, show }; } @@ -19092,18 +20194,78 @@ diff --git a/client.js b/client.js - const [now, setNow] = (0, import_react17.useState)(Date.now()); - (0, import_react17.useEffect)(() => { +function useNow3(every) { -+ const [now, setNow] = (0, import_react29.useState)(Date.now()); -+ (0, import_react29.useEffect)(() => { ++ const [now, setNow] = (0, import_react33.useState)(Date.now()); ++ (0, import_react33.useEffect)(() => { const id = setInterval(() => setNow(Date.now()), every); return () => clearInterval(id); }, [every]); return now; } -function MemoryDialog({ bot, actions, leaving = false }) { -- const { view, error, load, show } = useMemoryView(bot.id, actions); ++function MemoryNav({ bot, view, page, topic, query, setQuery, openOverview, openEntries, openTopic }) { ++ const stats = memoryStats(view?.entries); ++ const topics = memoryTopics(view?.entries); ++ const own = topics.filter((item2) => item2.scope === "own"); ++ const team = topics.filter((item2) => item2.scope === "team"); ++ const labelOf = (item2) => item2.topic ?? t("Main memory"); ++ const item = (kind, title, count, on, current) => (0, import_react33.createElement)( ++ "button", ++ { ++ type: "button", ++ className: "bt-mem-nav-item", ++ "aria-current": current ? "page" : void 0, ++ onClick: on ++ }, ++ (0, import_react33.createElement)("span", { className: "bt-mem-nav-label" }, title), ++ count === void 0 ? null : (0, import_react33.createElement)("span", { className: "bt-mem-nav-count" }, String(count)) ++ ); ++ const block = (title, items) => items.length === 0 ? null : (0, import_react33.createElement)( ++ "div", ++ { className: "bt-mem-nav-group" }, ++ (0, import_react33.createElement)("div", { className: "bt-mem-nav-heading" }, title), ++ items.map((entry) => (0, import_react33.createElement)( ++ import_react33.Fragment, ++ { key: `${entry.scope}:${entry.topic ?? ""}` }, ++ item("topic", labelOf(entry), entry.count, () => openTopic(entry), page === "entries" && sameTopic(topic, entry)) ++ )) ++ ); ++ return (0, import_react33.createElement)( ++ "nav", ++ { className: "bt-mem-nav", "aria-label": t("Memory directory") }, ++ (0, import_react33.createElement)( ++ "label", ++ { className: "bt-mem-search" }, ++ (0, import_react33.createElement)(SearchIcon), ++ (0, import_react33.createElement)("input", { ++ className: "bt-mem-search-input", ++ type: "search", ++ value: query, ++ placeholder: t("Search memory"), ++ "aria-label": t("Search memory"), ++ onChange: (event) => setQuery(event.target.value) ++ }) ++ ), ++ (0, import_react33.createElement)( ++ "div", ++ { className: "bt-mem-nav-list" }, ++ item("overview", t("Overview"), void 0, openOverview, page === "summary" && query.trim() === ""), ++ item("entries", t("All entries"), stats.entries, () => openEntries(null), page === "entries" && !topic && query.trim() === ""), ++ block(t("{name}'s memory", { name: bot.name }), own), ++ block(t("Team memory"), team) ++ ) ++ ); ++} ++function MemoryDialog({ bot, actions, roster, leaving = false }) { + const { view, error, load, show } = useMemoryView(bot.id, actions); - const [page, setPage] = (0, import_react17.useState)("summary"); - const [menu, setMenu] = (0, import_react17.useState)(false); -- const [menuShown, menuLeaving] = useLinger(menu, MENU_EXIT_MS2); ++ const locked = typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; ++ const [page, setPage] = (0, import_react33.useState)("summary"); ++ const [topic, setTopic] = (0, import_react33.useState)(null); ++ const [query, setQuery] = (0, import_react33.useState)(""); ++ const [navHidden, setNavHidden] = (0, import_react33.useState)(false); ++ const [menu, setMenu] = (0, import_react33.useState)(false); + const [menuShown, menuLeaving] = useLinger(menu, MENU_EXIT_MS2); - const [text, setText] = (0, import_react17.useState)(""); - const [answer, setAnswer] = (0, import_react17.useState)(null); - const menuRef = (0, import_react17.useRef)(null); @@ -19111,154 +20273,216 @@ diff --git a/client.js b/client.js - const inputRef = (0, import_react17.useRef)(null); - const now = useNow(3e4); - const close = (0, import_react17.useCallback)(() => actions.closeMemory(), []); -- useEscape(close); -- (0, import_react17.useEffect)(() => { -- if (!menu) return void 0; -+function MemoryDialog({ bot, actions, roster, leaving = false }) { -+ const { view, error, load, show } = useMemoryView(bot.id, actions); -+ const locked = typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; -+ const [page, setPage] = (0, import_react29.useState)("summary"); -+ const [menu, setMenu] = (0, import_react29.useState)(false); -+ const [menuShown, menuLeaving] = useLinger(menu, MENU_EXIT_MS2); -+ const [text2, setText] = (0, import_react29.useState)(""); -+ const [answer, setAnswer] = (0, import_react29.useState)(null); -+ const menuRef = (0, import_react29.useRef)(null); -+ const dotsRef = (0, import_react29.useRef)(null); -+ const inputRef = (0, import_react29.useRef)(null); ++ const [text2, setText] = (0, import_react33.useState)(""); ++ const [answer, setAnswer] = (0, import_react33.useState)(null); ++ const menuRef = (0, import_react33.useRef)(null); ++ const dotsRef = (0, import_react33.useRef)(null); ++ const inputRef = (0, import_react33.useRef)(null); + const now = useNow3(3e4); -+ const close = (0, import_react29.useCallback)(() => actions.closeMemory(), []); -+ useEscape(close); -+ (0, import_react29.useEffect)(() => { -+ if (!menu) return void 0; -+ const onDown = (event) => { -+ if (menuRef.current?.contains(event.target) || dotsRef.current?.contains(event.target)) return; -+ setMenu(false); -+ }; -+ const onKey = (event) => { -+ if (event.key === "Escape") { -+ event.stopPropagation(); -+ setMenu(false); -+ dotsRef.current?.focus(); -+ } -+ }; -+ window.addEventListener("mousedown", onDown); -+ window.addEventListener("keydown", onKey, true); -+ return () => { -+ window.removeEventListener("mousedown", onDown); -+ window.removeEventListener("keydown", onKey, true); -+ }; -+ }, [menu]); -+ const regenerate = () => { -+ setMenu(false); -+ setPage("summary"); -+ void load({ regenerate: true }); -+ }; -+ const openEntries = () => { ++ const close = (0, import_react33.useCallback)(() => actions.closeMemory(), []); + useEscape(close); +- (0, import_react17.useEffect)(() => { ++ (0, import_react33.useEffect)(() => { + if (!menu) return void 0; + const onDown = (event) => { + if (menuRef.current?.contains(event.target) || dotsRef.current?.contains(event.target)) return; +@@ -7650,16 +7650,24 @@ function MemoryDialog({ bot, actions, leaving = false }) { + const regenerate = () => { + setMenu(false); + setPage("summary"); ++ setTopic(null); ++ setQuery(""); + void load({ regenerate: true }); + }; +- const openEntries = () => { ++ const openEntries = (nextTopic = null) => { + setMenu(false); + setPage("entries"); ++ setTopic(nextTopic); ++ setQuery(""); + }; +- const backToSummary = () => { ++ const openOverview = () => { + setMenu(false); -+ setPage("entries"); -+ }; -+ const backToSummary = () => { -+ setPage("summary"); -+ void load({ summarize: true }); -+ }; -+ const remove = async (entry) => { -+ try { -+ show(await actions.memoryForget(bot.id, entry)); -+ return true; -+ } catch (failure) { -+ setAnswer({ asked: entry.text, error: failure?.message ?? String(failure) }); -+ return false; -+ } -+ }; -+ const ask = async (event) => { -+ event.preventDefault(); + setPage("summary"); ++ setTopic(null); ++ setQuery(""); + void load({ summarize: true }); + }; ++ const backToSummary = () => openOverview(); + const remove = async (entry) => { + try { + show(await actions.memoryForget(bot.id, entry)); +@@ -7671,7 +7671,7 @@ function MemoryDialog({ bot, actions, leaving = false }) { + }; + const ask = async (event) => { + event.preventDefault(); +- const asked = text.trim(); + const asked = text2.trim(); -+ if (asked === "" || answer?.pending) return; -+ setText(""); -+ setAnswer({ asked, pending: true }); -+ try { -+ const result = await actions.memoryAsk(bot.id, asked); -+ setAnswer({ asked, reply: result.reply, changes: result.changes }); -+ show(result.view); -+ if (result.changes.some((change) => change.ok)) void load({ summarize: page === "summary" }); -+ } catch (failure) { -+ setAnswer({ asked, error: failure?.message ?? String(failure) }); -+ } -+ inputRef.current?.focus(); -+ }; -+ const count = view?.entries.length ?? 0; -+ const when3 = view?.summary ? ago(view.summary.at, now) : null; -+ const status = view === null ? "" : page === "entries" ? count === 1 ? t("1 entry") : t("{count} entries", { count }) : view.summarizing && view.summary ? t("Updating…") : view.summary && view.fresh ? when3 ? t("Updated {time}", { time: when3 }) : t("Updated just now") : ""; -+ const busy = answer?.pending === true; -+ return (0, import_react29.createElement)( -+ "div", -+ { className: "bt-mem-layer", "data-leaving": leaving || void 0 }, -+ (0, import_react29.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), -+ (0, import_react29.createElement)( -+ "div", -+ { className: "bt-mem", role: "dialog", "aria-modal": true, "aria-label": t("{name}'s memory", { name: bot.name }) }, -+ (0, import_react29.createElement)( -+ "div", -+ { className: "bt-mem-head" }, -+ page === "entries" ? (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to the summary"), onClick: backToSummary }, (0, import_react29.createElement)(ChevronLeftIcon)) : null, -+ (0, import_react29.createElement)("h2", null, page === "entries" ? t("All entries") : t("Memory summary")), -+ (0, import_react29.createElement)("span", { className: "bt-mem-status" }, page === "summary" ? [bot.name, status].filter(Boolean).join(" · ") : status), -+ (0, import_react29.createElement)("span", { className: "bt-mem-head-gap" }), -+ (0, import_react29.createElement)("button", { ref: dotsRef, type: "button", className: "bt-icon-btn", "aria-label": t("Memory options"), "aria-haspopup": "menu", "aria-expanded": menu, onClick: () => setMenu((value) => !value) }, (0, import_react29.createElement)(DotsIcon)), -+ (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close memory"), onClick: close }, (0, import_react29.createElement)(CloseIcon)), -+ menuShown ? (0, import_react29.createElement)( + if (asked === "" || answer?.pending) return; + setText(""); + setAnswer({ asked, pending: true }); +@@ -7686,68 +7686,109 @@ function MemoryDialog({ bot, actions, leaving = false }) { + inputRef.current?.focus(); + }; + const count = view?.entries.length ?? 0; ++ const stats = memoryStats(view?.entries); + const when3 = view?.summary ? ago(view.summary.at, now) : null; +- const status = view === null ? "" : page === "entries" ? count === 1 ? t("1 entry") : t("{count} entries", { count }) : view.summarizing && view.summary ? t("Updating…") : view.summary && view.fresh ? when3 ? t("Updated {time}", { time: when3 }) : t("Updated just now") : ""; ++ const searching = query.trim() !== ""; ++ const filtered = view === null ? [] : searching ? filterMemoryEntries(view.entries, query) : topic ? view.entries.filter((entry) => sameTopic({ scope: entry.scope, topic: entry.topic ?? null }, topic)) : view.entries; ++ const listed = view === null ? null : { ...view, entries: filtered }; ++ const status = view === null ? "" : searching ? filtered.length === 1 ? t("1 entry") : t("{count} entries", { count: filtered.length }) : page === "entries" ? filtered.length === 1 ? t("1 entry") : t("{count} entries", { count: filtered.length }) : view.summarizing && view.summary ? t("Updating…") : view.summary && view.fresh ? when3 ? t("Updated {time}", { time: when3 }) : t("Updated just now") : [ ++ stats.entries ? stats.entries === 1 ? t("1 entry") : t("{count} entries", { count: stats.entries }) : null, ++ stats.topics ? stats.topics === 1 ? t("1 topic") : t("{count} topics", { count: stats.topics }) : null ++ ].filter(Boolean).join(" · "); ++ const title = searching ? t("Search memory") : page === "entries" ? topic ? topic.topic ?? t("Main memory") : t("All entries") : t("Memory summary"); ++ const showEntries = searching || page === "entries"; + const busy = answer?.pending === true; +- return (0, import_react17.createElement)( ++ return (0, import_react33.createElement)( + "div", + { className: "bt-mem-layer", "data-leaving": leaving || void 0 }, +- (0, import_react17.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), +- (0, import_react17.createElement)( ++ (0, import_react33.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), ++ (0, import_react33.createElement)( + "div", +- { className: "bt-mem", role: "dialog", "aria-modal": true, "aria-label": t("{name}'s memory", { name: bot.name }) }, +- (0, import_react17.createElement)( ++ { className: "bt-mem", role: "dialog", "aria-modal": true, "aria-label": t("{name}'s memory", { name: bot.name }), "data-nav": navHidden ? "hidden" : void 0 }, ++ (0, import_react33.createElement)( + "div", + { className: "bt-mem-head" }, +- page === "entries" ? (0, import_react17.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to the summary"), onClick: backToSummary }, (0, import_react17.createElement)(ChevronLeftIcon)) : null, +- (0, import_react17.createElement)("h2", null, page === "entries" ? t("All entries") : t("Memory summary")), +- (0, import_react17.createElement)("span", { className: "bt-mem-status" }, page === "summary" ? [bot.name, status].filter(Boolean).join(" · ") : status), +- (0, import_react17.createElement)("span", { className: "bt-mem-head-gap" }), +- (0, import_react17.createElement)("button", { ref: dotsRef, type: "button", className: "bt-icon-btn", "aria-label": t("Memory options"), "aria-haspopup": "menu", "aria-expanded": menu, onClick: () => setMenu((value) => !value) }, (0, import_react17.createElement)(DotsIcon)), +- (0, import_react17.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close memory"), onClick: close }, (0, import_react17.createElement)(CloseIcon)), +- menuShown ? (0, import_react17.createElement)( ++ (0, import_react33.createElement)("button", { ++ type: "button", ++ className: "bt-icon-btn", ++ "aria-label": navHidden ? t("Show directory") : t("Hide directory"), ++ "aria-pressed": !navHidden, ++ onClick: () => setNavHidden((value) => !value) ++ }, navHidden ? (0, import_react33.createElement)(ChevronRightIcon) : (0, import_react33.createElement)(ChevronLeftIcon)), ++ page === "entries" || searching ? (0, import_react33.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to the summary"), onClick: backToSummary }, (0, import_react33.createElement)(ChevronLeftIcon)) : null, ++ (0, import_react33.createElement)("h2", null, title), ++ (0, import_react33.createElement)("span", { className: "bt-mem-status" }, page === "summary" && !searching ? [bot.name, status].filter(Boolean).join(" · ") : status), ++ (0, import_react33.createElement)("span", { className: "bt-mem-head-gap" }), ++ (0, import_react33.createElement)("button", { ref: dotsRef, type: "button", className: "bt-icon-btn", "aria-label": t("Memory options"), "aria-haspopup": "menu", "aria-expanded": menu, onClick: () => setMenu((value) => !value) }, (0, import_react33.createElement)(DotsIcon)), ++ (0, import_react33.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close memory"), onClick: close }, (0, import_react33.createElement)(CloseIcon)), ++ menuShown ? (0, import_react33.createElement)( + "div", + { ref: menuRef, className: "bt-menu bt-mem-menu", role: "menu", "aria-label": t("Memory options"), "data-leaving": menuLeaving || void 0 }, +- (0, import_react17.createElement)( ++ (0, import_react33.createElement)( + "button", +- { type: "button", role: "menuitem", onClick: openEntries }, +- (0, import_react17.createElement)("span", { className: "bt-menu-label" }, t("All entries")), +- (0, import_react17.createElement)("span", { className: "bt-menu-hint" }, String(count)) ++ { type: "button", role: "menuitem", onClick: () => openEntries(null) }, ++ (0, import_react33.createElement)("span", { className: "bt-menu-label" }, t("All entries")), ++ (0, import_react33.createElement)("span", { className: "bt-menu-hint" }, String(count)) + ), +- (0, import_react17.createElement)( ++ (0, import_react33.createElement)( + "button", + { type: "button", role: "menuitem", disabled: count === 0 || view?.summarizing, onClick: regenerate }, +- (0, import_react17.createElement)("span", { className: "bt-menu-label" }, t("Regenerate summary")) ++ (0, import_react33.createElement)("span", { className: "bt-menu-label" }, t("Regenerate summary")) + ) + ) : null + ), +- (0, import_react17.createElement)( +- "div", +- { className: "bt-mem-body" }, +- error ? (0, import_react17.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, hostText(error)) : null, +- view === null ? error ? null : (0, import_react17.createElement)(Skeleton) : page === "entries" ? (0, import_react17.createElement)(Entries, { bot, view, remove }) : (0, import_react17.createElement)(Summary, { bot, view, regenerate }) +- ), +- (0, import_react17.createElement)( ++ (0, import_react33.createElement)( + "div", +- { className: "bt-mem-foot" }, +- answer ? (0, import_react17.createElement)(Reply, { answer, dismiss: () => setAnswer(null) }) : null, +- (0, import_react17.createElement)( +- "form", +- { className: "bt-mem-ask", onSubmit: ask }, +- (0, import_react17.createElement)("input", { +- ref: inputRef, +- className: "bt-mem-input", +- value: text, +- maxLength: 2e3, +- disabled: view === null, +- placeholder: t("Ask or update"), +- "aria-label": t("Ask about or update {name}'s memory", { name: bot.name }), +- onChange: (event) => setText(event.target.value) +- }), +- (0, import_react17.createElement)( +- "button", +- { type: "submit", className: "bt-mem-send", disabled: busy || text.trim() === "", "aria-label": t("Send") }, +- busy ? (0, import_react17.createElement)("span", { className: "bt-mem-spin", "aria-hidden": true }) : (0, import_react17.createElement)(ArrowUpIcon) ++ { className: "bt-mem-shell" }, ++ navHidden ? null : (0, import_react33.createElement)(MemoryNav, { ++ bot, ++ view, ++ page, ++ topic, ++ query, ++ setQuery, ++ openOverview, ++ openEntries, ++ openTopic: (item) => openEntries(item) ++ }), ++ (0, import_react33.createElement)( + "div", -+ { ref: menuRef, className: "bt-menu bt-mem-menu", role: "menu", "aria-label": t("Memory options"), "data-leaving": menuLeaving || void 0 }, -+ (0, import_react29.createElement)( -+ "button", -+ { type: "button", role: "menuitem", onClick: openEntries }, -+ (0, import_react29.createElement)("span", { className: "bt-menu-label" }, t("All entries")), -+ (0, import_react29.createElement)("span", { className: "bt-menu-hint" }, String(count)) ++ { className: "bt-mem-main" }, ++ (0, import_react33.createElement)( ++ "div", ++ { className: "bt-mem-body" }, ++ readOnlyLine(import_react33.createElement, roster, actions), ++ error ? (0, import_react33.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, hostText(error)) : null, ++ view === null ? error ? null : (0, import_react33.createElement)(Skeleton) : showEntries ? searching && filtered.length === 0 ? (0, import_react33.createElement)( ++ "div", ++ { className: "bt-mem-empty" }, ++ (0, import_react33.createElement)("div", { className: "bt-mem-empty-title" }, t('No entries match "{query}"', { query: query.trim() })), ++ (0, import_react33.createElement)("div", { className: "bt-mem-empty-text" }, t("Try a different word, or clear the search to see every entry.")) ++ ) : (0, import_react33.createElement)(Entries, { bot, view: listed, remove: locked ? null : remove, subset: searching || Boolean(topic) }) : (0, import_react33.createElement)(Summary, { bot, view, regenerate }) + ), -+ (0, import_react29.createElement)( -+ "button", -+ { type: "button", role: "menuitem", disabled: count === 0 || view?.summarizing, onClick: regenerate }, -+ (0, import_react29.createElement)("span", { className: "bt-menu-label" }, t("Regenerate summary")) -+ ) -+ ) : null -+ ), -+ (0, import_react29.createElement)( -+ "div", -+ { className: "bt-mem-body" }, -+ readOnlyLine(import_react29.createElement, roster, actions), -+ error ? (0, import_react29.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, hostText(error)) : null, -+ view === null ? error ? null : (0, import_react29.createElement)(Skeleton) : page === "entries" ? (0, import_react29.createElement)(Entries, { bot, view, remove: locked ? null : remove }) : (0, import_react29.createElement)(Summary, { bot, view, regenerate }) -+ ), -+ (0, import_react29.createElement)( -+ "div", -+ { className: "bt-mem-foot" }, -+ answer ? (0, import_react29.createElement)(Reply, { answer, dismiss: () => setAnswer(null) }) : null, -+ locked ? null : (0, import_react29.createElement)( -+ "form", -+ { className: "bt-mem-ask", onSubmit: ask }, -+ (0, import_react29.createElement)("input", { -+ ref: inputRef, -+ className: "bt-mem-input", -+ value: text2, -+ maxLength: 2e3, -+ disabled: view === null, -+ placeholder: t("Ask or update"), -+ "aria-label": t("Ask about or update {name}'s memory", { name: bot.name }), -+ onChange: (event) => setText(event.target.value) -+ }), -+ (0, import_react29.createElement)( -+ "button", -+ { type: "submit", className: "bt-mem-send", disabled: busy || text2.trim() === "", "aria-label": t("Send") }, -+ busy ? (0, import_react29.createElement)("span", { className: "bt-mem-spin", "aria-hidden": true }) : (0, import_react29.createElement)(ArrowUpIcon) -+ ) -+ ) -+ ) -+ ) -+ ); -+} -+ ++ (0, import_react33.createElement)( ++ "div", ++ { className: "bt-mem-foot" }, ++ answer ? (0, import_react33.createElement)(Reply, { answer, dismiss: () => setAnswer(null) }) : null, ++ locked ? null : (0, import_react33.createElement)( ++ "form", ++ { className: "bt-mem-ask", onSubmit: ask }, ++ (0, import_react33.createElement)("input", { ++ ref: inputRef, ++ className: "bt-mem-input", ++ value: text2, ++ maxLength: 2e3, ++ disabled: view === null, ++ placeholder: t("Ask or update"), ++ "aria-label": t("Ask about or update {name}'s memory", { name: bot.name }), ++ onChange: (event) => setText(event.target.value) ++ }), ++ (0, import_react33.createElement)( ++ "button", ++ { type: "submit", className: "bt-mem-send", disabled: busy || text2.trim() === "", "aria-label": t("Send") }, ++ busy ? (0, import_react33.createElement)("span", { className: "bt-mem-spin", "aria-hidden": true }) : (0, import_react33.createElement)(ArrowUpIcon) ++ ) ++ ) + ) + ) + ) +@@ -7755,8 +7755,40 @@ function MemoryDialog({ bot, actions, leaving = false }) { + ); + } + +// src/client/standing-approvals.js -+var import_react30 = require("react"); ++var import_react34 = require("react"); +var standingOf = (target, roster) => { + const me = roster?.self?.memberId; + return (target?.standingApprovals ?? []).filter((grant) => me === void 0 || grant.ownerId === me); @@ -19267,229 +20491,168 @@ diff --git a/client.js b/client.js + const grants = scope === "room" ? standingOf(target, roster) : target?.standingApprovals ?? []; + if (grants.length === 0) return null; + const hint = scope === "room" ? t("Your Bots in this group do these without asking.") : t("This Bot does these without asking."); -+ return (0, import_react30.createElement)( ++ return (0, import_react34.createElement)( + Card2, + { title: t("Always allowed") }, -+ grants.map((grant) => (0, import_react30.createElement)( ++ grants.map((grant) => (0, import_react34.createElement)( + "div", + { key: grant.kind, className: "bt-set-row bt-bs-row", "data-standing": grant.kind }, -+ (0, import_react30.createElement)( ++ (0, import_react34.createElement)( + "span", + { className: "bt-set-copy" }, -+ (0, import_react30.createElement)("span", { className: "bt-bs-label" }, grant.label || grant.kind), -+ (0, import_react30.createElement)("span", { className: "bt-set-hint" }, hint) ++ (0, import_react34.createElement)("span", { className: "bt-bs-label" }, grant.label || grant.kind), ++ (0, import_react34.createElement)("span", { className: "bt-set-hint" }, hint) + ), -+ (0, import_react30.createElement)("button", { ++ (0, import_react34.createElement)("button", { + type: "button", + className: "bt-soft bt-soft-sm", + "aria-label": t("Remove always allow for {kind}", { kind: grant.label || grant.kind }), + onClick: () => run(actions.removeStandingApproval(scope, target.id, grant.kind)) + }, t("Remove")) -+ )) -+ ); -+} -+ -+// src/client/bot-settings.js -+var import_react31 = require("react"); -+var capitalize = (word) => word[0].toUpperCase() + word.slice(1); -+async function avatarImage(file) { -+ if (!/^image\/(png|jpeg|webp|gif)$/.test(file.type)) throw new Error(t("Choose a PNG, JPEG, WebP, or GIF image")); -+ if (file.size > 25 * 1024 * 1024) throw new Error(t("Choose an image smaller than 25 MB")); -+ const bitmap = await createImageBitmap(file); -+ const side = 160; -+ const canvas = document.createElement("canvas"); -+ canvas.width = side; -+ canvas.height = side; -+ const context = canvas.getContext("2d"); -+ context.imageSmoothingQuality = "high"; -+ const crop = Math.min(bitmap.width, bitmap.height); -+ context.drawImage(bitmap, (bitmap.width - crop) / 2, (bitmap.height - crop) / 2, crop, crop, 0, 0, side, side); -+ bitmap.close?.(); -+ for (const quality of [0.9, 0.75, 0.6]) { -+ const url = canvas.toDataURL("image/webp", quality); -+ if (url.startsWith("data:image/webp") && url.length < 15e4) return url; -+ } -+ const png = canvas.toDataURL("image/png"); -+ if (png.length < 15e4) return png; -+ throw new Error(t("That image is too large")); -+} -+function InlineText({ label, value, placeholder, required = false, maxLength, multiline = false, onSave }) { -+ const [draft, setDraft] = (0, import_react31.useState)(null); -+ const reverting = (0, import_react31.useRef)(false); -+ const commit = () => { -+ const next = draft?.trim(); -+ setDraft(null); -+ if (reverting.current) { -+ reverting.current = false; -+ return; -+ } -+ if (next === void 0 || next === (value ?? "") || required && next === "") return; -+ void onSave(next); -+ }; -+ return (0, import_react31.createElement)(multiline ? "textarea" : "input", { -+ className: multiline ? "bt-bs-input bt-bs-area" : "bt-bs-input", -+ value: draft ?? value ?? "", -+ placeholder, -+ maxLength, -+ required, -+ "aria-label": label, -+ spellCheck: false, -+ onChange: (event) => setDraft(event.target.value), -+ onBlur: commit, -+ onKeyDown: (event) => { -+ if (event.key === "Escape") { -+ event.stopPropagation(); -+ reverting.current = true; -+ event.currentTarget.blur(); -+ } -+ if (event.key === "Enter" && !multiline && !event.nativeEvent.isComposing) event.currentTarget.blur(); -+ } -+ }); -+} -+function Row({ label, hint, stack = false, children }) { -+ return (0, import_react31.createElement)( -+ "label", -+ { className: stack ? "bt-set-row bt-bs-row bt-bs-stack" : "bt-set-row bt-bs-row" }, -+ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, label), hint ? (0, import_react31.createElement)("span", { className: "bt-set-hint" }, hint) : null), -+ children -+ ); -+} -+function Card({ title, children }) { -+ return (0, import_react31.createElement)("section", { className: "bt-set-section" }, title ? (0, import_react31.createElement)("h3", null, title) : null, (0, import_react31.createElement)("div", { className: "bt-set-card" }, children)); -+} -+function Switch({ on, label, disabled, onChange }) { -+ return (0, import_react31.createElement)( -+ "button", -+ { type: "button", role: "switch", className: "bt-switch", "aria-checked": on, "aria-label": label, disabled, onClick: () => onChange(!on) }, -+ (0, import_react31.createElement)("span", { className: "bt-switch-knob", "aria-hidden": true }) ++ )) + ); +} ++ + // src/client/bot-settings.js +-var import_react18 = require("react"); ++var import_react35 = require("react"); + var capitalize = (word) => word[0].toUpperCase() + word.slice(1); + async function avatarImage(file) { + if (!/^image\/(png|jpeg|webp|gif)$/.test(file.type)) throw new Error(t("Choose a PNG, JPEG, WebP, or GIF image")); +@@ -7780,8 +7780,8 @@ async function avatarImage(file) { + throw new Error(t("That image is too large")); + } + function InlineText({ label, value, placeholder, required = false, maxLength, multiline = false, onSave }) { +- const [draft, setDraft] = (0, import_react18.useState)(null); +- const reverting = (0, import_react18.useRef)(false); ++ const [draft, setDraft] = (0, import_react35.useState)(null); ++ const reverting = (0, import_react35.useRef)(false); + const commit = () => { + const next = draft?.trim(); + setDraft(null); +@@ -7792,7 +7792,7 @@ function InlineText({ label, value, placeholder, required = false, maxLength, mu + if (next === void 0 || next === (value ?? "") || required && next === "") return; + void onSave(next); + }; +- return (0, import_react18.createElement)(multiline ? "textarea" : "input", { ++ return (0, import_react35.createElement)(multiline ? "textarea" : "input", { + className: multiline ? "bt-bs-input bt-bs-area" : "bt-bs-input", + value: draft ?? value ?? "", + placeholder, +@@ -7813,29 +7813,29 @@ function InlineText({ label, value, placeholder, required = false, maxLength, mu + }); + } + function Row({ label, hint, stack = false, children }) { +- return (0, import_react18.createElement)( ++ return (0, import_react35.createElement)( + "label", + { className: stack ? "bt-set-row bt-bs-row bt-bs-stack" : "bt-set-row bt-bs-row" }, +- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, label), hint ? (0, import_react18.createElement)("span", { className: "bt-set-hint" }, hint) : null), ++ (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-bs-label" }, label), hint ? (0, import_react35.createElement)("span", { className: "bt-set-hint" }, hint) : null), + children + ); + } + function Card({ title, children }) { +- return (0, import_react18.createElement)("section", { className: "bt-set-section" }, title ? (0, import_react18.createElement)("h3", null, title) : null, (0, import_react18.createElement)("div", { className: "bt-set-card" }, children)); ++ return (0, import_react35.createElement)("section", { className: "bt-set-section" }, title ? (0, import_react35.createElement)("h3", null, title) : null, (0, import_react35.createElement)("div", { className: "bt-set-card" }, children)); + } + function Switch({ on, label, disabled, onChange }) { +- return (0, import_react18.createElement)( ++ return (0, import_react35.createElement)( + "button", + { type: "button", role: "switch", className: "bt-switch", "aria-checked": on, "aria-label": label, disabled, onClick: () => onChange(!on) }, +- (0, import_react18.createElement)("span", { className: "bt-switch-knob", "aria-hidden": true }) ++ (0, import_react35.createElement)("span", { className: "bt-switch-knob", "aria-hidden": true }) + ); + } +-function SwitchRow({ label, hint, on, disabled, onChange }) { +- return (0, import_react18.createElement)( +function SwitchRow({ label, hint, on, disabled, onChange, showLabel = true }) { -+ return (0, import_react31.createElement)( -+ "div", -+ { className: "bt-set-row bt-bs-row" }, -+ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, showLabel ? (0, import_react31.createElement)("span", { className: "bt-bs-label" }, label) : null, hint ? (0, import_react31.createElement)("span", { className: "bt-set-hint" }, hint) : null), -+ (0, import_react31.createElement)(Switch, { on, label, disabled, onChange }) -+ ); -+} -+function modelHint(bot, roster) { -+ const shown = modelOf(bot, roster); -+ if (shown === void 0) return t("Pick the model this Bot runs on."); -+ if (!shown.served && (roster.models ?? []).length > 0) return t("This model is not available now. Pick another one."); -+ if (bot.appliedModel && bot.appliedModel === bot.model) return t("Every message of this Bot runs on it."); -+ return t("Applies from the next message."); -+} -+function ShapeRing({ shape, size }) { -+ const maskId = (0, import_react31.useRef)(""); -+ if (maskId.current === "") maskId.current = `bt-ring-${nextMarkSerial()}`; -+ const def = shapeOf(shape); -+ const unit = def.size / size; -+ const markup = `${holes(def, `${bodyOf(def, "#000", true)}`)}${bodyOf(def, "currentColor", true)}`; -+ return (0, import_react31.createElement)("svg", { className: "bt-ring", viewBox: `0 0 ${def.size} ${def.size}`, "aria-hidden": true, dangerouslySetInnerHTML: { __html: markup } }); -+} -+function CharacterGrid({ look, hasPhoto = false, onShape, onColor }) { -+ const shapes = [...PICKER_SHAPES, ...Object.keys(SHAPES).filter((id) => !Object.hasOwn(CHARACTERS, id))]; -+ if (!shapes.includes(look.shape)) shapes.push(look.shape); -+ const rows = []; -+ for (let index = 0; index < shapes.length; index += PICKER_COLUMNS) rows.push(shapes.slice(index, index + PICKER_COLUMNS)); -+ return (0, import_react31.createElement)( -+ import_react31.Fragment, -+ null, -+ (0, import_react31.createElement)("div", { className: "bt-shapes", role: "group", "aria-label": t("Character shape") }, rows.map((row, index) => (0, import_react31.createElement)("div", { key: index, className: "bt-shape-row" }, row.map((id) => (0, import_react31.createElement)("button", { -+ key: id, -+ type: "button", -+ className: "bt-shape", -+ "aria-label": t(shapeOf(id).label), -+ title: t(shapeOf(id).label), -+ "aria-pressed": !hasPhoto && look.shape === id, -+ onClick: () => onShape(id) -+ }, (0, import_react31.createElement)(ShapeRing, { shape: id, size: 36 }), (0, import_react31.createElement)(BotMark, { look: { shape: id, color: look.color }, size: 36 })))))), -+ (0, import_react31.createElement)("div", { className: "bt-colors", role: "group", "aria-label": t("Character color") }, CHARACTER_COLORS.map((color) => (0, import_react31.createElement)("button", { -+ key: color, -+ type: "button", -+ className: "bt-color", -+ "aria-label": t(capitalize(color)), -+ title: t(capitalize(color)), -+ "aria-pressed": look.color === color, -+ onClick: () => onColor(color) -+ }, (0, import_react31.createElement)("span", { style: { background: paintCss(color) } })))) ++ return (0, import_react35.createElement)( + "div", + { className: "bt-set-row bt-bs-row" }, +- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, label), hint ? (0, import_react18.createElement)("span", { className: "bt-set-hint" }, hint) : null), +- (0, import_react18.createElement)(Switch, { on, label, disabled, onChange }) ++ (0, import_react35.createElement)("span", { className: "bt-set-copy" }, showLabel ? (0, import_react35.createElement)("span", { className: "bt-bs-label" }, label) : null, hint ? (0, import_react35.createElement)("span", { className: "bt-set-hint" }, hint) : null), ++ (0, import_react35.createElement)(Switch, { on, label, disabled, onChange }) + ); + } + function modelHint(bot, roster) { +@@ -7846,22 +7846,22 @@ function modelHint(bot, roster) { + return t("Applies from the next message."); + } + function ShapeRing({ shape, size }) { +- const maskId = (0, import_react18.useRef)(""); ++ const maskId = (0, import_react35.useRef)(""); + if (maskId.current === "") maskId.current = `bt-ring-${nextMarkSerial()}`; + const def = shapeOf(shape); + const unit = def.size / size; + const markup = `${holes(def, `${bodyOf(def, "#000", true)}`)}${bodyOf(def, "currentColor", true)}`; +- return (0, import_react18.createElement)("svg", { className: "bt-ring", viewBox: `0 0 ${def.size} ${def.size}`, "aria-hidden": true, dangerouslySetInnerHTML: { __html: markup } }); ++ return (0, import_react35.createElement)("svg", { className: "bt-ring", viewBox: `0 0 ${def.size} ${def.size}`, "aria-hidden": true, dangerouslySetInnerHTML: { __html: markup } }); + } + function CharacterGrid({ look, hasPhoto = false, onShape, onColor }) { + const shapes = [...PICKER_SHAPES, ...Object.keys(SHAPES).filter((id) => !Object.hasOwn(CHARACTERS, id))]; + if (!shapes.includes(look.shape)) shapes.push(look.shape); + const rows = []; + for (let index = 0; index < shapes.length; index += PICKER_COLUMNS) rows.push(shapes.slice(index, index + PICKER_COLUMNS)); +- return (0, import_react18.createElement)( +- import_react18.Fragment, ++ return (0, import_react35.createElement)( ++ import_react35.Fragment, + null, +- (0, import_react18.createElement)("div", { className: "bt-shapes", role: "group", "aria-label": t("Character shape") }, rows.map((row, index) => (0, import_react18.createElement)("div", { key: index, className: "bt-shape-row" }, row.map((id) => (0, import_react18.createElement)("button", { ++ (0, import_react35.createElement)("div", { className: "bt-shapes", role: "group", "aria-label": t("Character shape") }, rows.map((row, index) => (0, import_react35.createElement)("div", { key: index, className: "bt-shape-row" }, row.map((id) => (0, import_react35.createElement)("button", { + key: id, + type: "button", + className: "bt-shape", +@@ -7869,8 +7869,8 @@ function CharacterGrid({ look, hasPhoto = false, onShape, onColor }) { + title: t(shapeOf(id).label), + "aria-pressed": !hasPhoto && look.shape === id, + onClick: () => onShape(id) +- }, (0, import_react18.createElement)(ShapeRing, { shape: id, size: 36 }), (0, import_react18.createElement)(BotMark, { look: { shape: id, color: look.color }, size: 36 })))))), +- (0, import_react18.createElement)("div", { className: "bt-colors", role: "group", "aria-label": t("Character color") }, CHARACTER_COLORS.map((color) => (0, import_react18.createElement)("button", { ++ }, (0, import_react35.createElement)(ShapeRing, { shape: id, size: 36 }), (0, import_react35.createElement)(BotMark, { look: { shape: id, color: look.color }, size: 36 })))))), ++ (0, import_react35.createElement)("div", { className: "bt-colors", role: "group", "aria-label": t("Character color") }, CHARACTER_COLORS.map((color) => (0, import_react35.createElement)("button", { + key: color, + type: "button", + className: "bt-color", +@@ -7878,282 +7878,1215 @@ function CharacterGrid({ look, hasPhoto = false, onShape, onColor }) { + title: t(capitalize(color)), + "aria-pressed": look.color === color, + onClick: () => onColor(color) +- }, (0, import_react18.createElement)("span", { style: { background: paintCss(color) } })))) ++ }, (0, import_react35.createElement)("span", { style: { background: paintCss(color) } })))) + ); +} +function AvatarEditor({ bot, actions, run, onClose }) { + const look = lookOf(bot); -+ const [tab, setTab] = (0, import_react31.useState)(look.image ? "upload" : "bot"); -+ const [over, setOver] = (0, import_react31.useState)(false); -+ const ref = (0, import_react31.useRef)(null); -+ const fileRef = (0, import_react31.useRef)(null); ++ const [tab, setTab] = (0, import_react35.useState)(look.image ? "upload" : "bot"); ++ const [over, setOver] = (0, import_react35.useState)(false); ++ const ref = (0, import_react35.useRef)(null); ++ const fileRef = (0, import_react35.useRef)(null); + const upload = (file) => { + if (file) void run(avatarImage(file).then((image) => actions.updateBot(bot.id, { avatar: { ...bot.avatar ?? {}, image } }))); + }; -+ (0, import_react31.useEffect)(() => { - const onDown = (event) => { -- if (menuRef.current?.contains(event.target) || dotsRef.current?.contains(event.target)) return; -- setMenu(false); ++ (0, import_react35.useEffect)(() => { ++ const onDown = (event) => { + if (!(event.target instanceof Element) || ref.current?.contains(event.target) || event.target.closest(".bt-avatar-trigger")) return; + onClose(); - }; - const onKey = (event) => { - if (event.key === "Escape") { - event.stopPropagation(); -- setMenu(false); -- dotsRef.current?.focus(); ++ }; ++ const onKey = (event) => { ++ if (event.key === "Escape") { ++ event.stopPropagation(); + onClose(); - } - }; - window.addEventListener("mousedown", onDown); -@@ -7646,514 +7646,993 @@ function MemoryDialog({ bot, actions, leaving = false }) { - window.removeEventListener("mousedown", onDown); - window.removeEventListener("keydown", onKey, true); - }; -- }, [menu]); -- const regenerate = () => { -- setMenu(false); -- setPage("summary"); -- void load({ regenerate: true }); -- }; -- const openEntries = () => { -- setMenu(false); -- setPage("entries"); -- }; -- const backToSummary = () => { -- setPage("summary"); -- void load({ summarize: true }); -- }; -- const remove = async (entry) => { -- try { -- show(await actions.memoryForget(bot.id, entry)); -- return true; -- } catch (failure) { -- setAnswer({ asked: entry.text, error: failure?.message ?? String(failure) }); -- return false; -- } -- }; -- const ask = async (event) => { -- event.preventDefault(); -- const asked = text.trim(); -- if (asked === "" || answer?.pending) return; -- setText(""); -- setAnswer({ asked, pending: true }); -- try { -- const result = await actions.memoryAsk(bot.id, asked); -- setAnswer({ asked, reply: result.reply, changes: result.changes }); -- show(result.view); -- if (result.changes.some((change) => change.ok)) void load({ summarize: page === "summary" }); -- } catch (failure) { -- setAnswer({ asked, error: failure?.message ?? String(failure) }); -- } -- inputRef.current?.focus(); -- }; -- const count = view?.entries.length ?? 0; -- const when3 = view?.summary ? ago(view.summary.at, now) : null; -- const status = view === null ? "" : page === "entries" ? count === 1 ? t("1 entry") : t("{count} entries", { count }) : view.summarizing && view.summary ? t("Updating…") : view.summary && view.fresh ? when3 ? t("Updated {time}", { time: when3 }) : t("Updated just now") : ""; -- const busy = answer?.pending === true; -- return (0, import_react17.createElement)( ++ } ++ }; ++ window.addEventListener("mousedown", onDown); ++ window.addEventListener("keydown", onKey, true); ++ return () => { ++ window.removeEventListener("mousedown", onDown); ++ window.removeEventListener("keydown", onKey, true); ++ }; + }, [onClose]); -+ (0, import_react31.useEffect)(() => { ++ (0, import_react35.useEffect)(() => { + if (tab !== "upload") return void 0; + const onPaste = (event) => { + const file = [...event.clipboardData?.files ?? []].find((item) => item.type.startsWith("image/")); @@ -19503,45 +20666,32 @@ diff --git a/client.js b/client.js + }, [tab, bot]); + const hasPhoto = Boolean(look.image); + const glide = useGlide(tab); -+ return (0, import_react31.createElement)( - "div", -- { className: "bt-mem-layer", "data-leaving": leaving || void 0 }, -- (0, import_react17.createElement)("div", { className: "bt-scrim bt-mem-scrim", onMouseDown: close }), -- (0, import_react17.createElement)( ++ return (0, import_react35.createElement)( ++ "div", + { ref, className: "bt-avedit", role: "dialog", "aria-label": t("Avatar editor") }, -+ (0, import_react31.createElement)( - "div", -- { className: "bt-mem", role: "dialog", "aria-modal": true, "aria-label": t("{name}'s memory", { name: bot.name }) }, -- (0, import_react17.createElement)( ++ (0, import_react35.createElement)( ++ "div", + { className: "bt-avedit-top" }, -+ (0, import_react31.createElement)( - "div", -- { className: "bt-mem-head" }, -- page === "entries" ? (0, import_react17.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to the summary"), onClick: backToSummary }, (0, import_react17.createElement)(ChevronLeftIcon)) : null, -- (0, import_react17.createElement)("h2", null, page === "entries" ? t("All entries") : t("Memory summary")), -- (0, import_react17.createElement)("span", { className: "bt-mem-status" }, page === "summary" ? [bot.name, status].filter(Boolean).join(" · ") : status), -- (0, import_react17.createElement)("span", { className: "bt-mem-head-gap" }), -- (0, import_react17.createElement)("button", { ref: dotsRef, type: "button", className: "bt-icon-btn", "aria-label": t("Memory options"), "aria-haspopup": "menu", "aria-expanded": menu, onClick: () => setMenu((value) => !value) }, (0, import_react17.createElement)(DotsIcon)), -- (0, import_react17.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close memory"), onClick: close }, (0, import_react17.createElement)(CloseIcon)), -- menuShown ? (0, import_react17.createElement)( ++ (0, import_react35.createElement)( ++ "div", + { ref: glide.box, role: "tablist", "aria-label": t("Avatar source"), className: "bt-avedit-tabs" }, -+ (0, import_react31.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), -+ [["bot", "Bot"], ["upload", "Upload"]].map(([id, label]) => (0, import_react31.createElement)("button", { key: id, type: "button", role: "tab", className: "bt-avedit-tab", "aria-selected": tab === id, onClick: () => setTab(id) }, t(label))) ++ (0, import_react35.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), ++ [["bot", "Bot"], ["upload", "Upload"]].map(([id, label]) => (0, import_react35.createElement)("button", { key: id, type: "button", role: "tab", className: "bt-avedit-tab", "aria-selected": tab === id, onClick: () => setTab(id) }, t(label))) + ), -+ (0, import_react31.createElement)("button", { ++ (0, import_react35.createElement)("button", { + type: "button", + className: "bt-avedit-tab bt-avedit-reset", + title: t("Reset character to default"), + onClick: () => run(actions.updateBot(bot.id, { avatar: null, color: null })) + }, t("Reset")) + ), -+ tab === "bot" ? (0, import_react31.createElement)(CharacterGrid, { ++ tab === "bot" ? (0, import_react35.createElement)(CharacterGrid, { + look, + hasPhoto, + onShape: (shape) => run(actions.updateBot(bot.id, { avatar: { shape } })), + onColor: (color) => run(actions.updateBot(bot.id, { color })) + }) : null, -+ tab === "upload" ? (0, import_react31.createElement)( ++ tab === "upload" ? (0, import_react35.createElement)( + "div", + { + className: "bt-dropzone", @@ -19557,15 +20707,15 @@ diff --git a/client.js b/client.js + upload(event.dataTransfer.files?.[0]); + } + }, -+ hasPhoto ? (0, import_react31.createElement)("img", { src: look.image, alt: "" }) : null, -+ (0, import_react31.createElement)("div", null, t("Drag, drop, or paste an image")), -+ (0, import_react31.createElement)( ++ hasPhoto ? (0, import_react35.createElement)("img", { src: look.image, alt: "" }) : null, ++ (0, import_react35.createElement)("div", null, t("Drag, drop, or paste an image")), ++ (0, import_react35.createElement)( + "div", + { className: "bt-actions", style: { justifyContent: "center" } }, -+ (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, hasPhoto ? t("Replace") : t("Browse files")), -+ hasPhoto ? (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.updateBot(bot.id, { avatar: hasShape(bot.avatar?.shape) ? { shape: bot.avatar.shape } : null })) }, t("Remove photo")) : null ++ (0, import_react35.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, hasPhoto ? t("Replace") : t("Browse files")), ++ hasPhoto ? (0, import_react35.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.updateBot(bot.id, { avatar: hasShape(bot.avatar?.shape) ? { shape: bot.avatar.shape } : null })) }, t("Remove photo")) : null + ), -+ (0, import_react31.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { ++ (0, import_react35.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { + const file = event.target.files?.[0]; + event.target.value = ""; + upload(file); @@ -19576,80 +20726,67 @@ diff --git a/client.js b/client.js +function MemoryCard({ bot, actions }) { + const { count, failure } = useMemoryCount(bot.id, actions); + const label = memoryCountText({ count, failure }); -+ return (0, import_react31.createElement)( ++ return (0, import_react35.createElement)( + Card, + { title: t("Memory") }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "button", + { type: "button", className: "bt-set-row bt-bs-row", "aria-label": t("Manage {name}'s memory", { name: bot.name }), onClick: () => actions.openMemory(bot.id) }, -+ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, label)), -+ (0, import_react31.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react31.createElement)(ChevronRightIcon)) ++ (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-bs-label" }, label)), ++ (0, import_react35.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react35.createElement)(ChevronRightIcon)) + ) + ); +} +function BotSettingsForm({ bot, roster, actions, run }) { -+ const [editing, setEditing] = (0, import_react31.useState)(false); -+ const [confirming, setConfirming] = (0, import_react31.useState)(false); -+ const closeEditor = (0, import_react31.useCallback)(() => setEditing(false), []); -+ (0, import_react31.useEffect)(() => { ++ const [editing, setEditing] = (0, import_react35.useState)(false); ++ const [confirming, setConfirming] = (0, import_react35.useState)(false); ++ const closeEditor = (0, import_react35.useCallback)(() => setEditing(false), []); ++ (0, import_react35.useEffect)(() => { + if (!confirming) return void 0; + const timer = setTimeout(() => setConfirming(false), 4e3); + return () => clearTimeout(timer); + }, [confirming]); + if (bot.remote) return null; -+ (0, import_react31.useEffect)(() => { ++ (0, import_react35.useEffect)(() => { + void actions.refreshModels?.(); + }, [bot.id]); + const isMainBot = isMainOf(roster, bot.id); + const onlyMain = isMainBot && (roster.mainBotIds ?? []).length === 1; + const isTile = roster.mainBotId === bot.id; + if (lockedWindow(roster)) { -+ return (0, import_react31.createElement)( ++ return (0, import_react35.createElement)( + "div", + { className: "bt-bs" }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "div", + { className: "bt-bs-hero" }, -+ (0, import_react31.createElement)(BotMark, { bot, size: 64, live: false }), -+ (0, import_react31.createElement)( - "div", -- { ref: menuRef, className: "bt-menu bt-mem-menu", role: "menu", "aria-label": t("Memory options"), "data-leaving": menuLeaving || void 0 }, -- (0, import_react17.createElement)( -- "button", -- { type: "button", role: "menuitem", onClick: openEntries }, -- (0, import_react17.createElement)("span", { className: "bt-menu-label" }, t("All entries")), -- (0, import_react17.createElement)("span", { className: "bt-menu-hint" }, String(count)) -- ), -- (0, import_react17.createElement)( -- "button", -- { type: "button", role: "menuitem", disabled: count === 0 || view?.summarizing, onClick: regenerate }, -- (0, import_react17.createElement)("span", { className: "bt-menu-label" }, t("Regenerate summary")) -- ) -- ) : null ++ (0, import_react35.createElement)(BotMark, { bot, size: 64, live: false }), ++ (0, import_react35.createElement)( ++ "div", + { className: "bt-bs-who" }, -+ (0, import_react31.createElement)("span", { className: "bt-bs-name" }, bot.name), -+ (0, import_react31.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) ++ (0, import_react35.createElement)("span", { className: "bt-bs-name" }, bot.name), ++ (0, import_react35.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) + ) + ), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Card, + { title: t("Profile") }, -+ (0, import_react31.createElement)(Row, { label: t("Label"), hint: bot.role || t("Bot") }) ++ (0, import_react35.createElement)(Row, { label: t("Label"), hint: bot.role || t("Bot") }) + ), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Card, + { title: t("Model") }, -+ (0, import_react31.createElement)(Row, { label: t("Model"), hint: modelOf(bot, roster)?.name ?? modelHint(bot, roster) }) ++ (0, import_react35.createElement)(Row, { label: t("Model"), hint: modelOf(bot, roster)?.name ?? modelHint(bot, roster) }) + ), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Card, + { title: t("Working folder") }, -+ (0, import_react31.createElement)(Row, { label: t("Folder"), hint: bot.workDir || t("Not set") }) ++ (0, import_react35.createElement)(Row, { label: t("Folder"), hint: bot.workDir || t("Not set") }) + ), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Card, + { title: t("Instructions") }, -+ (0, import_react31.createElement)(Row, { label: t("What this Bot does"), hint: bot.instructions || t("None"), stack: true }) ++ (0, import_react35.createElement)(Row, { label: t("What this Bot does"), hint: bot.instructions || t("None"), stack: true }) + ) + ); + } @@ -19659,144 +20796,117 @@ diff --git a/client.js b/client.js + if (confirming) void run(actions.deleteBot(bot.id)); + else setConfirming(true); + }; -+ return (0, import_react31.createElement)( ++ return (0, import_react35.createElement)( + "div", + { className: "bt-bs" }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "div", + { className: "bt-bs-hero" }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "div", + { className: "bt-avatar-anchor" }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "button", + { type: "button", className: "bt-avatar-trigger", "aria-label": t("Edit Bot avatar"), "aria-expanded": editing, onClick: () => setEditing((value) => !value) }, -+ (0, import_react31.createElement)(BotMark, { bot, size: 64, live: true }), -+ (0, import_react31.createElement)("span", { className: "bt-avatar-pencil", "aria-hidden": true }, (0, import_react31.createElement)(PencilIcon)) ++ (0, import_react35.createElement)(BotMark, { bot, size: 64, live: true }), ++ (0, import_react35.createElement)("span", { className: "bt-avatar-pencil", "aria-hidden": true }, (0, import_react35.createElement)(PencilIcon)) + ), -+ editing ? (0, import_react31.createElement)(AvatarEditor, { bot, actions, run, onClose: closeEditor }) : null - ), -- (0, import_react17.createElement)( -+ (0, import_react31.createElement)( - "div", -- { className: "bt-mem-body" }, -- error ? (0, import_react17.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, hostText(error)) : null, -- view === null ? error ? null : (0, import_react17.createElement)(Skeleton) : page === "entries" ? (0, import_react17.createElement)(Entries, { bot, view, remove }) : (0, import_react17.createElement)(Summary, { bot, view, regenerate }) ++ editing ? (0, import_react35.createElement)(AvatarEditor, { bot, actions, run, onClose: closeEditor }) : null ++ ), ++ (0, import_react35.createElement)( ++ "div", + { className: "bt-bs-who" }, -+ (0, import_react31.createElement)("span", { className: "bt-bs-name" }, bot.name), -+ (0, import_react31.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) ++ (0, import_react35.createElement)("span", { className: "bt-bs-name" }, bot.name), ++ (0, import_react35.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) + ) + ), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Card, + { title: t("Profile") }, -+ (0, import_react31.createElement)(Row, { label: t("Name") }, (0, import_react31.createElement)(InlineText, { label: t("Name"), value: bot.name, placeholder: "Bob", required: true, maxLength: 40, onSave: (name) => save({ name }) })), -+ (0, import_react31.createElement)(Row, { label: t("Label"), hint: t("Optional. Shown under the name.") }, (0, import_react31.createElement)(InlineText, { label: t("Label"), value: bot.role, placeholder: t("Research, admin…"), maxLength: 24, onSave: (role) => save({ role }) })) ++ (0, import_react35.createElement)(Row, { label: t("Name") }, (0, import_react35.createElement)(InlineText, { label: t("Name"), value: bot.name, placeholder: "Bob", required: true, maxLength: 40, onSave: (name) => save({ name }) })), ++ (0, import_react35.createElement)(Row, { label: t("Label"), hint: t("Optional. Shown under the name.") }, (0, import_react35.createElement)(InlineText, { label: t("Label"), value: bot.role, placeholder: t("Research, admin…"), maxLength: 24, onSave: (role) => save({ role }) })) + ), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Card, + { title: t("Model") }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "div", + { className: "bt-set-row bt-bs-row" }, -+ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-set-hint" }, modelHint(bot, roster))), -+ (0, import_react31.createElement)(ModelMenu, { bot, roster, actions, run }) ++ (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-set-hint" }, modelHint(bot, roster))), ++ (0, import_react35.createElement)(ModelMenu, { bot, roster, actions, run }) + ), -+ bot.model ? (0, import_react31.createElement)(ModelTestRow, { bot, modelName: modelOf(bot, roster)?.name }) : null ++ bot.model ? (0, import_react35.createElement)(ModelTestRow, { bot, modelName: modelOf(bot, roster)?.name }) : null + ), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Card, + { title: t("Working folder") }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "div", + { className: "bt-set-row bt-bs-row" }, -+ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), -+ (0, import_react31.createElement)(FolderMenu, { value: bot.workDir, actions, run, onPick: (workDir) => save({ workDir }) }) ++ (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), ++ (0, import_react35.createElement)(FolderMenu, { value: bot.workDir, actions, run, onPick: (workDir) => save({ workDir }) }) + ) + ), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Card, + { title: t("Instructions") }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Row, + { label: t("What this Bot does"), hint: t("Its job on the team. Part of the Bot's system prompt."), stack: true }, -+ (0, import_react31.createElement)(InlineText, { label: t("Instructions"), value: bot.instructions, multiline: true, placeholder: t("What this Bot is responsible for…"), onSave: (instructions) => save({ instructions }) }) ++ (0, import_react35.createElement)(InlineText, { label: t("Instructions"), value: bot.instructions, multiline: true, placeholder: t("What this Bot is responsible for…"), onSave: (instructions) => save({ instructions }) }) + ) + ), + // Sharing sits near the top with a title like Profile and Model, not at the end of the page (#406). -+ (0, import_react31.createElement)(FlyBotDetails, { bot, roster, actions, wrap: (children) => (0, import_react31.createElement)(Card, { title: t("Sharing") }, children) }), -+ (0, import_react31.createElement)(BotCapabilitiesCard, { bot, roster, actions, run, Card, SwitchRow }), -+ (0, import_react31.createElement)(BotConnectorsCard, { bot, roster, actions, run, Card, SwitchRow }), -+ roster.memory === false ? null : (0, import_react31.createElement)(MemoryCard, { bot, actions }), -+ (0, import_react31.createElement)(BotSchedules, { bot, roster, actions }), -+ (0, import_react31.createElement)(StandingApprovalsCard, { scope: "bot", target: bot, roster, actions, run, Card }), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)(FlyBotDetails, { bot, roster, actions, wrap: (children) => (0, import_react35.createElement)(Card, { title: t("Sharing") }, children) }), ++ (0, import_react35.createElement)(BotCapabilitiesCard, { bot, roster, actions, run, Card, SwitchRow }), ++ (0, import_react35.createElement)(BotConnectorsCard, { bot, roster, actions, run, Card, SwitchRow }), ++ roster.memory === false ? null : (0, import_react35.createElement)(MemoryCard, { bot, actions }), ++ (0, import_react35.createElement)(BotSchedules, { bot, roster, actions }), ++ (0, import_react35.createElement)(StandingApprovalsCard, { scope: "bot", target: bot, roster, actions, run, Card }), ++ (0, import_react35.createElement)( + Card, + { title: t("Main Bot") }, -+ onlyMain ? (0, import_react31.createElement)( ++ onlyMain ? (0, import_react35.createElement)( + "div", + { className: "bt-set-row bt-bs-row" }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "span", + { className: "bt-set-copy" }, -+ (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("The only Main Bot. To hand the role to another Bot, use Main Bot on the Bots page.")) ++ (0, import_react35.createElement)("span", { className: "bt-set-hint" }, t("The only Main Bot. To hand the role to another Bot, use Main Bot on the Bots page.")) + ), -+ (0, import_react31.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.openSettings("bots") }, t("Change")) -+ ) : (0, import_react31.createElement)(SwitchRow, { label: t("Main Bot"), showLabel: false, hint: t("Can create and change Bots, and runs every group chat."), on: isMainBot, onChange: (on) => run(actions.setMain(bot.id, on)) }) ++ (0, import_react35.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.openSettings("bots") }, t("Change")) ++ ) : (0, import_react35.createElement)(SwitchRow, { label: t("Main Bot"), showLabel: false, hint: t("Can create and change Bots, and runs every group chat."), on: isMainBot, onChange: (on) => run(actions.setMain(bot.id, on)) }) + ), + // The Main Bot tile is always first and always shown, like in the context menu. -+ isTile ? null : (0, import_react31.createElement)( ++ isTile ? null : (0, import_react35.createElement)( + Card, + { title: t("Sidebar") }, -+ (0, import_react31.createElement)(SwitchRow, { label: t("Pin"), hint: t("Kept above the other chats."), on: bot.pinned === true, onChange: (pinned) => run(actions.setFlags(bot.id, { pinned })) }), -+ isMainBot ? null : (0, import_react31.createElement)(SwitchRow, { label: t("Hide from sidebar"), hint: t("Search still finds it."), on: bot.hidden === true, onChange: (hidden) => run(actions.setFlags(bot.id, { hidden })) }) ++ (0, import_react35.createElement)(SwitchRow, { label: t("Pin"), hint: t("Kept above the other chats."), on: bot.pinned === true, onChange: (pinned) => run(actions.setFlags(bot.id, { pinned })) }), ++ isMainBot ? null : (0, import_react35.createElement)(SwitchRow, { label: t("Hide from sidebar"), hint: t("Search still finds it."), on: bot.hidden === true, onChange: (hidden) => run(actions.setFlags(bot.id, { hidden })) }) + ), -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + Card, + { title: t("More") }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "button", + { type: "button", className: "bt-set-row bt-bs-row", onClick: duplicate }, -+ (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Duplicate")), (0, import_react31.createElement)("span", { className: "bt-set-hint" }, t("A copy with the same job and model, and fresh memory."))), -+ (0, import_react31.createElement)("span", { className: "bt-chevron" }, (0, import_react31.createElement)(ChevronRightIcon)) - ), -- (0, import_react17.createElement)( -- "div", -- { className: "bt-mem-foot" }, -- answer ? (0, import_react17.createElement)(Reply, { answer, dismiss: () => setAnswer(null) }) : null, -- (0, import_react17.createElement)( -- "form", -- { className: "bt-mem-ask", onSubmit: ask }, -- (0, import_react17.createElement)("input", { -- ref: inputRef, -- className: "bt-mem-input", -- value: text, -- maxLength: 2e3, -- disabled: view === null, -- placeholder: t("Ask or update"), -- "aria-label": t("Ask about or update {name}'s memory", { name: bot.name }), -- onChange: (event) => setText(event.target.value) -- }), -- (0, import_react17.createElement)( -- "button", -- { type: "submit", className: "bt-mem-send", disabled: busy || text.trim() === "", "aria-label": t("Send") }, -- busy ? (0, import_react17.createElement)("span", { className: "bt-mem-spin", "aria-hidden": true }) : (0, import_react17.createElement)(ArrowUpIcon) -- ) -- ) -+ isMainBot ? null : (0, import_react31.createElement)( ++ (0, import_react35.createElement)("span", { className: "bt-set-copy" }, (0, import_react35.createElement)("span", { className: "bt-bs-label" }, t("Duplicate")), (0, import_react35.createElement)("span", { className: "bt-set-hint" }, t("A copy with the same job and model, and fresh memory."))), ++ (0, import_react35.createElement)("span", { className: "bt-chevron" }, (0, import_react35.createElement)(ChevronRightIcon)) ++ ), ++ isMainBot ? null : (0, import_react35.createElement)( + "button", + { type: "button", className: "bt-set-row bt-bs-row bt-bs-danger", "data-confirm": confirming || void 0, onClick: remove }, -+ (0, import_react31.createElement)( ++ (0, import_react35.createElement)( + "span", + { className: "bt-set-copy" }, -+ (0, import_react31.createElement)("span", { className: "bt-bs-label" }, confirming ? t("Delete {name}?", { name: bot.name }) : t("Delete Bot")), -+ (0, import_react31.createElement)("span", { className: "bt-set-hint" }, confirming ? t("Click again to delete. Its chats are archived.") : t("Removes the Bot from the team.")) ++ (0, import_react35.createElement)("span", { className: "bt-bs-label" }, confirming ? t("Delete {name}?", { name: bot.name }) : t("Delete Bot")), ++ (0, import_react35.createElement)("span", { className: "bt-set-hint" }, confirming ? t("Click again to delete. Its chats are archived.") : t("Removes the Bot from the team.")) + ), -+ (0, import_react31.createElement)("span", { className: "bt-chevron" }, (0, import_react31.createElement)(ChevronRightIcon)) - ) - ) - ); - } ++ (0, import_react35.createElement)("span", { className: "bt-chevron" }, (0, import_react35.createElement)(ChevronRightIcon)) ++ ) ++ ) ++ ); ++} +var BOT_SETTINGS_CSS = ` +.bt-bs{display:flex;flex-direction:column;gap:18px} +.bt-bs-hero{display:flex;align-items:center;gap:14px;padding:2px 4px} @@ -19846,28 +20956,26 @@ diff --git a/client.js b/client.js + .bt-bs-input{flex:1 1 100%;width:auto;min-width:0;margin:0;text-align:left} +} +`; - --// src/client/bot-settings.js --var import_react18 = require("react"); --var capitalize = (word) => word[0].toUpperCase() + word.slice(1); --async function avatarImage(file) { -- if (!/^image\/(png|jpeg|webp|gif)$/.test(file.type)) throw new Error(t("Choose a PNG, JPEG, WebP, or GIF image")); -- if (file.size > 25 * 1024 * 1024) throw new Error(t("Choose an image smaller than 25 MB")); -- const bitmap = await createImageBitmap(file); -- const side = 160; -- const canvas = document.createElement("canvas"); -- canvas.width = side; -- canvas.height = side; -- const context = canvas.getContext("2d"); -- context.imageSmoothingQuality = "high"; -- const crop = Math.min(bitmap.width, bitmap.height); -- context.drawImage(bitmap, (bitmap.width - crop) / 2, (bitmap.height - crop) / 2, crop, crop, 0, 0, side, side); -- bitmap.close?.(); -- for (const quality of [0.9, 0.75, 0.6]) { -- const url = canvas.toDataURL("image/webp", quality); -- if (url.startsWith("data:image/webp") && url.length < 15e4) return url; ++ ++// src/shared/group-create.js ++function groupMemberQuery(query) { ++ return String(query ?? "").trim().toLowerCase(); ++} ++function groupMemberMatches(bot, query) { ++ const wanted = groupMemberQuery(query); ++ if (!wanted) return true; ++ if (!bot) return false; ++ const name = String(bot.name ?? "").toLowerCase(); ++ const role = String(bot.role ?? "").toLowerCase(); ++ const label = pickerBotLabel(bot).toLowerCase(); ++ return name.includes(wanted) || role.includes(wanted) || label.includes(wanted); ++} ++function canCreateGroup(admin, members) { ++ return admin != null && admin !== "" && Array.isArray(members) && members.length > 0; ++} ++ +// src/client/group-settings.js -+var import_react32 = require("react"); ++var import_react36 = require("react"); +var ROOM_MODES = [ + ["admin", "Admin leads", "Plain messages go to the admin, who calls others with @Name."], + ["everyone", "Everyone", "Every member answers in turn, admin first."] @@ -19899,44 +21007,9 @@ diff --git a/client.js b/client.js + for (const seat of person?.seats ?? []) { + const bot = faceSeatBot(seat, roster); + if (!bot) continue; -+ marks.push((0, import_react32.createElement)(BotMark, { key: seat.key, bot, size, live: false })); - } -- const png = canvas.toDataURL("image/png"); -- if (png.length < 15e4) return png; -- throw new Error(t("That image is too large")); --} --function InlineText({ label, value, placeholder, required = false, maxLength, multiline = false, onSave }) { -- const [draft, setDraft] = (0, import_react18.useState)(null); -- const reverting = (0, import_react18.useRef)(false); -- const commit = () => { -- const next = draft?.trim(); -- setDraft(null); -- if (reverting.current) { -- reverting.current = false; -- return; -- } -- if (next === void 0 || next === (value ?? "") || required && next === "") return; -- void onSave(next); -- }; -- return (0, import_react18.createElement)(multiline ? "textarea" : "input", { -- className: multiline ? "bt-bs-input bt-bs-area" : "bt-bs-input", -- value: draft ?? value ?? "", -- placeholder, -- maxLength, -- required, -- "aria-label": label, -- spellCheck: false, -- onChange: (event) => setDraft(event.target.value), -- onBlur: commit, -- onKeyDown: (event) => { -- if (event.key === "Escape") { -- event.stopPropagation(); -- reverting.current = true; -- event.currentTarget.blur(); -- } -- if (event.key === "Enter" && !multiline && !event.nativeEvent.isComposing) event.currentTarget.blur(); -- } -+ if (marks.length === 0) return [(0, import_react32.createElement)(PersonMark, { key: "person", size, name: person?.name })]; ++ marks.push((0, import_react36.createElement)(BotMark, { key: seat.key, bot, size, live: false })); ++ } ++ if (marks.length === 0) return [(0, import_react36.createElement)(PersonMark, { key: "person", size, name: person?.name })]; + return marks; +} +function faceRoomCount(room2, roster) { @@ -19950,50 +21023,39 @@ diff --git a/client.js b/client.js +var isLeadSeat = (seat, lead) => Boolean(handleKey(lead) && handleKey(seat.record?.handle) === handleKey(lead)); +function FacePersonRow({ person, onOpenBot, lead, roster, className = "bt-set-row bt-bs-row bt-gs-member", size = 26 }) { + const bots = person.seats.flatMap((seat, index) => { -+ const name = seat.local && onOpenBot ? (0, import_react32.createElement)("button", { key: seat.key, type: "button", className: "bt-face-bot", title: t("Open {name}'s chat", { name: seat.bot }), onClick: () => onOpenBot(seat.local.id) }, seat.bot) : (0, import_react32.createElement)("span", { key: seat.key, className: "bt-face-bot", title: seat.record?.handle || void 0 }, seat.bot); -+ const marked = isLeadSeat(seat, lead) ? [name, (0, import_react32.createElement)("span", { key: `${seat.key}-lead`, className: "bt-tag", "data-flybot": "face-lead-tag" }, t("Lead"))] : [name]; -+ return index === 0 ? marked : [(0, import_react32.createElement)("span", { key: `${seat.key}-sep` }, t(", ")), ...marked]; - }); --} --function Row({ label, hint, stack = false, children }) { -- return (0, import_react18.createElement)( -- "label", -- { className: stack ? "bt-set-row bt-bs-row bt-bs-stack" : "bt-set-row bt-bs-row" }, -- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, label), hint ? (0, import_react18.createElement)("span", { className: "bt-set-hint" }, hint) : null), -- children -- ); --} --function Card({ title, children }) { -- return (0, import_react18.createElement)("section", { className: "bt-set-section" }, title ? (0, import_react18.createElement)("h3", null, title) : null, (0, import_react18.createElement)("div", { className: "bt-set-card" }, children)); --} --function Switch({ on, label, disabled, onChange }) { -- return (0, import_react18.createElement)( -- "button", -- { type: "button", role: "switch", className: "bt-switch", "aria-checked": on, "aria-label": label, disabled, onClick: () => onChange(!on) }, -- (0, import_react18.createElement)("span", { className: "bt-switch-knob", "aria-hidden": true }) -+ return (0, import_react32.createElement)( ++ const name = seat.local && onOpenBot ? (0, import_react36.createElement)("button", { key: seat.key, type: "button", className: "bt-face-bot", title: t("Open {name}'s chat", { name: seat.bot }), onClick: () => onOpenBot(seat.local.id) }, seat.bot) : (0, import_react36.createElement)("span", { key: seat.key, className: "bt-face-bot", title: seat.record?.handle || void 0 }, seat.bot); ++ const marked = isLeadSeat(seat, lead) ? [name, (0, import_react36.createElement)("span", { key: `${seat.key}-lead`, className: "bt-tag", "data-flybot": "face-lead-tag" }, t("Lead"))] : [name]; ++ return index === 0 ? marked : [(0, import_react36.createElement)("span", { key: `${seat.key}-sep` }, t(", ")), ...marked]; ++ }); ++ return (0, import_react36.createElement)( + "div", + { className, role: "listitem", "data-flybot": "face-person", "data-mine": person.mine || void 0 }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "span", + { className: "bt-gs-who bt-face-person" }, -+ (0, import_react32.createElement)("span", { className: "bt-face-marks", "data-flybot": "face-person-avatars" }, faceMarks(person, roster, size)), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)("span", { className: "bt-face-marks", "data-flybot": "face-person-avatars" }, faceMarks(person, roster, size)), ++ (0, import_react36.createElement)( + "span", + { className: "bt-face-person-text" }, -+ (0, import_react32.createElement)("span", { className: "bt-row-title" }, facePersonLabel(person)), -+ (0, import_react32.createElement)("span", { className: "bt-face-bots" }, bots) ++ (0, import_react36.createElement)("span", { className: "bt-row-title" }, facePersonLabel(person)), ++ (0, import_react36.createElement)("span", { className: "bt-face-bots" }, bots) + ) + ) ); } --function SwitchRow({ label, hint, on, disabled, onChange }) { -- return (0, import_react18.createElement)( +-function AvatarEditor({ bot, actions, run, onClose }) { +- const look = lookOf(bot); +- const [tab, setTab] = (0, import_react18.useState)(look.image ? "upload" : "bot"); +- const [over, setOver] = (0, import_react18.useState)(false); +- const ref = (0, import_react18.useRef)(null); +- const fileRef = (0, import_react18.useRef)(null); +- const upload = (file) => { +- if (file) void run(avatarImage(file).then((image) => actions.updateBot(bot.id, { avatar: { ...bot.avatar ?? {}, image } }))); +function FaceLead({ room: room2, roster, pick: pick2 }) { + const lead = room2.face?.lead; -+ const [open, setOpen] = (0, import_react32.useState)(false); -+ const [busy, setBusy] = (0, import_react32.useState)(false); -+ const [error, setError] = (0, import_react32.useState)(""); ++ const [open, setOpen] = (0, import_react36.useState)(false); ++ const [busy, setBusy] = (0, import_react36.useState)(false); ++ const [error, setError] = (0, import_react36.useState)(""); + const seats = faceSeats(room2, roster); + const current = seats.find((seat) => isLeadSeat(seat, lead?.handle)); + if (!current) return null; @@ -20010,95 +21072,158 @@ diff --git a/client.js b/client.js + } finally { + setBusy(false); + } -+ }; -+ return (0, import_react32.createElement)( + }; +- (0, import_react18.useEffect)(() => { +- const onDown = (event) => { +- if (!(event.target instanceof Element) || ref.current?.contains(event.target) || event.target.closest(".bt-avatar-trigger")) return; +- onClose(); +- }; +- const onKey = (event) => { +- if (event.key === "Escape") { +- event.stopPropagation(); +- onClose(); +- } +- }; +- window.addEventListener("mousedown", onDown); +- window.addEventListener("keydown", onKey, true); +- return () => { +- window.removeEventListener("mousedown", onDown); +- window.removeEventListener("keydown", onKey, true); +- }; +- }, [onClose]); +- (0, import_react18.useEffect)(() => { +- if (tab !== "upload") return void 0; +- const onPaste = (event) => { +- const file = [...event.clipboardData?.files ?? []].find((item) => item.type.startsWith("image/")); +- if (file) { +- event.preventDefault(); +- upload(file); +- } +- }; +- window.addEventListener("paste", onPaste); +- return () => window.removeEventListener("paste", onPaste); +- }, [tab, bot]); +- const hasPhoto = Boolean(look.image); +- const glide = useGlide(tab); +- return (0, import_react18.createElement)( ++ return (0, import_react36.createElement)( "div", -- { className: "bt-set-row bt-bs-row" }, -- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, label), hint ? (0, import_react18.createElement)("span", { className: "bt-set-hint" }, hint) : null), -- (0, import_react18.createElement)(Switch, { on, label, disabled, onChange }) +- { ref, className: "bt-avedit", role: "dialog", "aria-label": t("Avatar editor") }, +- (0, import_react18.createElement)( + { className: "bt-face-lead", "data-flybot": "face-lead" }, -+ (0, import_react32.createElement)("div", { className: "bt-section-title" }, t("Room lead")), -+ (0, import_react32.createElement)( -+ "div", ++ (0, import_react36.createElement)("div", { className: "bt-section-title" }, t("Room lead")), ++ (0, import_react36.createElement)( + "div", +- { className: "bt-avedit-top" }, +- (0, import_react18.createElement)( +- "div", +- { ref: glide.box, role: "tablist", "aria-label": t("Avatar source"), className: "bt-avedit-tabs" }, +- (0, import_react18.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), +- [["bot", "Bot"], ["upload", "Upload"]].map(([id, label]) => (0, import_react18.createElement)("button", { key: id, type: "button", role: "tab", className: "bt-avedit-tab", "aria-selected": tab === id, onClick: () => setTab(id) }, t(label))) + { className: "bt-set-row" }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "span", + { className: "bt-set-copy" }, -+ (0, import_react32.createElement)("span", { className: "bt-row-title" }, faceSeatLabel(current)), -+ (0, import_react32.createElement)("span", { className: "bt-set-hint" }, lead.picked ? t("Writes the plan and gives each Bot its part.") : t("Default: the first Bot of the room creator that joined.")) -+ ), -+ canPick ? (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", "aria-expanded": open, onClick: () => setOpen(!open) }, open ? t("Done") : t("Change")) : null -+ ), -+ open && canPick ? seats.map((seat) => (0, import_react32.createElement)( -+ "div", ++ (0, import_react36.createElement)("span", { className: "bt-row-title" }, faceSeatLabel(current)), ++ (0, import_react36.createElement)("span", { className: "bt-set-hint" }, lead.picked ? t("Writes the plan and gives each Bot its part.") : t("Default: the first Bot of the room creator that joined.")) + ), +- (0, import_react18.createElement)("button", { +- type: "button", +- className: "bt-avedit-tab bt-avedit-reset", +- title: t("Reset character to default"), +- onClick: () => run(actions.updateBot(bot.id, { avatar: null, color: null })) +- }, t("Reset")) ++ canPick ? (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", "aria-expanded": open, onClick: () => setOpen(!open) }, open ? t("Done") : t("Change")) : null + ), +- tab === "bot" ? (0, import_react18.createElement)(CharacterGrid, { +- look, +- hasPhoto, +- onShape: (shape) => run(actions.updateBot(bot.id, { avatar: { shape } })), +- onColor: (color) => run(actions.updateBot(bot.id, { color })) +- }) : null, +- tab === "upload" ? (0, import_react18.createElement)( ++ open && canPick ? seats.map((seat) => (0, import_react36.createElement)( + "div", +- { +- className: "bt-dropzone", +- "data-over": over || void 0, +- onDragOver: (event) => { +- event.preventDefault(); +- setOver(true); +- }, +- onDragLeave: () => setOver(false), +- onDrop: (event) => { +- event.preventDefault(); +- setOver(false); +- upload(event.dataTransfer.files?.[0]); +- } +- }, +- hasPhoto ? (0, import_react18.createElement)("img", { src: look.image, alt: "" }) : null, +- (0, import_react18.createElement)("div", null, t("Drag, drop, or paste an image")), +- (0, import_react18.createElement)( +- "div", +- { className: "bt-actions", style: { justifyContent: "center" } }, +- (0, import_react18.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, hasPhoto ? t("Replace") : t("Browse files")), +- hasPhoto ? (0, import_react18.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.updateBot(bot.id, { avatar: hasShape(bot.avatar?.shape) ? { shape: bot.avatar.shape } : null })) }, t("Remove photo")) : null +- ), +- (0, import_react18.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { +- const file = event.target.files?.[0]; +- event.target.value = ""; +- upload(file); +- } }) +- ) : null + { key: seat.key, className: "bt-set-row" }, -+ (0, import_react32.createElement)("span", { className: "bt-set-copy" }, faceSeatLabel(seat)), -+ seat === current ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Lead")) : (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", disabled: busy, onClick: () => void choose(seat.record?.handle) }, t("Make lead")) ++ (0, import_react36.createElement)("span", { className: "bt-set-copy" }, faceSeatLabel(seat)), ++ seat === current ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Lead")) : (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", disabled: busy, onClick: () => void choose(seat.record?.handle) }, t("Make lead")) + )) : null, -+ open && canPick && lead.picked ? (0, import_react32.createElement)("button", { type: "button", className: "bt-more", disabled: busy, onClick: () => void choose(null) }, t("Use the default lead")) : null, -+ canPick || locked || !lead.supported ? null : (0, import_react32.createElement)("div", { className: "bt-set-hint" }, t("Only the person who created this room can change it.")), -+ error ? (0, import_react32.createElement)("div", { className: "bt-set-hint", role: "alert" }, error) : null ++ open && canPick && lead.picked ? (0, import_react36.createElement)("button", { type: "button", className: "bt-more", disabled: busy, onClick: () => void choose(null) }, t("Use the default lead")) : null, ++ canPick || locked || !lead.supported ? null : (0, import_react36.createElement)("div", { className: "bt-set-hint" }, t("Only the person who created this room can change it.")), ++ error ? (0, import_react36.createElement)("div", { className: "bt-set-hint", role: "alert" }, error) : null ); } --function modelHint(bot, roster) { -- const shown = modelOf(bot, roster); -- if (shown === void 0) return t("Pick the model this Bot runs on."); -- if (!shown.served && (roster.models ?? []).length > 0) return t("This model is not available now. Pick another one."); -- if (bot.appliedModel && bot.appliedModel === bot.model) return t("Every message of this Bot runs on it."); -- return t("Applies from the next message."); +-function MemoryCard({ bot, actions }) { +- const count = useMemoryCount(bot.id, actions); +- const label = count === null ? t("Loading…") : count === 0 ? t("Nothing saved yet") : count === 1 ? t("1 entry") : t("{count} entries", { count }); +- return (0, import_react18.createElement)( +- Card, +- { title: t("Memory") }, +- (0, import_react18.createElement)( +- "button", +- { type: "button", className: "bt-set-row bt-bs-row", "aria-label": t("Manage {name}'s memory", { name: bot.name }), onClick: () => actions.openMemory(bot.id) }, +- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, label)), +- (0, import_react18.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react18.createElement)(ChevronRightIcon)) +- ) +- ); +function seatedCount(room2) { + const live = room2?.presentedParticipants ?? room2?.participants ?? []; + const humans = live.filter((p) => p.kind === "human" && p.leftSeq === void 0).length; + const remotes = live.filter((p) => p.remote && p.leftSeq === void 0).length; + return humans + remotes + (room2?.members?.length ?? 0); } --function ShapeRing({ shape, size }) { -- const maskId = (0, import_react18.useRef)(""); -- if (maskId.current === "") maskId.current = `bt-ring-${nextMarkSerial()}`; -- const def = shapeOf(shape); -- const unit = def.size / size; -- const markup = `${holes(def, `${bodyOf(def, "#000", true)}`)}${bodyOf(def, "currentColor", true)}`; -- return (0, import_react18.createElement)("svg", { className: "bt-ring", viewBox: `0 0 ${def.size} ${def.size}`, "aria-hidden": true, dangerouslySetInnerHTML: { __html: markup } }); +-function BotSettingsForm({ bot, roster, actions, run }) { +- const [editing, setEditing] = (0, import_react18.useState)(false); +- const [confirming, setConfirming] = (0, import_react18.useState)(false); +- const closeEditor = (0, import_react18.useCallback)(() => setEditing(false), []); +- (0, import_react18.useEffect)(() => { +function roomSubtitle(room2, roster) { + if (room2.origin === "face-to-face") return faceRoomCount(room2, roster); + const admin = roster.byId[room2.admin]; + const count = seatedCount(room2); + return [t(count === 1 ? "{count} member" : "{count} members", { count }), admin ? t("Admin {name}", { name: admin.name }) : t("No admin")].join(" · "); - } --function CharacterGrid({ look, hasPhoto = false, onShape, onColor }) { -- const shapes = [...PICKER_SHAPES, ...Object.keys(SHAPES).filter((id) => !Object.hasOwn(CHARACTERS, id))]; -- if (!shapes.includes(look.shape)) shapes.push(look.shape); -- const rows = []; -- for (let index = 0; index < shapes.length; index += PICKER_COLUMNS) rows.push(shapes.slice(index, index + PICKER_COLUMNS)); -- return (0, import_react18.createElement)( -- import_react18.Fragment, -- null, -- (0, import_react18.createElement)("div", { className: "bt-shapes", role: "group", "aria-label": t("Character shape") }, rows.map((row, index) => (0, import_react18.createElement)("div", { key: index, className: "bt-shape-row" }, row.map((id) => (0, import_react18.createElement)("button", { -- key: id, -- type: "button", -- className: "bt-shape", -- "aria-label": t(shapeOf(id).label), -- title: t(shapeOf(id).label), -- "aria-pressed": !hasPhoto && look.shape === id, -- onClick: () => onShape(id) -- }, (0, import_react18.createElement)(ShapeRing, { shape: id, size: 36 }), (0, import_react18.createElement)(BotMark, { look: { shape: id, color: look.color }, size: 36 })))))), -- (0, import_react18.createElement)("div", { className: "bt-colors", role: "group", "aria-label": t("Character color") }, CHARACTER_COLORS.map((color) => (0, import_react18.createElement)("button", { -- key: color, -- type: "button", -- className: "bt-color", -- "aria-label": t(capitalize(color)), -- title: t(capitalize(color)), -- "aria-pressed": look.color === color, -- onClick: () => onColor(color) -- }, (0, import_react18.createElement)("span", { style: { background: paintCss(color) } })))) ++} +function GroupSettingsForm({ room: room2, roster, actions, run, onDeleted }) { -+ const [adding, setAdding] = (0, import_react32.useState)(false); -+ const [confirming, setConfirming] = (0, import_react32.useState)(false); -+ (0, import_react32.useEffect)(() => { -+ if (!confirming) return void 0; -+ const timer = setTimeout(() => setConfirming(false), 4e3); -+ return () => clearTimeout(timer); -+ }, [confirming]); ++ const [adding, setAdding] = (0, import_react36.useState)(false); ++ const [confirming, setConfirming] = (0, import_react36.useState)(false); ++ (0, import_react36.useEffect)(() => { + if (!confirming) return void 0; + const timer = setTimeout(() => setConfirming(false), 4e3); + return () => clearTimeout(timer); + }, [confirming]); +- const isMainBot = isMainOf(roster, bot.id); +- const onlyMain = isMainBot && (roster.mainBotIds ?? []).length === 1; +- const isTile = roster.mainBotId === bot.id; +- const save = (patch) => run(actions.updateBot(bot.id, patch)); +- const duplicate = () => run(actions.duplicateBot(bot.id).then((copy2) => actions.openSession(copy2.id))); + const live = room2.presentedParticipants ?? room2.participants ?? []; + const humans = live.filter((p) => p.kind === "human" && p.leftSeq === void 0); + const remotes = live.filter((p) => p.remote && p.leftSeq === void 0); @@ -20120,39 +21245,39 @@ diff --git a/client.js b/client.js + const modeHint = ROOM_MODES.find(([id]) => id === mode)?.[2] ?? ""; + const modeLabel = ROOM_MODES.find(([id]) => id === mode)?.[1] ?? "Everyone"; + if (lockedWindow(roster)) { -+ return (0, import_react32.createElement)( ++ return (0, import_react36.createElement)( + "div", + { className: "bt-bs" }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "div", + { className: "bt-bs-hero" }, -+ (0, import_react32.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), ++ (0, import_react36.createElement)( + "div", + { className: "bt-bs-who" }, -+ (0, import_react32.createElement)("span", { className: "bt-bs-name" }, room2.name), -+ (0, import_react32.createElement)("span", { className: "bt-bs-sub" }, roomSubtitle(room2, roster)) ++ (0, import_react36.createElement)("span", { className: "bt-bs-name" }, room2.name), ++ (0, import_react36.createElement)("span", { className: "bt-bs-sub" }, roomSubtitle(room2, roster)) + ) + ), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + Card, + { title: t("Members · {count}", { count: face ? people2.length : members.length + humans.length + remotes.length }) }, -+ face ? people2.map((person) => (0, import_react32.createElement)(FacePersonRow, { key: person.key, person, roster, lead: room2.face?.lead?.handle })) : [ ++ face ? people2.map((person) => (0, import_react36.createElement)(FacePersonRow, { key: person.key, person, roster, lead: room2.face?.lead?.handle })) : [ + // The stored name, cleaned by the same reader the friend's-Bot rows use (#2474). -+ humans.map((person) => (0, import_react32.createElement)(Row, { key: person.id, label: remoteBotName(person, person.id), hint: t("Human") })), -+ members.map((member) => (0, import_react32.createElement)(Row, { ++ humans.map((person) => (0, import_react36.createElement)(Row, { key: person.id, label: remoteBotName(person, person.id), hint: t("Human") })), ++ members.map((member) => (0, import_react36.createElement)(Row, { + key: member.id, + label: member.name, + hint: [room2.admin === member.id ? t("Admin") : "", room2.taskLead === member.id ? t("Task lead") : ""].filter(Boolean).join(" · ") || t("Bot") + })), -+ remotes.map((person) => (0, import_react32.createElement)(Row, { key: person.handle || person.id, label: person.label || remoteBotTitle(person), hint: t("Friend's Bot") })) ++ remotes.map((person) => (0, import_react36.createElement)(Row, { key: person.handle || person.id, label: person.label || remoteBotTitle(person), hint: t("Friend's Bot") })) + ] + ), + // Both facts are reads (`shownMode` and `room.workDir`), so a locked page keeps them as + // text for every group, the way a face-to-face room already did (#2492). -+ (0, import_react32.createElement)(Card, { title: t("Who answers") }, (0, import_react32.createElement)(Row, { label: t(modeLabel), hint: t(modeHint) })), -+ (0, import_react32.createElement)(Card, { title: t("Working folder") }, (0, import_react32.createElement)(Row, { label: t("Folder"), hint: room2.workDir || t("Not set") })), -+ room2.notice ? (0, import_react32.createElement)(Card, { title: t("Notice") }, (0, import_react32.createElement)(Row, { label: t("Group notice"), hint: room2.notice, stack: true })) : null ++ (0, import_react36.createElement)(Card, { title: t("Who answers") }, (0, import_react36.createElement)(Row, { label: t(modeLabel), hint: t(modeHint) })), ++ (0, import_react36.createElement)(Card, { title: t("Working folder") }, (0, import_react36.createElement)(Row, { label: t("Folder"), hint: room2.workDir || t("Not set") })), ++ room2.notice ? (0, import_react36.createElement)(Card, { title: t("Notice") }, (0, import_react36.createElement)(Row, { label: t("Group notice"), hint: room2.notice, stack: true })) : null + ); + } + const update = (patch) => run(actions.updateRoom(room2.id, patch)); @@ -20160,7 +21285,9 @@ diff --git a/client.js b/client.js + actions.closeSettings(); + actions.openSession(id); + }; -+ const remove = () => { + const remove = () => { +- if (confirming) void run(actions.deleteBot(bot.id)); +- else setConfirming(true); + if (!confirming) { + setConfirming(true); + return; @@ -20169,41 +21296,41 @@ diff --git a/client.js b/client.js + if (done) onDeleted?.(); + }); + }; -+ return (0, import_react32.createElement)( ++ return (0, import_react36.createElement)( + "div", + { className: "bt-bs" }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "div", + { className: "bt-bs-hero" }, -+ (0, import_react32.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), ++ (0, import_react36.createElement)( + "div", + { className: "bt-bs-who" }, -+ (0, import_react32.createElement)("span", { className: "bt-bs-name" }, room2.name), -+ (0, import_react32.createElement)("span", { className: "bt-bs-sub" }, roomSubtitle(room2, roster)) ++ (0, import_react36.createElement)("span", { className: "bt-bs-name" }, room2.name), ++ (0, import_react36.createElement)("span", { className: "bt-bs-sub" }, roomSubtitle(room2, roster)) + ) + ), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + Card, + { title: t("Profile") }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + Row, + { label: t("Name"), hint: t("Leave it empty to name the group after its members.") }, -+ (0, import_react32.createElement)(InlineText, { label: t("Group name"), value: room2.named ? room2.name : "", placeholder: t("Name after members"), maxLength: 60, onSave: (name) => update({ name }) }) ++ (0, import_react36.createElement)(InlineText, { label: t("Group name"), value: room2.named ? room2.name : "", placeholder: t("Name after members"), maxLength: 60, onSave: (name) => update({ name }) }) + ), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + Row, + { label: t("Notice"), hint: t("Every member reads it before speaking in this group."), stack: true }, -+ (0, import_react32.createElement)(InlineText, { label: t("Group notice"), value: room2.notice, multiline: true, maxLength: 2e3, placeholder: t("Shared instructions every member reads before speaking…"), onSave: (notice) => update({ notice }) }) ++ (0, import_react36.createElement)(InlineText, { label: t("Group notice"), value: room2.notice, multiline: true, maxLength: 2e3, placeholder: t("Shared instructions every member reads before speaking…"), onSave: (notice) => update({ notice }) }) + ) + ), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + Card, + { title: t("Who answers") }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "div", + { className: "bt-set-row bt-bs-row bt-bs-stack" }, -+ (0, import_react32.createElement)(Segmented, { label: t("Who answers"), value: mode }, ROOM_MODES.map(([id, label]) => (0, import_react32.createElement)("button", { ++ (0, import_react36.createElement)(Segmented, { label: t("Who answers"), value: mode }, ROOM_MODES.map(([id, label]) => (0, import_react36.createElement)("button", { + key: id, + type: "button", + "aria-pressed": mode === id, @@ -20213,108 +21340,108 @@ diff --git a/client.js b/client.js + if (mode !== id) void update({ mode: id }); + } + }, t(label)))), -+ (0, import_react32.createElement)("span", { key: mode, className: "bt-set-hint bt-veil" }, `${t(modeHint)} ${t("@mentions always pick who answers.")}`) ++ (0, import_react36.createElement)("span", { key: mode, className: "bt-set-hint bt-veil" }, `${t(modeHint)} ${t("@mentions always pick who answers.")}`) + ) + ), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + Card, + { title: t("Working folder") }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "div", + { className: "bt-set-row bt-bs-row" }, -+ (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), -+ (0, import_react32.createElement)(FolderMenu, { value: room2.workDir, group: true, actions, run, onPick: (workDir) => update({ workDir }) }) ++ (0, import_react36.createElement)("span", { className: "bt-set-copy" }, (0, import_react36.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), ++ (0, import_react36.createElement)(FolderMenu, { value: room2.workDir, group: true, actions, run, onPick: (workDir) => update({ workDir }) }) + ) + ), -+ face ? (0, import_react32.createElement)( ++ face ? (0, import_react36.createElement)( + Card, + { title: t("Members · {count}", { count: people2.length }) }, -+ people2.map((person) => (0, import_react32.createElement)(FacePersonRow, { key: person.key, person, roster, onOpenBot: openBot, lead: room2.face?.lead?.handle })) ++ people2.map((person) => (0, import_react36.createElement)(FacePersonRow, { key: person.key, person, roster, onOpenBot: openBot, lead: room2.face?.lead?.handle })) + ) : null, -+ face ? null : (0, import_react32.createElement)( ++ face ? null : (0, import_react36.createElement)( + Card, + { title: t("Members · {count}", { count: members.length + humans.length + remotes.length }) }, -+ humans.map((person) => (0, import_react32.createElement)( ++ humans.map((person) => (0, import_react36.createElement)( + "div", + { key: person.id, className: "bt-set-row bt-bs-row bt-gs-member" }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "span", + { className: "bt-gs-who" }, -+ (0, import_react32.createElement)("span", { className: "bt-row-title" }, person.displayName || person.id), -+ (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Human")), -+ person.role === "admin" ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Admin")) : null ++ (0, import_react36.createElement)("span", { className: "bt-row-title" }, person.displayName || person.id), ++ (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Human")), ++ person.role === "admin" ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Admin")) : null + ), -+ humans.length + members.length + remotes.length > 2 && person.id !== roster.self?.memberId ? (0, import_react32.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: person.displayName || person.id }), title: t("Remove from group"), onClick: () => update({ removeParticipants: [{ kind: "human", id: person.id }] }) }, "×") : null ++ humans.length + members.length + remotes.length > 2 && person.id !== roster.self?.memberId ? (0, import_react36.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: person.displayName || person.id }), title: t("Remove from group"), onClick: () => update({ removeParticipants: [{ kind: "human", id: person.id }] }) }, "×") : null + )), + members.map((member) => { + const leads = room2.admin === member.id; + const boardHere = room2.origin !== "face-to-face" && room2.origin !== "inbound-share"; + const taskLead = room2.taskLead === member.id; -+ return (0, import_react32.createElement)( ++ return (0, import_react36.createElement)( + "div", + { key: member.id, className: "bt-set-row bt-bs-row bt-gs-member" }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "button", + { type: "button", className: "bt-gs-who", title: t("Open {name}'s chat", { name: member.name }), onClick: () => openBot(member.id) }, -+ (0, import_react32.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: leads, live: false }), -+ (0, import_react32.createElement)("span", { className: "bt-row-title" }, member.name), -+ leads ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Admin")) : null, -+ taskLead ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Task lead")) : null, -+ (roster.humans ?? []).some((person) => person.designatedChiefId === member.id) ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Chief")) : null ++ (0, import_react36.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: leads, live: false }), ++ (0, import_react36.createElement)("span", { className: "bt-row-title" }, member.name), ++ leads ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Admin")) : null, ++ taskLead ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Task lead")) : null, ++ (roster.humans ?? []).some((person) => person.designatedChiefId === member.id) ? (0, import_react36.createElement)("span", { className: "bt-tag" }, t("Chief")) : null + ), -+ leads ? (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", title: t("Leave the group without an admin"), onClick: () => update({ admin: null }) }, t("Unset")) : (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ admin: member.id }) }, t("Make admin")), -+ boardHere ? taskLead ? (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ taskLead: null }) }, t("Use the admin")) : (0, import_react32.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ taskLead: member.id }) }, t("Make task lead")) : null, -+ members.length > 2 ? (0, import_react32.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: member.name }), title: t("Remove from group"), onClick: () => update({ remove: [member.id] }) }, "×") : null ++ leads ? (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", title: t("Leave the group without an admin"), onClick: () => update({ admin: null }) }, t("Unset")) : (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ admin: member.id }) }, t("Make admin")), ++ boardHere ? taskLead ? (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ taskLead: null }) }, t("Use the admin")) : (0, import_react36.createElement)("button", { type: "button", className: "bt-mini", onClick: () => update({ taskLead: member.id }) }, t("Make task lead")) : null, ++ members.length > 2 ? (0, import_react36.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: member.name }), title: t("Remove from group"), onClick: () => update({ remove: [member.id] }) }, "×") : null + ); + }), -+ remotes.map((person) => (0, import_react32.createElement)( ++ remotes.map((person) => (0, import_react36.createElement)( + "div", + { key: person.handle || person.id, className: "bt-set-row bt-bs-row bt-gs-member" }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "span", + { className: "bt-gs-who" }, -+ (0, import_react32.createElement)(BotAvatar, { bot: lookBotForRemote(person, roster), size: 26, badge: false, live: false }), -+ (0, import_react32.createElement)("span", { className: "bt-row-title", title: person.handle || void 0 }, person.label || remoteBotTitle(person)), ++ (0, import_react36.createElement)(BotAvatar, { bot: lookBotForRemote(person, roster), size: 26, badge: false, live: false }), ++ (0, import_react36.createElement)("span", { className: "bt-row-title", title: person.handle || void 0 }, person.label || remoteBotTitle(person)), + // #904: a host's roster entry is not a friend's Bot, and one this home cannot confirm is + // labelled as such; a Bot with no Bot Social identity can never be written to at all. -+ room2.origin === "face-to-face" ? null : (0, import_react32.createElement)("span", { className: "bt-tag" }, person.unconnected ? t("Not connected") : room2.origin === "inbound-share" && person.verified === false ? t("Unconfirmed") : t("Friend's Bot")) ++ room2.origin === "face-to-face" ? null : (0, import_react36.createElement)("span", { className: "bt-tag" }, person.unconnected ? t("Not connected") : room2.origin === "inbound-share" && person.verified === false ? t("Unconfirmed") : t("Friend's Bot")) + ), + // A guest's mirror is not theirs to edit: the host's membership is changed on the host side. -+ room2.origin === "face-to-face" || room2.origin === "inbound-share" || members.length + remotes.length <= 2 ? null : (0, import_react32.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: remoteBotTitle(person) }), title: t("Remove from group"), onClick: () => update({ removeParticipants: [{ kind: "bot", id: person.handle || person.id, remote: true }] }) }, "×") ++ room2.origin === "face-to-face" || room2.origin === "inbound-share" || members.length + remotes.length <= 2 ? null : (0, import_react36.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Remove {name} from the group", { name: remoteBotTitle(person) }), title: t("Remove from group"), onClick: () => update({ removeParticipants: [{ kind: "bot", id: person.handle || person.id, remote: true }] }) }, "×") + )), + room2.origin === "face-to-face" ? null : adding ? [ -+ ...outsidePeople.map((person) => (0, import_react32.createElement)( ++ ...outsidePeople.map((person) => (0, import_react36.createElement)( + "button", + { key: person.id, type: "button", className: "bt-set-row bt-bs-row bt-gs-pick", onClick: () => { + setAdding(false); + void update({ addParticipants: [{ kind: "human", id: person.id, displayName: person.displayName }] }); + } }, -+ (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, person.displayName || person.id)), -+ (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("Add person")) ++ (0, import_react36.createElement)("span", { className: "bt-set-copy" }, (0, import_react36.createElement)("span", { className: "bt-bs-label" }, person.displayName || person.id)), ++ (0, import_react36.createElement)("span", { className: "bt-set-hint" }, t("Add person")) + )), -+ ...outside.map((bot) => (0, import_react32.createElement)( ++ ...outside.map((bot) => (0, import_react36.createElement)( + "button", + { key: bot.id, type: "button", className: "bt-set-row bt-bs-row bt-gs-pick", onClick: () => { + setAdding(false); + void update({ add: [bot.id] }); + } }, -+ (0, import_react32.createElement)(BotMark, { bot, size: 22 }), -+ (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, bot.name)), -+ (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("Add")) ++ (0, import_react36.createElement)(BotMark, { bot, size: 22 }), ++ (0, import_react36.createElement)("span", { className: "bt-set-copy" }, (0, import_react36.createElement)("span", { className: "bt-bs-label" }, bot.name)), ++ (0, import_react36.createElement)("span", { className: "bt-set-hint" }, t("Add")) + )), -+ ...outsideRemotes.map((bot) => (0, import_react32.createElement)( ++ ...outsideRemotes.map((bot) => (0, import_react36.createElement)( + "button", + { key: bot.handle, type: "button", className: "bt-set-row bt-bs-row bt-gs-pick", onClick: () => { + setAdding(false); + void update({ addParticipants: [{ kind: "bot", remote: true, handle: bot.handle }] }); + } }, -+ (0, import_react32.createElement)(BotAvatar, { bot: lookBotForRemote({ handle: bot.handle, displayName: bot.name, avatar: bot.avatar, color: bot.color }, roster), size: 22, badge: false, live: false }), -+ (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, remoteBotTitle({ displayName: bot.name, ownerName: bot.homeName || bot.owner, handle: bot.handle, isChief: bot.isChief }))), -+ (0, import_react32.createElement)("span", { className: "bt-set-hint" }, t("Add friend's Bot")) ++ (0, import_react36.createElement)(BotAvatar, { bot: lookBotForRemote({ handle: bot.handle, displayName: bot.name, avatar: bot.avatar, color: bot.color }, roster), size: 22, badge: false, live: false }), ++ (0, import_react36.createElement)("span", { className: "bt-set-copy" }, (0, import_react36.createElement)("span", { className: "bt-bs-label" }, remoteBotTitle({ displayName: bot.name, ownerName: bot.homeName || bot.owner, handle: bot.handle, isChief: bot.isChief }))), ++ (0, import_react36.createElement)("span", { className: "bt-set-hint" }, t("Add friend's Bot")) + )), -+ (0, import_react32.createElement)("button", { key: "cancel", type: "button", className: "bt-set-row bt-bs-row bt-gs-add", onClick: () => setAdding(false) }, t("Cancel")) -+ ] : outside.length + outsidePeople.length + outsideRemotes.length > 0 ? (0, import_react32.createElement)("button", { type: "button", className: "bt-set-row bt-bs-row bt-gs-add", onClick: () => setAdding(true) }, (0, import_react32.createElement)(PlusIcon), t("Add member")) : null, -+ (0, import_react32.createElement)("div", { className: "bt-set-row bt-gs-note" }, (0, import_react32.createElement)( ++ (0, import_react36.createElement)("button", { key: "cancel", type: "button", className: "bt-set-row bt-bs-row bt-gs-add", onClick: () => setAdding(false) }, t("Cancel")) ++ ] : outside.length + outsidePeople.length + outsideRemotes.length > 0 ? (0, import_react36.createElement)("button", { type: "button", className: "bt-set-row bt-bs-row bt-gs-add", onClick: () => setAdding(true) }, (0, import_react36.createElement)(PlusIcon), t("Add member")) : null, ++ (0, import_react36.createElement)("div", { className: "bt-set-row bt-gs-note" }, (0, import_react36.createElement)( + "span", + { className: "bt-set-hint" }, + // The host's two-Bot floor guards membership changes; this hint warns before one. @@ -20322,220 +21449,245 @@ diff --git a/client.js b/client.js + )), + // #876: a plugin's rows for this room (Invite by link), only in a group that lives here. Last, after + // the note on who leads, so that note stays with the members it is about (#892). -+ room2.origin === "face-to-face" || room2.origin === "inbound-share" ? null : (0, import_react32.createElement)(FlyBotRoomMembers, { room: room2, roster, actions }) ++ room2.origin === "face-to-face" || room2.origin === "inbound-share" ? null : (0, import_react36.createElement)(FlyBotRoomMembers, { room: room2, roster, actions }) + ), -+ (0, import_react32.createElement)(StandingApprovalsCard, { scope: "room", target: room2, roster, actions, run, Card }), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)(StandingApprovalsCard, { scope: "room", target: room2, roster, actions, run, Card }), ++ (0, import_react36.createElement)( + Card, + { title: t("Sidebar") }, -+ (0, import_react32.createElement)(SwitchRow, { label: t("Pin"), hint: t("Kept above the other chats."), on: room2.pinned === true, onChange: (pinned) => run(actions.setFlags(room2.id, { pinned })) }), -+ (0, import_react32.createElement)(SwitchRow, { label: t("Hide from sidebar"), hint: t("Search still finds it."), on: room2.hidden === true, onChange: (hidden) => run(actions.setFlags(room2.id, { hidden })) }) ++ (0, import_react36.createElement)(SwitchRow, { label: t("Pin"), hint: t("Kept above the other chats."), on: room2.pinned === true, onChange: (pinned) => run(actions.setFlags(room2.id, { pinned })) }), ++ (0, import_react36.createElement)(SwitchRow, { label: t("Hide from sidebar"), hint: t("Search still finds it."), on: room2.hidden === true, onChange: (hidden) => run(actions.setFlags(room2.id, { hidden })) }) + ), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + Card, + { title: t("More") }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "button", + { type: "button", className: "bt-set-row bt-bs-row bt-bs-danger", "data-confirm": confirming || void 0, onClick: remove }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( + "span", + { className: "bt-set-copy" }, -+ (0, import_react32.createElement)("span", { className: "bt-bs-label" }, confirming ? t("Delete {name}?", { name: room2.name }) : t("Delete group")), -+ (0, import_react32.createElement)("span", { className: "bt-set-hint" }, confirming ? t("Click again to delete. Its history is archived.") : t("Removes the group chat. Its members stay on the team.")) ++ (0, import_react36.createElement)("span", { className: "bt-bs-label" }, confirming ? t("Delete {name}?", { name: room2.name }) : t("Delete group")), ++ (0, import_react36.createElement)("span", { className: "bt-set-hint" }, confirming ? t("Click again to delete. Its history is archived.") : t("Removes the group chat. Its members stay on the team.")) + ), -+ (0, import_react32.createElement)("span", { className: "bt-chevron" }, (0, import_react32.createElement)(ChevronRightIcon)) ++ (0, import_react36.createElement)("span", { className: "bt-chevron" }, (0, import_react36.createElement)(ChevronRightIcon)) + ) + ) - ); - } --function AvatarEditor({ bot, actions, run, onClose }) { -- const look = lookOf(bot); -- const [tab, setTab] = (0, import_react18.useState)(look.image ? "upload" : "bot"); -- const [over, setOver] = (0, import_react18.useState)(false); -- const ref = (0, import_react18.useRef)(null); -- const fileRef = (0, import_react18.useRef)(null); -- const upload = (file) => { -- if (file) void run(avatarImage(file).then((image) => actions.updateBot(bot.id, { avatar: { ...bot.avatar ?? {}, image } }))); ++ ); ++} +function NewGroupForm({ roster, actions, run, onCreated, onCancel }) { -+ const [admin, setAdmin] = (0, import_react32.useState)(null); -+ const [members, setMembers] = (0, import_react32.useState)([]); -+ const [name, setName] = (0, import_react32.useState)(""); -+ const [busy, setBusy] = (0, import_react32.useState)(false); -+ const toggle = (id) => setMembers((list) => list.includes(id) ? list.filter((item) => item !== id) : [...list, id]); ++ const [admin, setAdmin] = (0, import_react36.useState)(null); ++ const [members, setMembers] = (0, import_react36.useState)([]); ++ const [name, setName] = (0, import_react36.useState)(""); ++ const [query, setQuery] = (0, import_react36.useState)(""); ++ const [busy, setBusy] = (0, import_react36.useState)(false); ++ const locked = lockedWindow(roster); ++ const bots = listedChatBots(roster); ++ const selectedIds = admin === null ? members : [admin, ...members]; ++ const selected = selectedIds.map((id) => roster.byId[id]).filter(Boolean); ++ const available = bots.filter((bot) => !selectedIds.includes(bot.id) && groupMemberMatches(bot, query)); ++ const ready = canCreateGroup(admin, members); ++ const add = (bot) => { ++ if (admin === null && !bot.remote) { ++ setAdmin(bot.id); ++ return; ++ } ++ setMembers((list) => list.includes(bot.id) ? list : [...list, bot.id]); ++ }; ++ const remove = (id) => { ++ if (id === admin) { ++ const nextAdmin = members.find((other) => !roster.byId[other]?.remote) ?? null; ++ setAdmin(nextAdmin); ++ setMembers((list) => list.filter((item) => item !== nextAdmin)); ++ return; ++ } ++ setMembers((list) => list.filter((item) => item !== id)); ++ }; + const pickAdmin = (id) => { ++ if (id === admin || roster.byId[id]?.remote) return; ++ setMembers((list) => { ++ const without2 = list.filter((item) => item !== id); ++ return admin === null ? without2 : [...without2, admin]; ++ }); + setAdmin(id); -+ setMembers((list) => list.filter((item) => item !== id)); - }; -- (0, import_react18.useEffect)(() => { -- const onDown = (event) => { -- if (!(event.target instanceof Element) || ref.current?.contains(event.target) || event.target.closest(".bt-avatar-trigger")) return; -- onClose(); -- }; -- const onKey = (event) => { -- if (event.key === "Escape") { -- event.stopPropagation(); -- onClose(); -- } -- }; -- window.addEventListener("mousedown", onDown); -- window.addEventListener("keydown", onKey, true); -- return () => { -- window.removeEventListener("mousedown", onDown); -- window.removeEventListener("keydown", onKey, true); -- }; -- }, [onClose]); -- (0, import_react18.useEffect)(() => { -- if (tab !== "upload") return void 0; -- const onPaste = (event) => { -- const file = [...event.clipboardData?.files ?? []].find((item) => item.type.startsWith("image/")); -- if (file) { -- event.preventDefault(); -- upload(file); -- } -- }; -- window.addEventListener("paste", onPaste); -- return () => window.removeEventListener("paste", onPaste); -- }, [tab, bot]); -- const hasPhoto = Boolean(look.image); -- const glide = useGlide(tab); -- return (0, import_react18.createElement)( -+ const locked = lockedWindow(roster); ++ }; + const create = async () => { -+ if (locked || busy || admin === null || members.length === 0) return; ++ if (locked || busy || !ready) return; + setBusy(true); + let room2; -+ const done = await run(actions.createRoom([admin, ...members], { admin, ...name.trim() ? { name: name.trim() } : {} }).then((value) => { ++ const { members: localIds, remotes } = splitRoomPicks(roster, [admin, ...members]); ++ const participants = remotes.length === 0 ? void 0 : [ ++ ...localIds.map((id) => ({ kind: "bot", id, role: id === admin ? "admin" : "member" })), ++ ...remotes ++ ]; ++ const done = await run(actions.createRoom(localIds, { ++ admin, ++ ...name.trim() ? { name: name.trim() } : {}, ++ ...participants ? { participants } : {} ++ }).then((value) => { + room2 = value; + })); + if (done && room2) onCreated(room2); + else setBusy(false); -+ }; -+ const chip = (bot, on, onClick, role) => (0, import_react32.createElement)("button", { -+ key: bot.id, -+ type: "button", -+ role, -+ className: "bt-ng-chip", -+ "aria-checked": on, -+ onClick -+ }, (0, import_react32.createElement)(BotAvatar, { bot, size: 22, badge: false, live: false }), (0, import_react32.createElement)("span", { className: "bt-ng-name" }, bot.name), on && role === "radio" ? (0, import_react32.createElement)(AdminStar) : null); -+ return (0, import_react32.createElement)( + }; +- (0, import_react18.useEffect)(() => { +- void actions.refreshModels?.(); +- }, [bot.id]); +- return (0, import_react18.createElement)( ++ const pickRow = (bot, selectedRow) => (0, import_react36.createElement)( ++ "button", ++ { ++ key: bot.id, ++ type: "button", ++ className: selectedRow ? "bt-ng-pick bt-ng-pick-on" : "bt-ng-pick", ++ "data-bot-id": bot.id, ++ role: selectedRow ? bot.id === admin ? "radio" : "checkbox" : "option", ++ "aria-checked": selectedRow ? true : void 0, ++ onClick: () => { ++ selectedRow ? remove(bot.id) : add(bot); ++ } ++ }, ++ (0, import_react36.createElement)(BotAvatar, { bot, size: 22, badge: false, live: false }), ++ (0, import_react36.createElement)("span", { className: "bt-ng-name" }, pickerBotLabel(bot)), ++ selectedRow && bot.id === admin ? (0, import_react36.createElement)(AdminStar) : null, ++ selectedRow && bot.id !== admin && !bot.remote ? (0, import_react36.createElement)("span", { ++ className: "bt-ng-make-admin", ++ role: "button", ++ tabIndex: 0, ++ "aria-label": t("Make admin"), ++ onClick: (event) => { ++ event.preventDefault(); ++ event.stopPropagation(); ++ pickAdmin(bot.id); ++ }, ++ onKeyDown: (event) => { ++ if (event.key === "Enter" || event.key === " ") { ++ event.preventDefault(); ++ event.stopPropagation(); ++ pickAdmin(bot.id); ++ } ++ } ++ }, (0, import_react36.createElement)(AdminStar)) : null ++ ); ++ const availHint = bots.every((bot) => selectedIds.includes(bot.id)) ? t("No more Bots to add") : t("No Bots match"); ++ return (0, import_react36.createElement)( "div", -- { ref, className: "bt-avedit", role: "dialog", "aria-label": t("Avatar editor") }, +- { className: "bt-bs" }, - (0, import_react18.createElement)( + { className: "bt-set-card bt-ng" }, -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)("p", { className: "bt-ng-intro" }, t("Add a name, then pick Bots to chat with.")), ++ (0, import_react36.createElement)( ++ "label", ++ { className: "bt-ng-name-row" }, ++ (0, import_react36.createElement)("span", { className: "bt-ng-name-label" }, t("Group name")), ++ (0, import_react36.createElement)("input", { ++ className: "bt-ng-name-input", ++ value: name, ++ maxLength: 60, ++ placeholder: t("Group name (optional)"), ++ "aria-label": t("Group name"), ++ onChange: (event) => setName(event.target.value) ++ }) ++ ), ++ (0, import_react36.createElement)( "div", -- { className: "bt-avedit-top" }, +- { className: "bt-bs-hero" }, - (0, import_react18.createElement)( -+ { className: "bt-set-row bt-bs-row bt-bs-stack" }, -+ (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label bt-ng-label" }, (0, import_react32.createElement)(AdminStar), t("Choose the group admin"))), -+ (0, import_react32.createElement)( ++ { className: "bt-ng-split" }, ++ (0, import_react36.createElement)( "div", -- { ref: glide.box, role: "tablist", "aria-label": t("Avatar source"), className: "bt-avedit-tabs" }, -- (0, import_react18.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), -- [["bot", "Bot"], ["upload", "Upload"]].map(([id, label]) => (0, import_react18.createElement)("button", { key: id, type: "button", role: "tab", className: "bt-avedit-tab", "aria-selected": tab === id, onClick: () => setTab(id) }, t(label))) -- ), -- (0, import_react18.createElement)("button", { -- type: "button", -- className: "bt-avedit-tab bt-avedit-reset", -- title: t("Reset character to default"), -- onClick: () => run(actions.updateBot(bot.id, { avatar: null, color: null })) -- }, t("Reset")) -+ { className: "bt-ng-picks", role: "radiogroup", "aria-label": t("Group admin") }, -+ roster.bots.map((bot) => chip(bot, admin === bot.id, () => pickAdmin(bot.id), "radio")) -+ ) - ), -- tab === "bot" ? (0, import_react18.createElement)(CharacterGrid, { -- look, -- hasPhoto, -- onShape: (shape) => run(actions.updateBot(bot.id, { avatar: { shape } })), -- onColor: (color) => run(actions.updateBot(bot.id, { color })) -- }) : null, -- tab === "upload" ? (0, import_react18.createElement)( -+ admin === null ? null : (0, import_react32.createElement)( - "div", -- { -- className: "bt-dropzone", -- "data-over": over || void 0, -- onDragOver: (event) => { -- event.preventDefault(); -- setOver(true); -- }, -- onDragLeave: () => setOver(false), -- onDrop: (event) => { -- event.preventDefault(); -- setOver(false); -- upload(event.dataTransfer.files?.[0]); -- } -- }, -- hasPhoto ? (0, import_react18.createElement)("img", { src: look.image, alt: "" }) : null, -- (0, import_react18.createElement)("div", null, t("Drag, drop, or paste an image")), +- { className: "bt-avatar-anchor" }, +- (0, import_react18.createElement)( +- "button", +- { type: "button", className: "bt-avatar-trigger", "aria-label": t("Edit Bot avatar"), "aria-expanded": editing, onClick: () => setEditing((value) => !value) }, +- (0, import_react18.createElement)(BotMark, { bot, size: 64, live: true }), +- (0, import_react18.createElement)("span", { className: "bt-avatar-pencil", "aria-hidden": true }, (0, import_react18.createElement)(PencilIcon)) ++ { className: "bt-ng-col" }, ++ (0, import_react36.createElement)( ++ "label", ++ { className: "bt-ng-search" }, ++ (0, import_react36.createElement)(SearchIcon), ++ (0, import_react36.createElement)("input", { ++ className: "bt-ng-search-input", ++ type: "search", ++ value: query, ++ placeholder: t("Search"), ++ "aria-label": t("Search members"), ++ onChange: (event) => setQuery(event.target.value) ++ }) + ), +- editing ? (0, import_react18.createElement)(AvatarEditor, { bot, actions, run, onClose: closeEditor }) : null ++ available.length === 0 ? (0, import_react36.createElement)("div", { className: "bt-ng-empty" }, availHint) : (0, import_react36.createElement)( ++ "div", ++ { className: "bt-ng-list", role: "listbox", "aria-label": t("Members") }, ++ available.map((bot) => pickRow(bot, false)) ++ ) + ), +- (0, import_react18.createElement)( +- "div", +- { className: "bt-bs-who" }, +- (0, import_react18.createElement)("span", { className: "bt-bs-name" }, bot.name), +- (0, import_react18.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) +- ) +- ), +- (0, import_react18.createElement)( +- Card, +- { title: t("Profile") }, +- (0, import_react18.createElement)(Row, { label: t("Name") }, (0, import_react18.createElement)(InlineText, { label: t("Name"), value: bot.name, placeholder: "Bob", required: true, maxLength: 40, onSave: (name) => save({ name }) })), +- (0, import_react18.createElement)(Row, { label: t("Label"), hint: t("Optional. Shown under the name.") }, (0, import_react18.createElement)(InlineText, { label: t("Label"), value: bot.role, placeholder: t("Research, admin…"), maxLength: 24, onSave: (role) => save({ role }) })) +- ), +- (0, import_react18.createElement)( +- Card, +- { title: t("Model") }, - (0, import_react18.createElement)( -+ { className: "bt-set-row bt-bs-row bt-bs-stack bt-ng-step" }, -+ (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, t("Who to chat with…"))), -+ (0, import_react32.createElement)( ++ (0, import_react36.createElement)( "div", -- { className: "bt-actions", style: { justifyContent: "center" } }, -- (0, import_react18.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, hasPhoto ? t("Replace") : t("Browse files")), -- hasPhoto ? (0, import_react18.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.updateBot(bot.id, { avatar: hasShape(bot.avatar?.shape) ? { shape: bot.avatar.shape } : null })) }, t("Remove photo")) : null -- ), -- (0, import_react18.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { -- const file = event.target.files?.[0]; -- event.target.value = ""; -- upload(file); -- } }) -- ) : null -- ); --} --function MemoryCard({ bot, actions }) { -- const count = useMemoryCount(bot.id, actions); -- const label = count === null ? t("Loading…") : count === 0 ? t("Nothing saved yet") : count === 1 ? t("1 entry") : t("{count} entries", { count }); -- return (0, import_react18.createElement)( -- Card, -- { title: t("Memory") }, +- { className: "bt-set-row bt-bs-row" }, +- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, t("Model")), (0, import_react18.createElement)("span", { className: "bt-set-hint" }, modelHint(bot, roster))), +- (0, import_react18.createElement)(ModelMenu, { bot, roster, actions, run }) ++ { className: "bt-ng-col" }, ++ (0, import_react36.createElement)("div", { className: "bt-ng-sel-head" }, t("Selected {count}", { count: selected.length })), ++ selected.length === 0 ? (0, import_react36.createElement)("div", { className: "bt-ng-empty" }, t("No members selected")) : (0, import_react36.createElement)( ++ "div", ++ { className: "bt-ng-list", role: "group", "aria-label": t("Selected members") }, ++ selected.map((bot) => pickRow(bot, true)) ++ ) + ) + ), - (0, import_react18.createElement)( -- "button", -- { type: "button", className: "bt-set-row bt-bs-row", "aria-label": t("Manage {name}'s memory", { name: bot.name }), onClick: () => actions.openMemory(bot.id) }, -- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, label)), -- (0, import_react18.createElement)("span", { className: "bt-mem-row-go" }, t("Manage"), (0, import_react18.createElement)(ChevronRightIcon)) -+ { className: "bt-ng-picks", role: "group", "aria-label": t("Members") }, -+ roster.bots.filter((bot) => bot.id !== admin).map((bot) => chip(bot, members.includes(bot.id), () => toggle(bot.id), "checkbox")) -+ ) -+ ), -+ admin === null || members.length === 0 ? null : (0, import_react32.createElement)( -+ "label", -+ { className: "bt-set-row bt-bs-row bt-ng-step" }, -+ (0, import_react32.createElement)("span", { className: "bt-set-copy" }, (0, import_react32.createElement)("span", { className: "bt-bs-label" }, t("Name"))), -+ (0, import_react32.createElement)("input", { className: "bt-bs-input", value: name, maxLength: 60, placeholder: t("Name after members"), onChange: (event) => setName(event.target.value) }) -+ ), -+ (0, import_react32.createElement)( +- Card, +- { title: t("Working folder") }, +- (0, import_react18.createElement)( ++ (0, import_react36.createElement)( + "div", + { className: "bt-set-row bt-task-foot" }, -+ (0, import_react32.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onCancel }, t("Cancel")), -+ locked ? (0, import_react32.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : (0, import_react32.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy || admin === null || members.length === 0, onClick: () => void create() }, t("Create group chat")) - ) - ); - } --function BotSettingsForm({ bot, roster, actions, run }) { -- const [editing, setEditing] = (0, import_react18.useState)(false); -- const [confirming, setConfirming] = (0, import_react18.useState)(false); -- const closeEditor = (0, import_react18.useCallback)(() => setEditing(false), []); -- (0, import_react18.useEffect)(() => { -- if (!confirming) return void 0; -- const timer = setTimeout(() => setConfirming(false), 4e3); -- return () => clearTimeout(timer); -- }, [confirming]); -- const isMainBot = isMainOf(roster, bot.id); -- const onlyMain = isMainBot && (roster.mainBotIds ?? []).length === 1; -- const isTile = roster.mainBotId === bot.id; -- const save = (patch) => run(actions.updateBot(bot.id, patch)); -- const duplicate = () => run(actions.duplicateBot(bot.id).then((copy2) => actions.openSession(copy2.id))); -- const remove = () => { -- if (confirming) void run(actions.deleteBot(bot.id)); -- else setConfirming(true); ++ (0, import_react36.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onCancel }, t("Cancel")), ++ locked ? (0, import_react36.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : (0, import_react36.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy || !ready, onClick: () => void create() }, t("Create group chat")) ++ ) ++ ); ++} +var GROUP_SETTINGS_CSS = ` -+.bt-ng{animation:bt-q-in .4s cubic-bezier(.22,1,.36,1),bt-veil-in .2s ease-out} -+.bt-ng-step{animation:bt-veil-in .22s ease-out} ++.bt-ng{padding:16px 16px 8px;animation:bt-q-in .4s cubic-bezier(.22,1,.36,1),bt-veil-in .2s ease-out} ++.bt-ng-intro{margin:0 0 14px;color:var(--bt-ink-2);font-size:13px;line-height:18px} ++.bt-ng-name-row{display:flex;align-items:center;gap:12px;margin:0 0 12px} ++.bt-ng-name-label{flex:none;min-width:4.5em;font-size:13px;color:var(--bt-ink)} ++.bt-ng-name-input{flex:1;min-width:0;height:36px;box-sizing:border-box;padding:0 12px;border:.5px solid var(--bt-line-2);border-radius:10px;background:var(--bt-main);color:var(--bt-ink);font:inherit;font-size:13px;outline:none} ++.bt-ng-name-input::placeholder{color:var(--bt-ink-3)} ++.bt-ng-split{display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:10px;min-height:220px;margin:0 0 8px} ++.bt-ng-col{display:flex;flex-direction:column;min-width:0;min-height:220px;border:.5px solid var(--bt-line);border-radius:12px;background:var(--bt-main);overflow:hidden} ++.bt-ng-search{display:flex;align-items:center;gap:8px;margin:8px;padding:0 10px;height:32px;border-radius:999px;background:var(--bt-card);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2)} ++.bt-ng-search svg{flex:none;width:14px;height:14px} ++.bt-ng-search-input{flex:1;min-width:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;outline:none} ++.bt-ng-sel-head{display:flex;align-items:center;min-height:32px;margin:8px 12px 0;color:var(--bt-ink-2);font-size:13px} ++.bt-ng-list{flex:1;overflow:auto;padding:4px 8px 8px;display:flex;flex-direction:column;gap:2px} ++.bt-ng-empty{flex:1;display:flex;align-items:center;justify-content:center;padding:16px;color:var(--bt-ink-3);font-size:13px;text-align:center} ++.bt-ng-pick{display:flex;align-items:center;gap:8px;width:100%;border:0;background:none;color:inherit;font:inherit;font-size:13px;padding:6px 8px;border-radius:8px;cursor:pointer;text-align:left} ++.bt-ng-pick:hover{background:var(--bt-hover)} ++.bt-ng-pick-on{background:var(--bt-card)} ++.bt-ng-make-admin{display:inline-flex;margin-left:auto;padding:2px;border-radius:999px;color:var(--bt-ink-3)} ++.bt-ng-make-admin:hover{color:var(--bt-ink);background:var(--bt-hover)} ++.bt-ng-pick-on>.bt-admin-star{margin-left:auto} ++.bt-ng-name{max-width:160px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-ng-label{display:inline-flex;align-items:center;gap:6px} +.bt-ng-picks{display:flex;flex-wrap:wrap;gap:6px} +.bt-ng-chip{display:inline-flex;align-items:center;gap:6px;height:32px;padding:0 10px 0 5px;border-radius:999px;border:.5px solid var(--bt-line);background:var(--bt-card);color:var(--bt-ink-2);font:inherit;font-size:13px;cursor:pointer;transition:background-color .12s ease,color .12s ease,border-color .12s ease,scale .3s cubic-bezier(.34,1.56,.64,1)} @@ -20543,8 +21695,7 @@ diff --git a/client.js b/client.js +.bt-ng-chip:active{scale:.96} +.bt-ng-chip[aria-checked=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink)} +.bt-ng-chip .bt-admin-star{animation:bt-check-pop .4s cubic-bezier(.34,1.56,.64,1)} -+.bt-ng-name{max-width:140px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -+@media (prefers-reduced-motion:reduce){.bt-ng,.bt-ng-step,.bt-ng-chip .bt-admin-star{animation:none}} ++@media (prefers-reduced-motion:reduce){.bt-ng,.bt-ng-chip .bt-admin-star{animation:none}} +.bt-gs-member{gap:8px} +.bt-gs-who{flex:1;display:flex;align-items:center;gap:8px;min-width:0;padding:0;border:0;background:none;color:inherit;font:inherit;text-align:left;cursor:pointer} +.bt-gs-who .bt-row-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap} @@ -20564,16 +21715,38 @@ diff --git a/client.js b/client.js +@media (prefers-reduced-motion:reduce){.bt-gs-pick{animation:none}} +`; + ++// src/shared/palette-search.js ++var PALETTE_FILTERS = ["all", "chats", "messages", "commands"]; ++var PALETTE_MESSAGE_MIN = 2; ++function paletteFilterAllows(filter, kind) { ++ if (filter === "chats") return kind === "chats"; ++ if (filter === "messages") return kind === "messages"; ++ if (filter === "commands") return kind === "commands"; ++ return true; ++} ++function paletteEmptyKind(query, filter, min = PALETTE_MESSAGE_MIN) { ++ const wanted = String(query ?? "").trim(); ++ if (wanted === "") return "empty"; ++ if (filter === "messages" && wanted.length < min) return "short"; ++ return "none"; ++} ++ +// src/client/palette.js -+var import_react33 = require("react"); -+var import_dsh_client_ui_primitives3 = require("@deepseek-ai/dsh-client-ui-primitives"); ++var import_react37 = require("react"); ++var import_dsh_client_ui_primitives4 = require("@deepseek-ai/dsh-client-ui-primitives"); +var paletteText = (raw, names) => readableLine(String(raw ?? ""), names); +var PALETTE_EXIT_MS = 160; +function CommandPalette({ start, token, roster, actions, useSessions }) { -+ const [query, setQuery] = (0, import_react33.useState)(start ?? ""); -+ const [cursor, setCursor] = (0, import_react33.useState)(0); -+ const [leaving, setLeaving] = (0, import_react33.useState)(false); ++ const [query, setQuery] = (0, import_react37.useState)(start ?? ""); ++ const [cursor, setCursor] = (0, import_react37.useState)(0); ++ const [leaving, setLeaving] = (0, import_react37.useState)(false); ++ const [filter, setFilter] = (0, import_react37.useState)("all"); ++ const [selectedHit, setSelectedHit] = (0, import_react37.useState)(null); ++ const history = useHistorySearch(!selectedHit && paletteFilterAllows(filter, "messages") ? actions.searchMessages : void 0, query.trim()); ++ const historyEnabled = typeof actions.searchMessages === "function"; ++ const historyVisible = paletteFilterAllows(filter, "messages"); + const wanted = query.trim().toLowerCase(); ++ const emptyKind = paletteEmptyKind(query, filter); + const close = () => { + if (leaving) return; + setLeaving(true); @@ -20583,7 +21756,7 @@ diff --git a/client.js b/client.js + const ids = [...roster.bots.map(currentPart), ...roster.rooms.map((item) => item.id)]; + const names = botNames(roster); + const found = useSessions((list) => { -+ if (wanted.length < 2) return "[]"; ++ if (wanted.length < PALETTE_MESSAGE_MIN) return "[]"; + const hits = []; + for (const id of ids) { + const outline = list.projectionsBySession?.[id]?.values?.turnOutline ?? list.byId[id]?.projectionValues?.turnOutline; @@ -20609,7 +21782,7 @@ diff --git a/client.js b/client.js + const people2 = [ + ...roster.bots.filter((bot) => isListedRemoteChat(bot) && matchesName(bot.name, bot.role, pickerBotLabel(bot))).map((bot) => ({ + key: bot.id, -+ avatar: (0, import_react33.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }), ++ avatar: (0, import_react37.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }), + title: pickerBotLabel(bot), + subtitle: [bot.role, isMainOf(roster, bot.id) ? t("Main Bot") : ""].filter(Boolean).join(" · "), + badge: bot.hidden ? t("Hidden") : void 0, @@ -20620,7 +21793,7 @@ diff --git a/client.js b/client.js + })), + ...roster.rooms.filter((room2) => matchesName(room2.name)).map((room2) => ({ + key: room2.id, -+ avatar: (0, import_react33.createElement)(RoomAvatar, { room: room2, roster, size: 24 }), ++ avatar: (0, import_react37.createElement)(RoomAvatar, { room: room2, roster, size: 24 }), + title: room2.name, + subtitle: t(seatedCount(room2) === 1 ? "{count} member" : "{count} members", { count: seatedCount(room2) }), + badge: room2.hidden ? t("Hidden") : void 0, @@ -20630,34 +21803,44 @@ diff --git a/client.js b/client.js + } + })) + ]; -+ if (people2.length) sections.push([t("Bots"), people2]); ++ if (emptyKind !== "empty" && paletteFilterAllows(filter, "chats") && people2.length) sections.push([t("Bots"), people2]); + const agents = (roster.agents ?? []).filter(() => matchesName("DSH Agent")).map((agent) => ({ + key: agent.id, -+ avatar: (0, import_react33.createElement)("span", { className: "bt-palette-agent" }, (0, import_react33.createElement)(import_dsh_client_ui_primitives3.FishLogo, { size: 18 })), ++ avatar: (0, import_react37.createElement)("span", { className: "bt-palette-agent" }, (0, import_react37.createElement)(import_dsh_client_ui_primitives4.FishLogo, { size: 18 })), + title: "DSH Agent", + subtitle: t("Plain dsh session"), + run: () => actions.openAgent(agent.id) + })); -+ if (agents.length) sections.push(["DSH Agent", agents]); -+ const messages = JSON.parse(found).map(([id, turn, snippet]) => { ++ if (emptyKind !== "empty" && paletteFilterAllows(filter, "chats") && agents.length) sections.push(["DSH Agent", agents]); ++ const historyRows = history.items.filter((hit) => roster.byId[hit.botId]).map((hit) => ({ ++ key: `history:${hit.sessionId}:${hit.seq}`, ++ title: roster.byId[hit.botId].name, ++ subtitle: hit.snippet, ++ avatar: (0, import_react37.createElement)(BotAvatar, { bot: roster.byId[hit.botId], size: 24, badge: false, live: false }), ++ badge: t(hit.earlier ? "Earlier part; view read-only history" : "View read-only history"), ++ keepOpen: true, ++ run: () => setSelectedHit({ botId: hit.botId, sessionId: hit.sessionId, hitToken: hit.hitToken }) ++ })); ++ if (emptyKind !== "empty" && historyVisible && historyRows.length) sections.push([t("Local Bot chat history"), historyRows]); ++ const messages = JSON.parse(found).filter(([id, turn]) => !history.items.some((hit) => hit.sessionId === id && hit.turn === turn)).map(([id, turn, snippet]) => { + const bot = roster.byId[id]; + const room2 = roster.roomsById[id]; + return { + key: `${id}:${turn}`, + title: bot?.name ?? room2?.name ?? t("Bot"), + subtitle: snippet, -+ avatar: bot ? (0, import_react33.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }) : (0, import_react33.createElement)(RoomAvatar, { room: room2, roster, size: 24 }), ++ avatar: bot ? (0, import_react37.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }) : (0, import_react37.createElement)(RoomAvatar, { room: room2, roster, size: 24 }), + run: () => actions.openSession(id) + }; + }); -+ if (messages.length) sections.push([t("Messages"), messages]); ++ if (emptyKind !== "empty" && paletteFilterAllows(filter, "messages") && messages.length) sections.push([t("Messages"), messages]); + const commands = [ -+ { key: "cmd:new", icon: (0, import_react33.createElement)(PlusIcon), title: t("New chat"), run: () => actions.openNewChat("new") }, -+ { key: "cmd:bot", icon: (0, import_react33.createElement)(PlusIcon), title: t("Create Bot"), run: () => actions.openNewChat("create") }, -+ { key: "cmd:group", icon: (0, import_react33.createElement)(PeopleIcon), title: t("Create group chat"), run: () => actions.openNewChat("group") }, -+ { key: "cmd:settings", icon: (0, import_react33.createElement)(GearIcon), title: t("Settings"), run: () => actions.openSettings("general") } ++ { key: "cmd:new", icon: (0, import_react37.createElement)(PlusIcon), title: t("New chat"), run: () => actions.openNewChat("new") }, ++ { key: "cmd:bot", icon: (0, import_react37.createElement)(PlusIcon), title: t("Create Bot"), run: () => actions.openNewChat("create") }, ++ { key: "cmd:group", icon: (0, import_react37.createElement)(PeopleIcon), title: t("Create group chat"), run: () => actions.openNewChat("group") }, ++ { key: "cmd:settings", icon: (0, import_react37.createElement)(GearIcon), title: t("Settings"), run: () => actions.openSettings("general") } + ].filter((command) => matchesName(command.title)); -+ if (commands.length) sections.push([t("Commands"), commands]); ++ if (emptyKind !== "empty" && paletteFilterAllows(filter, "commands") && commands.length) sections.push([t("Commands"), commands]); + const rows = sections.flatMap(([, items]) => items); + const active = Math.min(cursor, Math.max(rows.length - 1, 0)); + const shown = rows.map((row) => row.key).join("\n"); @@ -20665,46 +21848,52 @@ diff --git a/client.js b/client.js +${shown}`, { axis: "y", ...QUICK_EDGES }); + const listRef = glide.box; + useFlip(listRef, shown, "[data-flip]"); -+ (0, import_react33.useEffect)(() => { ++ (0, import_react37.useEffect)(() => { + listRef.current?.querySelector("[aria-selected=true]")?.scrollIntoView({ block: "nearest" }); + }, [active, query]); + const choose = (row) => { + if (!row || leaving) return; + void Promise.resolve(row.run()).catch((error) => actions.reportError(error, "menu")); -+ close(); - }; -- (0, import_react18.useEffect)(() => { -- void actions.refreshModels?.(); -- }, [bot.id]); -- return (0, import_react18.createElement)( ++ if (!row.keepOpen) close(); ++ }; ++ if (selectedHit) return (0, import_react37.createElement)(HistoryHitDialog, { key: selectedHit.hitToken, hit: selectedHit, roster, actions, onBack: () => setSelectedHit(null) }); + let index = -1; -+ return (0, import_react33.createElement)( - "div", -- { className: "bt-bs" }, -- (0, import_react18.createElement)( ++ return (0, import_react37.createElement)( ++ "div", + { className: "bt-palette-layer", "data-leaving": leaving || void 0 }, -+ (0, import_react33.createElement)("div", { className: "bt-backdrop", onMouseDown: close }), -+ (0, import_react33.createElement)( - "div", -- { className: "bt-bs-hero" }, -- (0, import_react18.createElement)( ++ (0, import_react37.createElement)("div", { className: "bt-backdrop", onMouseDown: close }), ++ (0, import_react37.createElement)( ++ "div", + { className: "bt-palette", role: "dialog", "aria-label": t("Search"), "aria-modal": true }, -+ (0, import_react33.createElement)( ++ (0, import_react37.createElement)( "div", -- { className: "bt-avatar-anchor" }, -- (0, import_react18.createElement)( -- "button", -- { type: "button", className: "bt-avatar-trigger", "aria-label": t("Edit Bot avatar"), "aria-expanded": editing, onClick: () => setEditing((value) => !value) }, -- (0, import_react18.createElement)(BotMark, { bot, size: 64, live: true }), -- (0, import_react18.createElement)("span", { className: "bt-avatar-pencil", "aria-hidden": true }, (0, import_react18.createElement)(PencilIcon)) -- ), -- editing ? (0, import_react18.createElement)(AvatarEditor, { bot, actions, run, onClose: closeEditor }) : null +- { className: "bt-set-row bt-bs-row" }, +- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), +- (0, import_react18.createElement)(FolderMenu, { value: bot.workDir, actions, run, onPick: (workDir) => save({ workDir }) }) +- ) +- ), +- (0, import_react18.createElement)( +- Card, +- { title: t("Instructions") }, +- (0, import_react18.createElement)( +- Row, +- { label: t("What this Bot does"), hint: t("Its job on the team. Part of the Bot's system prompt."), stack: true }, +- (0, import_react18.createElement)(InlineText, { label: t("Instructions"), value: bot.instructions, multiline: true, placeholder: t("What this Bot is responsible for…"), onSave: (instructions) => save({ instructions }) }) +- ) +- ), +- (0, import_react18.createElement)(BotCapabilitiesCard, { bot, roster, actions, run, Card, SwitchRow }), +- roster.memory === false ? null : (0, import_react18.createElement)(MemoryCard, { bot, actions }), +- (0, import_react18.createElement)(BotSchedules, { bot, roster, actions }), +- (0, import_react18.createElement)( +- Card, +- { title: t("Main Bot") }, +- onlyMain ? (0, import_react18.createElement)( + { className: "bt-palette-head" }, -+ (0, import_react33.createElement)("span", { className: "bt-palette-glyph", "aria-hidden": true }, (0, import_react33.createElement)(SearchIcon)), -+ (0, import_react33.createElement)("input", { ++ (0, import_react37.createElement)("span", { className: "bt-palette-glyph", "aria-hidden": true }, (0, import_react37.createElement)(SearchIcon)), ++ (0, import_react37.createElement)("input", { + autoFocus: true, + value: query, -+ placeholder: t("Search Bots, chats and messages"), ++ placeholder: t(historyEnabled ? "Search chats and local Bot history" : "Search Bots, chats, and loaded messages"), + "aria-label": t("Search"), + role: "combobox", + "aria-expanded": true, @@ -20724,64 +21913,12 @@ diff --git a/client.js b/client.js + } else if (event.key === "Enter") { + event.preventDefault(); + choose(rows[active]); -+ } -+ } -+ }), -+ query ? (0, import_react33.createElement)("button", { type: "button", className: "bt-palette-clear", "aria-label": t("Clear search"), onClick: () => { -+ setQuery(""); -+ setCursor(0); -+ } }, (0, import_react33.createElement)(CloseIcon)) : null - ), -- (0, import_react18.createElement)( -- "div", -- { className: "bt-bs-who" }, -- (0, import_react18.createElement)("span", { className: "bt-bs-name" }, bot.name), -- (0, import_react18.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot")) -- ) -- ), -- (0, import_react18.createElement)( -- Card, -- { title: t("Profile") }, -- (0, import_react18.createElement)(Row, { label: t("Name") }, (0, import_react18.createElement)(InlineText, { label: t("Name"), value: bot.name, placeholder: "Bob", required: true, maxLength: 40, onSave: (name) => save({ name }) })), -- (0, import_react18.createElement)(Row, { label: t("Label"), hint: t("Optional. Shown under the name.") }, (0, import_react18.createElement)(InlineText, { label: t("Label"), value: bot.role, placeholder: t("Research, admin…"), maxLength: 24, onSave: (role) => save({ role }) })) -- ), -- (0, import_react18.createElement)( -- Card, -- { title: t("Model") }, -- (0, import_react18.createElement)( -- "div", -- { className: "bt-set-row bt-bs-row" }, -- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, t("Model")), (0, import_react18.createElement)("span", { className: "bt-set-hint" }, modelHint(bot, roster))), -- (0, import_react18.createElement)(ModelMenu, { bot, roster, actions, run }) -- ) -- ), -- (0, import_react18.createElement)( -- Card, -- { title: t("Working folder") }, -- (0, import_react18.createElement)( -- "div", -- { className: "bt-set-row bt-bs-row" }, -- (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), -- (0, import_react18.createElement)(FolderMenu, { value: bot.workDir, actions, run, onPick: (workDir) => save({ workDir }) }) -- ) -- ), -- (0, import_react18.createElement)( -- Card, -- { title: t("Instructions") }, -- (0, import_react18.createElement)( -- Row, -- { label: t("What this Bot does"), hint: t("Its job on the team. Part of the Bot's system prompt."), stack: true }, -- (0, import_react18.createElement)(InlineText, { label: t("Instructions"), value: bot.instructions, multiline: true, placeholder: t("What this Bot is responsible for…"), onSave: (instructions) => save({ instructions }) }) -- ) -- ), -- (0, import_react18.createElement)(BotCapabilitiesCard, { bot, roster, actions, run, Card, SwitchRow }), -- roster.memory === false ? null : (0, import_react18.createElement)(MemoryCard, { bot, actions }), -- (0, import_react18.createElement)(BotSchedules, { bot, roster, actions }), -- (0, import_react18.createElement)( -- Card, -- { title: t("Main Bot") }, -- onlyMain ? (0, import_react18.createElement)( -+ (0, import_react33.createElement)( ++ } ++ } ++ }), ++ (0, import_react37.createElement)("button", { type: "button", className: "bt-palette-clear", "aria-label": t("Close"), onClick: close }, (0, import_react37.createElement)(CloseIcon)) ++ ), ++ (0, import_react37.createElement)( "div", - { className: "bt-set-row bt-bs-row" }, - (0, import_react18.createElement)( @@ -20808,33 +21945,72 @@ diff --git a/client.js b/client.js - { type: "button", className: "bt-set-row bt-bs-row", onClick: duplicate }, - (0, import_react18.createElement)("span", { className: "bt-set-copy" }, (0, import_react18.createElement)("span", { className: "bt-bs-label" }, t("Duplicate")), (0, import_react18.createElement)("span", { className: "bt-set-hint" }, t("A copy with the same job and model, and fresh memory."))), - (0, import_react18.createElement)("span", { className: "bt-chevron" }, (0, import_react18.createElement)(ChevronRightIcon)) -- ), ++ { className: "bt-palette-filters", role: "tablist", "aria-label": t("Search filters") }, ++ PALETTE_FILTERS.map((id) => (0, import_react37.createElement)("button", { ++ key: id, ++ type: "button", ++ role: "tab", ++ className: "bt-palette-filter", ++ "data-filter": id, ++ "aria-selected": filter === id, ++ tabIndex: filter === id ? 0 : -1, ++ onKeyDown: (event) => { ++ if (!["ArrowLeft", "ArrowRight", "Home", "End"].includes(event.key)) return; ++ event.preventDefault(); ++ const index2 = PALETTE_FILTERS.indexOf(filter); ++ const next = event.key === "Home" ? 0 : event.key === "End" ? PALETTE_FILTERS.length - 1 : (index2 + (event.key === "ArrowRight" ? 1 : -1) + PALETTE_FILTERS.length) % PALETTE_FILTERS.length; ++ setFilter(PALETTE_FILTERS[next]); ++ setCursor(0); ++ event.currentTarget.parentElement?.querySelectorAll("[role=tab]")?.[next]?.focus(); ++ }, ++ onClick: () => { ++ setFilter(id); ++ setCursor(0); ++ } ++ }, t(id === "all" ? "All" : id === "chats" ? "Chats" : id === "messages" ? "Messages" : "Commands"))) + ), - isMainBot ? null : (0, import_react18.createElement)( - "button", - { type: "button", className: "bt-set-row bt-bs-row bt-bs-danger", "data-confirm": confirming || void 0, onClick: remove }, - (0, import_react18.createElement)( -- "span", ++ historyVisible ? (0, import_react37.createElement)( ++ "div", ++ { className: "bt-palette-history" }, ++ (0, import_react37.createElement)("p", { className: "bt-palette-scope" }, t(historyEnabled ? "History: your local Bots in this instance. Other chats: loaded messages only." : "History unavailable; searching loaded messages only.")), ++ (0, import_react37.createElement)( + "span", - { className: "bt-set-copy" }, - (0, import_react18.createElement)("span", { className: "bt-bs-label" }, confirming ? t("Delete {name}?", { name: bot.name }) : t("Delete Bot")), - (0, import_react18.createElement)("span", { className: "bt-set-hint" }, confirming ? t("Click again to delete. Its chats are archived.") : t("Removes the Bot from the team.")) -- ), ++ { role: "status", "aria-live": "polite" }, ++ [...query].length > 256 ? t("History query is limited to 256 characters.") : history.status === "loading" ? t("Searching history…") : history.status === "error" ? t("History query failed; showing loaded messages only.") : history.incomplete ? t("Some history could not be read; results are incomplete.") : "", ++ history.limited ? t("History search reached a safety limit; narrow your query.") : "" + ), - (0, import_react18.createElement)("span", { className: "bt-chevron" }, (0, import_react18.createElement)(ChevronRightIcon)) ++ history.cursor ? (0, import_react37.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: history.status === "loading", onClick: history.more }, t("Search more history")) : null ++ ) : null, ++ (0, import_react37.createElement)( ++ "div", + { ref: listRef, id: "bt-palette-list", className: "bt-palette-list", role: "listbox", "aria-label": t("Results") }, -+ (0, import_react33.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), -+ rows.length === 0 ? (0, import_react33.createElement)( ++ (0, import_react37.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), ++ rows.length === 0 ? (0, import_react37.createElement)( + "div", + { className: "bt-palette-empty" }, -+ (0, import_react33.createElement)("span", { className: "bt-palette-empty-icon", "aria-hidden": true }, (0, import_react33.createElement)(SearchIcon)), -+ (0, import_react33.createElement)("span", { className: "bt-palette-empty-label" }, t("No results")), -+ (0, import_react33.createElement)("span", { className: "bt-palette-empty-hint" }, t("Try a Bot name or words from a message")) -+ ) : sections.map(([title, items]) => (0, import_react33.createElement)( -+ import_react33.Fragment, ++ (0, import_react37.createElement)("span", { className: "bt-palette-empty-icon", "aria-hidden": true }, (0, import_react37.createElement)(SearchIcon)), ++ (0, import_react37.createElement)("span", { className: "bt-palette-empty-label" }, historyVisible && history.status === "loading" ? t("Searching history…") : historyVisible && history.cursor ? t("More history remains to be searched") : historyVisible && (history.incomplete || history.limited) ? t("No matches in the searched portion") : emptyKind === "none" ? t("No results") : t("Search chats and messages")), ++ (0, import_react37.createElement)( ++ "span", ++ { className: "bt-palette-empty-hint" }, ++ historyEnabled && historyVisible ? t("Enter text to search local Bot history; other chats use loaded messages.") : emptyKind === "short" ? t("Type at least two characters to search messages already loaded") : emptyKind === "none" ? t("Try a Bot name, a group name, or words from a loaded message") : t("Type a Bot name, a group name, or words from a loaded message") ++ ) ++ ) : sections.map(([title, items]) => (0, import_react37.createElement)( ++ import_react37.Fragment, + { key: title }, -+ (0, import_react33.createElement)("div", { className: "bt-palette-section", role: "presentation", "data-flip": `section:${title}` }, title), ++ (0, import_react37.createElement)("div", { className: "bt-palette-section", role: "presentation", "data-flip": `section:${title}` }, title), + items.map((row) => { + index += 1; + const at = index; -+ return (0, import_react33.createElement)( ++ return (0, import_react37.createElement)( + "button", + { + key: row.key, @@ -20848,14 +22024,14 @@ diff --git a/client.js b/client.js + }, + onClick: () => choose(row) + }, -+ (0, import_react33.createElement)("span", { className: "bt-palette-lead" }, row.avatar ?? (0, import_react33.createElement)("span", { className: "bt-palette-cmd" }, row.icon)), -+ (0, import_react33.createElement)( ++ (0, import_react37.createElement)("span", { className: "bt-palette-lead" }, row.avatar ?? (0, import_react37.createElement)("span", { className: "bt-palette-cmd" }, row.icon)), ++ (0, import_react37.createElement)( + "span", + { className: "bt-palette-text" }, -+ (0, import_react33.createElement)("span", { className: "bt-palette-title" }, row.title), -+ row.subtitle ? (0, import_react33.createElement)("span", { className: "bt-palette-sub" }, row.subtitle) : null ++ (0, import_react37.createElement)("span", { className: "bt-palette-title" }, row.title), ++ row.subtitle ? (0, import_react37.createElement)("span", { className: "bt-palette-sub" }, row.subtitle) : null + ), -+ row.badge ? (0, import_react33.createElement)("span", { className: "bt-palette-badge" }, row.badge) : null ++ row.badge ? (0, import_react37.createElement)("span", { className: "bt-palette-badge" }, row.badge) : null + ); + }) + )) @@ -20930,7 +22106,7 @@ diff --git a/client.js b/client.js // src/client/create-bot.js -var import_react19 = require("react"); -+var import_react34 = require("react"); ++var import_react38 = require("react"); var pick = (list) => list[Math.floor(Math.random() * list.length)]; var randomLook = (avoid = {}) => { const shapes = DEFAULT_SHAPES.filter((shape) => shape !== avoid.shape); @@ -20948,18 +22124,18 @@ diff --git a/client.js b/client.js - const fileRef = (0, import_react19.useRef)(null); - const frame = (0, import_react19.useRef)(null); +function CreateBot({ roster, actions, start, onBack, canGoBack, onCreated, inline = false }) { -+ const [look, setLook] = (0, import_react34.useState)(() => randomLook()); -+ const [image, setImage] = (0, import_react34.useState)(null); -+ const [name, setName] = (0, import_react34.useState)(start?.name ?? ""); -+ const [model, setModel] = (0, import_react34.useState)(() => startModel(roster)); -+ const [effort, setEffort] = (0, import_react34.useState)(void 0); -+ const [busy, setBusy] = (0, import_react34.useState)(false); -+ const [error, setError] = (0, import_react34.useState)(""); -+ const fileRef = (0, import_react34.useRef)(null); -+ const frame = (0, import_react34.useRef)(null); ++ const [look, setLook] = (0, import_react38.useState)(() => randomLook()); ++ const [image, setImage] = (0, import_react38.useState)(null); ++ const [name, setName] = (0, import_react38.useState)(start?.name ?? ""); ++ const [model, setModel] = (0, import_react38.useState)(() => startModel(roster)); ++ const [effort, setEffort] = (0, import_react38.useState)(void 0); ++ const [busy, setBusy] = (0, import_react38.useState)(false); ++ const [error, setError] = (0, import_react38.useState)(""); ++ const fileRef = (0, import_react38.useRef)(null); ++ const frame = (0, import_react38.useRef)(null); useEscape(onBack); - (0, import_react19.useEffect)(() => { -+ (0, import_react34.useEffect)(() => { ++ (0, import_react38.useEffect)(() => { if (inline) frame.current?.scrollIntoView({ block: "start", behavior: "smooth" }); }, []); + const locked = lockedWindow(roster); @@ -20985,32 +22161,32 @@ diff --git a/client.js b/client.js }; const previewLook = image ? { ...look, image } : look; - const card = (0, import_react19.createElement)( -+ const card = (0, import_react34.createElement)( ++ const card = (0, import_react38.createElement)( "div", { className: "bt-create-card" }, - (0, import_react19.createElement)( -+ (0, import_react34.createElement)( ++ (0, import_react38.createElement)( "div", { className: "bt-create-preview" }, // The key remounts the mark, so every new pick plays the pop. - (0, import_react19.createElement)( -+ (0, import_react34.createElement)( ++ (0, import_react38.createElement)( "span", { key: `${look.shape}:${look.color}:${image ? "photo" : ""}`, className: "bt-create-pop" }, - (0, import_react19.createElement)(BotMark, { look: previewLook, bot: { id: "new-bot" }, size: 88, live: true, gaze: true, pokeable: true }) -+ (0, import_react34.createElement)(BotMark, { look: previewLook, bot: { id: "new-bot" }, size: 88, live: true, gaze: true, pokeable: true }) ++ (0, import_react38.createElement)(BotMark, { look: previewLook, bot: { id: "new-bot" }, size: 88, live: true, gaze: true, pokeable: true }) ), - (0, import_react19.createElement)("span", { className: "bt-create-name" }, finalName) -+ (0, import_react34.createElement)("span", { className: "bt-create-name" }, finalName) ++ (0, import_react38.createElement)("span", { className: "bt-create-name" }, finalName) ), - (0, import_react19.createElement)("div", { className: "bt-create-step" }, t("Look")), - (0, import_react19.createElement)( -+ (0, import_react34.createElement)("div", { className: "bt-create-step" }, t("Look")), -+ (0, import_react34.createElement)( ++ (0, import_react38.createElement)("div", { className: "bt-create-step" }, t("Look")), ++ (0, import_react38.createElement)( "div", { className: "bt-create-looks" }, - (0, import_react19.createElement)(CharacterGrid, { -+ (0, import_react34.createElement)(CharacterGrid, { ++ (0, import_react38.createElement)(CharacterGrid, { look, hasPhoto: Boolean(image), onShape: (shape) => { @@ -21019,20 +22195,20 @@ diff --git a/client.js b/client.js } }), - (0, import_react19.createElement)( -+ (0, import_react34.createElement)( ++ (0, import_react38.createElement)( "div", { className: "bt-actions bt-create-lookbar" }, - (0, import_react19.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { -+ (0, import_react34.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { ++ (0, import_react38.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { setImage(null); setLook((current) => randomLook(current)); } }, t("Shuffle")), - (0, import_react19.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, image ? t("Replace photo") : t("Upload photo")), - image ? (0, import_react19.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setImage(null) }, t("Remove photo")) : null, - (0, import_react19.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { -+ (0, import_react34.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, image ? t("Replace photo") : t("Upload photo")), -+ image ? (0, import_react34.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setImage(null) }, t("Remove photo")) : null, -+ (0, import_react34.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { ++ (0, import_react38.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => fileRef.current?.click() }, image ? t("Replace photo") : t("Upload photo")), ++ image ? (0, import_react38.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setImage(null) }, t("Remove photo")) : null, ++ (0, import_react38.createElement)("input", { ref: fileRef, type: "file", accept: "image/png,image/jpeg,image/webp,image/gif", hidden: true, onChange: (event) => { const file = event.target.files?.[0]; event.target.value = ""; upload(file); @@ -21040,76 +22216,76 @@ diff --git a/client.js b/client.js ) ), - (0, import_react19.createElement)( -+ (0, import_react34.createElement)( ++ (0, import_react38.createElement)( "label", { className: "bt-field" }, - (0, import_react19.createElement)("span", { className: "bt-field-label" }, t("Name")), - (0, import_react19.createElement)("input", { -+ (0, import_react34.createElement)("span", { className: "bt-field-label" }, t("Name")), -+ (0, import_react34.createElement)("input", { ++ (0, import_react38.createElement)("span", { className: "bt-field-label" }, t("Name")), ++ (0, import_react38.createElement)("input", { className: "bt-input", autoFocus: !inline, value: name, -@@ -8284,75 +8284,114 @@ function CreateBot({ roster, actions, start, brief = "", onBack, canGoBack, onCr +@@ -8284,75 +8284,115 @@ function CreateBot({ roster, actions, start, brief = "", onBack, canGoBack, onCr } } }), - problem ? (0, import_react19.createElement)("span", { className: "bt-note bt-danger" }, hostText(problem)) : clash ? (0, import_react19.createElement)("span", { className: "bt-note bt-danger" }, t("A Bot named {name} already exists", { name: finalName })) : null -+ problem ? (0, import_react34.createElement)("span", { className: "bt-note bt-danger" }, hostText(problem)) : clash ? (0, import_react34.createElement)("span", { className: "bt-note bt-danger" }, t("A Bot named {name} already exists", { name: finalName })) : null ++ problem ? (0, import_react38.createElement)("span", { className: "bt-note bt-danger" }, hostText(problem)) : clash ? (0, import_react38.createElement)("span", { className: "bt-note bt-danger" }, t("A Bot named {name} already exists", { name: finalName })) : null ), - (0, import_react19.createElement)( -+ (0, import_react34.createElement)( ++ (0, import_react38.createElement)( "div", { className: "bt-field" }, - (0, import_react19.createElement)("span", { className: "bt-field-label" }, t("Model")), - (0, import_react19.createElement)(ModelMenu, { bot: { id: "new-bot", name: finalName, model: model || void 0, effort }, roster, actions, wide: true, onPick: (ref) => { -+ (0, import_react34.createElement)("span", { className: "bt-field-label" }, t("Model")), -+ (0, import_react34.createElement)(ModelMenu, { bot: { id: "new-bot", name: finalName, model: model || void 0, effort }, roster, actions, wide: true, onPick: (ref) => { ++ (0, import_react38.createElement)("span", { className: "bt-field-label" }, t("Model")), ++ (0, import_react38.createElement)(ModelMenu, { bot: { id: "new-bot", name: finalName, model: model || void 0, effort }, roster, actions, wide: true, onPick: (ref) => { setModel(ref); setEffort(void 0); }, onPickEffort: setEffort }), - (0, import_react19.createElement)("span", { className: "bt-note" }, (roster.models ?? []).length > 0 ? t("The Bot runs on this model. You can change it later in its details.") : t("Add a provider and a model in DeepSeek Harness first, or pick one in the Bot's chat later.")) -+ (0, import_react34.createElement)("span", { className: "bt-note" }, (roster.models ?? []).length > 0 ? t("The Bot runs on this model. You can change it later in its details.") : t("Add a provider and a model in DeepSeek Harness first, or pick one in the Bot's chat later.")) ++ (0, import_react38.createElement)("span", { className: "bt-note" }, (roster.models ?? []).length > 0 ? t("The Bot runs on this model. You can change it later in its details.") : t("Add a provider and a model in DeepSeek Harness first, or pick one in the Bot's chat later.")) ), - error ? (0, import_react19.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, - (0, import_react19.createElement)( -+ error ? (0, import_react34.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, -+ (0, import_react34.createElement)( ++ error ? (0, import_react38.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, ++ (0, import_react38.createElement)( "div", { className: "bt-create-foot" }, - (0, import_react19.createElement)("button", { type: "button", className: "bt-soft", onClick: onBack }, canGoBack ? t("Back") : t("Cancel")), - (0, import_react19.createElement)("button", { type: "button", className: "bt-send bt-create-go", disabled: busy || clash || Boolean(problem), onClick: () => void create() }, busy ? t("Creating…") : t("Create")) + // The dialog's header already has Back and Close (#230); only the inline form needs its own. -+ inline ? (0, import_react34.createElement)("button", { type: "button", className: "bt-soft", onClick: onBack }, canGoBack ? t("Back") : t("Cancel")) : null, -+ locked ? (0, import_react34.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : (0, import_react34.createElement)("button", { type: "button", className: "bt-send bt-create-go", disabled: busy || clash || Boolean(problem), onClick: () => void create() }, busy ? t("Creating…") : t("Create")) ++ inline ? (0, import_react38.createElement)("button", { type: "button", className: "bt-soft", onClick: onBack }, canGoBack ? t("Back") : t("Cancel")) : null, ++ locked ? (0, import_react38.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : (0, import_react38.createElement)("button", { type: "button", className: "bt-send bt-create-go", disabled: busy || clash || Boolean(problem), onClick: () => void create() }, busy ? t("Creating…") : t("Create")) ) ); - if (inline) return (0, import_react19.createElement)("div", { ref: frame, className: "bt-create-inline", role: "group", "aria-label": t("Create Bot") }, card); - return (0, import_react19.createElement)( -+ if (inline) return (0, import_react34.createElement)("div", { ref: frame, className: "bt-create-inline", role: "group", "aria-label": t("Create Bot") }, card); -+ return (0, import_react34.createElement)( ++ if (inline) return (0, import_react38.createElement)("div", { ref: frame, className: "bt-create-inline", role: "group", "aria-label": t("Create Bot") }, card); ++ return (0, import_react38.createElement)( "div", { className: "bt-create", role: "dialog", "aria-label": t("Create Bot") }, - (0, import_react19.createElement)( -+ (0, import_react34.createElement)( ++ (0, import_react38.createElement)( "div", { className: "bt-create-head" }, - canGoBack ? (0, import_react19.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to new chat"), onClick: onBack }, (0, import_react19.createElement)(ChevronLeftIcon)) : (0, import_react19.createElement)("span", { className: "bt-create-gap" }), - (0, import_react19.createElement)("span", { className: "bt-create-title" }, t("Create Bot")), - (0, import_react19.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close"), onClick: () => actions.closeOverlay() }, (0, import_react19.createElement)(CloseIcon)) -+ canGoBack ? (0, import_react34.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to new chat"), onClick: onBack }, (0, import_react34.createElement)(ChevronLeftIcon)) : (0, import_react34.createElement)("span", { className: "bt-create-gap" }), -+ (0, import_react34.createElement)("span", { className: "bt-create-title" }, t("Create Bot")), -+ (0, import_react34.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close"), onClick: () => actions.closeOverlay() }, (0, import_react34.createElement)(CloseIcon)) ++ canGoBack ? (0, import_react38.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to new chat"), onClick: onBack }, (0, import_react38.createElement)(ChevronLeftIcon)) : (0, import_react38.createElement)("span", { className: "bt-create-gap" }), ++ (0, import_react38.createElement)("span", { className: "bt-create-title" }, t("Create Bot")), ++ (0, import_react38.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close"), onClick: () => actions.closeOverlay() }, (0, import_react38.createElement)(CloseIcon)) ), - (0, import_react19.createElement)("div", { className: "bt-create-body" }, card) -+ (0, import_react34.createElement)("div", { className: "bt-create-body" }, card) ++ (0, import_react38.createElement)("div", { className: "bt-create-body" }, card) ); } // src/client/new-chat.js -var import_react20 = require("react"); -var import_dsh_client_ui_primitives4 = require("@deepseek-ai/dsh-client-ui-primitives"); -+var import_react35 = require("react"); ++var import_react39 = require("react"); function NewChat({ mode, roster, actions }) { - const [query, setQuery] = (0, import_react20.useState)(""); - const [picked, setPicked] = (0, import_react20.useState)([]); @@ -21121,20 +22297,21 @@ diff --git a/client.js b/client.js - const [cursor, setCursor] = (0, import_react20.useState)(0); - const [draft, setDraft] = (0, import_react20.useState)(mode === "create" ? { name: "", fromList: false } : null); - const inputRef = (0, import_react20.useRef)(null); -+ const [query, setQuery] = (0, import_react35.useState)(""); -+ const [picked, setPicked] = (0, import_react35.useState)([]); -+ const [group, setGroup] = (0, import_react35.useState)(mode === "group"); -+ const [compose, setCompose] = (0, import_react35.useState)(mode !== "new"); -+ const [admin, setAdmin] = (0, import_react35.useState)(null); -+ const [message, setMessage] = (0, import_react35.useState)(""); -+ const [busy, setBusy] = (0, import_react35.useState)(false); -+ const [error, setError] = (0, import_react35.useState)(""); -+ const [fix, setFix] = (0, import_react35.useState)(null); -+ const [fixNote, setFixNote] = (0, import_react35.useState)(""); -+ const [inviteLink, setInviteLink] = (0, import_react35.useState)(""); -+ const [cursor, setCursor] = (0, import_react35.useState)(0); -+ const [draft, setDraft] = (0, import_react35.useState)(mode === "create" ? { name: "", fromList: false } : null); -+ const inputRef = (0, import_react35.useRef)(null); ++ const [query, setQuery] = (0, import_react39.useState)(""); ++ const [picked, setPicked] = (0, import_react39.useState)([]); ++ const [group, setGroup] = (0, import_react39.useState)(mode === "group"); ++ const [compose, setCompose] = (0, import_react39.useState)(mode !== "new"); ++ const [admin, setAdmin] = (0, import_react39.useState)(null); ++ const [name, setName] = (0, import_react39.useState)(""); ++ const [message, setMessage] = (0, import_react39.useState)(""); ++ const [busy, setBusy] = (0, import_react39.useState)(false); ++ const [error, setError] = (0, import_react39.useState)(""); ++ const [fix, setFix] = (0, import_react39.useState)(null); ++ const [fixNote, setFixNote] = (0, import_react39.useState)(""); ++ const [inviteLink, setInviteLink] = (0, import_react39.useState)(""); ++ const [cursor, setCursor] = (0, import_react39.useState)(0); ++ const [draft, setDraft] = (0, import_react39.useState)(mode === "create" ? { name: "", fromList: false } : null); ++ const inputRef = (0, import_react39.useRef)(null); const close = () => actions.closeOverlay(); useEscape(close); const paneLeft = usePaneLeft(); @@ -21228,7 +22405,7 @@ diff --git a/client.js b/client.js + ...members.map((id) => ({ kind: "bot", id, role: id === admin ? "admin" : "member" })), + ...remotes + ]; -+ const room2 = await actions.createRoom(members, { admin, ...participants ? { participants } : {} }); ++ const room2 = await actions.createRoom(members, { admin, ...name.trim() ? { name: name.trim() } : {}, ...participants ? { participants } : {} }); + if (text2) await actions.send(room2.id, text2); actions.openSession(room2.id); close(); @@ -21269,14 +22446,14 @@ diff --git a/client.js b/client.js - options.push({ key: "new", icon: (0, import_react20.createElement)(PlusIcon), label: t("Create new Bot"), run: createBot }); - options.push({ key: "group", icon: (0, import_react20.createElement)(PeopleIcon), label: t("Create group chat"), run: () => { + if (menuOnly) { -+ options.push({ key: "chat", icon: (0, import_react35.createElement)(ChatIcon), label: t("New chat"), hint: t("Message one of your Bots"), run: () => { ++ options.push({ key: "chat", icon: (0, import_react39.createElement)(ChatIcon), label: t("New chat"), hint: t("Message one of your Bots"), run: () => { + setCompose(true); + setCursor(0); + setTimeout(() => inputRef.current?.focus()); + } }); + } -+ options.push({ key: "new", icon: (0, import_react35.createElement)(BotIcon), label: t("New Bot"), hint: t("Set up a Bot with its own role"), run: createBot }); -+ options.push({ key: "group", icon: (0, import_react35.createElement)(PeopleIcon), label: t("New group chat"), hint: t("Chat with several of your Bots"), run: () => { ++ options.push({ key: "new", icon: (0, import_react39.createElement)(BotIcon), label: t("New Bot"), hint: t("Set up a Bot with its own role"), run: createBot }); ++ options.push({ key: "group", icon: (0, import_react39.createElement)(PeopleIcon), label: t("New group chat"), hint: t("Chat with several of your Bots"), run: () => { setGroup(true); + setCompose(true); setCursor(0); @@ -21287,7 +22464,7 @@ diff --git a/client.js b/client.js + for (const action of newChatActionRows({ mode, group, picked, query, roster })) { + options.push({ + key: action.key, -+ icon: action.icon ? (0, import_react35.createElement)(SlotIcon, { id: action.key, icon: action.icon, fallback: (0, import_react35.createElement)(PeopleIcon) }) : (0, import_react35.createElement)(PeopleIcon), ++ icon: action.icon ? (0, import_react39.createElement)(SlotIcon, { id: action.key, icon: action.icon, fallback: (0, import_react39.createElement)(PeopleIcon) }) : (0, import_react39.createElement)(PeopleIcon), + label: t(action.label), + hint: action.hint ? t(action.hint) : void 0, + run: () => { @@ -21299,7 +22476,7 @@ diff --git a/client.js b/client.js + }); + } + if (!locked && (roster.agents ?? []).length === 0) { -+ options.push({ key: "agent", icon: (0, import_react35.createElement)(TerminalIcon), label: t("Add coding agent"), hint: t("A coding session without a Bot"), run: () => run(async () => { ++ options.push({ key: "agent", icon: (0, import_react39.createElement)(TerminalIcon), label: t("Add coding agent"), hint: t("A coding session without a Bot"), run: () => run(async () => { await actions.addAgent(); close(); }) }); @@ -21313,22 +22490,22 @@ diff --git a/client.js b/client.js + } } - if (wanted !== "" && !exact && mode !== "search") options.push({ key: "create", icon: (0, import_react20.createElement)(PlusIcon), label: t("Create new Bot “{name}”", { name: query.trim() }), run: createBot }); -+ if (wanted !== "" && !exact && mode !== "search") options.push({ key: "create", icon: (0, import_react35.createElement)(PlusIcon), label: t("New Bot “{name}”", { name: query.trim() }), run: createBot }); ++ if (wanted !== "" && !exact && mode !== "search") options.push({ key: "create", icon: (0, import_react39.createElement)(PlusIcon), label: t("New Bot “{name}”", { name: query.trim() }), run: createBot }); const active = Math.min(cursor, Math.max(options.length - 1, 0)); const listed = options.map((option) => option.key).join("\n"); const glide = useGlide(`${active} ${listed}`, { axis: "y", ...QUICK_EDGES }); useFlip(glide.box, listed, "[data-flip]"); - const drop = (0, import_react20.useRef)(null); -+ const drop = (0, import_react35.useRef)(null); ++ const drop = (0, import_react39.useRef)(null); useMorph(drop, listed); if (draft) { - return (0, import_react20.createElement)( -+ return (0, import_react35.createElement)( ++ return (0, import_react39.createElement)( "div", { className: "bt-pane", style: { left: paneLeft } }, - (0, import_react20.createElement)(CreateBot, { -+ (0, import_react35.createElement)(CreateBot, { ++ (0, import_react39.createElement)(CreateBot, { roster, actions, start: draft, @@ -21341,7 +22518,7 @@ diff --git a/client.js b/client.js else if (admin !== null) setAdmin(null); }; - return (0, import_react20.createElement)( -+ return (0, import_react35.createElement)( ++ return (0, import_react39.createElement)( "div", - { className: "bt-pane", style: { left: paneLeft } }, - (0, import_react20.createElement)( @@ -21353,124 +22530,156 @@ diff --git a/client.js b/client.js + if (event.target === event.currentTarget) close(); + } : void 0 + }, -+ (0, import_react35.createElement)( ++ (0, import_react39.createElement)( "div", - { className: "bt-newchat", role: "dialog", "aria-label": mode === "search" ? t("Search") : t("New chat") }, - (0, import_react20.createElement)( + { className: "bt-newchat", role: "dialog", "aria-label": mode === "search" ? t("Search") : menuOnly ? t("New…") : t("New chat"), "data-menu": menuOnly || void 0 }, + // The popover needs no title row: Escape or a press outside closes it. -+ menuOnly ? null : (0, import_react35.createElement)( ++ menuOnly ? null : (0, import_react39.createElement)( "div", { className: "bt-to" }, - (0, import_react20.createElement)("span", { className: "bt-to-label" }, t("To:")), - adminBot ? (0, import_react20.createElement)( -+ (0, import_react35.createElement)("span", { className: "bt-to-label" }, t("To:")), -+ adminBot ? (0, import_react35.createElement)( ++ (0, import_react39.createElement)("span", { className: "bt-to-label" }, t("To:")), ++ adminBot ? (0, import_react39.createElement)( "span", { key: adminBot.id, className: "bt-token bt-token-admin", title: t("Admin") }, - (0, import_react20.createElement)(BotMark, { bot: adminBot, size: 16 }), -+ (0, import_react35.createElement)(BotMark, { bot: adminBot, size: 16 }), ++ (0, import_react39.createElement)(BotMark, { bot: adminBot, size: 16 }), adminBot.name, - (0, import_react20.createElement)(AdminStar), - (0, import_react20.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: adminBot.name }), onClick: () => setAdmin(null) }, "×") -+ (0, import_react35.createElement)(AdminStar), -+ (0, import_react35.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: adminBot.name }), onClick: () => setAdmin(null) }, "×") ++ (0, import_react39.createElement)(AdminStar), ++ (0, import_react39.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: adminBot.name }), onClick: () => setAdmin(null) }, "×") ) : null, - choosingAdmin ? (0, import_react20.createElement)("span", { className: "bt-to-star", "aria-hidden": true }, (0, import_react20.createElement)(AdminStar)) : null, - pickedBots.map((bot) => (0, import_react20.createElement)( -+ choosingAdmin ? (0, import_react35.createElement)("span", { className: "bt-to-star", "aria-hidden": true }, (0, import_react35.createElement)(AdminStar)) : null, -+ pickedBots.map((bot) => (0, import_react35.createElement)( ++ choosingAdmin ? (0, import_react39.createElement)("span", { className: "bt-to-star", "aria-hidden": true }, (0, import_react39.createElement)(AdminStar)) : null, ++ pickedBots.map((bot) => (0, import_react39.createElement)( "span", { key: bot.id, className: "bt-token" }, - (0, import_react20.createElement)(BotMark, { bot, size: 16 }), -+ (0, import_react35.createElement)(BotMark, { bot, size: 16 }), ++ (0, import_react39.createElement)(BotMark, { bot, size: 16 }), bot.name, - (0, import_react20.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: bot.name }), onClick: () => setPicked((current) => current.filter((id) => id !== bot.id)) }, "×") -+ (0, import_react35.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: bot.name }), onClick: () => setPicked((current) => current.filter((id) => id !== bot.id)) }, "×") ++ (0, import_react39.createElement)("button", { type: "button", "aria-label": t("Remove {name}", { name: bot.name }), onClick: () => setPicked((current) => current.filter((id) => id !== bot.id)) }, "×") )), - (0, import_react20.createElement)("input", { -+ (0, import_react35.createElement)("input", { ++ (0, import_react39.createElement)("input", { ref: inputRef, autoFocus: true, value: query, -@@ -8517,20 +8517,20 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); +@@ -8504,7 +8504,7 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); + setCursor(0); + }, + onKeyDown: (event) => { +- if (event.nativeEvent.isComposing) return; ++ if (event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229) return; + if (event.key === "ArrowDown") { + event.preventDefault(); + setCursor(Math.min(active + 1, options.length - 1)); +@@ -8517,20 +8517,34 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); } else if (event.key === "Backspace" && query === "") unpick(); } }), - group && admin !== null ? (0, import_react20.createElement)("button", { -+ group && admin !== null ? locked ? readOnlyLine(import_react35.createElement, roster, actions, { key: "readonly-admin" }) : (0, import_react35.createElement)("button", { ++ group ? locked ? readOnlyLine(import_react39.createElement, roster, actions, { key: "readonly-admin" }) : (0, import_react39.createElement)("button", { type: "button", className: "bt-send bt-to-create", - disabled: busy || picked.length === 0, - title: picked.length === 0 ? t("Add at least one more Bot") : void 0, +- disabled: busy || picked.length === 0, +- title: picked.length === 0 ? t("Add at least one more Bot") : void 0, ++ disabled: busy || admin === null || picked.length === 0, ++ title: admin === null || picked.length === 0 ? t("Add at least one more Bot") : void 0, onClick: createGroup }, t("Create group chat")) : null, - (0, import_react20.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Close new chat"), onClick: close }, "×") -+ (0, import_react35.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Close new chat"), onClick: close }, "×") ++ (0, import_react39.createElement)("button", { type: "button", className: "bt-x", "aria-label": t("Close new chat"), onClick: close }, "×") ), - (0, import_react20.createElement)("div", { ref: drop, className: "bt-drop" }, (0, import_react20.createElement)( -+ (0, import_react35.createElement)("div", { ref: drop, className: "bt-drop" }, (0, import_react35.createElement)( ++ group ? (0, import_react39.createElement)( ++ "label", ++ { className: "bt-ng-name-row bt-nc-name" }, ++ (0, import_react39.createElement)("span", { className: "bt-ng-name-label" }, t("Group name")), ++ (0, import_react39.createElement)("input", { ++ className: "bt-ng-name-input", ++ value: name, ++ maxLength: 60, ++ readOnly: locked, ++ placeholder: t("Group name (optional)"), ++ "aria-label": t("Group name"), ++ onChange: (event) => setName(event.target.value) ++ }) ++ ) : null, ++ (0, import_react39.createElement)("div", { ref: drop, className: "bt-drop" }, (0, import_react39.createElement)( "div", { ref: glide.box, role: "listbox", "aria-label": t("Recipients"), className: "bt-drop-list" }, - (0, import_react20.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), - options.length === 0 ? (0, import_react20.createElement)("div", { className: "bt-hint" }, mode === "search" ? t("No Bots match") : t("Type a name to create a Bot")) : options.map((option, index) => (0, import_react20.createElement)( -+ (0, import_react35.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), -+ options.length === 0 ? (0, import_react35.createElement)("div", { className: "bt-hint" }, mode === "search" ? t("No Bots match") : t("Type a name to create a Bot")) : options.map((option, index) => (0, import_react35.createElement)( ++ (0, import_react39.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), ++ options.length === 0 ? (0, import_react39.createElement)("div", { className: "bt-hint" }, mode === "search" || group ? t("No Bots match") : t("Type a name to create a Bot")) : options.map((option, index) => (0, import_react39.createElement)( "button", { key: option.key, -@@ -8542,21 +8542,36 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); +@@ -8542,34 +8542,50 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); onMouseEnter: () => setCursor(index), onClick: option.run }, - option.bot ? (0, import_react20.createElement)(BotMark, { bot: option.bot, size: 22 }) : (0, import_react20.createElement)("span", { className: "bt-option-icon" }, option.icon), - (0, import_react20.createElement)("span", { className: "bt-option-label" }, option.label), - option.hint && index === active ? (0, import_react20.createElement)("span", { className: "bt-option-hint" }, option.hint) : null -+ option.bot ? (0, import_react35.createElement)(BotMark, { bot: option.bot, size: 22 }) : (0, import_react35.createElement)("span", { className: "bt-option-icon" }, option.icon), ++ option.bot ? (0, import_react39.createElement)(BotMark, { bot: option.bot, size: 22 }) : (0, import_react39.createElement)("span", { className: "bt-option-icon" }, option.icon), + // An action row's description sits under its title and is always there (#283): a long line + // beside the title squeezed the title to nothing on hover, and a line that appears on hover moves the rows. + // A Bot row's short hint stays beside the name and shows on the active row only. -+ option.bot || !option.hint ? (0, import_react35.createElement)("span", { className: "bt-option-label" }, option.label) : (0, import_react35.createElement)("span", { className: "bt-option-copy" }, (0, import_react35.createElement)("span", { className: "bt-option-label" }, option.label), (0, import_react35.createElement)("span", { className: "bt-option-sub" }, option.hint)), -+ option.bot && option.hint && index === active ? (0, import_react35.createElement)("span", { className: "bt-option-hint" }, option.hint) : null ++ option.bot || !option.hint ? (0, import_react39.createElement)("span", { className: "bt-option-label" }, option.label) : (0, import_react39.createElement)("span", { className: "bt-option-copy" }, (0, import_react39.createElement)("span", { className: "bt-option-label" }, option.label), (0, import_react39.createElement)("span", { className: "bt-option-sub" }, option.hint)), ++ option.bot && option.hint && index === active ? (0, import_react39.createElement)("span", { className: "bt-option-hint" }, option.hint) : null )) )), - (0, import_react20.createElement)("div", { className: "bt-nc-spacer" }), - error ? (0, import_react20.createElement)("div", { className: "bt-error" }, error) : null, - (0, import_react20.createElement)( -+ menuOnly ? null : (0, import_react35.createElement)("div", { className: "bt-nc-spacer" }), -+ error && fix ? (0, import_react35.createElement)( ++ menuOnly ? null : (0, import_react39.createElement)("div", { className: "bt-nc-spacer" }), ++ error && fix ? (0, import_react39.createElement)( + "div", + { className: "bt-error bt-fix", role: "alert", "data-fix": "ungranted-local" }, -+ (0, import_react35.createElement)("div", null, fix.bots.length === 1 ? t("{name} is not shared with {friend}, so it cannot be in a group with their Bot: the group's messages go to their home.", { name: fix.bots[0].name, friend: fix.friends.join(", ") || t("that friend") }) : t("{name} are not shared with {friend}, so they cannot be in a group with their Bot: the group's messages go to their home.", { name: fix.bots.map((bot) => bot.name).join(", "), friend: fix.friends.join(", ") || t("that friend") })), -+ (0, import_react35.createElement)("div", { className: "bt-fix-actions" }, fix.bots.flatMap((bot) => [ -+ typeof globalThis.__flybot__?.social?.createInvite === "function" && globalThis.__flybot__.social.canInvite?.(bot.id) !== false ? (0, import_react35.createElement)("button", { key: `invite-${bot.id}`, type: "button", className: "bt-fix-btn", "data-fix-action": "invite", onClick: () => { ++ (0, import_react39.createElement)("div", null, fix.bots.length === 1 ? t("{name} is not shared with {friend}, so it cannot be in a group with their Bot: the group's messages go to their home.", { name: fix.bots[0].name, friend: fix.friends.join(", ") || t("that friend") }) : t("{name} are not shared with {friend}, so they cannot be in a group with their Bot: the group's messages go to their home.", { name: fix.bots.map((bot) => bot.name).join(", "), friend: fix.friends.join(", ") || t("that friend") })), ++ (0, import_react39.createElement)("div", { className: "bt-fix-actions" }, fix.bots.flatMap((bot) => [ ++ typeof globalThis.__flybot__?.social?.createInvite === "function" && globalThis.__flybot__.social.canInvite?.(bot.id) !== false ? (0, import_react39.createElement)("button", { key: `invite-${bot.id}`, type: "button", className: "bt-fix-btn", "data-fix-action": "invite", onClick: () => { + void copyInvite(bot); + } }, t("Copy invite link for {name}", { name: bot.name })) : null, -+ (0, import_react35.createElement)("button", { key: `out-${bot.id}`, type: "button", className: "bt-fix-btn", "data-fix-action": "leave-out", onClick: () => leaveOut(bot.id) }, t("Leave {name} out", { name: bot.name })) ++ (0, import_react39.createElement)("button", { key: `out-${bot.id}`, type: "button", className: "bt-fix-btn", "data-fix-action": "leave-out", onClick: () => leaveOut(bot.id) }, t("Leave {name} out", { name: bot.name })) + ])), -+ fixNote ? (0, import_react35.createElement)("div", { className: "bt-note", role: "status" }, fixNote) : null, -+ inviteLink ? (0, import_react35.createElement)("input", { className: "bt-input bt-fix-link", type: "text", readOnly: true, value: inviteLink, "aria-label": t("Invite link"), "data-fix-link": "", autoFocus: true, onFocus: (event) => event.target.select(), onClick: (event) => event.target.select() }) : null -+ ) : error ? (0, import_react35.createElement)("div", { className: "bt-error" }, error) : null, -+ menuOnly ? null : (0, import_react35.createElement)( ++ fixNote ? (0, import_react39.createElement)("div", { className: "bt-note", role: "status" }, fixNote) : null, ++ inviteLink ? (0, import_react39.createElement)("input", { className: "bt-input bt-fix-link", type: "text", readOnly: true, value: inviteLink, "aria-label": t("Invite link"), "data-fix-link": "", autoFocus: true, onFocus: (event) => event.target.select(), onClick: (event) => event.target.select() }) : null ++ ) : error ? (0, import_react39.createElement)("div", { className: "bt-error" }, error) : null, ++ menuOnly ? null : (0, import_react39.createElement)( "div", { className: "bt-nc-compose" }, - (0, import_react20.createElement)( -+ (0, import_react35.createElement)( ++ (0, import_react39.createElement)( "div", { className: "bt-nc-card" }, - (0, import_react20.createElement)("span", { className: "bt-nc-plus", "aria-hidden": true }, (0, import_react20.createElement)(PlusIcon)), - (0, import_react20.createElement)("textarea", { -+ (0, import_react35.createElement)("span", { className: "bt-nc-plus", "aria-hidden": true }, (0, import_react35.createElement)(PlusIcon)), -+ (0, import_react35.createElement)("textarea", { ++ (0, import_react39.createElement)("span", { className: "bt-nc-plus", "aria-hidden": true }, (0, import_react39.createElement)(PlusIcon)), ++ (0, import_react39.createElement)("textarea", { rows: 1, value: message, placeholder, -@@ -8569,7 +8569,7 @@ ${listed}`, { axis: "y", ...QUICK_EDGES }); ++ readOnly: locked, + "aria-label": placeholder, + onChange: (event) => setMessage(event.target.value), + onKeyDown: (event) => { +- if (event.key === "Enter" && !event.shiftKey && !event.nativeEvent.isComposing) { ++ if (!locked && shouldSendOnKey(event, sendKeyOf(roster.prefs))) { + event.preventDefault(); + sendMessage(); } } }), - (0, import_react20.createElement)("button", { type: "button", className: "bt-nc-send", "aria-label": t("Send message"), disabled: busy || message.trim() === "" || picked.length === 0, onClick: sendMessage }, (0, import_react20.createElement)(ArrowUpIcon)) -+ locked ? group && admin !== null ? null : readOnlyLine(import_react35.createElement, roster, actions, { key: "readonly-compose" }) : (0, import_react35.createElement)("button", { type: "button", className: "bt-nc-send", "aria-label": t("Send message"), disabled: busy || message.trim() === "" || picked.length === 0, onClick: sendMessage }, (0, import_react35.createElement)(ArrowUpIcon)) ++ locked ? group ? null : readOnlyLine(import_react39.createElement, roster, actions, { key: "readonly-compose" }) : (0, import_react39.createElement)("button", { type: "button", className: "bt-nc-send", "aria-label": t("Send message"), disabled: busy || message.trim() === "" || picked.length === 0, onClick: sendMessage }, (0, import_react39.createElement)(ArrowUpIcon)) ) ) ) @@ -21479,7 +22688,7 @@ diff --git a/client.js b/client.js // src/client/exchange.js -var import_react21 = require("react"); -+var import_react36 = require("react"); ++var import_react40 = require("react"); var SHEET_EXIT_MS = 220; +function exchangeText(text2, names = []) { + if (typeof text2 !== "string") return ""; @@ -21499,18 +22708,18 @@ diff --git a/client.js b/client.js + const bot = roster.byId[entry.from] ?? { id: entry.from, name: t("You"), color: "gray" }; + const body = exchangeText(entry.text, botNames(roster)); + if (body === "") return null; -+ return (0, import_react36.createElement)( ++ return (0, import_react40.createElement)( + "div", + { className: "bt-group-msg" }, -+ (0, import_react36.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, bot.name), -+ (0, import_react36.createElement)(Bubbles, { texts: [body], roster, selfId: bot.id, actions, lead: (0, import_react36.createElement)("span", { className: "bt-lead" }, (0, import_react36.createElement)(BotMark, { bot, size: 22 })) }) ++ (0, import_react40.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, bot.name), ++ (0, import_react40.createElement)(Bubbles, { texts: [body], roster, selfId: bot.id, actions, lead: (0, import_react40.createElement)("span", { className: "bt-lead" }, (0, import_react40.createElement)(BotMark, { bot, size: 22 })) }) + ); +} function ExchangeDialog({ pair, roster, actions }) { - const [entries2, setEntries] = (0, import_react21.useState)(null); - const [leaving, setLeaving] = (0, import_react21.useState)(false); -+ const [entries2, setEntries] = (0, import_react36.useState)(null); -+ const [leaving, setLeaving] = (0, import_react36.useState)(false); ++ const [entries2, setEntries] = (0, import_react40.useState)(null); ++ const [leaving, setLeaving] = (0, import_react40.useState)(false); const close = () => { if (leaving) return; setLeaving(true); @@ -21518,7 +22727,7 @@ diff --git a/client.js b/client.js }; useEscape(close); - (0, import_react21.useEffect)(() => { -+ (0, import_react36.useEffect)(() => { ++ (0, import_react40.useEffect)(() => { let stop = false; let timer; let seen = null; @@ -21527,39 +22736,39 @@ diff --git a/client.js b/client.js let lastDay = 0; const paneLeft = usePaneLeft(); - return (0, import_react21.createElement)( -+ return (0, import_react36.createElement)( ++ return (0, import_react40.createElement)( "div", { className: "bt-pane bt-exchange", style: { left: paneLeft }, "data-leaving": leaving || void 0 }, - (0, import_react21.createElement)( -+ (0, import_react36.createElement)( ++ (0, import_react40.createElement)( "div", { className: "bt-dialog", role: "dialog", "aria-label": t("Bot exchange") }, - (0, import_react21.createElement)("div", { className: "bt-head" }, (0, import_react21.createElement)( -+ (0, import_react36.createElement)("div", { className: "bt-head" }, (0, import_react36.createElement)( ++ (0, import_react40.createElement)("div", { className: "bt-head" }, (0, import_react40.createElement)( "span", { className: "bt-pill", style: { cursor: "default" } }, - left ? (0, import_react21.createElement)(BotMark, { bot: left, size: 22 }) : null, -+ left ? (0, import_react36.createElement)(BotMark, { bot: left, size: 22 }) : null, ++ left ? (0, import_react40.createElement)(BotMark, { bot: left, size: 22 }) : null, left?.name ?? "?", - (0, import_react21.createElement)("span", { className: "bt-swap" }, "⇄"), - right ? (0, import_react21.createElement)(BotMark, { bot: right, size: 22 }) : null, -+ (0, import_react36.createElement)("span", { className: "bt-swap" }, "⇄"), -+ right ? (0, import_react36.createElement)(BotMark, { bot: right, size: 22 }) : null, ++ (0, import_react40.createElement)("span", { className: "bt-swap" }, "⇄"), ++ right ? (0, import_react40.createElement)(BotMark, { bot: right, size: 22 }) : null, right?.name ?? "?" )), - (0, import_react21.createElement)( -+ (0, import_react36.createElement)( ++ (0, import_react40.createElement)( "div", { className: "bt-dialog-log", role: "log", "aria-label": t("Bot exchange transcript") }, - entries2 === null ? (0, import_react21.createElement)("div", { className: "bt-hint" }, t("Loading…")) : entries2.length === 0 ? (0, import_react21.createElement)("div", { className: "bt-hint" }, t("No messages yet")) : entries2.map((entry) => { - const bot = roster.byId[entry.from] ?? { id: entry.from, name: t("You"), color: "gray" }; -+ entries2 === null ? (0, import_react36.createElement)("div", { className: "bt-hint" }, t("Loading…")) : entries2.length === 0 ? (0, import_react36.createElement)("div", { className: "bt-hint" }, t("No messages yet")) : entries2.map((entry) => { ++ entries2 === null ? (0, import_react40.createElement)("div", { className: "bt-hint" }, t("Loading…")) : entries2.length === 0 ? (0, import_react40.createElement)("div", { className: "bt-hint" }, t("No messages yet")) : entries2.map((entry) => { const showDay = entry.time - lastDay > 30 * 60 * 1e3; lastDay = entry.time; - return (0, import_react21.createElement)( - import_react21.Fragment, -+ return (0, import_react36.createElement)( -+ import_react36.Fragment, ++ return (0, import_react40.createElement)( ++ import_react40.Fragment, { key: entry.id }, - showDay ? (0, import_react21.createElement)("time", { className: "bt-time" }, dayLabel(entry.time)) : null, - (0, import_react21.createElement)( @@ -21568,13 +22777,13 @@ diff --git a/client.js b/client.js - (0, import_react21.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, bot.name), - (0, import_react21.createElement)(Bubbles, { texts: [entry.text], roster, selfId: bot.id, actions, lead: (0, import_react21.createElement)("span", { className: "bt-lead" }, (0, import_react21.createElement)(BotMark, { bot, size: 22 })) }) - ) -+ showDay ? (0, import_react36.createElement)("time", { className: "bt-time" }, dayLabel(entry.time)) : null, -+ (0, import_react36.createElement)(ExchangeLine, { entry, roster, actions }) ++ showDay ? (0, import_react40.createElement)("time", { className: "bt-time" }, dayLabel(entry.time)) : null, ++ (0, import_react40.createElement)(ExchangeLine, { entry, roster, actions }) ); }) ), - (0, import_react21.createElement)("div", { className: "bt-dialog-foot" }, (0, import_react21.createElement)("button", { type: "button", className: "bt-soft", onClick: close }, t("Close Chat"))) -+ (0, import_react36.createElement)("div", { className: "bt-dialog-foot" }, (0, import_react36.createElement)("button", { type: "button", className: "bt-soft", onClick: close }, t("Close Chat"))) ++ (0, import_react40.createElement)("div", { className: "bt-dialog-foot" }, (0, import_react40.createElement)("button", { type: "button", className: "bt-soft", onClick: close }, t("Close Chat"))) ) ); } @@ -21582,7 +22791,7 @@ diff --git a/client.js b/client.js // src/client/voice.js -var import_react22 = require("react"); -var plainSpeech = (text) => stripHeader(text).replace(/```[\s\S]*?```/g, " ").replace(/\[([^\]]*)\]\([^)]*\)/g, "$1").replace(/[*_`#>|~-]+/g, " ").replace(/\s+/g, " ").trim(); -+var import_react37 = require("react"); ++var import_react41 = require("react"); var VOICE_LABELS = { listening: "Listening", thinking: "Thinking", @@ -21592,8 +22801,8 @@ diff --git a/client.js b/client.js function useMicLevel(enabled) { - const [level, setLevel] = (0, import_react22.useState)(0); - (0, import_react22.useEffect)(() => { -+ const [level, setLevel] = (0, import_react37.useState)(0); -+ (0, import_react37.useEffect)(() => { ++ const [level, setLevel] = (0, import_react41.useState)(0); ++ (0, import_react41.useEffect)(() => { if (!enabled || !navigator.mediaDevices?.getUserMedia) return void 0; let stream = null; let audio = null; @@ -21618,19 +22827,19 @@ diff --git a/client.js b/client.js - const [cycle, setCycle] = (0, import_react22.useState)(0); - const waiting = (0, import_react22.useRef)(null); - const reply = (0, import_react22.useRef)(lastReply); -+ const [speech] = (0, import_react37.useState)(() => actions.speech()); -+ const [phase, setPhase] = (0, import_react37.useState)(speech ? "starting" : speechApi() ? "listening" : "unsupported"); -+ const [catalog, setCatalog] = (0, import_react37.useState)(null); -+ const [heard, setHeard] = (0, import_react37.useState)(""); -+ const [said, setSaid] = (0, import_react37.useState)(""); -+ const [note, setNote] = (0, import_react37.useState)(""); -+ const [serviceLevel, setServiceLevel] = (0, import_react37.useState)(0); -+ const [cycle, setCycle] = (0, import_react37.useState)(0); -+ const waiting = (0, import_react37.useRef)(null); -+ const reply = (0, import_react37.useRef)(lastReply); ++ const [speech] = (0, import_react41.useState)(() => actions.speech()); ++ const [phase, setPhase] = (0, import_react41.useState)(speech ? "starting" : speechApi() ? "listening" : "unsupported"); ++ const [catalog, setCatalog] = (0, import_react41.useState)(null); ++ const [heard, setHeard] = (0, import_react41.useState)(""); ++ const [said, setSaid] = (0, import_react41.useState)(""); ++ const [note, setNote] = (0, import_react41.useState)(""); ++ const [serviceLevel, setServiceLevel] = (0, import_react41.useState)(0); ++ const [cycle, setCycle] = (0, import_react41.useState)(0); ++ const waiting = (0, import_react41.useRef)(null); ++ const reply = (0, import_react41.useRef)(lastReply); reply.current = lastReply; - const turn = (0, import_react22.useRef)(0); -+ const turn = (0, import_react37.useRef)(0); ++ const turn = (0, import_react41.useRef)(0); const paneLeft = usePaneLeft(); const close = () => { turn.current += 1; @@ -21657,13 +22866,13 @@ diff --git a/client.js b/client.js + submit(text2); }); - (0, import_react22.useEffect)(() => { -+ (0, import_react37.useEffect)(() => { ++ (0, import_react41.useEffect)(() => { if (!note) return void 0; const timer = setTimeout(() => setNote(""), 2600); return () => clearTimeout(timer); }, [note]); - (0, import_react22.useEffect)(() => { -+ (0, import_react37.useEffect)(() => { ++ (0, import_react41.useEffect)(() => { if (!speech) return void 0; let live = true; speechCatalog(speech).then(({ catalog: next, usable }) => { @@ -21672,18 +22881,18 @@ diff --git a/client.js b/client.js }, [speech]); const listen = phase === "listening"; - (0, import_react22.useEffect)(() => { -+ (0, import_react37.useEffect)(() => { ++ (0, import_react41.useEffect)(() => { if (speech || !listen || dictation.listening) return void 0; const timer = setTimeout(() => dictation.start({ continuous: false, onEnd: () => { } }), 250); return () => clearTimeout(timer); }, [listen, dictation.listening]); - (0, import_react22.useEffect)(() => { -+ (0, import_react37.useEffect)(() => { ++ (0, import_react41.useEffect)(() => { if (phase !== "listening") dictation.stop(); }, [phase]); - (0, import_react22.useEffect)(() => { -+ (0, import_react37.useEffect)(() => { ++ (0, import_react41.useEffect)(() => { if (!speech || !catalog || !listen) return void 0; const own = turn.current; let capture = null; @@ -21704,7 +22913,7 @@ diff --git a/client.js b/client.js }; }, [speech, catalog, listen, cycle]); - (0, import_react22.useEffect)(() => { -+ (0, import_react37.useEffect)(() => { ++ (0, import_react41.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; @@ -21721,71 +22930,510 @@ diff --git a/client.js b/client.js window.speechSynthesis.speak(utterance); }, [phase, running, lastReply]); - (0, import_react22.useEffect)(() => () => window.speechSynthesis?.cancel(), []); -+ (0, import_react37.useEffect)(() => () => window.speechSynthesis?.cancel(), []); ++ (0, import_react41.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"; -@@ -8875,291 +8875,852 @@ function VoiceMode({ sessionId, roster, actions, useSessions, useSessionStatus } +@@ -8875,291 +8875,1284 @@ function VoiceMode({ sessionId, roster, actions, useSessions, useSessionStatus } const openSetup = phase === "setup" ? actions.voiceSetup() : null; const caption = phase === "speaking" ? said : heard; const shownNote = note || dictation.note; - return (0, import_react22.createElement)( -+ return (0, import_react37.createElement)( ++ return (0, import_react41.createElement)( "div", { className: "bt-pane bt-voice-pane", style: { left: paneLeft } }, - (0, import_react22.createElement)( -+ (0, import_react37.createElement)( ++ (0, import_react41.createElement)( "div", { className: "bt-voice-stage", role: "dialog", "aria-label": t("Voice chat with {name}", { name }), "data-phase": phase === "transcribing" ? "thinking" : phase }, - (0, import_react22.createElement)( -+ (0, import_react37.createElement)( ++ (0, import_react41.createElement)( "div", { className: "bt-voice-orb", style: { "--bt-level": level } }, - (0, import_react22.createElement)("span", { className: "bt-voice-ring", "aria-hidden": true }), - (0, import_react22.createElement)("span", { className: "bt-voice-ring bt-voice-ring-2", "aria-hidden": true }), - bot ? (0, import_react22.createElement)(BotMark, { bot, size: 112, state: markState, live: true, gaze: phase === "listening" }) : room2 ? (0, import_react22.createElement)(RoomAvatar, { room: room2, roster, size: 112 }) : null -+ (0, import_react37.createElement)("span", { className: "bt-voice-ring", "aria-hidden": true }), -+ (0, import_react37.createElement)("span", { className: "bt-voice-ring bt-voice-ring-2", "aria-hidden": true }), -+ bot ? (0, import_react37.createElement)(BotMark, { bot, size: 112, state: markState, live: true, gaze: phase === "listening" }) : room2 ? (0, import_react37.createElement)(RoomAvatar, { room: room2, roster, size: 112 }) : null ++ (0, import_react41.createElement)("span", { className: "bt-voice-ring", "aria-hidden": true }), ++ (0, import_react41.createElement)("span", { className: "bt-voice-ring bt-voice-ring-2", "aria-hidden": true }), ++ bot ? (0, import_react41.createElement)(BotMark, { bot, size: 112, state: markState, live: true, gaze: phase === "listening" }) : room2 ? (0, import_react41.createElement)(RoomAvatar, { room: room2, roster, size: 112 }) : null ), - (0, import_react22.createElement)("div", { className: "bt-voice-name" }, name), - (0, import_react22.createElement)( -+ (0, import_react37.createElement)("div", { className: "bt-voice-name" }, name), -+ (0, import_react37.createElement)( ++ (0, import_react41.createElement)("div", { className: "bt-voice-name" }, name), ++ (0, import_react41.createElement)( "div", { className: "bt-voice-status", role: "status" }, - phase === "thinking" ? (0, import_react22.createElement)(Shimmer, null, t("Thinking…")) : phase === "transcribing" ? (0, import_react22.createElement)(Shimmer, null, t("Recognizing…")) : VOICE_LABELS[phase] ? t(VOICE_LABELS[phase]) : "" -+ phase === "thinking" ? (0, import_react37.createElement)(Shimmer, null, t("Thinking…")) : phase === "transcribing" ? (0, import_react37.createElement)(Shimmer, null, t("Recognizing…")) : VOICE_LABELS[phase] ? t(VOICE_LABELS[phase]) : "" ++ phase === "thinking" ? (0, import_react41.createElement)(Shimmer, null, t("Thinking…")) : phase === "transcribing" ? (0, import_react41.createElement)(Shimmer, null, t("Recognizing…")) : VOICE_LABELS[phase] ? t(VOICE_LABELS[phase]) : "" ), - (0, import_react22.createElement)("div", { className: "bt-voice-caption", key: `${phase}:${caption.slice(0, 12)}` }, caption), - openSetup ? (0, import_react22.createElement)("button", { type: "button", className: "bt-voice-setup", onClick: () => { -+ (0, import_react37.createElement)("div", { className: "bt-voice-caption", key: `${phase}:${caption.slice(0, 12)}` }, caption), -+ openSetup ? (0, import_react37.createElement)("button", { type: "button", className: "bt-voice-setup", onClick: () => { ++ (0, import_react41.createElement)("div", { className: "bt-voice-caption", key: `${phase}:${caption.slice(0, 12)}` }, caption), ++ openSetup ? (0, import_react41.createElement)("button", { type: "button", className: "bt-voice-setup", onClick: () => { close(); openSetup(); } }, t("Set up voice input")) : null, - shownNote ? (0, import_react22.createElement)("div", { className: "bt-voice-note" }, shownNote) : null -+ shownNote ? (0, import_react37.createElement)("div", { className: "bt-voice-note" }, shownNote) : null ++ shownNote ? (0, import_react41.createElement)("div", { className: "bt-voice-note" }, shownNote) : null ), - (0, import_react22.createElement)( -+ (0, import_react37.createElement)( ++ (0, import_react41.createElement)( ++ "div", ++ { className: "bt-voice-bar" }, ++ (0, import_react41.createElement)("button", { ++ type: "button", ++ className: "bt-voice-btn", ++ "aria-pressed": phase === "paused", ++ disabled: blocked, ++ "aria-label": phase === "paused" ? t("Resume listening") : t("Pause"), ++ onClick: togglePause ++ }, (0, import_react41.createElement)(MicIcon, { size: 20 }), phase === "paused" ? (0, import_react41.createElement)("span", { className: "bt-voice-slash", "aria-hidden": true }) : null), ++ (0, import_react41.createElement)("button", { type: "button", className: "bt-voice-btn bt-voice-end", "aria-label": t("End voice chat"), onClick: close }, (0, import_react41.createElement)(CloseIcon)) ++ ) ++ ); ++} ++ ++// src/client/connectors.js ++var import_react42 = require("react"); ++var TOKEN_URL = "https://github.com/settings/personal-access-tokens/new"; ++var COMPOSIO_KEY_URL = "https://platform.composio.dev/"; ++var FEISHU_WEBHOOK_URL = "https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot"; ++var APPS = [ ++ ["gmail", "Gmail"], ++ ["googlecalendar", "Google Calendar"], ++ ["googledrive", "Google Drive"], ++ ["googledocs", "Google Docs"], ++ ["googlesheets", "Google Sheets"], ++ ["outlook", "Outlook"], ++ ["slack", "Slack"], ++ ["microsoft_teams", "Microsoft Teams"], ++ ["discord", "Discord"], ++ ["telegram", "Telegram"], ++ ["whatsapp", "WhatsApp"], ++ ["notion", "Notion"], ++ ["linear", "Linear"], ++ ["jira", "Jira"], ++ ["asana", "Asana"], ++ ["trello", "Trello"], ++ ["todoist", "Todoist"], ++ ["airtable", "Airtable"], ++ ["dropbox", "Dropbox"], ++ ["hubspot", "HubSpot"], ++ ["salesforce", "Salesforce"], ++ ["stripe", "Stripe"], ++ ["zoom", "Zoom"], ++ ["calendly", "Calendly"], ++ ["figma", "Figma"], ++ ["twitter", "X (Twitter)"], ++ ["youtube", "YouTube"] ++]; ++var appName = (slug) => APPS.find(([id]) => id === slug)?.[1] ?? slug; ++var GitHubMark = () => (0, import_react42.createElement)( ++ "svg", ++ { width: 20, height: 20, viewBox: "0 0 16 16", fill: "currentColor", "aria-hidden": true }, ++ (0, import_react42.createElement)("path", { d: "M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z" }) ++); ++var FeishuMark = () => (0, import_react42.createElement)( ++ "svg", ++ { width: 20, height: 20, viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": true }, ++ (0, import_react42.createElement)("path", { d: "M3.2 6.6c3 .1 6.4 1.5 8.6 3.9-1.9.4-3.5 1.4-4.7 2.9-1.9-.6-3.4-1.9-3.9-3.6-.2-.7-.2-1.5 0-3.2z" }), ++ (0, import_react42.createElement)("path", { d: "M16.8 5.4c-2.9.2-5.6 1.5-7.4 3.4 1.7 1.2 3.1 2.8 3.9 4.9 2.2-1.1 3.8-3.2 4-5.6.1-.9-.1-1.9-.4-2.7z" }), ++ (0, import_react42.createElement)("path", { d: "M8.6 12.1c.9.7 1.7 1.6 2.2 2.7-1.1.2-2.3 0-3.3-.6.2-.8.6-1.5 1.1-2.1z" }) ++); ++var MARKS = { github: GitHubMark, composio: ConnectorIcon, feishu: FeishuMark }; ++var ABOUT = { ++ github: () => t("Repositories, issues, and pull requests"), ++ composio: () => t("Gmail, Slack, Calendar, Notion and many more apps, through one Composio key"), ++ feishu: () => t("Posts into one Feishu group through a custom bot webhook") ++}; ++function statusText2(connector) { ++ if (connector.state === "connecting") return t("Connecting…"); ++ if (connector.state === "error") return t("Could not connect: {error}", { error: connector.error ?? "" }); ++ if (connector.state === "ready" && connector.kind === "channel") { ++ return connector.mode === "app" ? t("Connected: app, over the long connection") : t("Connected: custom bot webhook"); ++ } ++ if (connector.state === "ready" && connector.apps?.length > 0) return t("Connected: {apps}", { apps: connector.apps.map(appName).join(", ") }); ++ if (connector.state === "ready") return connector.account ? t("Connected as {account}", { account: connector.account }) : t("Connected"); ++ return ABOUT[connector.id]?.() ?? ""; ++} ++function CredentialField({ credential, value, onChange, onEnter, autoFocus }) { ++ const label = t(credential.label); ++ if (credential.masked) return (0, import_react42.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react42.createElement)(MaskedInput, { value, onChange, onEnter, label, autoFocus })); ++ return (0, import_react42.createElement)( ++ "label", ++ { className: "bt-q-field" }, ++ (0, import_react42.createElement)("input", { ++ className: "bt-input", ++ type: "text", ++ value, ++ "aria-label": label, ++ placeholder: label, ++ spellCheck: false, ++ autoFocus, ++ onChange: (event) => onChange(event.target.value), ++ onKeyDown: (event) => { ++ if (event.key === "Enter") onEnter?.(); ++ } ++ }) ++ ); ++} ++function AllowedSenders({ connector, actions, run, busy }) { ++ const [openId, setOpenId] = (0, import_react42.useState)(""); ++ const allowed = connector.allowed ?? []; ++ const refused = connector.inbound?.refusedSenders ?? []; ++ const allow = (id) => void run(actions.connectorAllow(connector.id, id)); ++ return (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-allowed" }, ++ (0, import_react42.createElement)("span", { className: "bt-connector-person-title" }, t("Who may talk to the Bots")), ++ allowed.length === 0 && refused.length === 0 ? (0, import_react42.createElement)("span", { className: "bt-set-hint" }, t("Nobody yet. A message from anyone else starts no turn.")) : null, ++ allowed.map((entry) => (0, import_react42.createElement)( ++ "div", ++ { key: entry.openId, className: "bt-connector-person" }, ++ (0, import_react42.createElement)("span", { className: "bt-connector-person-name" }, entry.name ?? entry.openId), ++ (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorBlock(connector.id, entry.openId)) }, t("Block")) ++ )), ++ refused.map((entry) => (0, import_react42.createElement)( ++ "div", ++ { key: entry.openId, className: "bt-connector-person" }, ++ (0, import_react42.createElement)("span", { className: "bt-connector-person-name" }, entry.name ?? entry.openId), ++ (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => allow(entry.openId) }, t("Allow")) ++ )), ++ (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-form-row" }, ++ (0, import_react42.createElement)("input", { ++ className: "bt-input", ++ type: "text", ++ value: openId, ++ spellCheck: false, ++ "aria-label": t("Feishu open_id"), ++ placeholder: t("Paste an open_id to allow"), ++ onChange: (event) => setOpenId(event.target.value), ++ onKeyDown: (event) => { ++ if (event.key === "Enter" && openId.trim() !== "") { ++ allow(openId.trim()); ++ setOpenId(""); ++ } ++ } ++ }), ++ (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || openId.trim() === "", onClick: () => { ++ allow(openId.trim()); ++ setOpenId(""); ++ } }, t("Allow")) ++ ) ++ ); ++} ++var APP_STATUS = { ready: () => t("Ready"), "sign-in": () => t("Needs sign-in") }; ++function AppChip({ name, status, onRemove }) { ++ const label = APP_STATUS[status]?.(); ++ return (0, import_react42.createElement)( ++ "button", ++ { type: "button", className: "bt-state bt-app-chip", "aria-pressed": true, "data-status": status ?? "unknown", title: t("Remove {app}", { app: name }), onClick: onRemove }, ++ name, ++ label ? (0, import_react42.createElement)("span", { className: "bt-app-status" }, ` · ${label}`) : null ++ ); ++} ++function AppPicker({ apps, onChange, search, statuses = {} }) { ++ const [query, setQuery] = (0, import_react42.useState)(""); ++ const [found, setFound] = (0, import_react42.useState)(null); ++ const [failed, setFailed] = (0, import_react42.useState)(null); ++ const names = (0, import_react42.useRef)(new Map(APPS)); ++ const asked = (0, import_react42.useRef)(0); ++ (0, import_react42.useEffect)(() => { ++ const text2 = query.trim(); ++ if (text2 === "" || search === void 0) { ++ setFound(null); ++ setFailed(null); ++ return void 0; ++ } ++ const ask = ++asked.current; ++ const timer = setTimeout(() => { ++ search(text2).then((list) => { ++ if (ask !== asked.current) return; ++ for (const app of list) names.current.set(app.slug, app.name); ++ setFound(list); ++ setFailed(null); ++ }, (failure) => { ++ if (ask !== asked.current) return; ++ setFound(null); ++ setFailed(failure?.message ?? String(failure)); ++ }); ++ }, 250); ++ return () => clearTimeout(timer); ++ }, [query, search]); ++ const nameOf = (slug) => names.current.get(slug) ?? appName(slug); ++ const picked = new Set(apps); ++ const needle = query.trim().toLowerCase(); ++ const local = APPS.filter(([slug, name]) => needle === "" || slug.includes(needle) || name.toLowerCase().includes(needle)).map(([slug, name]) => ({ slug, name })); ++ const results = (found ?? local).filter((app) => !picked.has(app.slug)); ++ return (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-apps" }, ++ apps.length > 0 ? (0, import_react42.createElement)("div", { className: "bt-states", "aria-label": t("Picked apps") }, apps.map((slug) => (0, import_react42.createElement)(AppChip, { key: slug, name: nameOf(slug), status: statuses[slug], onRemove: () => onChange(apps.filter((app) => app !== slug)) }))) : null, ++ (0, import_react42.createElement)("input", { className: "bt-input", type: "search", value: query, spellCheck: false, "aria-label": t("Search apps"), placeholder: t("Search Composio apps"), onChange: (event) => setQuery(event.target.value) }), ++ failed ? (0, import_react42.createElement)("span", { className: "bt-set-hint" }, t("Could not search Composio: {error}", { error: failed })) : null, ++ (0, import_react42.createElement)("div", { className: "bt-states", "aria-label": t("Apps to add") }, results.length === 0 ? (0, import_react42.createElement)("span", { className: "bt-set-hint" }, t("No apps match")) : results.map((app) => (0, import_react42.createElement)("button", { key: app.slug, type: "button", className: "bt-state", "aria-pressed": false, onClick: () => { ++ names.current.set(app.slug, app.name); ++ onChange([...apps, app.slug]); ++ } }, app.name))) ++ ); ++} ++function AppStatusList({ apps, statuses }) { ++ if (apps.length === 0 || Object.keys(statuses).length === 0) return null; ++ return (0, import_react42.createElement)("ul", { className: "bt-connector-app-list", "aria-label": t("App status") }, apps.map((slug) => (0, import_react42.createElement)( ++ "li", ++ { key: slug, className: "bt-connector-app", "data-status": statuses[slug] ?? "unknown" }, ++ (0, import_react42.createElement)("span", { className: "bt-connector-app-name" }, appName(slug)), ++ (0, import_react42.createElement)("span", { className: "bt-app-status" }, APP_STATUS[statuses[slug]]?.() ?? "") ++ ))); ++} ++function ConnectorRow({ connector, roster, actions }) { ++ const [form, setForm] = (0, import_react42.useState)(false); ++ const [bots, setBots] = (0, import_react42.useState)(false); ++ const [token, setToken] = (0, import_react42.useState)(""); ++ const [apps, setApps] = (0, import_react42.useState)(() => connector.apps ?? []); ++ const [picking, setPicking] = (0, import_react42.useState)(false); ++ const [busy, setBusy] = (0, import_react42.useState)(false); ++ const [error, setError] = (0, import_react42.useState)(null); ++ const [message, setMessage] = (0, import_react42.useState)(""); ++ const [copyState, setCopyState] = (0, import_react42.useState)("idle"); ++ const run = (task, after) => { ++ setBusy(true); ++ setError(null); ++ return task.then(() => { ++ after?.(); ++ }, (failure) => setError(failure?.message ?? String(failure))).finally(() => setBusy(false)); ++ }; ++ const gateway = connector.id === "composio"; ++ const sender = connector.kind === "sender"; ++ const channel = connector.kind === "channel"; ++ const modes = connector.modes ?? []; ++ const [mode, setMode] = (0, import_react42.useState)(() => connector.mode ?? modes[0]?.id); ++ const [values, setValues] = (0, import_react42.useState)({}); ++ const chosen = modes.find((entry) => entry.id === mode) ?? modes[0]; ++ const field = (name) => values[name] ?? ""; ++ const setField = (name, value) => setValues((current) => ({ ...current, [name]: value })); ++ const filled = chosen !== void 0 && chosen.credentials.every((credential) => field(credential.name).trim() !== ""); ++ const [statuses, setStatuses] = (0, import_react42.useState)({}); ++ const appsKey = (connector.apps ?? []).join(","); ++ (0, import_react42.useEffect)(() => { ++ if (!gateway || connector.state !== "ready" || appsKey === "" || actions.connectorAppStatus === void 0) { ++ setStatuses({}); ++ return void 0; ++ } ++ let live = true; ++ actions.connectorAppStatus(connector.id).then((value) => { ++ if (live) setStatuses(value ?? {}); ++ }, () => { ++ if (live) setStatuses({}); ++ }); ++ return () => { ++ live = false; ++ }; ++ }, [gateway, connector.state, appsKey, picking]); ++ (0, import_react42.useEffect)(() => { ++ setCopyState("idle"); ++ }, [connector.state, connector.error]); ++ const search = (0, import_react42.useCallback)((query) => actions.connectorAppSearch(connector.id, query, connector.state === "off" ? token : void 0), [connector.id, connector.state, token]); ++ const connect = () => { ++ if (busy) return; ++ if (channel) { ++ if (chosen === void 0 || !filled) return; ++ const credentials = Object.fromEntries(chosen.credentials.map((credential) => [credential.name, field(credential.name)])); ++ void run(actions.connectorConnect(connector.id, { mode: chosen.id, credentials }), () => { ++ setValues({}); ++ setForm(false); ++ }); ++ return; ++ } ++ if (token.trim() === "") return; ++ if (gateway && apps.length === 0) { ++ setError(t("Pick at least one app")); ++ return; ++ } ++ void run(actions.connectorConnect(connector.id, token, gateway ? apps : void 0), () => { ++ setToken(""); ++ setForm(false); ++ }); ++ }; ++ const saveApps = () => { ++ if (busy) return; ++ if (apps.length === 0) { ++ setError(t("Pick at least one app")); ++ return; ++ } ++ void run(actions.connectorApps(connector.id, apps), () => setPicking(false)); ++ }; ++ const on = connector.state !== "off"; ++ const canPost = sender || channel && connector.mode === "webhook"; ++ const perBot = !sender && (!channel || connector.mode === "app"); ++ const copyLabel = copyState === "copied" ? t("Copied") : copyState === "failed" ? t("Could not copy the error") : t("Copy error"); ++ const copyError = () => { ++ void copiedToClipboard(connector.error ?? "").then((written) => setCopyState(written ? "copied" : "failed")); ++ }; ++ const Mark = MARKS[connector.id]; ++ const row = (0, import_react42.useRef)(null); ++ useMorph(row, `${form}:${picking}:${bots}:${error !== null}:${connector.state}:${mode}`); ++ return (0, import_react42.createElement)( ++ "div", ++ { ref: row, className: "bt-connector", "data-state": connector.state }, ++ (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-head" }, ++ (0, import_react42.createElement)("span", { className: "bt-connector-mark" }, Mark ? (0, import_react42.createElement)(Mark) : null), ++ (0, import_react42.createElement)( ++ "span", ++ { className: "bt-connector-text" }, ++ (0, import_react42.createElement)("span", { className: "bt-connector-name" }, connector.name), ++ (0, import_react42.createElement)("span", { className: "bt-connector-status" }, statusText2(connector)) ++ ), ++ (0, import_react42.createElement)( ++ "span", ++ { className: "bt-connector-actions" }, ++ connector.state === "error" ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorRetry(connector.id)) }, t("Try again")) : null, ++ connector.state === "error" ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: copyError }, copyLabel) : null, ++ on && gateway && !picking ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { ++ setApps(connector.apps ?? []); ++ setPicking(true); ++ } }, t("Choose apps")) : null, ++ on && perBot ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "aria-expanded": bots, onClick: () => setBots((value) => !value) }, bots ? t("Done") : t("Choose Bots")) : null, ++ on ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorDisconnect(connector.id)) }, t("Disconnect")) : form ? null : (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setForm(true) }, t("Connect")) ++ ) ++ ), ++ on && gateway && !picking ? (0, import_react42.createElement)(AppStatusList, { apps: connector.apps ?? [], statuses }) : null, ++ on && perBot ? (0, import_react42.createElement)("span", { className: "bt-connector-uses" }, usageText(roster, connector.id)) : null, ++ on && bots ? (0, import_react42.createElement)(ConnectorBots, { connector, roster, actions, run, SwitchRow }) : null, ++ on && channel && connector.mode === "app" ? (0, import_react42.createElement)(AllowedSenders, { connector, actions, run, busy }) : null, ++ on && canPost ? (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-form" }, ++ (0, import_react42.createElement)("label", { className: "bt-q-field" }, (0, import_react42.createElement)("input", { className: "bt-input", type: "text", value: message, "aria-label": t("Message to send to Feishu"), placeholder: t("Type a message for the Feishu group"), onChange: (event) => setMessage(event.target.value) })), ++ (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-form-row" }, ++ (0, import_react42.createElement)("span", { className: "bt-connector-link" }), ++ (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || message.trim() === "" || actions.connectorSend === void 0, onClick: () => void run(actions.connectorSend(connector.id, message), () => setMessage("")) }, t("Send")) ++ ) ++ ) : null, ++ !on && form ? (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-form" }, ++ channel ? (0, import_react42.createElement)("div", { className: "bt-states", role: "group", "aria-label": t("How to connect") }, modes.map((entry) => (0, import_react42.createElement)("button", { ++ key: entry.id, ++ type: "button", ++ className: "bt-state", ++ "aria-pressed": entry.id === chosen?.id, ++ onClick: () => { ++ setMode(entry.id); ++ setValues({}); ++ setError(null); ++ } ++ }, t(entry.label)))) : null, ++ channel ? (chosen?.credentials ?? []).map((credential, index) => (0, import_react42.createElement)(CredentialField, { ++ key: credential.name, ++ credential, ++ value: field(credential.name), ++ onChange: (value) => setField(credential.name, value), ++ onEnter: connect, ++ autoFocus: index === 0 ++ })) : (0, import_react42.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react42.createElement)(MaskedInput, { value: token, onChange: setToken, onEnter: connect, label: gateway ? t("Composio API key") : t("GitHub token"), autoFocus: true })), ++ gateway ? (0, import_react42.createElement)(AppPicker, { apps, onChange: setApps, search: token.trim() === "" ? void 0 : search }) : null, ++ (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-form-row" }, ++ (0, import_react42.createElement)( ++ "a", ++ { className: "bt-connector-link", href: channel ? chosen?.link ?? FEISHU_WEBHOOK_URL : gateway ? COMPOSIO_KEY_URL : TOKEN_URL, target: "_blank", rel: "noopener noreferrer" }, ++ channel ? t(chosen?.linkLabel ?? "Get a webhook URL in Feishu") : gateway ? t("Get a Composio API key") : t("Create a token on GitHub") ++ ), ++ (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { ++ setForm(false); ++ setToken(""); ++ setValues({}); ++ setError(null); ++ } }, t("Cancel")), ++ (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || (channel ? !filled : token.trim() === ""), onClick: connect }, busy ? t("Connecting…") : t("Connect")) ++ ) ++ ) : null, ++ on && gateway && picking ? (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-form" }, ++ (0, import_react42.createElement)(AppPicker, { apps, onChange: setApps, search, statuses }), ++ (0, import_react42.createElement)("span", { className: "bt-set-hint" }, t("The first time a Bot uses an app, it shows a sign-in link in the chat.")), ++ (0, import_react42.createElement)( ++ "div", ++ { className: "bt-connector-form-row" }, ++ (0, import_react42.createElement)("span", { className: "bt-connector-link" }), ++ (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { ++ setPicking(false); ++ setError(null); ++ } }, t("Cancel")), ++ (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || apps.length === 0, onClick: saveApps }, busy ? t("Connecting…") : t("Save")) ++ ) ++ ) : null, ++ error ? (0, import_react42.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null ++ ); ++} ++function connectorsOf(roster, kind) { ++ const list = roster?.connectors ?? []; ++ return kind ? list.filter((connector) => connector.kind === kind) : list; ++} ++function ConnectorsPage({ roster, actions, kind, empty, hint }) { ++ const list = connectorsOf(roster, kind); ++ const vacant = empty ?? t("No connectors"); ++ const note = hint ? (0, import_react42.createElement)("div", { className: "bt-set-row" }, (0, import_react42.createElement)("span", { className: "bt-set-hint" }, hint)) : null; ++ if (lockedWindow(roster)) { ++ return (0, import_react42.createElement)( ++ "section", ++ { className: "bt-set-section" }, ++ (0, import_react42.createElement)( ++ "div", ++ { className: "bt-set-card bt-connectors-card" }, ++ note, ++ list.length === 0 ? (0, import_react42.createElement)("div", { className: "bt-set-row" }, (0, import_react42.createElement)("span", { className: "bt-set-hint" }, vacant)) : list.map((connector) => (0, import_react42.createElement)( ++ "div", ++ { key: connector.id, className: "bt-set-row" }, ++ (0, import_react42.createElement)( ++ "span", ++ { className: "bt-set-copy" }, ++ (0, import_react42.createElement)("span", { className: "bt-bs-label" }, connector.name), ++ (0, import_react42.createElement)("span", { className: "bt-set-hint" }, statusText2(connector)) ++ ) ++ )) ++ ) ++ ); ++ } ++ return (0, import_react42.createElement)( ++ "section", ++ { className: "bt-set-section" }, ++ (0, import_react42.createElement)( "div", - { className: "bt-voice-bar" }, +- { className: "bt-voice-bar" }, - (0, import_react22.createElement)("button", { -+ (0, import_react37.createElement)("button", { - type: "button", - className: "bt-voice-btn", - "aria-pressed": phase === "paused", - disabled: blocked, - "aria-label": phase === "paused" ? t("Resume listening") : t("Pause"), - onClick: togglePause +- type: "button", +- className: "bt-voice-btn", +- "aria-pressed": phase === "paused", +- disabled: blocked, +- "aria-label": phase === "paused" ? t("Resume listening") : t("Pause"), +- onClick: togglePause - }, (0, import_react22.createElement)(MicIcon, { size: 20 }), phase === "paused" ? (0, import_react22.createElement)("span", { className: "bt-voice-slash", "aria-hidden": true }) : null), - (0, import_react22.createElement)("button", { type: "button", className: "bt-voice-btn bt-voice-end", "aria-label": t("End voice chat"), onClick: close }, (0, import_react22.createElement)(CloseIcon)) -+ }, (0, import_react37.createElement)(MicIcon, { size: 20 }), phase === "paused" ? (0, import_react37.createElement)("span", { className: "bt-voice-slash", "aria-hidden": true }) : null), -+ (0, import_react37.createElement)("button", { type: "button", className: "bt-voice-btn bt-voice-end", "aria-label": t("End voice chat"), onClick: close }, (0, import_react37.createElement)(CloseIcon)) ++ { className: "bt-set-card bt-connectors-card" }, ++ note, ++ list.length === 0 ? (0, import_react42.createElement)("div", { className: "bt-set-row" }, (0, import_react42.createElement)("span", { className: "bt-set-hint" }, vacant)) : list.map((connector) => (0, import_react42.createElement)(ConnectorRow, { key: connector.id, connector, roster, actions })) ) ); } ++function ChannelsPage({ roster, actions }) { ++ return (0, import_react42.createElement)(ConnectorsPage, { ++ roster, ++ actions, ++ kind: "channel", ++ empty: t("No channels yet."), ++ hint: t("Only integrations FlyBot already has appear here.") ++ }); ++} -// src/client/group-settings.js -var import_react23 = require("react"); @@ -21798,7 +23446,7 @@ diff --git a/client.js b/client.js - const admin = roster.byId[room2.admin]; - return [t("{count} members", { count: room2.members.length }), admin ? t("Admin {name}", { name: admin.name }) : t("No admin")].join(" · "); +// src/client/workflows.js -+var import_react38 = require("react"); ++var import_react43 = require("react"); +var READ_MS = 8e3; +var POLL_MS6 = 2e3; +var WORKFLOW_PLUGIN_HINT = "The Workflow plugin is not installed or not enabled. A default install includes @flybot/workflow."; @@ -22060,11 +23708,11 @@ diff --git a/client.js b/client.js + return Number.isFinite(width) && width > 0 ? width : 0; +} +function GraphCanvas({ graph, editing, roster, onCommit, width: knownWidth = 0, cardHeights: knownHeights = null }) { -+ const gesture = (0, import_react38.useRef)(null); -+ const canvasRef = (0, import_react38.useRef)(null); -+ const [measuredWidth, setCanvasWidth] = (0, import_react38.useState)(0); -+ const [measuredHeights, setCardHeights] = (0, import_react38.useState)(null); -+ const [pointedWire, setPointedWire] = (0, import_react38.useState)(null); ++ const gesture = (0, import_react43.useRef)(null); ++ const canvasRef = (0, import_react43.useRef)(null); ++ const [measuredWidth, setCanvasWidth] = (0, import_react43.useState)(0); ++ const [measuredHeights, setCardHeights] = (0, import_react43.useState)(null); ++ const [pointedWire, setPointedWire] = (0, import_react43.useState)(null); + const nodes = graph.nodes ?? []; + const edges = graph.edges ?? []; + const status = graph.run?.nodeStatus ?? null; @@ -22078,7 +23726,7 @@ diff --git a/client.js b/client.js + const routes = wireRoutes(nodes, edges, heights); + const frames = parallelFrames(nodes, graph.layers, heights); + const nodeKey = nodes.map((node) => node.id).join(","); -+ (0, import_react38.useEffect)(() => { ++ (0, import_react43.useEffect)(() => { + const el = canvasRef.current; + const measure = () => { + const width = measureCanvasWidth(el); @@ -22090,7 +23738,7 @@ diff --git a/client.js b/client.js + observer.observe(el); + return () => observer.disconnect(); + }, [canvasWidth]); -+ (0, import_react38.useEffect)(() => { ++ (0, import_react43.useEffect)(() => { + const el = canvasRef.current; + if (!el || typeof el.querySelectorAll !== "function") return void 0; + const measure = () => { @@ -22124,19 +23772,19 @@ diff --git a/client.js b/client.js + onCommit?.({ nodes: dropBot(nodes, current.bot, x, y), edges }); + } + }; -+ return (0, import_react38.createElement)( ++ return (0, import_react43.createElement)( "div", - { className: "bt-bs" }, - (0, import_react23.createElement)( + { className: "bt-wf-canvas", ref: canvasRef, onPointerUp: end }, -+ editing ? (0, import_react38.createElement)( ++ editing ? (0, import_react43.createElement)( "div", - { className: "bt-bs-hero" }, - (0, import_react23.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), - (0, import_react23.createElement)( + { className: "bt-wf-palette" }, -+ (0, import_react38.createElement)("span", { className: "bt-wf-hint" }, t("Drag a Bot here")), -+ locals.map((bot) => (0, import_react38.createElement)("button", { ++ (0, import_react43.createElement)("span", { className: "bt-wf-hint" }, t("Drag a Bot here")), ++ locals.map((bot) => (0, import_react43.createElement)("button", { + key: bot.id, + type: "button", + "data-bot": bot.id, @@ -22149,11 +23797,11 @@ diff --git a/client.js b/client.js + // A node's system prompt is the run Bot's prompt (plugins/workflow + // nodeConfig). The sidebar panel has this field, so the Settings editor + // writes the same graph instead of only drawing it (#1393). -+ editing ? (0, import_react38.createElement)("div", { className: "bt-wf-prompts" }, nodes.map((node) => (0, import_react38.createElement)( ++ editing ? (0, import_react43.createElement)("div", { className: "bt-wf-prompts" }, nodes.map((node) => (0, import_react43.createElement)( + "label", + { key: node.id, className: "bt-wf-prompt" }, -+ (0, import_react38.createElement)("span", null, `${node.name} · ${t("System prompt")}`), -+ (0, import_react38.createElement)("textarea", { ++ (0, import_react43.createElement)("span", null, `${node.name} · ${t("System prompt")}`), ++ (0, import_react43.createElement)("textarea", { + "data-prompt": node.id, + rows: 3, + defaultValue: node.prompt || "", @@ -22165,16 +23813,16 @@ diff --git a/client.js b/client.js + } + }) + ))) : null, -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( + "div", + { className: "bt-wf-stage", style: pad2 > 0 ? { height: drawnHeight, paddingLeft: pad2 } : { height: drawnHeight } }, -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( "div", - { className: "bt-bs-who" }, - (0, import_react23.createElement)("span", { className: "bt-bs-name" }, room2.name), - (0, import_react23.createElement)("span", { className: "bt-bs-sub" }, roomSubtitle(room2, roster)) + { className: "bt-wf-fit", style: { height, transform: `scale(${scale})` } }, -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( + "div", + { className: "bt-wf-plane", "data-plane": "1", style: { height, "--bt-wf-wire-span": `${WIRE_SPAN}px` } }, + // P-395: every wire says which two cards it joins, and carries a 10px transparent @@ -22183,7 +23831,7 @@ diff --git a/client.js b/client.js + // The layer is no longer `aria-hidden`: each route is a named image, and the + // pointer marks the one under it while the rest recede. The geometry stays + // wireRoutes' own; this layer only adds a hit target and its name. -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( + "svg", + { + className: "bt-wf-wires", @@ -22193,10 +23841,10 @@ diff --git a/client.js b/client.js + height, + viewBox: `0 0 ${WIRE_SPAN * 2} ${height}` + }, -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( + "defs", + null, -+ (0, import_react38.createElement)("marker", { ++ (0, import_react43.createElement)("marker", { + id: "bt-wf-arrow", + viewBox: "0 0 10 10", + refX: "8", @@ -22204,9 +23852,9 @@ diff --git a/client.js b/client.js + markerWidth: "6", + markerHeight: "6", + orient: "auto" -+ }, (0, import_react38.createElement)("path", { d: "M0 0 10 5 0 10z" })) ++ }, (0, import_react43.createElement)("path", { d: "M0 0 10 5 0 10z" })) + ), -+ (0, import_react38.createElement)("g", { transform: `translate(${WIRE_SPAN} 0)` }, routes.map((route) => { ++ (0, import_react43.createElement)("g", { transform: `translate(${WIRE_SPAN} 0)` }, routes.map((route) => { + const active = pointedWire === route.key; + const dim = pointedWire !== null && !active; + const [from, to] = String(route.key).split(">"); @@ -22218,14 +23866,14 @@ diff --git a/client.js b/client.js + "data-dim": dim ? "" : void 0 + }; + return [ -+ (0, import_react38.createElement)("path", { ++ (0, import_react43.createElement)("path", { + key: route.key, + d: route.d, + markerEnd: "url(#bt-wf-arrow)", + "data-route": route.back ? "back" : "forward", + ...state + }), -+ (0, import_react38.createElement)("path", { ++ (0, import_react43.createElement)("path", { + key: `${route.key}:hit`, + className: "bt-wf-hit", + d: route.d, @@ -22236,18 +23884,18 @@ diff --git a/client.js b/client.js + style: { pointerEvents: "stroke", stroke: "transparent", strokeWidth: 10, fill: "none" }, + onPointerEnter: () => setPointedWire(route.key), + onPointerLeave: () => setPointedWire((current) => current === route.key ? null : current) -+ }, (0, import_react38.createElement)("title", null, label)) ++ }, (0, import_react43.createElement)("title", null, label)) + ]; + })) + ), -+ frames.map((frame) => (0, import_react38.createElement)("div", { ++ frames.map((frame) => (0, import_react43.createElement)("div", { + key: frame.key, + className: "bt-wf-par", + style: { left: frame.left, top: frame.top, width: frame.width, height: frame.height } -+ }, (0, import_react38.createElement)("div", { className: "bt-wf-plabel" }, t("Parallel branch, then join")))), ++ }, (0, import_react43.createElement)("div", { className: "bt-wf-plabel" }, t("Parallel branch, then join")))), + nodes.map((node) => { + const state = status ? status[node.id] ?? "queued" : "idle"; -+ return (0, import_react38.createElement)( ++ return (0, import_react43.createElement)( + "div", + { + key: node.id, @@ -22259,7 +23907,7 @@ diff --git a/client.js b/client.js + gesture.current = { kind: "move", id: node.id, ox: event.clientX, oy: event.clientY, x: node.x ?? 0, y: node.y ?? 0 }; + } + }, -+ editing ? (0, import_react38.createElement)("button", { ++ editing ? (0, import_react43.createElement)("button", { + type: "button", + className: "bt-wf-port", + "data-port": "out", @@ -22270,7 +23918,7 @@ diff --git a/client.js b/client.js + gesture.current = { kind: "wire", from: node.id }; + } + }) : null, -+ editing ? (0, import_react38.createElement)("button", { ++ editing ? (0, import_react43.createElement)("button", { + type: "button", + className: "bt-wf-remove", + "data-remove": node.id, @@ -22281,15 +23929,15 @@ diff --git a/client.js b/client.js + onCommit?.(next); + } + }, "×") : null, -+ (0, import_react38.createElement)("span", { className: `bt-wf-chip ${state}` }, statusLabel2(state)), ++ (0, import_react43.createElement)("span", { className: `bt-wf-chip ${state}` }, statusLabel2(state)), + // #2017: one code point, not one UTF-16 unit — a name that starts with an emoji + // would otherwise put half a surrogate pair in the circle. -+ (0, import_react38.createElement)("span", { className: "bt-wf-av", style: { background: COLORS[node.name] ?? "#4d6bfe" } }, Array.from(String(node.name ?? "").trim())[0] ?? "?"), -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)("span", { className: "bt-wf-av", style: { background: COLORS[node.name] ?? "#4d6bfe" } }, Array.from(String(node.name ?? "").trim())[0] ?? "?"), ++ (0, import_react43.createElement)( + "span", + { className: "bt-wf-copy" }, -+ (0, import_react38.createElement)("span", { className: "bt-wf-name" }, node.name), -+ (0, import_react38.createElement)("span", { className: "bt-wf-role" }, node.role ?? "") ++ (0, import_react43.createElement)("span", { className: "bt-wf-name" }, node.name), ++ (0, import_react43.createElement)("span", { className: "bt-wf-role" }, node.role ?? "") + ) + ); + }) @@ -22299,7 +23947,7 @@ diff --git a/client.js b/client.js + ); +} +function Row2({ item, source, onOpen, onRename, onDelete, editable = true }) { -+ return (0, import_react38.createElement)( ++ return (0, import_react43.createElement)( + "button", + { + type: "button", @@ -22308,11 +23956,11 @@ diff --git a/client.js b/client.js + "data-source": source, + onClick: () => onOpen?.(item) + }, -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( + "span", + { className: "bt-set-copy" }, -+ (0, import_react38.createElement)("span", null, item.name), -+ (0, import_react38.createElement)("span", { className: "bt-set-hint" }, item.preview || chainOf(item) || item.description || "") ++ (0, import_react43.createElement)("span", null, item.name), ++ (0, import_react43.createElement)("span", { className: "bt-set-hint" }, item.preview || chainOf(item) || item.description || "") ), - (0, import_react23.createElement)( - Card, @@ -22321,10 +23969,10 @@ diff --git a/client.js b/client.js - Row, - { label: t("Name"), hint: t("Leave it empty to name the group after its members.") }, - (0, import_react23.createElement)(InlineText, { label: t("Group name"), value: room2.named ? room2.name : "", placeholder: t("Name after members"), maxLength: 60, onSave: (name) => update({ name }) }) -+ source === "own" && editable ? (0, import_react38.createElement)( ++ source === "own" && editable ? (0, import_react43.createElement)( + "span", + { className: "bt-set-actions" }, -+ (0, import_react38.createElement)("button", { ++ (0, import_react43.createElement)("button", { + type: "button", + className: "bt-set-action", + "aria-label": t("Rename"), @@ -22334,7 +23982,7 @@ diff --git a/client.js b/client.js + onRename?.(item); + } + }, "✎"), -+ (0, import_react38.createElement)("button", { ++ (0, import_react43.createElement)("button", { + type: "button", + className: "bt-set-action", + "aria-label": t("Delete"), @@ -22345,7 +23993,7 @@ diff --git a/client.js b/client.js + } + }, "×") + ) : null, -+ (0, import_react38.createElement)("span", { className: "bt-chevron", "aria-hidden": true }, "›") ++ (0, import_react43.createElement)("span", { className: "bt-chevron", "aria-hidden": true }, "›") + ); +} +function alertCopy(error) { @@ -22360,33 +24008,33 @@ diff --git a/client.js b/client.js + const readOnly = typeof roster?.readOnly === "string" ? roster.readOnly.trim() : ""; + const locked = readOnly !== ""; + const showUse = !locked && (opened?.source === "factory" || opened?.fromFactory !== void 0); -+ return (0, import_react38.createElement)( ++ return (0, import_react43.createElement)( + "div", + { className: "bt-wf-page" }, -+ (0, import_react38.createElement)("p", { className: "bt-wf-hint" }, t("A workflow is a group of your Bots. Drag the flowchart to change who hands work to whom.")), -+ error ? (0, import_react38.createElement)( ++ (0, import_react43.createElement)("p", { className: "bt-wf-hint" }, t("A workflow is a group of your Bots. Drag the flowchart to change who hands work to whom.")), ++ error ? (0, import_react43.createElement)( + "div", + { className: "bt-error", role: "alert" }, + alertCopy(error), -+ phase === "error" ? (0, import_react38.createElement)("button", { type: "button", onClick: () => onRetry?.() }, t("Retry")) : null ++ phase === "error" ? (0, import_react43.createElement)("button", { type: "button", onClick: () => onRetry?.() }, t("Retry")) : null + ) : null, -+ phase === "loading" ? (0, import_react38.createElement)("p", { className: "bt-wf-status", role: "status" }, t("Reading workflows…")) : null, -+ phase === "empty" ? (0, import_react38.createElement)("p", { className: "bt-wf-status" }, t("No workflows yet.")) : null, -+ phase === "ready" && !graph ? (0, import_react38.createElement)( ++ phase === "loading" ? (0, import_react43.createElement)("p", { className: "bt-wf-status", role: "status" }, t("Reading workflows…")) : null, ++ phase === "empty" ? (0, import_react43.createElement)("p", { className: "bt-wf-status" }, t("No workflows yet.")) : null, ++ phase === "ready" && !graph ? (0, import_react43.createElement)( + "div", + { className: "bt-wf-lists" }, -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( + "section", + { className: "bt-set-section" }, -+ (0, import_react38.createElement)("h3", null, t("Factory presets")), -+ (0, import_react38.createElement)("p", { className: "bt-wf-hint" }, t("Ready-made pipelines. Use one to start your own.")), -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)("h3", null, t("Factory presets")), ++ (0, import_react43.createElement)("p", { className: "bt-wf-hint" }, t("Ready-made pipelines. Use one to start your own.")), ++ (0, import_react43.createElement)( + "div", + { className: "bt-set-card" }, -+ templates.length === 0 ? (0, import_react38.createElement)("div", { className: "bt-set-row" }, (0, import_react38.createElement)("span", { className: "bt-set-hint" }, t("No workflows yet."))) : templates.map((item) => { ++ templates.length === 0 ? (0, import_react43.createElement)("div", { className: "bt-set-row" }, (0, import_react43.createElement)("span", { className: "bt-set-hint" }, t("No workflows yet."))) : templates.map((item) => { + const live = (pack.workflows ?? []).find((workflow) => workflow.id === item.id); + const row = live ? { ...item, name: live.name, preview: live.preview || chainOf(live) || chainOf(item) } : item; -+ return (0, import_react38.createElement)(Row2, { key: item.id, item: row, source: "factory", onOpen: () => onOpen?.(item, "factory") }); ++ return (0, import_react43.createElement)(Row2, { key: item.id, item: row, source: "factory", onOpen: () => onOpen?.(item, "factory") }); + }) + ) ), @@ -22394,15 +24042,15 @@ diff --git a/client.js b/client.js - Row, - { label: t("Notice"), hint: t("Every member reads it before speaking in this group."), stack: true }, - (0, import_react23.createElement)(InlineText, { label: t("Group notice"), value: room2.notice, multiline: true, maxLength: 2e3, placeholder: t("Shared instructions every member reads before speaking…"), onSave: (notice) => update({ notice }) }) -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( + "section", + { className: "bt-set-section" }, -+ (0, import_react38.createElement)("h3", null, t("Yours")), -+ (0, import_react38.createElement)("p", { className: "bt-wf-hint" }, t("Workflows saved on this machine.")), -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)("h3", null, t("Yours")), ++ (0, import_react43.createElement)("p", { className: "bt-wf-hint" }, t("Workflows saved on this machine.")), ++ (0, import_react43.createElement)( + "div", + { className: "bt-set-card" }, -+ yours.length === 0 ? (0, import_react38.createElement)("div", { className: "bt-set-row" }, (0, import_react38.createElement)("span", { className: "bt-set-hint" }, t("No workflows of your own yet."))) : yours.map((item) => (0, import_react38.createElement)(Row2, { key: item.id, item, source: "own", editable: !locked, onOpen: () => onOpen?.(item, "own"), onRename, onDelete })) ++ yours.length === 0 ? (0, import_react43.createElement)("div", { className: "bt-set-row" }, (0, import_react43.createElement)("span", { className: "bt-set-hint" }, t("No workflows of your own yet."))) : yours.map((item) => (0, import_react43.createElement)(Row2, { key: item.id, item, source: "own", editable: !locked, onOpen: () => onOpen?.(item, "own"), onRename, onDelete })) + ) ) - ), @@ -22411,10 +24059,10 @@ diff --git a/client.js b/client.js - { title: t("Who answers") }, - (0, import_react23.createElement)( + ) : null, -+ graph ? (0, import_react38.createElement)( ++ graph ? (0, import_react43.createElement)( + "div", + { className: "bt-wf-editor" }, -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( "div", - { className: "bt-set-row bt-bs-row bt-bs-stack" }, - (0, import_react23.createElement)(Segmented, { label: t("Who answers"), value: mode }, ROOM_MODES.map(([id, label]) => (0, import_react23.createElement)("button", { @@ -22435,13 +24083,13 @@ diff --git a/client.js b/client.js - { title: t("Working folder") }, - (0, import_react23.createElement)( + { className: "bt-wf-actions" }, -+ (0, import_react38.createElement)("button", { type: "button", onClick: () => onBack?.() }, t("Back")), -+ showUse ? (0, import_react38.createElement)("button", { type: "button", onClick: () => onUse?.(opened.source === "factory" ? opened.id : opened.fromFactory) }, t("Use this")) : null, -+ locked ? null : opened?.source === "own" ? (0, import_react38.createElement)("button", { type: "button", onClick: () => onEditing?.(!editing) }, editing ? t("Finish editing") : t("Edit")) : null ++ (0, import_react43.createElement)("button", { type: "button", onClick: () => onBack?.() }, t("Back")), ++ showUse ? (0, import_react43.createElement)("button", { type: "button", onClick: () => onUse?.(opened.source === "factory" ? opened.id : opened.fromFactory) }, t("Use this")) : null, ++ locked ? null : opened?.source === "own" ? (0, import_react43.createElement)("button", { type: "button", onClick: () => onEditing?.(!editing) }, editing ? t("Finish editing") : t("Edit")) : null + ), -+ (0, import_react38.createElement)("h3", { className: "bt-wf-title" }, graph.name), -+ graph.description ? (0, import_react38.createElement)("p", { className: "bt-wf-hint" }, graph.description) : null, -+ (graph.nodes ?? []).length === 0 ? (0, import_react38.createElement)("p", { className: "bt-wf-status" }, t("This workflow has no flowchart yet.")) : (0, import_react38.createElement)(GraphCanvas, { ++ (0, import_react43.createElement)("h3", { className: "bt-wf-title" }, graph.name), ++ graph.description ? (0, import_react43.createElement)("p", { className: "bt-wf-hint" }, graph.description) : null, ++ (graph.nodes ?? []).length === 0 ? (0, import_react43.createElement)("p", { className: "bt-wf-status" }, t("This workflow has no flowchart yet.")) : (0, import_react43.createElement)(GraphCanvas, { + graph, + roster, + onCommit, @@ -22453,30 +24101,30 @@ diff --git a/client.js b/client.js + ); +} +function RenameModal({ workflow, onClose, onConfirm }) { -+ const [name, setName] = (0, import_react38.useState)(workflow?.name ?? ""); -+ return (0, import_react38.createElement)( ++ const [name, setName] = (0, import_react43.useState)(workflow?.name ?? ""); ++ return (0, import_react43.createElement)( + "div", + { className: "bt-modal-mask", onClick: (event) => { + if (event.target === event.currentTarget) onClose?.(); + } }, -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( + "div", + { className: "bt-modal", role: "dialog", "aria-modal": true, "aria-label": t("Rename workflow") }, -+ (0, import_react38.createElement)("h3", null, t("Rename workflow")), -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)("h3", null, t("Rename workflow")), ++ (0, import_react43.createElement)( + "label", + { className: "bt-field" }, + t("Name"), -+ (0, import_react38.createElement)("input", { type: "text", value: name, onChange: (event) => setName(event.target.value), autoFocus: true }) ++ (0, import_react43.createElement)("input", { type: "text", value: name, onChange: (event) => setName(event.target.value), autoFocus: true }) + ), -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( "div", - { className: "bt-set-row bt-bs-row" }, - (0, import_react23.createElement)("span", { className: "bt-set-copy" }, (0, import_react23.createElement)("span", { className: "bt-bs-label" }, t("Folder"))), - (0, import_react23.createElement)(FolderMenu, { value: room2.workDir, group: true, actions, run, onPick: (workDir) => update({ workDir }) }) + { className: "bt-modal-actions" }, -+ (0, import_react38.createElement)("button", { type: "button", onClick: onClose }, t("Cancel")), -+ (0, import_react38.createElement)("button", { type: "button", onClick: () => onConfirm?.(name) }, t("Rename")) ++ (0, import_react43.createElement)("button", { type: "button", onClick: onClose }, t("Cancel")), ++ (0, import_react43.createElement)("button", { type: "button", onClick: () => onConfirm?.(name) }, t("Rename")) ) - ), - (0, import_react23.createElement)( @@ -22541,21 +24189,21 @@ diff --git a/client.js b/client.js + ); +} +function DeleteModal({ workflow, onClose, onConfirm }) { -+ return (0, import_react38.createElement)( ++ return (0, import_react43.createElement)( + "div", + { className: "bt-modal-mask", onClick: (event) => { + if (event.target === event.currentTarget) onClose?.(); + } }, -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)( + "div", + { className: "bt-modal", role: "dialog", "aria-modal": true, "aria-label": t("Delete workflow") }, -+ (0, import_react38.createElement)("h3", null, t("Delete workflow")), -+ (0, import_react38.createElement)("p", null, t('Are you sure you want to delete "{name}"? This cannot be undone.', { name: workflow?.name ?? "" })), -+ (0, import_react38.createElement)( ++ (0, import_react43.createElement)("h3", null, t("Delete workflow")), ++ (0, import_react43.createElement)("p", null, t('Are you sure you want to delete "{name}"? This cannot be undone.', { name: workflow?.name ?? "" })), ++ (0, import_react43.createElement)( + "div", + { className: "bt-modal-actions" }, -+ (0, import_react38.createElement)("button", { type: "button", onClick: onClose }, t("Cancel")), -+ (0, import_react38.createElement)("button", { type: "button", className: "bt-danger", onClick: onConfirm }, t("Delete")) ++ (0, import_react43.createElement)("button", { type: "button", onClick: onClose }, t("Cancel")), ++ (0, import_react43.createElement)("button", { type: "button", className: "bt-danger", onClick: onConfirm }, t("Delete")) ) ) ); @@ -22571,16 +24219,16 @@ diff --git a/client.js b/client.js - setMembers((list) => list.filter((item) => item !== id)); +function WorkflowsPage({ call: call4, roster, start }) { + const readOnly = typeof roster?.readOnly === "string" && roster.readOnly.trim() ? roster.readOnly : ""; -+ const [phase, setPhase] = (0, import_react38.useState)("loading"); -+ const [pack, setPack] = (0, import_react38.useState)(null); -+ const [error, setError] = (0, import_react38.useState)(""); -+ const [opened, setOpened] = (0, import_react38.useState)(null); -+ const [editing, setEditing] = (0, import_react38.useState)(false); -+ const [renaming, setRenaming] = (0, import_react38.useState)(null); -+ const [deleting, setDeleting] = (0, import_react38.useState)(null); ++ const [phase, setPhase] = (0, import_react43.useState)("loading"); ++ const [pack, setPack] = (0, import_react43.useState)(null); ++ const [error, setError] = (0, import_react43.useState)(""); ++ const [opened, setOpened] = (0, import_react43.useState)(null); ++ const [editing, setEditing] = (0, import_react43.useState)(false); ++ const [renaming, setRenaming] = (0, import_react43.useState)(null); ++ const [deleting, setDeleting] = (0, import_react43.useState)(null); + const invoke = typeof call4 === "function" ? call4 : () => Promise.reject(new Error("Could not read workflows")); + const startId = typeof start === "string" && start ? start : ""; -+ const seeded = (0, import_react38.useRef)(false); ++ const seeded = (0, import_react43.useRef)(false); + const apply2 = (settled) => { + setPhase(settled.phase); + setPack(settled.pack); @@ -22599,7 +24247,7 @@ diff --git a/client.js b/client.js - })); - if (done && room2) onCreated(room2); - else setBusy(false); -+ (0, import_react38.useEffect)(() => { ++ (0, import_react43.useEffect)(() => { + let gone = false; + readWorkflows(invoke).then((settled) => { + if (!gone) apply2(settled); @@ -22609,7 +24257,7 @@ diff --git a/client.js b/client.js + }; + }, []); + const live = (pack?.workflows ?? []).some((item) => (item.activeCount ?? 0) > 0); -+ (0, import_react38.useEffect)(() => { ++ (0, import_react43.useEffect)(() => { + if (!live || editing) return void 0; + let gone = false; + const timer = setInterval(() => { @@ -22697,7 +24345,16 @@ diff --git a/client.js b/client.js + }).catch((failure) => { + setError(workflowCallError(failure, t("Could not delete this workflow"))); + }); -+ }; + }; +- const chip = (bot, on, onClick, role) => (0, import_react23.createElement)("button", { +- key: bot.id, +- type: "button", +- role, +- className: "bt-ng-chip", +- "aria-checked": on, +- onClick +- }, (0, import_react23.createElement)(BotAvatar, { bot, size: 22, badge: false, live: false }), (0, import_react23.createElement)("span", { className: "bt-ng-name" }, bot.name), on && role === "radio" ? (0, import_react23.createElement)(AdminStar) : null); +- return (0, import_react23.createElement)( + const commit = (graph) => { + if (!opened || opened.source !== "own") return; + if (readOnly) return; @@ -22713,17 +24370,8 @@ diff --git a/client.js b/client.js + }).catch((failure) => { + setError(workflowCallError(failure, t("Could not save this workflow"))); + }); - }; -- const chip = (bot, on, onClick, role) => (0, import_react23.createElement)("button", { -- key: bot.id, -- type: "button", -- role, -- className: "bt-ng-chip", -- "aria-checked": on, -- onClick -- }, (0, import_react23.createElement)(BotAvatar, { bot, size: 22, badge: false, live: false }), (0, import_react23.createElement)("span", { className: "bt-ng-name" }, bot.name), on && role === "radio" ? (0, import_react23.createElement)(AdminStar) : null); -- return (0, import_react23.createElement)( -+ return (0, import_react38.createElement)( ++ }; ++ return (0, import_react43.createElement)( "div", - { className: "bt-set-card bt-ng" }, - (0, import_react23.createElement)( @@ -22759,7 +24407,7 @@ diff --git a/client.js b/client.js - (0, import_react23.createElement)("button", { type: "button", className: "bt-send bt-soft-sm", disabled: busy || admin === null || members.length === 0, onClick: () => void create() }, t("Create group chat")) - ) + null, -+ (0, import_react38.createElement)(WorkflowsView, { ++ (0, import_react43.createElement)(WorkflowsView, { + phase, + pack, + error, @@ -22778,12 +24426,12 @@ diff --git a/client.js b/client.js + onRename: rename, + onDelete: deleteWorkflow + }), -+ renaming ? (0, import_react38.createElement)(RenameModal, { ++ renaming ? (0, import_react43.createElement)(RenameModal, { + workflow: renaming, + onClose: () => setRenaming(null), + onConfirm: (name) => confirmRename(renaming.id, name) + }) : null, -+ deleting ? (0, import_react38.createElement)(DeleteModal, { ++ deleting ? (0, import_react43.createElement)(DeleteModal, { + workflow: deleting, + onClose: () => setDeleting(null), + onConfirm: () => confirmDelete(deleting.id) @@ -22837,7 +24485,7 @@ diff --git a/client.js b/client.js // src/client/usage-page.js -var import_react24 = require("react"); -+var import_react39 = require("react"); ++var import_react44 = require("react"); var HEAT_WEEKS = 53; var TOP_SERIES = 7; var RING_R = 42; @@ -22853,9 +24501,9 @@ diff --git a/client.js b/client.js - const [shown, setShown] = (0, import_react24.useState)(0); - const from = (0, import_react24.useRef)(0); - (0, import_react24.useEffect)(() => { -+ const [shown, setShown] = (0, import_react39.useState)(0); -+ const from = (0, import_react39.useRef)(0); -+ (0, import_react39.useEffect)(() => { ++ const [shown, setShown] = (0, import_react44.useState)(0); ++ const from = (0, import_react44.useRef)(0); ++ (0, import_react44.useEffect)(() => { if (reducedMotion() || typeof requestAnimationFrame !== "function") { from.current = value; setShown(value); @@ -22864,10 +24512,10 @@ diff --git a/client.js b/client.js return shown; } -var glyphBox = (size, icon2) => (0, import_react24.createElement)("span", { className: "bt-us-glyph", style: { width: size, height: size } }, (0, import_react24.createElement)(icon2)); -+var glyphBox = (size, icon3) => (0, import_react39.createElement)("span", { className: "bt-us-glyph", style: { width: size, height: size } }, (0, import_react39.createElement)(icon3)); ++var glyphBox = (size, icon3) => (0, import_react44.createElement)("span", { className: "bt-us-glyph", style: { width: size, height: size } }, (0, import_react44.createElement)(icon3)); function ModelGlyph({ name, paint, size }) { - return (0, import_react24.createElement)("span", { -+ return (0, import_react39.createElement)("span", { ++ return (0, import_react44.createElement)("span", { className: "bt-us-model", "aria-hidden": true, style: { width: size, height: size, fontSize: Math.round(size * 0.42), background: `color-mix(in srgb, ${paint} 20%, var(--bt-card))`, color: `color-mix(in srgb, ${paint} 72%, var(--bt-ink))` } @@ -22876,7 +24524,7 @@ diff --git a/client.js b/client.js paint: paintCss(colorOf(bot)), stops: GRADIENTS[colorOf(bot)], - glyph: (size) => (0, import_react24.createElement)(BotAvatar, { bot, size, badge: false, live: false }) -+ glyph: (size) => (0, import_react39.createElement)(BotAvatar, { bot, size, badge: false, live: false }) ++ glyph: (size) => (0, import_react44.createElement)(BotAvatar, { bot, size, badge: false, live: false }) }; } if (owner.kind === "room") { @@ -22885,7 +24533,7 @@ diff --git a/client.js b/client.js sub: owner.deleted ? t("Deleted") : t("Group chat"), paint: "var(--bt-us-rest)", - glyph: (size) => room2 ? (0, import_react24.createElement)(RoomAvatar, { room: room2, roster, size }) : glyphBox(size, ChatsIcon) -+ glyph: (size) => room2 ? (0, import_react39.createElement)(RoomAvatar, { room: room2, roster, size }) : glyphBox(size, ChatsIcon) ++ glyph: (size) => room2 ? (0, import_react44.createElement)(RoomAvatar, { room: room2, roster, size }) : glyphBox(size, ChatsIcon) }; } if (owner.kind === "agent") { @@ -22898,13 +24546,13 @@ diff --git a/client.js b/client.js const glide = useGlide(`${value} ${names}`, { box: boxRef }); - return (0, import_react24.createElement)( -+ return (0, import_react39.createElement)( ++ return (0, import_react44.createElement)( "div", { ref: glide.box, className: "bt-us-tabs", role: "group", "aria-label": label }, - (0, import_react24.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), - options.map(([id, text, icon2]) => (0, import_react24.createElement)("button", { key: id, type: "button", "aria-pressed": value === id, onClick: () => onChange(id) }, icon2 ? (0, import_react24.createElement)(icon2) : null, text)) -+ (0, import_react39.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), -+ options.map(([id, text2, icon3]) => (0, import_react39.createElement)("button", { key: id, type: "button", "aria-pressed": value === id, onClick: () => onChange(id) }, icon3 ? (0, import_react39.createElement)(icon3) : null, text2)) ++ (0, import_react44.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), ++ options.map(([id, text2, icon3]) => (0, import_react44.createElement)("button", { key: id, type: "button", "aria-pressed": value === id, onClick: () => onChange(id) }, icon3 ? (0, import_react44.createElement)(icon3) : null, text2)) ); } function Stats({ range, total, previous }) { @@ -22912,25 +24560,25 @@ diff --git a/client.js b/client.js const change = previous > 0 ? Math.round((total.total - previous) / previous * 100) : null; - const cell = (label, value) => (0, import_react24.createElement)("div", { className: "bt-us-stat" }, (0, import_react24.createElement)("span", { className: "bt-us-stat-label" }, label), (0, import_react24.createElement)("span", { className: "bt-us-stat-value" }, value)); - return (0, import_react24.createElement)( -+ const cell = (label, value) => (0, import_react39.createElement)("div", { className: "bt-us-stat" }, (0, import_react39.createElement)("span", { className: "bt-us-stat-label" }, label), (0, import_react39.createElement)("span", { className: "bt-us-stat-value" }, value)); -+ return (0, import_react39.createElement)( ++ const cell = (label, value) => (0, import_react44.createElement)("div", { className: "bt-us-stat" }, (0, import_react44.createElement)("span", { className: "bt-us-stat-label" }, label), (0, import_react44.createElement)("span", { className: "bt-us-stat-value" }, value)); ++ return (0, import_react44.createElement)( "section", { className: "bt-us-stats", style: { "--i": 0 } }, - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "div", { className: "bt-us-stat bt-us-stat-main" }, - (0, import_react24.createElement)("span", { className: "bt-us-stat-label" }, lastText(range)), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)("span", { className: "bt-us-stat-label" }, lastText(range)), -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)("span", { className: "bt-us-stat-label" }, lastText(range)), ++ (0, import_react44.createElement)( "span", { className: "bt-us-stat-value" }, compact(shown), - (0, import_react24.createElement)("small", null, t("tokens")), - change === null ? null : (0, import_react24.createElement)( -+ (0, import_react39.createElement)("small", null, t("tokens")), -+ change === null ? null : (0, import_react39.createElement)( ++ (0, import_react44.createElement)("small", null, t("tokens")), ++ change === null ? null : (0, import_react44.createElement)( "span", { className: "bt-us-delta", title: compareText(range) }, `${change >= 0 ? "↑" : "↓"} ${Math.abs(change)}%` @@ -22939,7 +24587,7 @@ diff --git a/client.js b/client.js } function Chart({ range, columns, series, tipSeries, by, onBy, onPick }) { - const [hover, setHover] = (0, import_react24.useState)(null); -+ const [hover, setHover] = (0, import_react39.useState)(null); ++ const [hover, setHover] = (0, import_react44.useState)(null); const top = niceTop(Math.max(0, ...columns.map((column) => column.total))); const count = columns.length; const fillOf = new Map(series.map((entry) => [entry.key, entry.fill])); @@ -22947,77 +24595,77 @@ diff --git a/client.js b/client.js const tip = hover === null ? null : columns[hover]; const tipSide = hover !== null && hover >= count / 2 ? { right: `calc(${(count - hover) / count * 100}% + 8px)` } : { left: `calc(${(hover + 1) / count * 100}% + 8px)` }; - return (0, import_react24.createElement)( -+ return (0, import_react39.createElement)( ++ return (0, import_react44.createElement)( "section", { className: "bt-us-card bt-us-chart", style: { "--i": 1 } }, - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "div", { className: "bt-us-card-head" }, - (0, import_react24.createElement)("h3", null, t("Tokens over time"), (0, import_react24.createElement)("span", null, unitLabel(range.unit))), - onBy ? (0, import_react24.createElement)(Tabs, { label: t("Group usage by"), value: by, onChange: onBy, options: [["bot", t("By Bot")], ["model", t("By model")]] }) : null -+ (0, import_react39.createElement)("h3", null, t("Tokens over time"), (0, import_react39.createElement)("span", null, unitLabel(range.unit))), -+ onBy ? (0, import_react39.createElement)(Tabs, { label: t("Group usage by"), value: by, onChange: onBy, options: [["bot", t("By Bot")], ["model", t("By model")]] }) : null ++ (0, import_react44.createElement)("h3", null, t("Tokens over time"), (0, import_react44.createElement)("span", null, unitLabel(range.unit))), ++ onBy ? (0, import_react44.createElement)(Tabs, { label: t("Group usage by"), value: by, onChange: onBy, options: [["bot", t("By Bot")], ["model", t("By model")]] }) : null ), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "div", { className: "bt-us-chart-body" }, - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "div", { className: "bt-us-plot", "data-hover": hover === null ? void 0 : "", onMouseLeave: () => setHover(null) }, - [1, 0.5].map((level) => (0, import_react24.createElement)("div", { key: level, className: "bt-us-grid", style: { bottom: `${level * 100}%` } }, (0, import_react24.createElement)("span", null, compact(top * level)))), - (0, import_react24.createElement)("div", { className: "bt-us-grid bt-us-base", style: { bottom: 0 } }, (0, import_react24.createElement)("span", null, "0")), - (0, import_react24.createElement)( -+ [1, 0.5].map((level) => (0, import_react39.createElement)("div", { key: level, className: "bt-us-grid", style: { bottom: `${level * 100}%` } }, (0, import_react39.createElement)("span", null, compact(top * level)))), -+ (0, import_react39.createElement)("div", { className: "bt-us-grid bt-us-base", style: { bottom: 0 } }, (0, import_react39.createElement)("span", null, "0")), -+ (0, import_react39.createElement)( ++ [1, 0.5].map((level) => (0, import_react44.createElement)("div", { key: level, className: "bt-us-grid", style: { bottom: `${level * 100}%` } }, (0, import_react44.createElement)("span", null, compact(top * level)))), ++ (0, import_react44.createElement)("div", { className: "bt-us-grid bt-us-base", style: { bottom: 0 } }, (0, import_react44.createElement)("span", null, "0")), ++ (0, import_react44.createElement)( "div", { className: "bt-us-cols" }, - columns.map((column, at) => (0, import_react24.createElement)("div", { -+ columns.map((column, at) => (0, import_react39.createElement)("div", { ++ columns.map((column, at) => (0, import_react44.createElement)("div", { key: `${range.from ? `${range.from}~${range.to}` : range.id}:${column.key}`, className: "bt-us-col", "data-on": hover === at ? "" : void 0, onMouseEnter: () => setHover(at) - }, column.total > 0 ? (0, import_react24.createElement)( -+ }, column.total > 0 ? (0, import_react39.createElement)( ++ }, column.total > 0 ? (0, import_react44.createElement)( "div", { className: "bt-us-stack", style: { height: `${column.total / top * 100}%`, "--i": at } }, - column.parts.map(([key, value]) => value > 0 ? (0, import_react24.createElement)("i", { key, style: { flexGrow: value, background: fillOf.get(key) } }) : null) - ) : (0, import_react24.createElement)("div", { className: "bt-us-stub" }))) -+ column.parts.map(([key, value]) => value > 0 ? (0, import_react39.createElement)("i", { key, style: { flexGrow: value, background: fillOf.get(key) } }) : null) -+ ) : (0, import_react39.createElement)("div", { className: "bt-us-stub" }))) ++ column.parts.map(([key, value]) => value > 0 ? (0, import_react44.createElement)("i", { key, style: { flexGrow: value, background: fillOf.get(key) } }) : null) ++ ) : (0, import_react44.createElement)("div", { className: "bt-us-stub" }))) ), - tip ? (0, import_react24.createElement)( -+ tip ? (0, import_react39.createElement)( ++ tip ? (0, import_react44.createElement)( "div", { className: "bt-us-tip", style: tipSide }, - (0, import_react24.createElement)("div", { className: "bt-us-tip-title" }, tip.title), - (0, import_react24.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(tip.total) })), - tip.tip.filter(([, value]) => value > 0).sort((a, b) => b[1] - a[1]).map(([key, value]) => (0, import_react24.createElement)( -+ (0, import_react39.createElement)("div", { className: "bt-us-tip-title" }, tip.title), -+ (0, import_react39.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(tip.total) })), -+ tip.tip.filter(([, value]) => value > 0).sort((a, b) => b[1] - a[1]).map(([key, value]) => (0, import_react39.createElement)( ++ (0, import_react44.createElement)("div", { className: "bt-us-tip-title" }, tip.title), ++ (0, import_react44.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(tip.total) })), ++ tip.tip.filter(([, value]) => value > 0).sort((a, b) => b[1] - a[1]).map(([key, value]) => (0, import_react44.createElement)( "div", { key, className: "bt-us-tip-row" }, - (0, import_react24.createElement)("i", { className: "bt-us-dot", style: { background: tipOf.get(key)?.fill } }), - (0, import_react24.createElement)("span", null, tipOf.get(key)?.name), - (0, import_react24.createElement)("b", null, compact(value)) -+ (0, import_react39.createElement)("i", { className: "bt-us-dot", style: { background: tipOf.get(key)?.fill } }), -+ (0, import_react39.createElement)("span", null, tipOf.get(key)?.name), -+ (0, import_react39.createElement)("b", null, compact(value)) ++ (0, import_react44.createElement)("i", { className: "bt-us-dot", style: { background: tipOf.get(key)?.fill } }), ++ (0, import_react44.createElement)("span", null, tipOf.get(key)?.name), ++ (0, import_react44.createElement)("b", null, compact(value)) )) ) : null ), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "div", { className: "bt-us-ticks", "aria-hidden": true }, // A preset counts its labels back from now; a picked span forward from its first day. - columns.map((column, at) => (0, import_react24.createElement)( -+ columns.map((column, at) => (0, import_react39.createElement)( ++ columns.map((column, at) => (0, import_react44.createElement)( "span", { key: column.key, "data-now": at === count - 1 && range.ends !== false ? "" : void 0 }, (range.from ? at : count - 1 - at) % range.stride === 0 ? column.tick : "" @@ -23025,16 +24673,16 @@ diff --git a/client.js b/client.js ) ), - series.length > 1 || series[0]?.pick ? (0, import_react24.createElement)( -+ series.length > 1 || series[0]?.pick ? (0, import_react39.createElement)( ++ series.length > 1 || series[0]?.pick ? (0, import_react44.createElement)( "div", { className: "bt-us-legend" }, - series.map((entry) => (0, import_react24.createElement)(entry.pick ? "button" : "span", { -+ series.map((entry) => (0, import_react39.createElement)(entry.pick ? "button" : "span", { ++ series.map((entry) => (0, import_react44.createElement)(entry.pick ? "button" : "span", { key: entry.key, className: "bt-us-key", ...entry.pick ? { type: "button", onClick: () => onPick(entry.pick) } : {} - }, (0, import_react24.createElement)("i", { className: "bt-us-dot", style: { background: entry.fill } }), entry.name)) -+ }, (0, import_react39.createElement)("i", { className: "bt-us-dot", style: { background: entry.fill } }), entry.name)) ++ }, (0, import_react44.createElement)("i", { className: "bt-us-dot", style: { background: entry.fill } }), entry.name)) ) : null ); } @@ -23042,7 +24690,7 @@ diff --git a/client.js b/client.js +function Row3({ kind, glyph, name, sub, sum, whole, fill: fill3, index, onClick }) { const width = whole > 0 ? Math.max(sum.total > 0 ? 2 : 0, sum.total / whole * 100) : 0; - return (0, import_react24.createElement)( -+ return (0, import_react39.createElement)( ++ return (0, import_react44.createElement)( onClick ? "button" : "div", { className: "bt-us-row", @@ -23052,77 +24700,77 @@ diff --git a/client.js b/client.js }, - glyph ? (0, import_react24.createElement)("span", { className: "bt-us-row-glyph" }, glyph) : null, - (0, import_react24.createElement)( -+ glyph ? (0, import_react39.createElement)("span", { className: "bt-us-row-glyph" }, glyph) : null, -+ (0, import_react39.createElement)( ++ glyph ? (0, import_react44.createElement)("span", { className: "bt-us-row-glyph" }, glyph) : null, ++ (0, import_react44.createElement)( "span", { className: "bt-us-row-body" }, - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "span", { className: "bt-us-row-line" }, - (0, import_react24.createElement)("span", { className: "bt-us-row-name" }, name), - sub ? (0, import_react24.createElement)("span", { className: "bt-us-row-sub" }, sub) : null -+ (0, import_react39.createElement)("span", { className: "bt-us-row-name" }, name), -+ sub ? (0, import_react39.createElement)("span", { className: "bt-us-row-sub" }, sub) : null ++ (0, import_react44.createElement)("span", { className: "bt-us-row-name" }, name), ++ sub ? (0, import_react44.createElement)("span", { className: "bt-us-row-sub" }, sub) : null ), - (0, import_react24.createElement)("span", { className: "bt-us-track" }, (0, import_react24.createElement)("span", { style: { width: `${width}%`, background: fill2 } })) -+ (0, import_react39.createElement)("span", { className: "bt-us-track" }, (0, import_react39.createElement)("span", { style: { width: `${width}%`, background: fill3 } })) ++ (0, import_react44.createElement)("span", { className: "bt-us-track" }, (0, import_react44.createElement)("span", { style: { width: `${width}%`, background: fill3 } })) ), - (0, import_react24.createElement)("span", { className: "bt-us-row-num" }, (0, import_react24.createElement)("b", null, compact(sum.total)), (0, import_react24.createElement)("small", null, `${percent(sum.total, whole)}%`)) -+ (0, import_react39.createElement)("span", { className: "bt-us-row-num" }, (0, import_react39.createElement)("b", null, compact(sum.total)), (0, import_react39.createElement)("small", null, `${percent(sum.total, whole)}%`)) ++ (0, import_react44.createElement)("span", { className: "bt-us-row-num" }, (0, import_react44.createElement)("b", null, compact(sum.total)), (0, import_react44.createElement)("small", null, `${percent(sum.total, whole)}%`)) ); } function ListCard({ title, count, index, children }) { - return (0, import_react24.createElement)( -+ return (0, import_react39.createElement)( ++ return (0, import_react44.createElement)( "section", { className: "bt-us-card", style: { "--i": index } }, - (0, import_react24.createElement)("div", { className: "bt-us-card-head" }, (0, import_react24.createElement)("h3", null, title, count === void 0 ? null : (0, import_react24.createElement)("span", null, count))), - (0, import_react24.createElement)("div", { className: "bt-us-rows" }, children) -+ (0, import_react39.createElement)("div", { className: "bt-us-card-head" }, (0, import_react39.createElement)("h3", null, title, count === void 0 ? null : (0, import_react39.createElement)("span", null, count))), -+ (0, import_react39.createElement)("div", { className: "bt-us-rows" }, children) ++ (0, import_react44.createElement)("div", { className: "bt-us-card-head" }, (0, import_react44.createElement)("h3", null, title, count === void 0 ? null : (0, import_react44.createElement)("span", null, count))), ++ (0, import_react44.createElement)("div", { className: "bt-us-rows" }, children) ); } function Profile({ face, share, range }) { - const arc = Math.max(0, Math.min(1, share)) * RING; - return (0, import_react24.createElement)( + const arc = Math.max(0, Math.min(1, share)) * RING2; -+ return (0, import_react39.createElement)( ++ return (0, import_react44.createElement)( "section", { className: "bt-us-profile" }, - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "span", { className: "bt-us-ring" }, - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "svg", { viewBox: "0 0 96 96", "aria-hidden": true }, - face.stops ? (0, import_react24.createElement)("defs", null, (0, import_react24.createElement)( -+ face.stops ? (0, import_react39.createElement)("defs", null, (0, import_react39.createElement)( ++ face.stops ? (0, import_react44.createElement)("defs", null, (0, import_react44.createElement)( "linearGradient", { id: "bt-us-ring-paint", x1: 0, y1: 1, x2: 1, y2: 0 }, - face.stops.map(([offset, color]) => (0, import_react24.createElement)("stop", { key: offset, offset, stopColor: color })) -+ face.stops.map(([offset, color]) => (0, import_react39.createElement)("stop", { key: offset, offset, stopColor: color })) ++ face.stops.map(([offset, color]) => (0, import_react44.createElement)("stop", { key: offset, offset, stopColor: color })) )) : null, - (0, import_react24.createElement)("circle", { className: "bt-us-ring-track", cx: 48, cy: 48, r: RING_R }), - arc > 0 ? (0, import_react24.createElement)("circle", { className: "bt-us-ring-arc", cx: 48, cy: 48, r: RING_R, style: { stroke: face.stops ? "url(#bt-us-ring-paint)" : face.paint, strokeDasharray: `${arc} ${RING}` } }) : null -+ (0, import_react39.createElement)("circle", { className: "bt-us-ring-track", cx: 48, cy: 48, r: RING_R }), -+ arc > 0 ? (0, import_react39.createElement)("circle", { className: "bt-us-ring-arc", cx: 48, cy: 48, r: RING_R, style: { stroke: face.stops ? "url(#bt-us-ring-paint)" : face.paint, strokeDasharray: `${arc} ${RING2}` } }) : null ++ (0, import_react44.createElement)("circle", { className: "bt-us-ring-track", cx: 48, cy: 48, r: RING_R }), ++ arc > 0 ? (0, import_react44.createElement)("circle", { className: "bt-us-ring-arc", cx: 48, cy: 48, r: RING_R, style: { stroke: face.stops ? "url(#bt-us-ring-paint)" : face.paint, strokeDasharray: `${arc} ${RING2}` } }) : null ), - (0, import_react24.createElement)("span", { className: "bt-us-ring-face" }, face.glyph(64)) -+ (0, import_react39.createElement)("span", { className: "bt-us-ring-face" }, face.glyph(64)) ++ (0, import_react44.createElement)("span", { className: "bt-us-ring-face" }, face.glyph(64)) ), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "div", { className: "bt-us-profile-copy" }, - (0, import_react24.createElement)("h3", null, face.name), - face.sub ? (0, import_react24.createElement)("span", { className: "bt-us-profile-sub" }, face.sub) : null, - (0, import_react24.createElement)("span", { className: "bt-us-profile-share" }, range.from ? t("{share}% of all usage from {span}", { share: percent(share, 1), span: spanText(range.from, range.to) }) : t("{share}% of all usage in the last {range}", { share: percent(share, 1), range: rangeLabel(range.id) })) -+ (0, import_react39.createElement)("h3", null, face.name), -+ face.sub ? (0, import_react39.createElement)("span", { className: "bt-us-profile-sub" }, face.sub) : null, -+ (0, import_react39.createElement)("span", { className: "bt-us-profile-share" }, range.from ? t("{share}% of all usage from {span}", { share: percent(share, 1), span: spanText(range.from, range.to) }) : t("{share}% of all usage in the last {range}", { share: percent(share, 1), range: rangeLabel(range.id) })) ++ (0, import_react44.createElement)("h3", null, face.name), ++ face.sub ? (0, import_react44.createElement)("span", { className: "bt-us-profile-sub" }, face.sub) : null, ++ (0, import_react44.createElement)("span", { className: "bt-us-profile-share" }, range.from ? t("{share}% of all usage from {span}", { share: percent(share, 1), span: spanText(range.from, range.to) }) : t("{share}% of all usage in the last {range}", { share: percent(share, 1), range: rangeLabel(range.id) })) ) ); } @@ -23130,17 +24778,17 @@ diff --git a/client.js b/client.js var addMonths = (ms, count) => Date.UTC(yearOf(ms), new Date(ms).getUTCMonth() + count, 1); function SpanPicker({ span, today, oldest, active, near, onPick, onClose }) { - const box = (0, import_react24.useRef)(null); -+ const box = (0, import_react39.useRef)(null); ++ const box = (0, import_react44.useRef)(null); const todayMs = hourMs(today); const thisMonth = monthOf(todayMs); - const [right, setRight] = (0, import_react24.useState)(() => Math.max(addMonths(oldest, 1), monthOf(hourMs(span?.to ?? today)))); - const [anchor, setAnchor] = (0, import_react24.useState)(null); - const [hover, setHover] = (0, import_react24.useState)(null); - (0, import_react24.useEffect)(() => { -+ const [right, setRight] = (0, import_react39.useState)(() => Math.max(addMonths(oldest, 1), monthOf(hourMs(span?.to ?? today)))); -+ const [anchor, setAnchor] = (0, import_react39.useState)(null); -+ const [hover, setHover] = (0, import_react39.useState)(null); -+ (0, import_react39.useEffect)(() => { ++ const [right, setRight] = (0, import_react44.useState)(() => Math.max(addMonths(oldest, 1), monthOf(hourMs(span?.to ?? today)))); ++ const [anchor, setAnchor] = (0, import_react44.useState)(null); ++ const [hover, setHover] = (0, import_react44.useState)(null); ++ (0, import_react44.useEffect)(() => { const onDown = (event) => { if (![box, near].some((ref) => ref.current?.contains(event.target))) onClose(); }; @@ -23149,19 +24797,19 @@ diff --git a/client.js b/client.js onPick(from, to); }; - const weekdays = (0, import_react24.useMemo)(() => Array.from({ length: 7 }, (_, at) => dates({ weekday: "narrow" }).format(Date.UTC(2024, 0, 1 + at))), []); -+ const weekdays = (0, import_react39.useMemo)(() => Array.from({ length: 7 }, (_, at) => dates({ weekday: "narrow" }).format(Date.UTC(2024, 0, 1 + at))), []); ++ const weekdays = (0, import_react44.useMemo)(() => Array.from({ length: 7 }, (_, at) => dates({ weekday: "narrow" }).format(Date.UTC(2024, 0, 1 + at))), []); const month = (start, side) => { const length = new Date(addMonths(start, 1) - DAY_MS).getUTCDate(); const lead = (new Date(start).getUTCDay() + 6) % 7; - const cells = Array.from({ length: lead }, (_, at) => (0, import_react24.createElement)("span", { key: `b${at}` })); -+ const cells = Array.from({ length: lead }, (_, at) => (0, import_react39.createElement)("span", { key: `b${at}` })); ++ const cells = Array.from({ length: lead }, (_, at) => (0, import_react44.createElement)("span", { key: `b${at}` })); for (let day = 1; day <= length; day += 1) { const ms = start + (day - 1) * DAY_MS; const key = dayKey(ms); const weekday = (lead + day - 1) % 7; const flag = (on) => on ? "" : void 0; - cells.push((0, import_react24.createElement)("button", { -+ cells.push((0, import_react39.createElement)("button", { ++ cells.push((0, import_react44.createElement)("button", { key, type: "button", className: "bt-us-day", @@ -23170,20 +24818,20 @@ diff --git a/client.js b/client.js onMouseEnter: () => setHover(key), onClick: () => press(key) - }, (0, import_react24.createElement)("b", null, day))); -+ }, (0, import_react39.createElement)("b", null, day))); ++ }, (0, import_react44.createElement)("b", null, day))); } - const nav = side === "left" ? (0, import_react24.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "left", "aria-label": t("Previous month"), disabled: start <= oldest, onClick: () => setRight(addMonths(right, -1)) }, (0, import_react24.createElement)(ChevronLeftIcon)) : (0, import_react24.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "right", "aria-label": t("Next month"), disabled: start >= thisMonth, onClick: () => setRight(addMonths(right, 1)) }, (0, import_react24.createElement)(ChevronRightIcon)); - return (0, import_react24.createElement)( -+ const nav = side === "left" ? (0, import_react39.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "left", "aria-label": t("Previous month"), disabled: start <= oldest, onClick: () => setRight(addMonths(right, -1)) }, (0, import_react39.createElement)(ChevronLeftIcon)) : (0, import_react39.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "right", "aria-label": t("Next month"), disabled: start >= thisMonth, onClick: () => setRight(addMonths(right, 1)) }, (0, import_react39.createElement)(ChevronRightIcon)); -+ return (0, import_react39.createElement)( ++ const nav = side === "left" ? (0, import_react44.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "left", "aria-label": t("Previous month"), disabled: start <= oldest, onClick: () => setRight(addMonths(right, -1)) }, (0, import_react44.createElement)(ChevronLeftIcon)) : (0, import_react44.createElement)("button", { type: "button", className: "bt-us-month-nav", "data-side": "right", "aria-label": t("Next month"), disabled: start >= thisMonth, onClick: () => setRight(addMonths(right, 1)) }, (0, import_react44.createElement)(ChevronRightIcon)); ++ return (0, import_react44.createElement)( "div", { key: start, className: "bt-us-month" }, - (0, import_react24.createElement)("div", { className: "bt-us-month-head" }, nav, (0, import_react24.createElement)("span", null, dates({ year: "numeric", month: "long" }).format(start))), - (0, import_react24.createElement)("div", { className: "bt-us-weekdays", "aria-hidden": true }, weekdays.map((name, at) => (0, import_react24.createElement)("span", { key: at }, name))), - (0, import_react24.createElement)("div", { className: "bt-us-days", onMouseLeave: () => setHover(null) }, cells) -+ (0, import_react39.createElement)("div", { className: "bt-us-month-head" }, nav, (0, import_react39.createElement)("span", null, dates({ year: "numeric", month: "long" }).format(start))), -+ (0, import_react39.createElement)("div", { className: "bt-us-weekdays", "aria-hidden": true }, weekdays.map((name, at) => (0, import_react39.createElement)("span", { key: at }, name))), -+ (0, import_react39.createElement)("div", { className: "bt-us-days", onMouseLeave: () => setHover(null) }, cells) ++ (0, import_react44.createElement)("div", { className: "bt-us-month-head" }, nav, (0, import_react44.createElement)("span", null, dates({ year: "numeric", month: "long" }).format(start))), ++ (0, import_react44.createElement)("div", { className: "bt-us-weekdays", "aria-hidden": true }, weekdays.map((name, at) => (0, import_react44.createElement)("span", { key: at }, name))), ++ (0, import_react44.createElement)("div", { className: "bt-us-days", onMouseLeave: () => setHover(null) }, cells) ); }; const shortcuts = [ @@ -23192,15 +24840,15 @@ diff --git a/client.js b/client.js ]; const count = low === null ? 0 : Math.round((hourMs(high) - hourMs(low)) / DAY_MS) + 1; - return (0, import_react24.createElement)( -+ return (0, import_react39.createElement)( ++ return (0, import_react44.createElement)( "div", { ref: box, className: "bt-us-pick", role: "dialog", "aria-label": t("Custom range") }, - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "div", { className: "bt-us-pick-quick" }, - shortcuts.map(([id, label, from, to]) => (0, import_react24.createElement)("button", { -+ shortcuts.map(([id, label, from, to]) => (0, import_react39.createElement)("button", { ++ shortcuts.map(([id, label, from, to]) => (0, import_react44.createElement)("button", { key: id, type: "button", "aria-pressed": span?.from === from && span?.to === to, @@ -23209,20 +24857,20 @@ diff --git a/client.js b/client.js ), - (0, import_react24.createElement)("div", { className: "bt-us-pick-months" }, month(addMonths(right, -1), "left"), month(right, "right")), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)("div", { className: "bt-us-pick-months" }, month(addMonths(right, -1), "left"), month(right, "right")), -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)("div", { className: "bt-us-pick-months" }, month(addMonths(right, -1), "left"), month(right, "right")), ++ (0, import_react44.createElement)( "div", { className: "bt-us-pick-foot", role: "status" }, - (0, import_react24.createElement)("span", null, anchor ? t("Pick the last day") : t("Pick the first day")), - low === null ? null : (0, import_react24.createElement)("span", null, (0, import_react24.createElement)("b", null, spanText(low, high)), ` · ${daysText(count)}`) -+ (0, import_react39.createElement)("span", null, anchor ? t("Pick the last day") : t("Pick the first day")), -+ low === null ? null : (0, import_react39.createElement)("span", null, (0, import_react39.createElement)("b", null, spanText(low, high)), ` · ${daysText(count)}`) ++ (0, import_react44.createElement)("span", null, anchor ? t("Pick the last day") : t("Pick the first day")), ++ low === null ? null : (0, import_react44.createElement)("span", null, (0, import_react44.createElement)("b", null, spanText(low, high)), ` · ${daysText(count)}`) ) ); } function Heat({ view, keep, paint, index }) { - const [hover, setHover] = (0, import_react24.useState)(null); -+ const [hover, setHover] = (0, import_react39.useState)(null); ++ const [hover, setHover] = (0, import_react44.useState)(null); const today = hourMs(`${view.now.slice(0, 10)} 00`); const first = mondayOf(today) - (HEAT_WEEKS - 1) * 7 * DAY_MS; const from = dayKey(first); @@ -23231,14 +24879,14 @@ diff --git a/client.js b/client.js const monday = first + week * 7 * DAY_MS; if (week > 0 && new Date(monday).getUTCMonth() !== new Date(monday - 7 * DAY_MS).getUTCMonth()) { - months.push((0, import_react24.createElement)("span", { key: week, style: { gridColumn: week + 1 } }, dates({ month: "short" }).format(monday))); -+ months.push((0, import_react39.createElement)("span", { key: week, style: { gridColumn: week + 1 } }, dates({ month: "short" }).format(monday))); ++ months.push((0, import_react44.createElement)("span", { key: week, style: { gridColumn: week + 1 } }, dates({ month: "short" }).format(monday))); } for (let day = 0; day < 7; day += 1) { const ms = monday + day * DAY_MS; const value = daily.get(dayKey(ms)) ?? 0; const level = value > 0 ? Math.max(1, Math.ceil(4 * Math.sqrt(value / most))) : 0; - cells.push((0, import_react24.createElement)("span", { -+ cells.push((0, import_react39.createElement)("span", { ++ cells.push((0, import_react44.createElement)("span", { key: ms, className: "bt-us-cell", style: { "--w": week }, @@ -23247,7 +24895,7 @@ diff --git a/client.js b/client.js "data-today": ms === today ? "" : void 0, onMouseEnter: ms > today ? void 0 : () => setHover({ ms, week, day }) - }, level > 0 ? (0, import_react24.createElement)("i", { style: { background: soften(paint, levels[level - 1]) } }) : null)); -+ }, level > 0 ? (0, import_react39.createElement)("i", { style: { background: soften(paint, levels[level - 1]) } }) : null)); ++ }, level > 0 ? (0, import_react44.createElement)("i", { style: { background: soften(paint, levels[level - 1]) } }) : null)); } } const tipSide = hover ? { @@ -23256,63 +24904,63 @@ diff --git a/client.js b/client.js const active = [...daily.values()].filter((value) => value > 0).length; const summary = active === 1 ? t("Active on 1 day in the last year") : t("Active on {count} days in the last year", { count: active }); - return (0, import_react24.createElement)( -+ return (0, import_react39.createElement)( ++ return (0, import_react44.createElement)( "section", { className: "bt-us-card bt-us-heat", style: { "--i": index } }, - (0, import_react24.createElement)("div", { className: "bt-us-card-head" }, (0, import_react24.createElement)("h3", null, t("Activity")), (0, import_react24.createElement)("span", { className: "bt-us-head-note" }, summary)), - (0, import_react24.createElement)("div", { className: "bt-us-heat-months", "aria-hidden": true }, months), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)("div", { className: "bt-us-card-head" }, (0, import_react39.createElement)("h3", null, t("Activity")), (0, import_react39.createElement)("span", { className: "bt-us-head-note" }, summary)), -+ (0, import_react39.createElement)("div", { className: "bt-us-heat-months", "aria-hidden": true }, months), -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)("div", { className: "bt-us-card-head" }, (0, import_react44.createElement)("h3", null, t("Activity")), (0, import_react44.createElement)("span", { className: "bt-us-head-note" }, summary)), ++ (0, import_react44.createElement)("div", { className: "bt-us-heat-months", "aria-hidden": true }, months), ++ (0, import_react44.createElement)( "div", { className: "bt-us-heat-plot", onMouseLeave: () => setHover(null) }, - (0, import_react24.createElement)("div", { className: "bt-us-heat-grid", role: "img", "aria-label": summary }, cells), - hover ? (0, import_react24.createElement)( -+ (0, import_react39.createElement)("div", { className: "bt-us-heat-grid", role: "img", "aria-label": summary }, cells), -+ hover ? (0, import_react39.createElement)( ++ (0, import_react44.createElement)("div", { className: "bt-us-heat-grid", role: "img", "aria-label": summary }, cells), ++ hover ? (0, import_react44.createElement)( "div", { className: "bt-us-tip bt-us-heat-tip", style: tipSide }, - (0, import_react24.createElement)("div", { className: "bt-us-tip-title" }, dates({ month: "long", day: "numeric", weekday: "short" }).format(hover.ms)), - (0, import_react24.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(daily.get(dayKey(hover.ms)) ?? 0) })) -+ (0, import_react39.createElement)("div", { className: "bt-us-tip-title" }, dates({ month: "long", day: "numeric", weekday: "short" }).format(hover.ms)), -+ (0, import_react39.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(daily.get(dayKey(hover.ms)) ?? 0) })) ++ (0, import_react44.createElement)("div", { className: "bt-us-tip-title" }, dates({ month: "long", day: "numeric", weekday: "short" }).format(hover.ms)), ++ (0, import_react44.createElement)("div", { className: "bt-us-tip-total" }, t("{count} tokens", { count: full(daily.get(dayKey(hover.ms)) ?? 0) })) ) : null ), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "div", { className: "bt-us-heat-scale", "aria-hidden": true }, t("Light"), - levels.map((level) => (0, import_react24.createElement)("span", { key: level, className: "bt-us-cell" }, (0, import_react24.createElement)("i", { style: { background: soften(paint, level) } }))), -+ levels.map((level) => (0, import_react39.createElement)("span", { key: level, className: "bt-us-cell" }, (0, import_react39.createElement)("i", { style: { background: soften(paint, level) } }))), ++ levels.map((level) => (0, import_react44.createElement)("span", { key: level, className: "bt-us-cell" }, (0, import_react44.createElement)("i", { style: { background: soften(paint, level) } }))), t("Heavy") ) ); } function Skeleton2() { - return (0, import_react24.createElement)( -+ return (0, import_react39.createElement)( ++ return (0, import_react44.createElement)( "div", { className: "bt-us", "aria-busy": true }, - (0, import_react24.createElement)("div", { className: "bt-us-skel", style: { height: 32, width: 320, borderRadius: 999 } }), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 32, width: 320, borderRadius: 999 } }), -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 32, width: 320, borderRadius: 999 } }), ++ (0, import_react44.createElement)( "div", { className: "bt-us-sheet bt-us-skel-sheet" }, - (0, import_react24.createElement)("div", { className: "bt-us-skel", style: { height: 94 } }), - (0, import_react24.createElement)("div", { className: "bt-us-skel", style: { height: 318 } }), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 94 } }), -+ (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 318 } }), -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 94 } }), ++ (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 318 } }), ++ (0, import_react44.createElement)( "div", { className: "bt-us-pair" }, - (0, import_react24.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }), - (0, import_react24.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }) -+ (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }), -+ (0, import_react39.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }) ++ (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }), ++ (0, import_react44.createElement)("div", { className: "bt-us-skel", style: { height: 200 } }) ) ) ); @@ -23326,16 +24974,16 @@ diff --git a/client.js b/client.js - const [picking, setPicking] = (0, import_react24.useState)(false); - const [by, setBy] = (0, import_react24.useState)("bot"); - const tabs = (0, import_react24.useRef)(null); -+ const [view, setView] = (0, import_react39.useState)(null); -+ const [error, setError] = (0, import_react39.useState)(""); -+ const [rangeId, setRangeId] = (0, import_react39.useState)("7d"); -+ const [span, setSpan] = (0, import_react39.useState)(null); -+ const [picking, setPicking] = (0, import_react39.useState)(false); -+ const [by, setBy] = (0, import_react39.useState)("bot"); -+ const tabs = (0, import_react39.useRef)(null); ++ const [view, setView] = (0, import_react44.useState)(null); ++ const [error, setError] = (0, import_react44.useState)(""); ++ const [rangeId, setRangeId] = (0, import_react44.useState)("7d"); ++ const [span, setSpan] = (0, import_react44.useState)(null); ++ const [picking, setPicking] = (0, import_react44.useState)(false); ++ const [by, setBy] = (0, import_react44.useState)("bot"); ++ const tabs = (0, import_react44.useRef)(null); const focus = focusOf(focusId); - (0, import_react24.useEffect)(() => { -+ (0, import_react39.useEffect)(() => { ++ (0, import_react44.useEffect)(() => { let stopped = false; let timer; const resized = Promise.all((document.querySelector(".bt-settings")?.getAnimations() ?? []).filter((animation) => animation.transitionProperty === "width" || animation.transitionProperty === "height").map((animation) => animation.finished.catch(() => { @@ -23344,7 +24992,7 @@ diff --git a/client.js b/client.js await resized; if (stopped) return; - (0, import_react24.startTransition)(() => setView(value)); -+ (0, import_react39.startTransition)(() => setView(value)); ++ (0, import_react44.startTransition)(() => setView(value)); setError(""); timer = setTimeout(load, value.scanning ? 3e3 : 2e4); } catch (failure) { @@ -23353,7 +25001,7 @@ diff --git a/client.js b/client.js const today = view?.now.slice(0, 10); const range = rangeId === "custom" && span ? { ...spanRange(span.from, span.to), ends: span.to >= today } : RANGES.find((item) => item.id === rangeId); - const shaped = (0, import_react24.useMemo)(() => { -+ const shaped = (0, import_react39.useMemo)(() => { ++ const shaped = (0, import_react44.useMemo)(() => { if (!view) return null; const faces2 = view.owners.map((owner) => ownerFace(owner, roster)); const lifetime = /* @__PURE__ */ new Map(); @@ -23362,7 +25010,7 @@ diff --git a/client.js b/client.js const name = model.name || model.model || t("Unknown model"); const paint = modelPaint.get(at) ?? "var(--bt-us-rest)"; - return { kind: "model", name, sub: model.providerName ?? model.provider, paint, glyph: (size) => (0, import_react24.createElement)(ModelGlyph, { name, paint, size }) }; -+ return { kind: "model", name, sub: model.providerName ?? model.provider, paint, glyph: (size) => (0, import_react39.createElement)(ModelGlyph, { name, paint, size }) }; ++ return { kind: "model", name, sub: model.providerName ?? model.provider, paint, glyph: (size) => (0, import_react44.createElement)(ModelGlyph, { name, paint, size }) }; }); const ownerAt2 = focus?.kind === "owner" ? view.owners.findIndex((owner) => owner.key === focus.key) : -1; const modelAt = focus?.kind === "model" ? view.models.findIndex((model) => model.key === focus.key) : -1; @@ -23372,29 +25020,29 @@ diff --git a/client.js b/client.js }, [view, rangeId, span, by, focusId, roster]); - const root = (0, import_react24.useRef)(null); - (0, import_react24.useEffect)(() => { -+ const root = (0, import_react39.useRef)(null); -+ (0, import_react39.useEffect)(() => { ++ const root = (0, import_react44.useRef)(null); ++ (0, import_react44.useEffect)(() => { root.current?.closest(".bt-settings-scroll")?.scrollTo?.({ top: 0 }); }, [focusId]); if (!view) { - return error ? (0, import_react24.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : (0, import_react24.createElement)(Skeleton2); -+ return error ? (0, import_react39.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : (0, import_react39.createElement)(Skeleton2); ++ return error ? (0, import_react44.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : (0, import_react44.createElement)(Skeleton2); } if (view.rows.length === 0) { - return (0, import_react24.createElement)( -+ return (0, import_react39.createElement)( ++ return (0, import_react44.createElement)( "div", { className: "bt-us" }, - (0, import_react24.createElement)( -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)( "div", { className: "bt-us-empty" }, - (0, import_react24.createElement)(BotMark, { look: MAIN_LOOK, size: 56, live: true }), - (0, import_react24.createElement)("b", null, view.scanning ? t("Reading your chats…") : t("No usage yet.")), - (0, import_react24.createElement)("span", null, t("Token usage shows up here after a model is called.")) -+ (0, import_react39.createElement)(BotMark, { look: MAIN_LOOK, size: 56, live: true }), -+ (0, import_react39.createElement)("b", null, view.scanning ? t("Reading your chats…") : t("No usage yet.")), -+ (0, import_react39.createElement)("span", null, t("Token usage shows up here after a model is called.")) ++ (0, import_react44.createElement)(BotMark, { look: MAIN_LOOK, size: 56, live: true }), ++ (0, import_react44.createElement)("b", null, view.scanning ? t("Reading your chats…") : t("No usage yet.")), ++ (0, import_react44.createElement)("span", null, t("Token usage shows up here after a model is called.")) ) ); } @@ -23403,7 +25051,7 @@ diff --git a/client.js b/client.js ]; const whole = part.total.total; - const ownerRow = ([at, sum], index, total = whole) => (0, import_react24.createElement)(Row2, { -+ const ownerRow = ([at, sum], index, total = whole) => (0, import_react39.createElement)(Row3, { ++ const ownerRow = ([at, sum], index, total = whole) => (0, import_react44.createElement)(Row3, { key: `o${at}`, kind: faces[at].kind, glyph: faces[at].glyph(32), @@ -23412,7 +25060,7 @@ diff --git a/client.js b/client.js onClick: () => pick2({ kind: "owner", key: view.owners[at].key }) }); - const modelRow = ([at, sum], index) => (0, import_react24.createElement)(Row2, { -+ const modelRow = ([at, sum], index) => (0, import_react39.createElement)(Row3, { ++ const modelRow = ([at, sum], index) => (0, import_react44.createElement)(Row3, { key: `m${at}`, kind: "model", glyph: models[at].glyph(32), @@ -23421,7 +25069,7 @@ diff --git a/client.js b/client.js onClick: () => pick2({ kind: "model", key: view.models[at].key }) }); - const nothing = (0, import_react24.createElement)("div", { className: "bt-us-none" }, t("Nothing in this range.")); -+ const nothing = (0, import_react39.createElement)("div", { className: "bt-us-none" }, t("Nothing in this range.")); ++ const nothing = (0, import_react44.createElement)("div", { className: "bt-us-none" }, t("Nothing in this range.")); let body; if (face) { const kinds = ranked(part.kinds); @@ -23430,548 +25078,196 @@ diff --git a/client.js b/client.js body = [ - (0, import_react24.createElement)(Profile, { key: "profile", face, range, share: all.total.total > 0 ? whole / all.total.total : 0 }), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)(Profile, { key: "profile", face, range, share: all.total.total > 0 ? whole / all.total.total : 0 }), -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)(Profile, { key: "profile", face, range, share: all.total.total > 0 ? whole / all.total.total : 0 }), ++ (0, import_react44.createElement)( "div", { key: "sheet", className: "bt-us-sheet" }, - (0, import_react24.createElement)(Stats, { key: "stats", range, total: part.total, previous: part.previous }), - (0, import_react24.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, onPick: pick2 }), - (0, import_react24.createElement)( -+ (0, import_react39.createElement)(Stats, { key: "stats", range, total: part.total, previous: part.previous }), -+ (0, import_react39.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, onPick: pick2 }), -+ (0, import_react39.createElement)( ++ (0, import_react44.createElement)(Stats, { key: "stats", range, total: part.total, previous: part.previous }), ++ (0, import_react44.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, onPick: pick2 }), ++ (0, import_react44.createElement)( "div", { key: "pair", className: "bt-us-pair" }, - ownerAt >= 0 ? (0, import_react24.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 2 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) : (0, import_react24.createElement)(ListCard, { title: t("Who used it"), count: owners.length, index: 2 }, owners.length > 0 ? owners.map((entry, index) => ownerRow(entry, index)) : nothing), - (0, import_react24.createElement)( -+ ownerAt >= 0 ? (0, import_react39.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 2 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) : (0, import_react39.createElement)(ListCard, { title: t("Who used it"), count: owners.length, index: 2 }, owners.length > 0 ? owners.map((entry, index) => ownerRow(entry, index)) : nothing), -+ (0, import_react39.createElement)( ++ ownerAt >= 0 ? (0, import_react44.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 2 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) : (0, import_react44.createElement)(ListCard, { title: t("Who used it"), count: owners.length, index: 2 }, owners.length > 0 ? owners.map((entry, index) => ownerRow(entry, index)) : nothing), ++ (0, import_react44.createElement)( ListCard, { title: t("What for"), index: 3 }, - kinds.length > 0 ? kinds.map(([at, sum], index) => (0, import_react24.createElement)(Row2, { key: at, name: kindLabel(view.kinds[at], ownerAt >= 0 && isBot(ownerAt)), sum, whole, index, fill: soften(face.paint, 0.8) })) : nothing -+ kinds.length > 0 ? kinds.map(([at, sum], index) => (0, import_react39.createElement)(Row3, { key: at, name: kindLabel(view.kinds[at], ownerAt >= 0 && isBot(ownerAt)), sum, whole, index, fill: soften(face.paint, 0.8) })) : nothing ++ kinds.length > 0 ? kinds.map(([at, sum], index) => (0, import_react44.createElement)(Row3, { key: at, name: kindLabel(view.kinds[at], ownerAt >= 0 && isBot(ownerAt)), sum, whole, index, fill: soften(face.paint, 0.8) })) : nothing ) ), - (0, import_react24.createElement)(Heat, { key: "heat", view, keep, paint: face.paint, index: 4 }) -+ (0, import_react39.createElement)(Heat, { key: "heat", view, keep, paint: face.paint, index: 4 }) - ) - ]; - } else { -@@ -9968,39 +9968,39 @@ function UsagePage({ roster, actions, focusId }) { - const rest = owners.filter(([at]) => !isBot(at)); - const usedModels = ranked(all.models); - body = [ -- (0, import_react24.createElement)( -+ (0, import_react39.createElement)( - "div", - { key: "sheet", className: "bt-us-sheet" }, -- (0, import_react24.createElement)(Stats, { key: "stats", range, total: all.total, previous: all.previous }), -- (0, import_react24.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, by, onBy: setBy, onPick: pick2 }), -- (0, import_react24.createElement)( -+ (0, import_react39.createElement)(Stats, { key: "stats", range, total: all.total, previous: all.previous }), -+ (0, import_react39.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, by, onBy: setBy, onPick: pick2 }), -+ (0, import_react39.createElement)( - "div", - { key: "pair", className: "bt-us-pair" }, -- (0, import_react24.createElement)( -+ (0, import_react39.createElement)( - ListCard, - { title: t("Bots"), count: bots.length, index: 2 }, - owners.length > 0 ? null : nothing, - bots.map((entry, index) => ownerRow(entry, index)), -- bots.length > 0 && rest.length > 0 ? (0, import_react24.createElement)("div", { className: "bt-us-split", role: "separator" }) : null, -+ bots.length > 0 && rest.length > 0 ? (0, import_react39.createElement)("div", { className: "bt-us-split", role: "separator" }) : null, - rest.map((entry, index) => ownerRow(entry, bots.length + index)) - ), -- (0, import_react24.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 3 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) -+ (0, import_react39.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 3 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) - ), -- (0, import_react24.createElement)(Heat, { key: "heat", view, keep, paint: "var(--bt-accent)", index: 4 }) -+ (0, import_react39.createElement)(Heat, { key: "heat", view, keep, paint: "var(--bt-accent)", index: 4 }) ++ (0, import_react44.createElement)(Heat, { key: "heat", view, keep, paint: face.paint, index: 4 }) ) - ]; - } -- return (0, import_react24.createElement)( -+ return (0, import_react39.createElement)( - "div", - { ref: root, className: "bt-us", key: focusId ?? "all" }, -- (0, import_react24.createElement)( -+ (0, import_react39.createElement)( - "div", - { className: "bt-us-top" }, -- (0, import_react24.createElement)(Tabs, { label: t("Time range"), value: rangeId, onChange: chooseRange, options: rangeOptions, boxRef: tabs }), -- view.scanning ? (0, import_react24.createElement)("span", { className: "bt-us-note", role: "status" }, t("Still reading older chats; totals may grow.")) : null, -- picking ? (0, import_react24.createElement)(SpanPicker, { span, today, oldest, active: activeDays, near: tabs, onPick: pickSpan, onClose: () => setPicking(false) }) : null -+ (0, import_react39.createElement)(Tabs, { label: t("Time range"), value: rangeId, onChange: chooseRange, options: rangeOptions, boxRef: tabs }), -+ view.scanning ? (0, import_react39.createElement)("span", { className: "bt-us-note", role: "status" }, t("Still reading older chats; totals may grow.")) : null, -+ picking ? (0, import_react39.createElement)(SpanPicker, { span, today, oldest, active: activeDays, near: tabs, onPick: pickSpan, onClose: () => setPicking(false) }) : null - ), -- error ? (0, import_react24.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, -+ error ? (0, import_react39.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, - body - ); - } -@@ -10150,33 +10150,217 @@ button.bt-us-row:hover{background:var(--bt-hover)} - @keyframes bt-us-drop{from{opacity:0;transform:translateY(-4px) scale(.96)}} - @keyframes bt-us-fade{from{opacity:0}} - @keyframes bt-us-cell{from{opacity:0;transform:scale(.5)}} --@keyframes bt-us-ring{from{stroke-dasharray:0 ${Math.ceil(RING)}}} -+@keyframes bt-us-ring{from{stroke-dasharray:0 ${Math.ceil(RING2)}}} - @keyframes bt-us-pulse{50%{opacity:.25}} - @keyframes bt-us-shine{from{background-position:200% 0}to{background-position:-200% 0}} - @media (prefers-reduced-motion:reduce){.bt-us *,.bt-us *::before{animation:none!important;transition:none!important}} - `; - - // src/client/connectors.js --var import_react25 = require("react"); -+var import_react40 = require("react"); - var TOKEN_URL = "https://github.com/settings/personal-access-tokens/new"; --var GitHubMark = () => (0, import_react25.createElement)( -+var COMPOSIO_KEY_URL = "https://platform.composio.dev/"; -+var FEISHU_WEBHOOK_URL = "https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot"; -+var APPS = [ -+ ["gmail", "Gmail"], -+ ["googlecalendar", "Google Calendar"], -+ ["googledrive", "Google Drive"], -+ ["googledocs", "Google Docs"], -+ ["googlesheets", "Google Sheets"], -+ ["outlook", "Outlook"], -+ ["slack", "Slack"], -+ ["microsoft_teams", "Microsoft Teams"], -+ ["discord", "Discord"], -+ ["telegram", "Telegram"], -+ ["whatsapp", "WhatsApp"], -+ ["notion", "Notion"], -+ ["linear", "Linear"], -+ ["jira", "Jira"], -+ ["asana", "Asana"], -+ ["trello", "Trello"], -+ ["todoist", "Todoist"], -+ ["airtable", "Airtable"], -+ ["dropbox", "Dropbox"], -+ ["hubspot", "HubSpot"], -+ ["salesforce", "Salesforce"], -+ ["stripe", "Stripe"], -+ ["zoom", "Zoom"], -+ ["calendly", "Calendly"], -+ ["figma", "Figma"], -+ ["twitter", "X (Twitter)"], -+ ["youtube", "YouTube"] -+]; -+var appName = (slug) => APPS.find(([id]) => id === slug)?.[1] ?? slug; -+var GitHubMark = () => (0, import_react40.createElement)( - "svg", - { width: 20, height: 20, viewBox: "0 0 16 16", fill: "currentColor", "aria-hidden": true }, -- (0, import_react25.createElement)("path", { d: "M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z" }) -+ (0, import_react40.createElement)("path", { d: "M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z" }) -+); -+var FeishuMark = () => (0, import_react40.createElement)( -+ "svg", -+ { width: 20, height: 20, viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": true }, -+ (0, import_react40.createElement)("path", { d: "M3.2 6.6c3 .1 6.4 1.5 8.6 3.9-1.9.4-3.5 1.4-4.7 2.9-1.9-.6-3.4-1.9-3.9-3.6-.2-.7-.2-1.5 0-3.2z" }), -+ (0, import_react40.createElement)("path", { d: "M16.8 5.4c-2.9.2-5.6 1.5-7.4 3.4 1.7 1.2 3.1 2.8 3.9 4.9 2.2-1.1 3.8-3.2 4-5.6.1-.9-.1-1.9-.4-2.7z" }), -+ (0, import_react40.createElement)("path", { d: "M8.6 12.1c.9.7 1.7 1.6 2.2 2.7-1.1.2-2.3 0-3.3-.6.2-.8.6-1.5 1.1-2.1z" }) - ); --var MARKS = { github: GitHubMark }; --var ABOUT = { github: () => t("Repositories, issues, and pull requests") }; -+var MARKS = { github: GitHubMark, composio: ConnectorIcon, feishu: FeishuMark }; -+var ABOUT = { -+ github: () => t("Repositories, issues, and pull requests"), -+ composio: () => t("Gmail, Slack, Calendar, Notion and many more apps, through one Composio key"), -+ feishu: () => t("Posts into one Feishu group through a custom bot webhook") -+}; - function statusText2(connector) { - if (connector.state === "connecting") return t("Connecting…"); - if (connector.state === "error") return t("Could not connect: {error}", { error: connector.error ?? "" }); -+ if (connector.state === "ready" && connector.kind === "channel") { -+ return connector.mode === "app" ? t("Connected: app, over the long connection") : t("Connected: custom bot webhook"); -+ } -+ if (connector.state === "ready" && connector.apps?.length > 0) return t("Connected: {apps}", { apps: connector.apps.map(appName).join(", ") }); - if (connector.state === "ready") return connector.account ? t("Connected as {account}", { account: connector.account }) : t("Connected"); - return ABOUT[connector.id]?.() ?? ""; - } --function ConnectorRow({ connector, actions }) { -- const [form, setForm] = (0, import_react25.useState)(false); -- const [token, setToken] = (0, import_react25.useState)(""); -- const [busy, setBusy] = (0, import_react25.useState)(false); -- const [error, setError] = (0, import_react25.useState)(null); -+function CredentialField({ credential, value, onChange, onEnter, autoFocus }) { -+ const label = t(credential.label); -+ if (credential.masked) return (0, import_react40.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react40.createElement)(MaskedInput, { value, onChange, onEnter, label, autoFocus })); -+ return (0, import_react40.createElement)( -+ "label", -+ { className: "bt-q-field" }, -+ (0, import_react40.createElement)("input", { -+ className: "bt-input", -+ type: "text", -+ value, -+ "aria-label": label, -+ placeholder: label, -+ spellCheck: false, -+ autoFocus, -+ onChange: (event) => onChange(event.target.value), -+ onKeyDown: (event) => { -+ if (event.key === "Enter") onEnter?.(); -+ } -+ }) -+ ); -+} -+function AllowedSenders({ connector, actions, run, busy }) { -+ const [openId, setOpenId] = (0, import_react40.useState)(""); -+ const allowed = connector.allowed ?? []; -+ const refused = connector.inbound?.refusedSenders ?? []; -+ const allow = (id) => void run(actions.connectorAllow(connector.id, id)); -+ return (0, import_react40.createElement)( -+ "div", -+ { className: "bt-connector-allowed" }, -+ (0, import_react40.createElement)("span", { className: "bt-connector-person-title" }, t("Who may talk to the Bots")), -+ allowed.length === 0 && refused.length === 0 ? (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("Nobody yet. A message from anyone else starts no turn.")) : null, -+ allowed.map((entry) => (0, import_react40.createElement)( -+ "div", -+ { key: entry.openId, className: "bt-connector-person" }, -+ (0, import_react40.createElement)("span", { className: "bt-connector-person-name" }, entry.name ?? entry.openId), -+ (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorBlock(connector.id, entry.openId)) }, t("Block")) -+ )), -+ refused.map((entry) => (0, import_react40.createElement)( -+ "div", -+ { key: entry.openId, className: "bt-connector-person" }, -+ (0, import_react40.createElement)("span", { className: "bt-connector-person-name" }, entry.name ?? entry.openId), -+ (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => allow(entry.openId) }, t("Allow")) -+ )), -+ (0, import_react40.createElement)( -+ "div", -+ { className: "bt-connector-form-row" }, -+ (0, import_react40.createElement)("input", { -+ className: "bt-input", -+ type: "text", -+ value: openId, -+ spellCheck: false, -+ "aria-label": t("Feishu open_id"), -+ placeholder: t("Paste an open_id to allow"), -+ onChange: (event) => setOpenId(event.target.value), -+ onKeyDown: (event) => { -+ if (event.key === "Enter" && openId.trim() !== "") { -+ allow(openId.trim()); -+ setOpenId(""); -+ } -+ } -+ }), -+ (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || openId.trim() === "", onClick: () => { -+ allow(openId.trim()); -+ setOpenId(""); -+ } }, t("Allow")) -+ ) -+ ); -+} -+var APP_STATUS = { ready: () => t("Ready"), "sign-in": () => t("Needs sign-in") }; -+function AppChip({ name, status, onRemove }) { -+ const label = APP_STATUS[status]?.(); -+ return (0, import_react40.createElement)( -+ "button", -+ { type: "button", className: "bt-state bt-app-chip", "aria-pressed": true, "data-status": status ?? "unknown", title: t("Remove {app}", { app: name }), onClick: onRemove }, -+ name, -+ label ? (0, import_react40.createElement)("span", { className: "bt-app-status" }, ` · ${label}`) : null -+ ); -+} -+function AppPicker({ apps, onChange, search, statuses = {} }) { -+ const [query, setQuery] = (0, import_react40.useState)(""); -+ const [found, setFound] = (0, import_react40.useState)(null); -+ const [failed, setFailed] = (0, import_react40.useState)(null); -+ const names = (0, import_react40.useRef)(new Map(APPS)); -+ const asked = (0, import_react40.useRef)(0); -+ (0, import_react40.useEffect)(() => { -+ const text2 = query.trim(); -+ if (text2 === "" || search === void 0) { -+ setFound(null); -+ setFailed(null); -+ return void 0; -+ } -+ const ask = ++asked.current; -+ const timer = setTimeout(() => { -+ search(text2).then((list) => { -+ if (ask !== asked.current) return; -+ for (const app of list) names.current.set(app.slug, app.name); -+ setFound(list); -+ setFailed(null); -+ }, (failure) => { -+ if (ask !== asked.current) return; -+ setFound(null); -+ setFailed(failure?.message ?? String(failure)); -+ }); -+ }, 250); -+ return () => clearTimeout(timer); -+ }, [query, search]); -+ const nameOf = (slug) => names.current.get(slug) ?? appName(slug); -+ const picked = new Set(apps); -+ const needle = query.trim().toLowerCase(); -+ const local = APPS.filter(([slug, name]) => needle === "" || slug.includes(needle) || name.toLowerCase().includes(needle)).map(([slug, name]) => ({ slug, name })); -+ const results = (found ?? local).filter((app) => !picked.has(app.slug)); -+ return (0, import_react40.createElement)( -+ "div", -+ { className: "bt-connector-apps" }, -+ apps.length > 0 ? (0, import_react40.createElement)("div", { className: "bt-states", "aria-label": t("Picked apps") }, apps.map((slug) => (0, import_react40.createElement)(AppChip, { key: slug, name: nameOf(slug), status: statuses[slug], onRemove: () => onChange(apps.filter((app) => app !== slug)) }))) : null, -+ (0, import_react40.createElement)("input", { className: "bt-input", type: "search", value: query, spellCheck: false, "aria-label": t("Search apps"), placeholder: t("Search Composio apps"), onChange: (event) => setQuery(event.target.value) }), -+ failed ? (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("Could not search Composio: {error}", { error: failed })) : null, -+ (0, import_react40.createElement)("div", { className: "bt-states", "aria-label": t("Apps to add") }, results.length === 0 ? (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("No apps match")) : results.map((app) => (0, import_react40.createElement)("button", { key: app.slug, type: "button", className: "bt-state", "aria-pressed": false, onClick: () => { -+ names.current.set(app.slug, app.name); -+ onChange([...apps, app.slug]); -+ } }, app.name))) -+ ); -+} -+function AppStatusList({ apps, statuses }) { -+ if (apps.length === 0 || Object.keys(statuses).length === 0) return null; -+ return (0, import_react40.createElement)("ul", { className: "bt-connector-app-list", "aria-label": t("App status") }, apps.map((slug) => (0, import_react40.createElement)( -+ "li", -+ { key: slug, className: "bt-connector-app", "data-status": statuses[slug] ?? "unknown" }, -+ (0, import_react40.createElement)("span", { className: "bt-connector-app-name" }, appName(slug)), -+ (0, import_react40.createElement)("span", { className: "bt-app-status" }, APP_STATUS[statuses[slug]]?.() ?? "") -+ ))); -+} -+function ConnectorRow({ connector, roster, actions }) { -+ const [form, setForm] = (0, import_react40.useState)(false); -+ const [bots, setBots] = (0, import_react40.useState)(false); -+ const [token, setToken] = (0, import_react40.useState)(""); -+ const [apps, setApps] = (0, import_react40.useState)(() => connector.apps ?? []); -+ const [picking, setPicking] = (0, import_react40.useState)(false); -+ const [busy, setBusy] = (0, import_react40.useState)(false); -+ const [error, setError] = (0, import_react40.useState)(null); -+ const [message, setMessage] = (0, import_react40.useState)(""); -+ const [copyState, setCopyState] = (0, import_react40.useState)("idle"); - const run = (task, after) => { - setBusy(true); - setError(null); -@@ -10184,83 +10184,219 @@ function ConnectorRow({ connector, actions }) { - after?.(); - }, (failure) => setError(failure?.message ?? String(failure))).finally(() => setBusy(false)); - }; -+ const gateway = connector.id === "composio"; -+ const sender = connector.kind === "sender"; -+ const channel = connector.kind === "channel"; -+ const modes = connector.modes ?? []; -+ const [mode, setMode] = (0, import_react40.useState)(() => connector.mode ?? modes[0]?.id); -+ const [values, setValues] = (0, import_react40.useState)({}); -+ const chosen = modes.find((entry) => entry.id === mode) ?? modes[0]; -+ const field = (name) => values[name] ?? ""; -+ const setField = (name, value) => setValues((current) => ({ ...current, [name]: value })); -+ const filled = chosen !== void 0 && chosen.credentials.every((credential) => field(credential.name).trim() !== ""); -+ const [statuses, setStatuses] = (0, import_react40.useState)({}); -+ const appsKey = (connector.apps ?? []).join(","); -+ (0, import_react40.useEffect)(() => { -+ if (!gateway || connector.state !== "ready" || appsKey === "" || actions.connectorAppStatus === void 0) { -+ setStatuses({}); -+ return void 0; -+ } -+ let live = true; -+ actions.connectorAppStatus(connector.id).then((value) => { -+ if (live) setStatuses(value ?? {}); -+ }, () => { -+ if (live) setStatuses({}); -+ }); -+ return () => { -+ live = false; -+ }; -+ }, [gateway, connector.state, appsKey, picking]); -+ (0, import_react40.useEffect)(() => { -+ setCopyState("idle"); -+ }, [connector.state, connector.error]); -+ const search = (0, import_react40.useCallback)((query) => actions.connectorAppSearch(connector.id, query, connector.state === "off" ? token : void 0), [connector.id, connector.state, token]); - const connect = () => { + ]; + } else { +@@ -9968,39 +9968,39 @@ function UsagePage({ roster, actions, focusId }) { + const rest = owners.filter(([at]) => !isBot(at)); + const usedModels = ranked(all.models); + body = [ +- (0, import_react24.createElement)( ++ (0, import_react44.createElement)( + "div", + { key: "sheet", className: "bt-us-sheet" }, +- (0, import_react24.createElement)(Stats, { key: "stats", range, total: all.total, previous: all.previous }), +- (0, import_react24.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, by, onBy: setBy, onPick: pick2 }), +- (0, import_react24.createElement)( ++ (0, import_react44.createElement)(Stats, { key: "stats", range, total: all.total, previous: all.previous }), ++ (0, import_react44.createElement)(Chart, { key: "chart", range, columns, series, tipSeries, by, onBy: setBy, onPick: pick2 }), ++ (0, import_react44.createElement)( + "div", + { key: "pair", className: "bt-us-pair" }, +- (0, import_react24.createElement)( ++ (0, import_react44.createElement)( + ListCard, + { title: t("Bots"), count: bots.length, index: 2 }, + owners.length > 0 ? null : nothing, + bots.map((entry, index) => ownerRow(entry, index)), +- bots.length > 0 && rest.length > 0 ? (0, import_react24.createElement)("div", { className: "bt-us-split", role: "separator" }) : null, ++ bots.length > 0 && rest.length > 0 ? (0, import_react44.createElement)("div", { className: "bt-us-split", role: "separator" }) : null, + rest.map((entry, index) => ownerRow(entry, bots.length + index)) + ), +- (0, import_react24.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 3 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) ++ (0, import_react44.createElement)(ListCard, { title: t("Models"), count: usedModels.length, index: 3 }, usedModels.length > 0 ? usedModels.map(modelRow) : nothing) + ), +- (0, import_react24.createElement)(Heat, { key: "heat", view, keep, paint: "var(--bt-accent)", index: 4 }) ++ (0, import_react44.createElement)(Heat, { key: "heat", view, keep, paint: "var(--bt-accent)", index: 4 }) + ) + ]; + } +- return (0, import_react24.createElement)( ++ return (0, import_react44.createElement)( + "div", + { ref: root, className: "bt-us", key: focusId ?? "all" }, +- (0, import_react24.createElement)( ++ (0, import_react44.createElement)( + "div", + { className: "bt-us-top" }, +- (0, import_react24.createElement)(Tabs, { label: t("Time range"), value: rangeId, onChange: chooseRange, options: rangeOptions, boxRef: tabs }), +- view.scanning ? (0, import_react24.createElement)("span", { className: "bt-us-note", role: "status" }, t("Still reading older chats; totals may grow.")) : null, +- picking ? (0, import_react24.createElement)(SpanPicker, { span, today, oldest, active: activeDays, near: tabs, onPick: pickSpan, onClose: () => setPicking(false) }) : null ++ (0, import_react44.createElement)(Tabs, { label: t("Time range"), value: rangeId, onChange: chooseRange, options: rangeOptions, boxRef: tabs }), ++ view.scanning ? (0, import_react44.createElement)("span", { className: "bt-us-note", role: "status" }, t("Still reading older chats; totals may grow.")) : null, ++ picking ? (0, import_react44.createElement)(SpanPicker, { span, today, oldest, active: activeDays, near: tabs, onPick: pickSpan, onClose: () => setPicking(false) }) : null + ), +- error ? (0, import_react24.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, ++ error ? (0, import_react44.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null, + body + ); + } +@@ -10150,117 +10150,30 @@ button.bt-us-row:hover{background:var(--bt-hover)} + @keyframes bt-us-drop{from{opacity:0;transform:translateY(-4px) scale(.96)}} + @keyframes bt-us-fade{from{opacity:0}} + @keyframes bt-us-cell{from{opacity:0;transform:scale(.5)}} +-@keyframes bt-us-ring{from{stroke-dasharray:0 ${Math.ceil(RING)}}} ++@keyframes bt-us-ring{from{stroke-dasharray:0 ${Math.ceil(RING2)}}} + @keyframes bt-us-pulse{50%{opacity:.25}} + @keyframes bt-us-shine{from{background-position:200% 0}to{background-position:-200% 0}} + @media (prefers-reduced-motion:reduce){.bt-us *,.bt-us *::before{animation:none!important;transition:none!important}} + `; + +-// src/client/connectors.js +-var import_react25 = require("react"); +-var TOKEN_URL = "https://github.com/settings/personal-access-tokens/new"; +-var GitHubMark = () => (0, import_react25.createElement)( +- "svg", +- { width: 20, height: 20, viewBox: "0 0 16 16", fill: "currentColor", "aria-hidden": true }, +- (0, import_react25.createElement)("path", { d: "M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z" }) +-); +-var MARKS = { github: GitHubMark }; +-var ABOUT = { github: () => t("Repositories, issues, and pull requests") }; +-function statusText2(connector) { +- if (connector.state === "connecting") return t("Connecting…"); +- if (connector.state === "error") return t("Could not connect: {error}", { error: connector.error ?? "" }); +- if (connector.state === "ready") return connector.account ? t("Connected as {account}", { account: connector.account }) : t("Connected"); +- return ABOUT[connector.id]?.() ?? ""; +-} +-function ConnectorRow({ connector, actions }) { +- const [form, setForm] = (0, import_react25.useState)(false); +- const [token, setToken] = (0, import_react25.useState)(""); +- const [busy, setBusy] = (0, import_react25.useState)(false); +- const [error, setError] = (0, import_react25.useState)(null); +- const run = (task, after) => { +- setBusy(true); +- setError(null); +- return task.then(() => { +- after?.(); +- }, (failure) => setError(failure?.message ?? String(failure))).finally(() => setBusy(false)); +- }; +- const connect = () => { - if (busy || token.trim() === "") return; - void run(actions.connectorConnect(connector.id, token), () => { -+ if (busy) return; -+ if (channel) { -+ if (chosen === void 0 || !filled) return; -+ const credentials = Object.fromEntries(chosen.credentials.map((credential) => [credential.name, field(credential.name)])); -+ void run(actions.connectorConnect(connector.id, { mode: chosen.id, credentials }), () => { -+ setValues({}); -+ setForm(false); -+ }); -+ return; -+ } -+ if (token.trim() === "") return; -+ if (gateway && apps.length === 0) { -+ setError(t("Pick at least one app")); -+ return; -+ } -+ void run(actions.connectorConnect(connector.id, token, gateway ? apps : void 0), () => { - setToken(""); - setForm(false); - }); - }; -+ const saveApps = () => { -+ if (busy) return; -+ if (apps.length === 0) { -+ setError(t("Pick at least one app")); -+ return; -+ } -+ void run(actions.connectorApps(connector.id, apps), () => setPicking(false)); -+ }; - const on = connector.state !== "off"; -+ const canPost = sender || channel && connector.mode === "webhook"; -+ const perBot = !sender && (!channel || connector.mode === "app"); -+ const copyLabel = copyState === "copied" ? t("Copied") : copyState === "failed" ? t("Could not copy the error") : t("Copy error"); -+ const copyError = () => { -+ void copiedToClipboard(connector.error ?? "").then((written) => setCopyState(written ? "copied" : "failed")); -+ }; - const Mark = MARKS[connector.id]; +- setToken(""); +- setForm(false); +- }); +- }; +- const on = connector.state !== "off"; +- const Mark = MARKS[connector.id]; - const row = (0, import_react25.useRef)(null); - useMorph(row, `${form}:${error !== null}:${connector.state}`); - return (0, import_react25.createElement)( -+ const row = (0, import_react40.useRef)(null); -+ useMorph(row, `${form}:${picking}:${bots}:${error !== null}:${connector.state}:${mode}`); -+ return (0, import_react40.createElement)( - "div", - { ref: row, className: "bt-connector", "data-state": connector.state }, +- "div", +- { ref: row, className: "bt-connector", "data-state": connector.state }, - (0, import_react25.createElement)( -+ (0, import_react40.createElement)( - "div", - { className: "bt-connector-head" }, +- "div", +- { className: "bt-connector-head" }, - (0, import_react25.createElement)("span", { className: "bt-connector-mark" }, Mark ? (0, import_react25.createElement)(Mark) : null), - (0, import_react25.createElement)( -+ (0, import_react40.createElement)("span", { className: "bt-connector-mark" }, Mark ? (0, import_react40.createElement)(Mark) : null), -+ (0, import_react40.createElement)( - "span", - { className: "bt-connector-text" }, +- "span", +- { className: "bt-connector-text" }, - (0, import_react25.createElement)("span", { className: "bt-connector-name" }, connector.name), - (0, import_react25.createElement)("span", { className: "bt-connector-status" }, statusText2(connector)) -+ (0, import_react40.createElement)("span", { className: "bt-connector-name" }, connector.name), -+ (0, import_react40.createElement)("span", { className: "bt-connector-status" }, statusText2(connector)) - ), +- ), - (0, import_react25.createElement)( -+ (0, import_react40.createElement)( - "span", - { className: "bt-connector-actions" }, +- "span", +- { className: "bt-connector-actions" }, - connector.state === "error" ? (0, import_react25.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorRetry(connector.id)) }, t("Try again")) : null, - on ? (0, import_react25.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorDisconnect(connector.id)) }, t("Disconnect")) : form ? null : (0, import_react25.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setForm(true) }, t("Connect")) -+ connector.state === "error" ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorRetry(connector.id)) }, t("Try again")) : null, -+ connector.state === "error" ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: copyError }, copyLabel) : null, -+ on && gateway && !picking ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { -+ setApps(connector.apps ?? []); -+ setPicking(true); -+ } }, t("Choose apps")) : null, -+ on && perBot ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", "aria-expanded": bots, onClick: () => setBots((value) => !value) }, bots ? t("Done") : t("Choose Bots")) : null, -+ on ? (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => void run(actions.connectorDisconnect(connector.id)) }, t("Disconnect")) : form ? null : (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setForm(true) }, t("Connect")) - ) - ), +- ) +- ), - !on && form ? (0, import_react25.createElement)( -+ on && gateway && !picking ? (0, import_react40.createElement)(AppStatusList, { apps: connector.apps ?? [], statuses }) : null, -+ on && perBot ? (0, import_react40.createElement)("span", { className: "bt-connector-uses" }, usageText(roster, connector.id)) : null, -+ on && bots ? (0, import_react40.createElement)(ConnectorBots, { connector, roster, actions, run, SwitchRow }) : null, -+ on && channel && connector.mode === "app" ? (0, import_react40.createElement)(AllowedSenders, { connector, actions, run, busy }) : null, -+ on && canPost ? (0, import_react40.createElement)( - "div", - { className: "bt-connector-form" }, +- "div", +- { className: "bt-connector-form" }, - (0, import_react25.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react25.createElement)(MaskedInput, { value: token, onChange: setToken, onEnter: connect, label: t("GitHub token"), autoFocus: true })), - (0, import_react25.createElement)( -+ (0, import_react40.createElement)("label", { className: "bt-q-field" }, (0, import_react40.createElement)("input", { className: "bt-input", type: "text", value: message, "aria-label": t("Message to send to Feishu"), placeholder: t("Type a message for the Feishu group"), onChange: (event) => setMessage(event.target.value) })), -+ (0, import_react40.createElement)( -+ "div", -+ { className: "bt-connector-form-row" }, -+ (0, import_react40.createElement)("span", { className: "bt-connector-link" }), -+ (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || message.trim() === "" || actions.connectorSend === void 0, onClick: () => void run(actions.connectorSend(connector.id, message), () => setMessage("")) }, t("Send")) -+ ) -+ ) : null, -+ !on && form ? (0, import_react40.createElement)( -+ "div", -+ { className: "bt-connector-form" }, -+ channel ? (0, import_react40.createElement)("div", { className: "bt-states", role: "group", "aria-label": t("How to connect") }, modes.map((entry) => (0, import_react40.createElement)("button", { -+ key: entry.id, -+ type: "button", -+ className: "bt-state", -+ "aria-pressed": entry.id === chosen?.id, -+ onClick: () => { -+ setMode(entry.id); -+ setValues({}); -+ setError(null); -+ } -+ }, t(entry.label)))) : null, -+ channel ? (chosen?.credentials ?? []).map((credential, index) => (0, import_react40.createElement)(CredentialField, { -+ key: credential.name, -+ credential, -+ value: field(credential.name), -+ onChange: (value) => setField(credential.name, value), -+ onEnter: connect, -+ autoFocus: index === 0 -+ })) : (0, import_react40.createElement)("label", { className: "bt-q-field bt-secret-field" }, (0, import_react40.createElement)(MaskedInput, { value: token, onChange: setToken, onEnter: connect, label: gateway ? t("Composio API key") : t("GitHub token"), autoFocus: true })), -+ gateway ? (0, import_react40.createElement)(AppPicker, { apps, onChange: setApps, search: token.trim() === "" ? void 0 : search }) : null, -+ (0, import_react40.createElement)( - "div", - { className: "bt-connector-form-row" }, +- "div", +- { className: "bt-connector-form-row" }, - (0, import_react25.createElement)("a", { className: "bt-connector-link", href: TOKEN_URL, target: "_blank", rel: "noopener noreferrer" }, t("Create a token on GitHub")), - (0, import_react25.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { -+ (0, import_react40.createElement)( -+ "a", -+ { className: "bt-connector-link", href: channel ? chosen?.link ?? FEISHU_WEBHOOK_URL : gateway ? COMPOSIO_KEY_URL : TOKEN_URL, target: "_blank", rel: "noopener noreferrer" }, -+ channel ? t(chosen?.linkLabel ?? "Get a webhook URL in Feishu") : gateway ? t("Get a Composio API key") : t("Create a token on GitHub") -+ ), -+ (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { - setForm(false); - setToken(""); -+ setValues({}); -+ setError(null); -+ } }, t("Cancel")), -+ (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || (channel ? !filled : token.trim() === ""), onClick: connect }, busy ? t("Connecting…") : t("Connect")) -+ ) -+ ) : null, -+ on && gateway && picking ? (0, import_react40.createElement)( -+ "div", -+ { className: "bt-connector-form" }, -+ (0, import_react40.createElement)(AppPicker, { apps, onChange: setApps, search, statuses }), -+ (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("The first time a Bot uses an app, it shows a sign-in link in the chat.")), -+ (0, import_react40.createElement)( -+ "div", -+ { className: "bt-connector-form-row" }, -+ (0, import_react40.createElement)("span", { className: "bt-connector-link" }), -+ (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy, onClick: () => { -+ setPicking(false); - setError(null); - } }, t("Cancel")), +- setForm(false); +- setToken(""); +- setError(null); +- } }, t("Cancel")), - (0, import_react25.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || token.trim() === "", onClick: connect }, busy ? t("Connecting…") : t("Connect")) -+ (0, import_react40.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: busy || apps.length === 0, onClick: saveApps }, busy ? t("Connecting…") : t("Save")) - ) - ) : null, +- ) +- ) : null, - error ? (0, import_react25.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null -+ error ? (0, import_react40.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null - ); - } - function ConnectorsPage({ roster, actions }) { - const list = roster?.connectors ?? []; +- ); +-} +-function ConnectorsPage({ roster, actions }) { +- const list = roster?.connectors ?? []; - return (0, import_react25.createElement)( -+ if (lockedWindow(roster)) { -+ return (0, import_react40.createElement)( -+ "section", -+ { className: "bt-set-section" }, -+ (0, import_react40.createElement)("div", { className: "bt-set-card bt-connectors-card" }, list.length === 0 ? (0, import_react40.createElement)("div", { className: "bt-set-row" }, (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("No connectors"))) : list.map((connector) => (0, import_react40.createElement)( -+ "div", -+ { key: connector.id, className: "bt-set-row" }, -+ (0, import_react40.createElement)( -+ "span", -+ { className: "bt-set-copy" }, -+ (0, import_react40.createElement)("span", { className: "bt-bs-label" }, connector.name), -+ (0, import_react40.createElement)("span", { className: "bt-set-hint" }, statusText2(connector)) -+ ) -+ ))) -+ ); -+ } -+ return (0, import_react40.createElement)( - "section", - { className: "bt-set-section" }, +- "section", +- { className: "bt-set-section" }, - (0, import_react25.createElement)("div", { className: "bt-set-card bt-connectors-card" }, list.length === 0 ? (0, import_react25.createElement)("div", { className: "bt-set-row" }, (0, import_react25.createElement)("span", { className: "bt-set-hint" }, t("No connectors"))) : list.map((connector) => (0, import_react25.createElement)(ConnectorRow, { key: connector.id, connector, actions }))) -+ (0, import_react40.createElement)("div", { className: "bt-set-card bt-connectors-card" }, list.length === 0 ? (0, import_react40.createElement)("div", { className: "bt-set-row" }, (0, import_react40.createElement)("span", { className: "bt-set-hint" }, t("No connectors"))) : list.map((connector) => (0, import_react40.createElement)(ConnectorRow, { key: connector.id, connector, roster, actions }))) - ); - } - +- ); +-} +- // src/client/feedback.js -var import_react26 = require("react"); -var FeedbackIcon = () => (0, import_react26.createElement)( -+var import_react41 = require("react"); -+var FeedbackIcon = () => (0, import_react41.createElement)( ++var import_react45 = require("react"); ++var FeedbackIcon = () => (0, import_react45.createElement)( "svg", { width: 15, height: 15, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, - (0, import_react26.createElement)("path", { d: "M4 4.5h12a1 1 0 0 1 1 1v7a1 1 0 0 1-1 1H9l-3.5 3v-3H4a1 1 0 0 1-1-1v-7a1 1 0 0 1 1-1z" }), - (0, import_react26.createElement)("path", { d: "M10 7v2.6M10 11.4h.01" }) -+ (0, import_react41.createElement)("path", { d: "M4 4.5h12a1 1 0 0 1 1 1v7a1 1 0 0 1-1 1H9l-3.5 3v-3H4a1 1 0 0 1-1-1v-7a1 1 0 0 1 1-1z" }), -+ (0, import_react41.createElement)("path", { d: "M10 7v2.6M10 11.4h.01" }) ++ (0, import_react45.createElement)("path", { d: "M4 4.5h12a1 1 0 0 1 1 1v7a1 1 0 0 1-1 1H9l-3.5 3v-3H4a1 1 0 0 1-1-1v-7a1 1 0 0 1 1-1z" }), ++ (0, import_react45.createElement)("path", { d: "M10 7v2.6M10 11.4h.01" }) ); -function download(name, text) { - const url = URL.createObjectURL(new Blob([text], { type: "text/plain;charset=utf-8" })); @@ -24007,18 +25303,18 @@ diff --git a/client.js b/client.js + return t("Cleared the error log."); +} +function FeedbackPage({ roster, actions, run, Section, Row: Row4 }) { -+ const [what, setWhat] = (0, import_react41.useState)(""); -+ const [report, setReport] = (0, import_react41.useState)(null); -+ const [allErrors, setAllErrors] = (0, import_react41.useState)(false); -+ const [preview, setPreview] = (0, import_react41.useState)(false); -+ const [note, setNote] = (0, import_react41.useState)(""); ++ const [what, setWhat] = (0, import_react45.useState)(""); ++ const [report, setReport] = (0, import_react45.useState)(null); ++ const [allErrors, setAllErrors] = (0, import_react45.useState)(false); ++ const [preview, setPreview] = (0, import_react45.useState)(false); ++ const [note, setNote] = (0, import_react45.useState)(""); const fetchReport = () => actions.diagnostics({ client: clientFacts(), clientErrors: clientErrors() }).then((next) => { setReport(next); return next; }); const load = () => fetchReport().then(() => void 0); - (0, import_react26.useEffect)(() => { -+ (0, import_react41.useEffect)(() => { ++ (0, import_react45.useEffect)(() => { void run(load()); }, []); const copyReport = () => run(fetchReport().then(async (next) => { @@ -24027,7 +25323,7 @@ diff --git a/client.js b/client.js if (!copied) setPreview(true); })); - const [issueLink, setIssueLink] = (0, import_react26.useState)(null); -+ const [issueLink, setIssueLink] = (0, import_react41.useState)(null); ++ const [issueLink, setIssueLink] = (0, import_react45.useState)(null); const openIssue = () => { const win = window.open("", "_blank"); if (win !== null) win.opener = null; @@ -24055,104 +25351,104 @@ diff --git a/client.js b/client.js + const shown = allErrors ? entries2 : entries2.slice(0, 8); return [ - (0, import_react26.createElement)( -+ (0, import_react41.createElement)( ++ (0, import_react45.createElement)( Section, { key: "report", title: t("Report a problem") }, - (0, import_react26.createElement)( -+ (0, import_react41.createElement)( ++ (0, import_react45.createElement)( "div", { className: "bt-set-row bt-set-paste bt-fb-what" }, - (0, import_react26.createElement)( -+ (0, import_react41.createElement)( ++ (0, import_react45.createElement)( "label", { className: "bt-set-copy", htmlFor: "bt-fb-what" }, - (0, import_react26.createElement)("span", null, t("What happened?")), - (0, import_react26.createElement)("span", { className: "bt-set-hint" }, t("What you did, what you expected, and what happened instead. It goes into the issue.")) -+ (0, import_react41.createElement)("span", null, t("What happened?")), -+ (0, import_react41.createElement)("span", { className: "bt-set-hint" }, t("What you did, what you expected, and what happened instead. It goes into the issue.")) ++ (0, import_react45.createElement)("span", null, t("What happened?")), ++ (0, import_react45.createElement)("span", { className: "bt-set-hint" }, t("What you did, what you expected, and what happened instead. It goes into the issue.")) ), - (0, import_react26.createElement)("textarea", { id: "bt-fb-what", className: "bt-input bt-input-area", value: what, maxLength: WHAT_MAX, placeholder: t("For example: I asked Writer in the group chat and it showed an error."), onChange: (event) => setWhat(event.target.value) }) -+ (0, import_react41.createElement)("textarea", { id: "bt-fb-what", className: "bt-input bt-input-area", value: what, maxLength: WHAT_MAX, placeholder: t("For example: I asked Writer in the group chat and it showed an error."), onChange: (event) => setWhat(event.target.value) }) ++ (0, import_react45.createElement)("textarea", { id: "bt-fb-what", className: "bt-input bt-input-area", value: what, maxLength: WHAT_MAX, placeholder: t("For example: I asked Writer in the group chat and it showed an error."), onChange: (event) => setWhat(event.target.value) }) ), - (0, import_react26.createElement)( - Row3, -+ (0, import_react41.createElement)( ++ (0, import_react45.createElement)( + Row4, { label: t("Diagnostics"), hint: t("Versions, system, models, and the latest errors. Saved keys, tokens, and your home folder are hidden.") }, - (0, import_react26.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setPreview(!preview), "aria-expanded": preview }, preview ? t("Hide") : t("Show")), - (0, import_react26.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: copyReport }, t("Copy")) -+ (0, import_react41.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setPreview(!preview), "aria-expanded": preview }, preview ? t("Hide") : t("Show")), -+ (0, import_react41.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: copyReport }, t("Copy")) ++ (0, import_react45.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => setPreview(!preview), "aria-expanded": preview }, preview ? t("Hide") : t("Show")), ++ (0, import_react45.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: copyReport }, t("Copy")) ), - preview ? (0, import_react26.createElement)("div", { className: "bt-set-row bt-fb-preview" }, (0, import_react26.createElement)("pre", { tabIndex: 0, "aria-label": t("Diagnostics") }, report?.markdown || t("Loading…"))) : null, - (0, import_react26.createElement)( - Row3, - { label: t("GitHub issue"), hint: t("Opens a new issue in the DS Bot repository with all of this filled in. Nothing is sent until you submit it there.") }, - (0, import_react26.createElement)("button", { type: "button", className: "bt-fb-primary", onClick: openIssue }, t("Report on GitHub")) -+ preview ? (0, import_react41.createElement)("div", { className: "bt-set-row bt-fb-preview" }, (0, import_react41.createElement)("pre", { tabIndex: 0, "aria-label": t("Diagnostics") }, report?.markdown || t("Loading…"))) : null, -+ (0, import_react41.createElement)( ++ preview ? (0, import_react45.createElement)("div", { className: "bt-set-row bt-fb-preview" }, (0, import_react45.createElement)("pre", { tabIndex: 0, "aria-label": t("Diagnostics") }, report?.markdown || t("Loading…"))) : null, ++ (0, import_react45.createElement)( + Row4, + { label: t("GitHub issue"), hint: t("Opens a new issue in the FlyBot repository with all of this filled in. Nothing is sent until you submit it there.") }, -+ (0, import_react41.createElement)("button", { type: "button", className: "bt-fb-primary", onClick: openIssue }, t("Report on GitHub")) ++ (0, import_react45.createElement)("button", { type: "button", className: "bt-fb-primary", onClick: openIssue }, t("Report on GitHub")) ) ), - note ? (0, import_react26.createElement)( -+ note ? (0, import_react41.createElement)( ++ note ? (0, import_react45.createElement)( "div", { key: "note", className: "bt-note bt-fb-note", role: "status" }, note, - issueLink ? [" ", (0, import_react26.createElement)("a", { key: "link", href: issueLink, target: "_blank", rel: "noopener noreferrer" }, t("Open the issue"))] : null -+ issueLink ? [" ", (0, import_react41.createElement)("a", { key: "link", href: issueLink, target: "_blank", rel: "noopener noreferrer" }, t("Open the issue"))] : null ++ issueLink ? [" ", (0, import_react45.createElement)("a", { key: "link", href: issueLink, target: "_blank", rel: "noopener noreferrer" }, t("Open the issue"))] : null ) : null, - (0, import_react26.createElement)( -+ (0, import_react41.createElement)( ++ (0, import_react45.createElement)( Section, { key: "errors", title: report ? t("Recent errors · {count}", { count: total }) : t("Recent errors") }, - shown.length === 0 ? (0, import_react26.createElement)(Row3, { label: t("No errors recorded."), hint: t("Failed model calls and DS Bot problems show here, newest first.") }) : shown.map((entry, index) => (0, import_react26.createElement)( -+ shown.length === 0 ? (0, import_react41.createElement)(Row4, { ++ shown.length === 0 ? (0, import_react45.createElement)(Row4, { + label: unread === void 0 ? t("No errors recorded.") : t("The error log could not be read ({reason}); the errors it holds are not shown.", { reason: unread }), + hint: t("Failed model calls and FlyBot problems show here, newest first.") -+ }) : shown.map((entry, index) => (0, import_react41.createElement)( ++ }) : shown.map((entry, index) => (0, import_react45.createElement)( "div", { key: `${entry.time}-${index}`, className: "bt-set-row bt-fb-entry", title: entry.text }, - (0, import_react26.createElement)("span", { className: "bt-fb-dot", "data-level": entry.level, "aria-hidden": true }), - (0, import_react26.createElement)( -+ (0, import_react41.createElement)("span", { className: "bt-fb-dot", "data-level": entry.level, "aria-hidden": true }), -+ (0, import_react41.createElement)( ++ (0, import_react45.createElement)("span", { className: "bt-fb-dot", "data-level": entry.level, "aria-hidden": true }), ++ (0, import_react45.createElement)( "div", { className: "bt-set-copy" }, - (0, import_react26.createElement)("span", { className: "bt-fb-text" }, entrySummary(entry)), - (0, import_react26.createElement)("span", { className: "bt-set-hint" }, [whenText(entry.time), entry.bot, entry.where, t(SOURCES[entry.source] ?? "DS Bot")].filter(Boolean).join(" · ")) -+ (0, import_react41.createElement)("span", { className: "bt-fb-text" }, entrySummary(entry)), -+ (0, import_react41.createElement)("span", { className: "bt-set-hint" }, [whenText2(entry.time), entry.bot, entry.where, t(SOURCES[entry.source] ?? "FlyBot")].filter(Boolean).join(" · ")) ++ (0, import_react45.createElement)("span", { className: "bt-fb-text" }, entrySummary(entry)), ++ (0, import_react45.createElement)("span", { className: "bt-set-hint" }, [whenText2(entry.time), entry.bot, entry.where, t(SOURCES[entry.source] ?? "FlyBot")].filter(Boolean).join(" · ")) ), - entry.code ? (0, import_react26.createElement)("span", { className: "bt-tag bt-fb-code" }, entry.status ? `${entry.code} ${entry.status}` : entry.code) : null -+ entry.code ? (0, import_react41.createElement)("span", { className: "bt-tag bt-fb-code" }, entry.status ? `${entry.code} ${entry.status}` : entry.code) : null ++ entry.code ? (0, import_react45.createElement)("span", { className: "bt-tag bt-fb-code" }, entry.status ? `${entry.code} ${entry.status}` : entry.code) : null )), - (0, import_react26.createElement)( - Row3, -+ total > 8 ? (0, import_react41.createElement)( ++ total > 8 ? (0, import_react45.createElement)( + "div", + { key: "more", className: "bt-set-row bt-fb-more-row" }, -+ (0, import_react41.createElement)( ++ (0, import_react45.createElement)( + "span", + { className: "bt-set-hint bt-fb-count" }, + allErrors && entries2.length === total ? t("Showing all {count}", { count: total }) : t("Showing {shown} of {count}", { shown: shown.length, count: total }) + ), -+ (0, import_react41.createElement)("button", { ++ (0, import_react45.createElement)("button", { + type: "button", + className: "bt-soft bt-soft-sm bt-fb-more", + "aria-expanded": allErrors, + onClick: () => setAllErrors(!allErrors) + }, t(allErrors ? "Show less" : "Show more")) + ) : null, -+ (0, import_react41.createElement)( ++ (0, import_react45.createElement)( + Row4, { label: t("Error log"), hint: t("Kept on this computer across restarts, up to about 1 MB.") }, - (0, import_react26.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: downloadLog }, t("Download")), - (0, import_react26.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: clearLog, disabled: !report || total === 0 }, t("Clear")) -+ (0, import_react41.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: downloadLog }, t("Download")), -+ locked ? null : (0, import_react41.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: clearLog, disabled: !report || total === 0 }, t("Clear")) ++ (0, import_react45.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: downloadLog }, t("Download")), ++ locked ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: clearLog, disabled: !report || total === 0 }, t("Clear")) ) ) ]; @@ -24162,8 +25458,8 @@ diff --git a/client.js b/client.js const toast = useUi((state) => state.toast); - const [leaving, setLeaving] = (0, import_react26.useState)(false); - (0, import_react26.useEffect)(() => { -+ const [leaving, setLeaving] = (0, import_react41.useState)(false); -+ (0, import_react41.useEffect)(() => { ++ const [leaving, setLeaving] = (0, import_react45.useState)(false); ++ (0, import_react45.useEffect)(() => { if (!toast) return void 0; setLeaving(false); const fade = setTimeout(() => setLeaving(true), TOAST_MS); @@ -24178,21 +25474,21 @@ diff --git a/client.js b/client.js + actions.dismissToast(toast.token); + void Promise.resolve(actions.reloadTeam?.()).catch((error) => actions.reportError?.(error, "reload")); + }; -+ return (0, import_react41.createElement)( ++ return (0, import_react45.createElement)( "div", - { className: "bt-toast", role: "alert", "data-leaving": leaving || void 0 }, - (0, import_react26.createElement)("span", { className: "bt-toast-text" }, toast.text), - (0, import_react26.createElement)("button", { type: "button", className: "bt-toast-link", onClick: () => { + { className: "bt-toast", role: info ? "status" : "alert", "data-tone": toast.tone, "data-leaving": leaving || void 0 }, -+ (0, import_react41.createElement)("span", { className: "bt-toast-text" }, toast.text), -+ toast.code ? (0, import_react41.createElement)("span", { className: "bt-tag bt-toast-code" }, toast.code) : null, -+ readOnly ? (0, import_react41.createElement)("button", { type: "button", className: "bt-toast-link bt-toast-reload", onClick: reload }, t("Reload")) : null, -+ info ? null : (0, import_react41.createElement)("button", { type: "button", className: "bt-toast-link", onClick: () => { ++ (0, import_react45.createElement)("span", { className: "bt-toast-text" }, toast.text), ++ toast.code ? (0, import_react45.createElement)("span", { className: "bt-tag bt-toast-code" }, toast.code) : null, ++ readOnly ? (0, import_react45.createElement)("button", { type: "button", className: "bt-toast-link bt-toast-reload", onClick: reload }, t("Reload")) : null, ++ info ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-toast-link", onClick: () => { actions.dismissToast(toast.token); actions.openSettings("feedback"); } }, t("Details")), - (0, import_react26.createElement)("button", { type: "button", className: "bt-icon-btn bt-toast-close", "aria-label": t("Dismiss"), onClick: () => actions.dismissToast(toast.token) }, (0, import_react26.createElement)(CloseIcon)) -+ (0, import_react41.createElement)("button", { type: "button", className: "bt-icon-btn bt-toast-close", "aria-label": t("Dismiss"), onClick: () => actions.dismissToast(toast.token) }, (0, import_react41.createElement)(CloseIcon)) ++ (0, import_react45.createElement)("button", { type: "button", className: "bt-icon-btn bt-toast-close", "aria-label": t("Dismiss"), onClick: () => actions.dismissToast(toast.token) }, (0, import_react45.createElement)(CloseIcon)) ); } var FEEDBACK_CSS = ` @@ -24218,7 +25514,7 @@ diff --git a/client.js b/client.js // src/client/about.js -var import_react27 = require("react"); -var CHEER_MS = 1800; -+var import_react42 = require("react"); ++var import_react46 = require("react"); var starCount = (count) => new Intl.NumberFormat(dateLocale(), { notation: "compact", maximumFractionDigits: 1 }).format(count); function botHint(update) { - if (update.phase === "installing") return t("Updating DS Bot…"); @@ -24262,9 +25558,9 @@ diff --git a/client.js b/client.js - const [checking, setChecking] = (0, import_react27.useState)(false); - const [stars, setStars] = (0, import_react27.useState)(null); - (0, import_react27.useEffect)(() => { -+ const [checking, setChecking] = (0, import_react42.useState)(false); -+ const [stars, setStars] = (0, import_react42.useState)(null); -+ (0, import_react42.useEffect)(() => { ++ const [checking, setChecking] = (0, import_react46.useState)(false); ++ const [stars, setStars] = (0, import_react46.useState)(null); ++ (0, import_react46.useEffect)(() => { let live = true; actions.repoStars().then((count) => { if (live && Number.isInteger(count)) setStars(count); @@ -24296,14 +25592,14 @@ diff --git a/client.js b/client.js const dshNew = showsDshRow(dsh, update.app); const dshShown = dshNew && dsh.available; - const botControl = phase === "installed" ? null : update.available || phase === "installing" ? (0, import_react27.createElement)( -+ const botControl = phase === "installed" ? null : update.available || phase === "installing" ? (0, import_react42.createElement)( ++ const botControl = phase === "installed" ? null : update.available || phase === "installing" ? (0, import_react46.createElement)( "button", { type: "button", className: "bt-fb-primary", disabled: phase === "installing", onClick: () => run(actions.installUpdate()) }, phase === "installing" ? t("Updating…") : phase === "failed" ? t("Try again") : t("Update") - ) : (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: checking || update.enabled === false, onClick: check }, checking ? t("Checking…") : t("Check for updates")); - const dshControl = !dshNew || dshPhase === "installed" ? null : dsh.kind === "app" ? dsh.available ? (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.openAppUpdates(dsh.verified)) }, t("Open updates")) : null : dsh.available || dshPhase !== "idle" ? (0, import_react27.createElement)( -+ ) : (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: checking || update.enabled === false, onClick: check }, checking ? t("Checking…") : t("Check for updates")); -+ const dshControl = !dshNew || dshPhase === "installed" ? null : dsh.kind === "app" ? dsh.available ? (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.openAppUpdates(dsh.verified)) }, t("Open updates")) : null : dsh.available || dshPhase !== "idle" ? (0, import_react42.createElement)( ++ ) : (0, import_react46.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: checking || update.enabled === false, onClick: check }, checking ? t("Checking…") : t("Check for updates")); ++ const dshControl = !dshNew || dshPhase === "installed" ? null : dsh.kind === "app" ? dsh.available ? (0, import_react46.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.openAppUpdates(dsh.verified)) }, t("Open updates")) : null : dsh.available || dshPhase !== "idle" ? (0, import_react46.createElement)( "button", { type: "button", className: "bt-fb-primary", disabled: dshPhase === "installing", onClick: () => run(actions.installDshUpdate()) }, dshPhase === "installing" ? t("Updating…") : dshPhase === "failed" ? t("Try again") : t("Update") @@ -24311,22 +25607,22 @@ diff --git a/client.js b/client.js const repo = update.repoUrl; return [ - (0, import_react27.createElement)( -+ (0, import_react42.createElement)( ++ (0, import_react46.createElement)( "div", { key: "hero", className: "bt-about-hero" }, - (0, import_react27.createElement)("span", { className: "bt-about-mark" }, (0, import_react27.createElement)(BotMark, { look: MAIN_LOOK, bot: { id: "about" }, size: 52, state: markState, live: true, gaze: true, pokeable: true })), - (0, import_react27.createElement)( -+ (0, import_react42.createElement)("span", { className: "bt-about-mark" }, (0, import_react42.createElement)(FlyBotMark, { size: 52 })), -+ (0, import_react42.createElement)( ++ (0, import_react46.createElement)("span", { className: "bt-about-mark" }, (0, import_react46.createElement)(FlyBotMark, { size: 52 })), ++ (0, import_react46.createElement)( "div", { className: "bt-about-copy" }, - (0, import_react27.createElement)("span", { className: "bt-about-name" }, "DS Bot"), - update.current ? (0, import_react27.createElement)("span", { className: "bt-about-version" }, t("Version {version}", { version: update.current })) : null -+ (0, import_react42.createElement)("span", { className: "bt-about-name" }, t("FlyBot")), -+ update.current ? (0, import_react42.createElement)("span", { className: "bt-about-version" }, versionLine(update)) : null ++ (0, import_react46.createElement)("span", { className: "bt-about-name" }, t("FlyBot")), ++ update.current ? (0, import_react46.createElement)("span", { className: "bt-about-version" }, versionLine(update)) : null ), - repo ? (0, import_react27.createElement)( -+ repo ? (0, import_react42.createElement)( ++ repo ? (0, import_react46.createElement)( "a", { className: "bt-star", @@ -24340,31 +25636,31 @@ diff --git a/client.js b/client.js }, - (0, import_react27.createElement)("span", { className: "bt-star-main" }, (0, import_react27.createElement)("span", { className: "bt-star-icon" }, (0, import_react27.createElement)(StarLineIcon)), "Star"), - stars === null ? null : (0, import_react27.createElement)("span", { className: "bt-star-count" }, starCount(stars)) -+ (0, import_react42.createElement)("span", { className: "bt-star-main" }, (0, import_react42.createElement)("span", { className: "bt-star-icon" }, (0, import_react42.createElement)(StarLineIcon)), "Star"), -+ stars === null ? null : (0, import_react42.createElement)("span", { className: "bt-star-count" }, starCount(stars)) ++ (0, import_react46.createElement)("span", { className: "bt-star-main" }, (0, import_react46.createElement)("span", { className: "bt-star-icon" }, (0, import_react46.createElement)(StarLineIcon)), "Star"), ++ stars === null ? null : (0, import_react46.createElement)("span", { className: "bt-star-count" }, starCount(stars)) ) : null ), - repo ? (0, import_react27.createElement)("p", { key: "ask", className: "bt-about-ask" }, t("If DS Bot helps you, a star on GitHub helps more people find it.")) : null, - (0, import_react27.createElement)( -+ repo ? (0, import_react42.createElement)("p", { key: "ask", className: "bt-about-ask" }, t("If FlyBot helps you, a star on GitHub helps more people find it.")) : null, -+ (0, import_react42.createElement)( ++ repo ? (0, import_react46.createElement)("p", { key: "ask", className: "bt-about-ask" }, t("If FlyBot helps you, a star on GitHub helps more people find it.")) : null, ++ (0, import_react46.createElement)( Section, { key: "updates", title: t("Updates") }, - (0, import_react27.createElement)(Row3, { label: "DS Bot", hint: botHint(update) }, botControl, update.available && update.notesUrl ? (0, import_react27.createElement)("a", linkProps(update.notesUrl), t("What's new")) : null), - dsh?.current ? (0, import_react27.createElement)(Row3, { label: "DeepSeek Harness", hint: dshHint(dsh, dshShown) }, dshControl) : null -+ (0, import_react42.createElement)(Row4, { label: t("FlyBot core"), hint: botHint(update) }, botControl, update.available && update.notesUrl ? (0, import_react42.createElement)("a", linkProps(update.notesUrl), t("What's new")) : null), -+ dsh?.current ? (0, import_react42.createElement)(Row4, { label: t("DeepSeek Harness (underlying)"), hint: dshHint(dsh, dshShown) }, dshControl) : null ++ (0, import_react46.createElement)(Row4, { label: t("FlyBot core"), hint: botHint(update) }, botControl, update.available && update.notesUrl ? (0, import_react46.createElement)("a", linkProps(update.notesUrl), t("What's new")) : null), ++ dsh?.current ? (0, import_react46.createElement)(Row4, { label: t("DeepSeek Harness (underlying)"), hint: dshHint(dsh, dshShown) }, dshControl) : null ), - (0, import_react27.createElement)( -+ (0, import_react42.createElement)( ++ (0, import_react46.createElement)( Section, { key: "links", title: t("Links") }, - repo ? (0, import_react27.createElement)(Row3, { label: t("Source code"), hint: repo.replace(/^https:\/\//, "") }, (0, import_react27.createElement)("a", linkProps(repo), (0, import_react27.createElement)(GitHubMark), t("Open"))) : null, - update.notesUrl ? (0, import_react27.createElement)(Row3, { label: t("Release notes") }, (0, import_react27.createElement)("a", linkProps(update.notesUrl), t("Open"))) : null, - (0, import_react27.createElement)(Row3, { label: t("Report a problem") }, (0, import_react27.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.openSettings("feedback") }, t("Open"))) -+ repo ? (0, import_react42.createElement)(Row4, { label: t("Source code"), hint: repo.replace(/^https:\/\//, "") }, (0, import_react42.createElement)("a", linkProps(repo), (0, import_react42.createElement)(GitHubMark), t("Open"))) : null, -+ update.notesUrl ? (0, import_react42.createElement)(Row4, { label: t("Release notes") }, (0, import_react42.createElement)("a", linkProps(update.notesUrl), t("Open"))) : null, -+ (0, import_react42.createElement)(Row4, { label: t("Report a problem") }, (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.openSettings("feedback") }, t("Open"))) ++ repo ? (0, import_react46.createElement)(Row4, { label: t("Source code"), hint: repo.replace(/^https:\/\//, "") }, (0, import_react46.createElement)("a", linkProps(repo), (0, import_react46.createElement)(GitHubMark), t("Open"))) : null, ++ update.notesUrl ? (0, import_react46.createElement)(Row4, { label: t("Release notes") }, (0, import_react46.createElement)("a", linkProps(update.notesUrl), t("Open"))) : null, ++ (0, import_react46.createElement)(Row4, { label: t("Report a problem") }, (0, import_react46.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.openSettings("feedback") }, t("Open"))) ) ]; } @@ -24379,30 +25675,30 @@ diff --git a/client.js b/client.js .bt-about-copy{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px} .bt-about-name{font-size:16px;line-height:22px;font-weight:600} .bt-about-version{font-size:12px;line-height:16px;color:var(--bt-ink-2);font-variant-numeric:tabular-nums} -@@ -10569,54 +10569,137 @@ body:not([data-bt-motion=quiet]) .bt-about-mark:hover .bt-mark[data-live][data-s +@@ -10569,54 +10569,217 @@ body:not([data-bt-motion=quiet]) .bt-about-mark:hover .bt-mark[data-live][data-s `; // src/client/settings.js -var import_react28 = require("react"); -+var import_react43 = require("react"); ++var import_react47 = require("react"); var capitalize2 = (word) => word[0].toUpperCase() + word.slice(1); -var SETTINGS_PAGES = [["general", "General"], ["bots", "Bots"], ["groups", "Group chats"], ["connectors", "Connectors"], ["capabilities", "Capabilities"], ["schedules", "Scheduled tasks"], ["usage", "Usage"], ["secrets", "Secrets"], ["feedback", "Feedback"], ["about", "About DS Bot"]]; -var PAGE_ICONS = { ...SETTINGS_ICONS, connectors: ConnectorIcon, capabilities: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon }; -+var SETTINGS_PAGES = [["general", "General"], ["bots", "Bots"], ["groups", "Group chats"], ["projects", "Projects"], ["connectors", "Connectors"], ["capabilities", "Capabilities"], ["plugins", "Plugins"], ["schedules", "Scheduled tasks"], ["workflows", "Workflows"], ["usage", "Usage"], ["secrets", "Secrets"], ["feedback", "Feedback"], ["about", "About FlyBot"]]; -+var PAGE_ICONS = { ...SETTINGS_ICONS, projects: FolderIcon, connectors: ConnectorIcon, workflows: WorkflowIcon, capabilities: PlugIcon, plugins: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon }; ++var SETTINGS_PAGES = [["general", "General"], ["bots", "Bots"], ["groups", "Group chats"], ["projects", "Projects"], ["connectors", "Connectors"], ["channels", "Channels"], ["capabilities", "Capabilities"], ["plugins", "Plugins"], ["schedules", "Scheduled tasks"], ["workflows", "Workflows"], ["usage", "Usage"], ["secrets", "Secrets"], ["feedback", "Feedback"], ["about", "About FlyBot"]]; ++var PAGE_ICONS = { ...SETTINGS_ICONS, projects: FolderIcon, connectors: ConnectorIcon, channels: ConnectorIcon, workflows: WorkflowIcon, capabilities: PlugIcon, plugins: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon }; function SetSection({ title, children }) { - return (0, import_react28.createElement)("section", { className: "bt-set-section" }, (0, import_react28.createElement)("h3", null, title), (0, import_react28.createElement)("div", { className: "bt-set-card" }, children)); -+ return (0, import_react43.createElement)("section", { className: "bt-set-section" }, (0, import_react43.createElement)("h3", null, title), (0, import_react43.createElement)("div", { className: "bt-set-card" }, children)); ++ return (0, import_react47.createElement)("section", { className: "bt-set-section" }, (0, import_react47.createElement)("h3", null, title), (0, import_react47.createElement)("div", { className: "bt-set-card" }, children)); } function SetRow({ label, hint, children }) { - return (0, import_react28.createElement)( -+ return (0, import_react43.createElement)( ++ return (0, import_react47.createElement)( "div", { className: "bt-set-row" }, - (0, import_react28.createElement)("div", { className: "bt-set-copy" }, (0, import_react28.createElement)("span", null, label), hint ? (0, import_react28.createElement)("span", { className: "bt-set-hint" }, hint) : null), - children ? (0, import_react28.createElement)("div", { className: "bt-set-control" }, children) : null -+ (0, import_react43.createElement)("div", { className: "bt-set-copy" }, (0, import_react43.createElement)("span", null, label), hint ? (0, import_react43.createElement)("span", { className: "bt-set-hint" }, hint) : null), -+ children ? (0, import_react43.createElement)("div", { className: "bt-set-control" }, children) : null ++ (0, import_react47.createElement)("div", { className: "bt-set-copy" }, (0, import_react47.createElement)("span", null, label), hint ? (0, import_react47.createElement)("span", { className: "bt-set-hint" }, hint) : null), ++ children ? (0, import_react47.createElement)("div", { className: "bt-set-control" }, children) : null + ); +} +var NOTIFY_KINDS = [ @@ -24413,45 +25709,45 @@ diff --git a/client.js b/client.js +function PluginsView({ answer = null, error = "", onFlip }) { + const plugins = answer?.plugins ?? []; + const profile = typeof answer?.profile === "string" && answer.profile !== "" ? answer.profile : ""; -+ return (0, import_react43.createElement)( ++ return (0, import_react47.createElement)( + "div", + null, -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( + SetSection, + { title: t("Plugins") }, -+ error ? (0, import_react43.createElement)("p", { className: "bt-set-hint", role: "alert" }, error) : null, -+ answer === null && !error ? (0, import_react43.createElement)("p", { className: "bt-set-hint" }, t("Loading…")) : null, -+ plugins.map((plugin) => plugin.installed === false ? (0, import_react43.createElement)( ++ error ? (0, import_react47.createElement)("p", { className: "bt-set-hint", role: "alert" }, error) : null, ++ answer === null && !error ? (0, import_react47.createElement)("p", { className: "bt-set-hint" }, t("Loading…")) : null, ++ plugins.map((plugin) => plugin.installed === false ? (0, import_react47.createElement)( + "div", + { key: plugin.id, className: "bt-set-row bt-set-missing", "data-plugin": plugin.id, "data-installed": "false" }, -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( + "div", + { className: "bt-set-copy" }, -+ (0, import_react43.createElement)("span", null, plugin.name), -+ (0, import_react43.createElement)("span", { className: "bt-set-hint" }, `${plugin.package} — ${t(plugin.purpose)}`), -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)("span", null, plugin.name), ++ (0, import_react47.createElement)("span", { className: "bt-set-hint" }, `${plugin.package} — ${t(plugin.purpose)}`), ++ (0, import_react47.createElement)( + "span", + { className: "bt-set-hint", role: "status" }, + t("Not installed in this profile."), + " ", -+ (0, import_react43.createElement)("code", { className: "bt-install-command" }, `dsh plugin --profile ${profile} add ${plugin.package}`) ++ (0, import_react47.createElement)("code", { className: "bt-install-command" }, `dsh plugin --profile ${profile} add ${plugin.package}`) + ) + ) -+ ) : (0, import_react43.createElement)(SwitchRow, { ++ ) : (0, import_react47.createElement)(SwitchRow, { + key: plugin.id, + label: plugin.name, + hint: `${plugin.package} — ${t(plugin.purpose)}`, + on: plugin.enabled !== false, + onChange: (enabled) => onFlip?.(plugin.id, enabled) + })), -+ (0, import_react43.createElement)("p", { className: "bt-set-hint" }, answer?.pendingRestart === true ? t("Restart FlyBot to apply the switches you changed.") : t("A switch takes effect the next time FlyBot starts.")) ++ (0, import_react47.createElement)("p", { className: "bt-set-hint" }, answer?.pendingRestart === true ? t("Restart FlyBot to apply the switches you changed.") : t("A switch takes effect the next time FlyBot starts.")) + ) ); } +function PluginsPage({ call: call4 }) { -+ const [answer, setAnswer] = (0, import_react43.useState)(null); -+ const [error, setError] = (0, import_react43.useState)(""); -+ (0, import_react43.useEffect)(() => { ++ const [answer, setAnswer] = (0, import_react47.useState)(null); ++ const [error, setError] = (0, import_react47.useState)(""); ++ (0, import_react47.useEffect)(() => { + let live = true; + call4("plugins/list").then((value) => { + if (live) setAnswer(value ?? { plugins: [] }); @@ -24469,104 +25765,249 @@ diff --git a/client.js b/client.js + setError(""); + }).catch((failure) => setError(failure?.message ?? String(failure))); + }; -+ return (0, import_react43.createElement)(PluginsView, { answer, error, onFlip: flip }); ++ return (0, import_react47.createElement)(PluginsView, { answer, error, onFlip: flip }); +} ++var APPEARANCE_MODES2 = [ ++ ["light", "Light theme"], ++ ["dark", "Dark theme"], ++ ["auto", "Automatic"], ++ ["system", "Match system"] ++]; ++var AUTO_KINDS2 = [["sun", "Estimated night hours (time-zone based)"], ["custom", "Custom hours"]]; ++var SEND_KEYS2 = [["enter", "Enter to send"], ["shift-enter", "Shift+Enter to send"]]; ++var appearanceLabel = (appearance) => APPEARANCE_MODES2.find(([id]) => id === appearance.mode)?.[1] ?? "Match system"; ++var autoLabel = (appearance) => appearance.auto === "custom" ? `${appearance.from} – ${appearance.to}` : "Estimated night hours (time-zone based)"; ++var sendKeyLabel = (key) => SEND_KEYS2.find(([id]) => id === key)?.[1] ?? "Enter to send"; ++var FOLD_MODE_OPTIONS = [ ++ ["compact", "Compact", "A very short preview, for scanning a conversation."], ++ ["standard", "Standard", "A moderate preview. Recommended."], ++ ["none", "No folding", "Show every message in full. Long messages push the conversation off the screen."] ++]; ++var foldModeLabel = (mode) => FOLD_MODE_OPTIONS.find(([id]) => id === mode)?.[1] ?? "Standard"; function GeneralPage({ roster, actions, run }) { const prefs = roster.prefs ?? {}; const themes = allThemes(); - const current = themes[prefs.theme] ? prefs.theme : "deepseek"; +- const current = themes[prefs.theme] ? prefs.theme : "deepseek"; - const [custom, setCustom] = (0, import_react28.useState)(prefs.accent ?? "#4d6bfe"); - const timer = (0, import_react28.useRef)(0); - (0, import_react28.useEffect)(() => () => clearTimeout(timer.current), []); -+ const [custom, setCustom] = (0, import_react43.useState)(prefs.accent ?? "#4d6bfe"); -+ const timer = (0, import_react43.useRef)(0); -+ (0, import_react43.useEffect)(() => () => clearTimeout(timer.current), []); ++ const current = resolveThemeId(prefs, themes); ++ const appearance = appearanceOf(prefs); ++ const sendKey = sendKeyOf(prefs); ++ const folding = foldingOf(prefs); ++ const [custom, setCustom] = (0, import_react47.useState)(prefs.accent ?? "#4d6bfe"); ++ const timer = (0, import_react47.useRef)(0); ++ (0, import_react47.useEffect)(() => () => clearTimeout(timer.current), []); const pickCustom = (value) => { setCustom(value); clearTimeout(timer.current); timer.current = setTimeout(() => run(actions.setPrefs({ accent: value })), 350); }; ++ const setAppearance = (patch) => run(actions.setPrefs({ appearance: { ...appearance, ...patch } })); ++ const localeChooser = canSetLocale(); + if (lockedWindow(roster)) { + const accent = ACCENT_INKS.find((ink) => INKS[ink][0] === prefs.accent); + return [ -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( ++ SetSection, ++ { key: "look", title: t("Appearance") }, ++ (0, import_react47.createElement)(SetRow, { label: t("Appearance"), hint: t(appearanceLabel(appearance)) }), ++ appearance.mode === "auto" ? (0, import_react47.createElement)(SetRow, { label: t("Automatic switch"), hint: t(autoLabel(appearance)) }) : null, ++ (0, import_react47.createElement)(SetRow, { label: t("Theme"), hint: t(themes[current].label) }), ++ (0, import_react47.createElement)(SetRow, { label: t("Accent"), hint: accent ? t(capitalize2(accent)) : prefs.accent ?? t("Default") }) ++ ), ++ (0, import_react47.createElement)( + SetSection, -+ { key: "look", title: t("Appearance") }, -+ (0, import_react43.createElement)(SetRow, { label: t("Theme"), hint: t(themes[current].label) }), -+ (0, import_react43.createElement)(SetRow, { label: t("Accent"), hint: accent ? t(capitalize2(accent)) : prefs.accent ?? t("Default") }) ++ { key: "language", title: t("Language") }, ++ (0, import_react47.createElement)(SetRow, { label: t("Interface language"), hint: t(languageLabel()) }) + ), -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( ++ SetSection, ++ { key: "shortcuts", title: t("Shortcuts") }, ++ (0, import_react47.createElement)(SetRow, { label: t("Send shortcut"), hint: t(sendKeyLabel(sendKey)) }) ++ ), ++ (0, import_react47.createElement)( ++ SetSection, ++ { key: "folding", title: t("Message folding") }, ++ (0, import_react47.createElement)(SetRow, { label: t("Message folding"), hint: t(foldModeLabel(folding.mode)) }), ++ (0, import_react47.createElement)(SetRow, { label: t("Collapse long documents into cards"), hint: folding.documentCards ? t("On") : t("Off") }) ++ ), ++ (0, import_react47.createElement)( + SetSection, + { key: "notify", title: t("Notifications") }, -+ (0, import_react43.createElement)(SetRow, { label: t("In other chats"), hint: prefs.notifications !== false ? t("On") : t("Off") }), -+ NOTIFY_KINDS.map(([kind, label]) => (0, import_react43.createElement)(SetRow, { key: kind, label: t(label), hint: prefs.notifications !== false && prefs.notify?.[kind] !== false ? t("On") : t("Off") })) ++ (0, import_react47.createElement)(SetRow, { label: t("In other chats"), hint: prefs.notifications !== false ? t("On") : t("Off") }), ++ NOTIFY_KINDS.map(([kind, label]) => (0, import_react47.createElement)(SetRow, { key: kind, label: t(label), hint: prefs.notifications !== false && prefs.notify?.[kind] !== false ? t("On") : t("Off") })) + ) + ]; + } return [ - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( SetSection, { key: "look", title: t("Appearance") }, - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( ++ SetRow, ++ { label: t("Appearance"), hint: t("How this window looks: light, dark, automatic, or match the system.") }, ++ (0, import_react47.createElement)(Segmented, { label: t("Appearance"), value: appearance.mode, className: "bt-appearance-seg" }, APPEARANCE_MODES2.map(([id, label]) => (0, import_react47.createElement)("button", { ++ key: id, ++ type: "button", ++ "aria-pressed": appearance.mode === id, ++ onClick: () => { ++ if (appearance.mode !== id) setAppearance({ mode: id }); ++ } ++ }, t(label)))) ++ ), ++ appearance.mode === "auto" ? (0, import_react47.createElement)( ++ SetRow, ++ { label: t("Automatic switch"), hint: t("Switches about a minute after the chosen time, and not in the middle of a turn.") }, ++ (0, import_react47.createElement)(Segmented, { label: t("Automatic switch"), value: appearance.auto, className: "bt-appearance-seg" }, AUTO_KINDS2.map(([id, label]) => (0, import_react47.createElement)("button", { ++ key: id, ++ type: "button", ++ "aria-pressed": appearance.auto === id, ++ onClick: () => { ++ if (appearance.auto !== id) setAppearance({ auto: id }); ++ } ++ }, t(label)))) ++ ) : null, ++ appearance.mode === "auto" && appearance.auto === "custom" ? (0, import_react47.createElement)( ++ SetRow, ++ { label: t("Custom hours") }, ++ (0, import_react47.createElement)( ++ "label", ++ { className: "bt-time-field" }, ++ t("Dark from"), ++ (0, import_react47.createElement)("input", { className: "bt-input", type: "time", "aria-label": t("Dark from"), value: appearance.from, onChange: (event) => setAppearance({ from: event.target.value }) }) ++ ), ++ (0, import_react47.createElement)( ++ "label", ++ { className: "bt-time-field" }, ++ t("Dark until"), ++ (0, import_react47.createElement)("input", { className: "bt-input", type: "time", "aria-label": t("Dark until"), value: appearance.to, onChange: (event) => setAppearance({ to: event.target.value }) }) ++ ) ++ ) : null, ++ (0, import_react47.createElement)( SetRow, { label: t("Theme"), hint: t("Colors for the whole team, on every device.") }, - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( "select", { className: "bt-select", "aria-label": t("Theme"), value: current, onChange: (event) => run(actions.setPrefs({ theme: event.target.value })) }, - Object.entries(themes).map(([id, theme]) => (0, import_react28.createElement)("option", { key: id, value: id }, t(theme.label))) -+ Object.entries(themes).map(([id, theme]) => (0, import_react43.createElement)("option", { key: id, value: id }, t(theme.label))) ++ Object.entries(themes).map(([id, theme]) => (0, import_react47.createElement)("option", { key: id, value: id }, t(theme.label))) ) ), - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( SetRow, { label: t("Accent"), hint: t("Unread marks, badges, and the brand mark.") }, - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( "div", { className: "bt-swatches" }, - (0, import_react28.createElement)("button", { type: "button", className: "bt-swatch bt-swatch-default", title: t("Theme accent"), "aria-label": t("Theme accent"), "aria-pressed": !prefs.accent, onClick: () => run(actions.setPrefs({ accent: null })) }), - ACCENT_INKS.map((ink) => (0, import_react28.createElement)("button", { -+ (0, import_react43.createElement)("button", { type: "button", className: "bt-swatch bt-swatch-default", title: t("Theme accent"), "aria-label": t("Theme accent"), "aria-pressed": !prefs.accent, onClick: () => run(actions.setPrefs({ accent: null })) }), -+ ACCENT_INKS.map((ink) => (0, import_react43.createElement)("button", { ++ (0, import_react47.createElement)("button", { type: "button", className: "bt-swatch bt-swatch-default", title: t("Theme accent"), "aria-label": t("Theme accent"), "aria-pressed": !prefs.accent, onClick: () => run(actions.setPrefs({ accent: null })) }), ++ ACCENT_INKS.map((ink) => (0, import_react47.createElement)("button", { key: ink, type: "button", className: "bt-swatch", -@@ -10626,75 +10626,101 @@ function GeneralPage({ roster, actions, run }) { +@@ -10626,75 +10626,167 @@ function GeneralPage({ roster, actions, run }) { style: { background: INKS[ink][0] }, onClick: () => run(actions.setPrefs({ accent: INKS[ink][0] })) })), - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( "label", { className: "bt-swatch bt-swatch-custom", title: t("Custom accent"), "data-on": Boolean(prefs.accent) && !ACCENT_INKS.some((ink) => INKS[ink][0] === prefs.accent) }, - (0, import_react28.createElement)("input", { type: "color", value: custom, "aria-label": t("Custom accent"), onChange: (event) => pickCustom(event.target.value) }) -+ (0, import_react43.createElement)("input", { type: "color", value: custom, "aria-label": t("Custom accent"), onChange: (event) => pickCustom(event.target.value) }) ++ (0, import_react47.createElement)("input", { type: "color", value: custom, "aria-label": t("Custom accent"), onChange: (event) => pickCustom(event.target.value) }) ) ) ) ), - (0, import_react28.createElement)( -+ // One switch for every system notification (#353), then one per kind (#469). -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( SetSection, - { key: "mode", title: t("Mode") }, - (0, import_react28.createElement)( -- SetRow, ++ { key: "language", title: t("Language") }, ++ localeChooser ? (0, import_react47.createElement)( ++ SetRow, ++ { label: t("Interface language") }, ++ (0, import_react47.createElement)(Segmented, { label: t("Interface language"), value: languageLabel() === "Simplified Chinese" ? "zh" : "en", className: "bt-appearance-seg" }, [ ++ (0, import_react47.createElement)("button", { key: "en", type: "button", "aria-pressed": languageLabel() !== "Simplified Chinese", onClick: () => setInterfaceLocale("en") }, t("English")), ++ (0, import_react47.createElement)("button", { key: "zh", type: "button", "aria-pressed": languageLabel() === "Simplified Chinese", onClick: () => setInterfaceLocale("zh") }, t("Simplified Chinese")) ++ ]) ++ ) : (0, import_react47.createElement)(SetRow, { label: t("Interface language"), hint: `${t(languageLabel())}. ${t("Follows the DeepSeek Harness language.")}` }) ++ ), ++ (0, import_react47.createElement)( ++ SetSection, ++ { key: "shortcuts", title: t("Shortcuts") }, ++ (0, import_react47.createElement)( + SetRow, - { label: t("Classic Agent mode") }, - (0, import_react28.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.setSurface("agent") }, t("Switch")) -- ) ++ { ++ label: t("Send shortcut"), ++ hint: t(sendKey === "shift-enter" ? "Enter inserts a new line." : "Shift+Enter inserts a new line.") ++ }, ++ (0, import_react47.createElement)(Segmented, { label: t("Send shortcut"), value: sendKey, className: "bt-appearance-seg" }, SEND_KEYS2.map(([id, label]) => (0, import_react47.createElement)("button", { ++ key: id, ++ type: "button", ++ "aria-pressed": sendKey === id, ++ onClick: () => { ++ if (sendKey !== id) run(actions.setPrefs({ sendKey: id === "enter" ? null : id })); ++ } ++ }, t(label)))) + ) ++ ), ++ (0, import_react47.createElement)( ++ SetSection, ++ { key: "folding", title: t("Message folding") }, ++ (0, import_react47.createElement)( ++ "div", ++ { className: "bt-fold-modes", role: "radiogroup", "aria-label": t("Message folding") }, ++ (0, import_react47.createElement)("p", { className: "bt-fold-lead" }, t("Choose how much of a long message to show before it folds.")), ++ FOLD_MODE_OPTIONS.map(([id, label, hint]) => (0, import_react47.createElement)( ++ "button", ++ { ++ key: id, ++ type: "button", ++ role: "radio", ++ className: "bt-fold-mode", ++ "aria-checked": folding.mode === id, ++ onClick: () => { ++ if (folding.mode !== id) run(actions.setPrefs({ folding: { mode: id, documentCards: folding.documentCards } })); ++ } ++ }, ++ (0, import_react47.createElement)("span", { className: "bt-fold-radio", "aria-hidden": true }), ++ (0, import_react47.createElement)( ++ "span", ++ { className: "bt-fold-mode-copy" }, ++ (0, import_react47.createElement)("span", { className: "bt-fold-mode-label" }, t(label)), ++ (0, import_react47.createElement)("span", { className: "bt-set-hint" }, t(hint)) ++ ) ++ )) ++ ), ++ (0, import_react47.createElement)(SwitchRow, { ++ label: t("Collapse long documents into cards"), ++ hint: t("Messages with several sections appear as a card you can open beside the conversation."), ++ on: folding.documentCards, ++ onChange: (on) => run(actions.setPrefs({ folding: { mode: folding.mode, documentCards: on } })) ++ }) ++ ), ++ // One switch for every system notification (#353), then one per kind (#469). ++ (0, import_react47.createElement)( ++ SetSection, + { key: "notify", title: t("Notifications") }, -+ (0, import_react43.createElement)(SwitchRow, { ++ (0, import_react47.createElement)(SwitchRow, { + label: t("In other chats"), + hint: t("When your Bots finish, fail, or wait for your approval while you are in another chat or app."), + on: prefs.notifications !== false, + onChange: (on) => run(actions.setPrefs({ notifications: on })) + }), -+ NOTIFY_KINDS.map(([kind, label, hint]) => (0, import_react43.createElement)(SwitchRow, { ++ NOTIFY_KINDS.map(([kind, label, hint]) => (0, import_react47.createElement)(SwitchRow, { + key: kind, + label: t(label), + hint: hint ? t(hint) : void 0, @@ -24585,47 +26026,47 @@ diff --git a/client.js b/client.js + const own = roster.bots.filter((bot) => !bot.remote); + const candidates = own.filter((bot) => !isMainOf(roster, bot.id)); + if (lockedWindow(roster)) { -+ return (0, import_react43.createElement)( ++ return (0, import_react47.createElement)( + SetSection, + { title: t("Main Bot") }, -+ (0, import_react43.createElement)(SetRow, { label: t("Main Bot"), hint: first ? first.name : void 0 }), -+ others.map((bot) => (0, import_react43.createElement)(SetRow, { key: bot.id, label: bot.name, hint: t("Also a Main Bot.") })) ++ (0, import_react47.createElement)(SetRow, { label: t("Main Bot"), hint: first ? first.name : void 0 }), ++ others.map((bot) => (0, import_react47.createElement)(SetRow, { key: bot.id, label: bot.name, hint: t("Also a Main Bot.") })) + ); + } -+ return (0, import_react43.createElement)( ++ return (0, import_react47.createElement)( SetSection, { title: t("Main Bot") }, - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( SetRow, { label: t("Main Bot"), hint: first ? t("First in the sidebar. Pick another Bot to hand it the role; {name} then stops being a Main Bot.", { name: first.name }) : void 0 }, - (0, import_react28.createElement)("select", { -+ (0, import_react43.createElement)("select", { ++ (0, import_react47.createElement)("select", { className: "bt-select", "aria-label": t("Main Bot"), value: first?.id ?? "", onChange: (event) => run(actions.setMain(event.target.value, true, first ? { replace: first.id } : {})) - }, first ? null : (0, import_react28.createElement)("option", { value: "" }, t("Choose a Bot…")), roster.bots.map((bot) => (0, import_react28.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) -+ }, first ? null : (0, import_react43.createElement)("option", { value: "" }, t("Choose a Bot…")), own.map((bot) => (0, import_react43.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) ++ }, first ? null : (0, import_react47.createElement)("option", { value: "" }, t("Choose a Bot…")), own.map((bot) => (0, import_react47.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) ), - others.map((bot) => (0, import_react28.createElement)( -+ others.map((bot) => (0, import_react43.createElement)( ++ others.map((bot) => (0, import_react47.createElement)( SetRow, { key: bot.id, label: bot.name, hint: t("Also a Main Bot.") }, - (0, import_react28.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, true, { primary: true })) }, t("Move to first")), - (0, import_react28.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, false)) }, t("Remove Main Bot role")) -+ (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, true, { primary: true })) }, t("Move to first")), -+ (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, false)) }, t("Remove Main Bot role")) ++ (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, true, { primary: true })) }, t("Move to first")), ++ (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => run(actions.setMain(bot.id, false)) }, t("Remove Main Bot role")) )), - candidates.length > 0 ? (0, import_react28.createElement)( -+ candidates.length > 0 ? (0, import_react43.createElement)( ++ candidates.length > 0 ? (0, import_react47.createElement)( SetRow, { label: t("Add a Main Bot"), hint: t("Main Bots can create and change Bots, and run every group chat.") }, - (0, import_react28.createElement)("select", { -+ (0, import_react43.createElement)("select", { ++ (0, import_react47.createElement)("select", { className: "bt-select", "aria-label": t("Add a Main Bot"), value: "", @@ -24633,7 +26074,7 @@ diff --git a/client.js b/client.js if (event.target.value) void run(actions.setMain(event.target.value, true)); } - }, (0, import_react28.createElement)("option", { value: "" }, t("Choose a Bot…")), candidates.map((bot) => (0, import_react28.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) -+ }, (0, import_react43.createElement)("option", { value: "" }, t("Choose a Bot…")), candidates.map((bot) => (0, import_react43.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) ++ }, (0, import_react47.createElement)("option", { value: "" }, t("Choose a Bot…")), candidates.map((bot) => (0, import_react47.createElement)("option", { key: bot.id, value: bot.id }, bot.name))) ) : null ); } @@ -24642,21 +26083,21 @@ diff --git a/client.js b/client.js const motion = roster.prefs?.motion === "quiet" || roster.prefs?.motion === "lively" ? roster.prefs.motion : "normal"; - return (0, import_react28.createElement)( + if (lockedWindow(roster)) { -+ return (0, import_react43.createElement)( ++ return (0, import_react47.createElement)( + SetSection, + { title: t("Animation") }, -+ (0, import_react43.createElement)(SetRow, { label: t("Bot animation"), hint: t(MOTIONS.find(([id]) => id === motion)?.[1] ?? "Normal") }) ++ (0, import_react47.createElement)(SetRow, { label: t("Bot animation"), hint: t(MOTIONS.find(([id]) => id === motion)?.[1] ?? "Normal") }) + ); + } -+ return (0, import_react43.createElement)( ++ return (0, import_react47.createElement)( SetSection, { title: t("Animation") }, - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( SetRow, { label: t("Bot animation") }, - (0, import_react28.createElement)(Segmented, { label: t("Bot animation"), value: motion, className: "bt-motion-seg" }, MOTIONS.map(([id, label]) => (0, import_react28.createElement)("button", { -+ (0, import_react43.createElement)(Segmented, { label: t("Bot animation"), value: motion, className: "bt-motion-seg" }, MOTIONS.map(([id, label]) => (0, import_react43.createElement)("button", { ++ (0, import_react47.createElement)(Segmented, { label: t("Bot animation"), value: motion, className: "bt-motion-seg" }, MOTIONS.map(([id, label]) => (0, import_react47.createElement)("button", { key: id, type: "button", "aria-pressed": motion === id, @@ -24665,30 +26106,30 @@ diff --git a/client.js b/client.js } function BotsPage({ roster, actions, run }) { - const [creating, setCreating] = (0, import_react28.useState)(false); -+ const [creating, setCreating] = (0, import_react43.useState)(false); ++ const [creating, setCreating] = (0, import_react47.useState)(false); return [ - (0, import_react28.createElement)(MainBotsSection, { key: "main", roster, actions, run }), - (0, import_react28.createElement)(MotionSection, { key: "motion", roster, actions, run }), - creating ? (0, import_react28.createElement)(CreateBot, { key: "create", roster, actions, inline: true, onBack: () => setCreating(false), onCreated: (bot) => actions.openSettings("bots", bot.id) }) : (0, import_react28.createElement)( -+ (0, import_react43.createElement)(MainBotsSection, { key: "main", roster, actions, run }), -+ (0, import_react43.createElement)(MotionSection, { key: "motion", roster, actions, run }), -+ creating ? (0, import_react43.createElement)(CreateBot, { key: "create", roster, actions, inline: true, onBack: () => setCreating(false), onCreated: (bot) => actions.openSettings("bots", bot.id) }) : (0, import_react43.createElement)( ++ (0, import_react47.createElement)(MainBotsSection, { key: "main", roster, actions, run }), ++ (0, import_react47.createElement)(MotionSection, { key: "motion", roster, actions, run }), ++ creating ? (0, import_react47.createElement)(CreateBot, { key: "create", roster, actions, inline: true, onBack: () => setCreating(false), onCreated: (bot) => actions.openSettings("bots", bot.id) }) : (0, import_react47.createElement)( "div", { key: "new", className: "bt-actions" }, - (0, import_react28.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", onClick: () => setCreating(true) }, (0, import_react28.createElement)(PlusIcon), t("New Bot")) -+ (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", onClick: () => setCreating(true) }, (0, import_react43.createElement)(PlusIcon), t("New Bot")) ++ (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", onClick: () => setCreating(true) }, (0, import_react47.createElement)(PlusIcon), t("New Bot")) ), - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( SetSection, - { key: "bots", title: t("Bots · {count}", { count: roster.bots.length }) }, - roster.bots.map((bot) => (0, import_react28.createElement)( + { key: "bots", title: t("Bots · {count}", { count: roster.bots.filter((bot) => !bot.remote).length }) }, -+ roster.bots.filter((bot) => !bot.remote).map((bot) => (0, import_react43.createElement)( ++ roster.bots.filter((bot) => !bot.remote).map((bot) => (0, import_react47.createElement)( "button", { key: bot.id, type: "button", className: "bt-set-row", onClick: () => actions.openSettings("bots", bot.id) }, - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( "span", { className: "bt-set-bot" }, - (0, import_react28.createElement)(BotAvatar, { bot, size: 28, badge: false, live: false }), @@ -24696,42 +26137,42 @@ diff --git a/client.js b/client.js - bot.role ? (0, import_react28.createElement)("span", { className: "bt-tag" }, bot.role) : null, - isMainOf(roster, bot.id) ? (0, import_react28.createElement)("span", { className: "bt-tag" }, t("Main Bot")) : null, - bot.hidden && !isMainOf(roster, bot.id) ? (0, import_react28.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null -+ (0, import_react43.createElement)(BotAvatar, { bot, size: 28, badge: false, live: false }), -+ (0, import_react43.createElement)("span", { className: "bt-row-title" }, bot.name), -+ bot.role ? (0, import_react43.createElement)("span", { className: "bt-tag" }, bot.role) : null, -+ isMainOf(roster, bot.id) ? (0, import_react43.createElement)("span", { className: "bt-tag" }, t("Main Bot")) : null, -+ bot.hidden && !isMainOf(roster, bot.id) ? (0, import_react43.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null ++ (0, import_react47.createElement)(BotAvatar, { bot, size: 28, badge: false, live: false }), ++ (0, import_react47.createElement)("span", { className: "bt-row-title" }, bot.name), ++ bot.role ? (0, import_react47.createElement)("span", { className: "bt-tag" }, bot.role) : null, ++ isMainOf(roster, bot.id) ? (0, import_react47.createElement)("span", { className: "bt-tag" }, t("Main Bot")) : null, ++ bot.hidden && !isMainOf(roster, bot.id) ? (0, import_react47.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null ), - (0, import_react28.createElement)("span", { className: "bt-chevron" }, (0, import_react28.createElement)(ChevronRightIcon)) -+ (0, import_react43.createElement)("span", { className: "bt-chevron" }, (0, import_react43.createElement)(ChevronRightIcon)) ++ (0, import_react47.createElement)("span", { className: "bt-chevron" }, (0, import_react47.createElement)(ChevronRightIcon)) )) ) ]; } function GroupsPage({ roster, actions, run }) { - const [creating, setCreating] = (0, import_react28.useState)(false); -+ const [creating, setCreating] = (0, import_react43.useState)(false); ++ const [creating, setCreating] = (0, import_react47.useState)(false); return [ - creating ? (0, import_react28.createElement)(NewGroupForm, { key: "create", roster, actions, run, onCancel: () => setCreating(false), onCreated: (room2) => actions.openSettings("groups", room2.id) }) : (0, import_react28.createElement)( -+ creating ? (0, import_react43.createElement)(NewGroupForm, { key: "create", roster, actions, run, onCancel: () => setCreating(false), onCreated: (room2) => actions.openSettings("groups", room2.id) }) : (0, import_react43.createElement)( ++ creating ? (0, import_react47.createElement)(NewGroupForm, { key: "create", roster, actions, run, onCancel: () => setCreating(false), onCreated: (room2) => actions.openSettings("groups", room2.id) }) : (0, import_react47.createElement)( "div", { key: "new", className: "bt-actions" }, - (0, import_react28.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", disabled: roster.bots.length < 2, title: roster.bots.length < 2 ? t("A group chat needs at least two Bots") : void 0, onClick: () => setCreating(true) }, (0, import_react28.createElement)(PlusIcon), t("Create group chat")) -+ (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", disabled: roster.bots.length < 2, title: roster.bots.length < 2 ? t("A group chat needs at least two Bots") : void 0, onClick: () => setCreating(true) }, (0, import_react43.createElement)(PlusIcon), t("Create group chat")) ++ (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm bt-with-icon", disabled: roster.bots.length < 2, title: roster.bots.length < 2 ? t("A group chat needs at least two Bots") : void 0, onClick: () => setCreating(true) }, (0, import_react47.createElement)(PlusIcon), t("Create group chat")) ), - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( SetSection, { key: "groups", title: t("Group chats · {count}", { count: roster.rooms.length }) }, - roster.rooms.length === 0 ? (0, import_react28.createElement)(SetRow, { label: t("No group chats yet."), hint: t("A group chat lets several Bots work on one thing with you.") }) : roster.rooms.map((room2) => { -+ roster.rooms.length === 0 ? (0, import_react43.createElement)(SetRow, { label: t("No group chats yet."), hint: t("A group chat lets several Bots work on one thing with you.") }) : roster.rooms.map((room2) => { ++ roster.rooms.length === 0 ? (0, import_react47.createElement)(SetRow, { label: t("No group chats yet."), hint: t("A group chat lets several Bots work on one thing with you.") }) : roster.rooms.map((room2) => { const admin = roster.byId[room2.admin]; - return (0, import_react28.createElement)( -+ return (0, import_react43.createElement)( ++ return (0, import_react47.createElement)( "button", { key: room2.id, type: "button", className: "bt-set-row", onClick: () => actions.openSettings("groups", room2.id) }, - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( "span", { className: "bt-set-bot" }, - (0, import_react28.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), @@ -24739,14 +26180,14 @@ diff --git a/client.js b/client.js - (0, import_react28.createElement)("span", { className: "bt-tag" }, t("{count} members", { count: room2.members.length })), - admin ? (0, import_react28.createElement)("span", { className: "bt-tag bt-tag-admin" }, (0, import_react28.createElement)(AdminStar), admin.name) : null, - room2.hidden ? (0, import_react28.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null -+ (0, import_react43.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), -+ (0, import_react43.createElement)("span", { className: "bt-row-title" }, room2.name), -+ (0, import_react43.createElement)("span", { className: "bt-tag" }, t(seatedCount(room2) === 1 ? "{count} member" : "{count} members", { count: seatedCount(room2) })), -+ admin ? (0, import_react43.createElement)("span", { className: "bt-tag bt-tag-admin" }, (0, import_react43.createElement)(AdminStar), admin.name) : null, -+ room2.hidden ? (0, import_react43.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null ++ (0, import_react47.createElement)(RoomAvatar, { room: room2, roster, size: 28 }), ++ (0, import_react47.createElement)("span", { className: "bt-row-title" }, room2.name), ++ (0, import_react47.createElement)("span", { className: "bt-tag" }, t(seatedCount(room2) === 1 ? "{count} member" : "{count} members", { count: seatedCount(room2) })), ++ admin ? (0, import_react47.createElement)("span", { className: "bt-tag bt-tag-admin" }, (0, import_react47.createElement)(AdminStar), admin.name) : null, ++ room2.hidden ? (0, import_react47.createElement)("span", { className: "bt-tag" }, t("Hidden")) : null ), - (0, import_react28.createElement)("span", { className: "bt-chevron" }, (0, import_react28.createElement)(ChevronRightIcon)) -+ (0, import_react43.createElement)("span", { className: "bt-chevron" }, (0, import_react43.createElement)(ChevronRightIcon)) ++ (0, import_react47.createElement)("span", { className: "bt-chevron" }, (0, import_react47.createElement)(ChevronRightIcon)) ); }) ) @@ -24755,21 +26196,21 @@ diff --git a/client.js b/client.js function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = false }) { - const [error, setError] = (0, import_react28.useState)(""); - const close = (0, import_react28.useCallback)(() => actions.closeSettings(), []); -+ const [error, setError] = (0, import_react43.useState)(""); -+ const close = (0, import_react43.useCallback)(() => actions.closeSettings(), []); ++ const [error, setError] = (0, import_react47.useState)(""); ++ const close = (0, import_react47.useCallback)(() => actions.closeSettings(), []); useEscape(close); -+ const dialog = (0, import_react43.useRef)(null); ++ const dialog = (0, import_react47.useRef)(null); + useDialogFocus(dialog); const run = (promise) => Promise.resolve(promise).then(() => { setError(""); return true; -@@ -10779,104 +10779,264 @@ function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = false +@@ -10779,142 +10779,317 @@ function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = false }); const bot = page === "bots" && id ? roster.byId[id] : void 0; const room2 = page === "groups" && id ? roster.roomsById[id] : void 0; - const shown = SETTINGS_PAGES.some(([key]) => key === page) ? page : "general"; + const extra = useSettingsPages().map((entry) => ({ entry, key: `plugin:${entry.id}` })); -+ const pages = SETTINGS_PAGES.flatMap((item) => item[0] === "connectors" ? [item, ...extra.map(({ entry, key }) => [key, entry.label ?? entry.id])] : [item]).filter(([key]) => key !== "projects" || projectPresent()); ++ const pages = SETTINGS_PAGES.flatMap((item) => item[0] === "channels" ? [item, ...extra.map(({ entry, key }) => [key, entry.label ?? entry.id])] : [item]).filter(([key]) => key !== "projects" || projectPresent()); + const shown = pages.some(([key]) => key === page) ? page : "general"; + const pluginPage = extra.find(({ key }) => key === shown)?.entry; const usageFocus = shown === "usage" && id ? id : null; @@ -24780,34 +26221,34 @@ diff --git a/client.js b/client.js const pageKey = `${shown}:${bot?.id ?? room2?.id ?? ""}`; const depth = bot || room2 ? 1 : 0; - const last = (0, import_react28.useRef)({ key: pageKey, depth, move: "up" }); -+ const last = (0, import_react43.useRef)({ key: pageKey, depth, move: "up" }); ++ const last = (0, import_react47.useRef)({ key: pageKey, depth, move: "up" }); if (last.current.key !== pageKey) { last.current = { key: pageKey, depth, move: depth > last.current.depth ? "in" : depth < last.current.depth ? "out" : "up" }; } - const [usageOpened, setUsageOpened] = (0, import_react28.useState)(shown === "usage"); -+ const [usageOpened, setUsageOpened] = (0, import_react43.useState)(shown === "usage"); ++ const [usageOpened, setUsageOpened] = (0, import_react47.useState)(shown === "usage"); if (shown === "usage" && !usageOpened) setUsageOpened(true); - const errorLine = error ? (0, import_react28.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null; - return (0, import_react28.createElement)( -+ const errorLine = error ? (0, import_react43.createElement)("div", { className: "bt-error", role: "alert", style: { padding: "0 20px 8px" } }, error) : null; -+ return (0, import_react43.createElement)( ++ const errorLine = error ? (0, import_react47.createElement)("div", { className: "bt-error", role: "alert", style: { padding: "0 20px 8px" } }, error) : null; ++ return (0, import_react47.createElement)( "div", { className: "bt-settings-layer", "data-leaving": leaving || void 0 }, - (0, import_react28.createElement)("div", { className: "bt-scrim", onMouseDown: close }), - (0, import_react28.createElement)( -+ (0, import_react43.createElement)("div", { className: "bt-scrim", onMouseDown: close }), -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)("div", { className: "bt-scrim", onMouseDown: close }), ++ (0, import_react47.createElement)( "div", - { className: "bt-settings", role: "dialog", "aria-modal": true, "aria-label": t("DS Bot settings"), "data-wide": shown === "usage" ? "" : void 0 }, - (0, import_react28.createElement)( + { className: "bt-settings", role: "dialog", "aria-modal": true, "aria-label": t("FlyBot settings"), "data-wide": shown === "usage" ? "" : void 0, tabIndex: -1, ref: dialog }, -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( "nav", { ref: nav.box, className: "bt-settings-nav", "aria-label": t("Settings pages") }, - (0, import_react28.createElement)("span", { ref: nav.thumb, className: "bt-thumb", "aria-hidden": true }), - SETTINGS_PAGES.map(([key, text]) => (0, import_react28.createElement)("button", { -+ (0, import_react43.createElement)("span", { ref: nav.thumb, className: "bt-thumb", "aria-hidden": true }), -+ pages.map(([key, text2]) => (0, import_react43.createElement)("button", { ++ (0, import_react47.createElement)("span", { ref: nav.thumb, className: "bt-thumb", "aria-hidden": true }), ++ pages.map(([key, text2]) => (0, import_react47.createElement)("button", { key, type: "button", className: "bt-settings-item", @@ -24815,10 +26256,10 @@ diff --git a/client.js b/client.js onClick: () => actions.openSettings(key) - }, (0, import_react28.createElement)(PAGE_ICONS[key]), t(text))), - (0, import_react28.createElement)("button", { -+ }, (0, import_react43.createElement)(extra.find((item) => item.key === key)?.entry.icon ?? PAGE_ICONS[key] ?? ConnectorIcon), t(text2))), ++ }, (0, import_react47.createElement)(extra.find((item) => item.key === key)?.entry.icon ?? PAGE_ICONS[key] ?? ConnectorIcon), t(text2))), + // DeepSeek Harness's own settings are a separate window with its own title and look; FlyBot + // does not embed or retitle it (never patch DSH), so the entry says it leaves (#421). -+ (0, import_react43.createElement)("button", { ++ (0, import_react47.createElement)("button", { type: "button", className: "bt-settings-item bt-settings-shell", - title: t("Models, providers, and the rest of DeepSeek Harness"), @@ -24829,28 +26270,28 @@ diff --git a/client.js b/client.js openHarnessSettings(); } - }, (0, import_react28.createElement)(SlidersIcon), t("Harness settings")) -+ }, (0, import_react43.createElement)(SlidersIcon), t("Harness settings"), (0, import_react43.createElement)("span", { className: "bt-settings-out", "aria-hidden": true }, "↗")) ++ }, (0, import_react47.createElement)(SlidersIcon), t("Harness settings"), (0, import_react47.createElement)("span", { className: "bt-settings-out", "aria-hidden": true }, "↗")) ), - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( "div", { className: "bt-settings-main" }, - (0, import_react28.createElement)( -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( "div", { className: "bt-settings-head" }, - back ? (0, import_react28.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": back, title: back, onClick: () => actions.openSettings(shown) }, (0, import_react28.createElement)(ChevronLeftIcon)) : null, - (0, import_react28.createElement)("h2", { key: bot?.id ?? room2?.id ?? shown }, bot?.name ?? room2?.name ?? label) -+ back ? (0, import_react43.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": back, title: back, onClick: () => actions.openSettings(shown) }, (0, import_react43.createElement)(ChevronLeftIcon)) : null, -+ (0, import_react43.createElement)("h2", { key: bot?.id ?? room2?.id ?? shown }, bot?.name ?? room2?.name ?? label) ++ back ? (0, import_react47.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": back, title: back, onClick: () => actions.openSettings(shown) }, (0, import_react47.createElement)(ChevronLeftIcon)) : null, ++ (0, import_react47.createElement)("h2", { key: bot?.id ?? room2?.id ?? shown }, bot?.name ?? room2?.name ?? label) ), - shown === "usage" ? null : (0, import_react28.createElement)( + // A window that holds the team read-only still opens every page here, so the header says + // why nothing can be changed, in the host's own sentence and above the refusal below it: + // the standing state first, the answer to one pressed control closest to that control. -+ readOnlyLine(import_react43.createElement, roster, actions, { key: "readonly", className: "bt-readonly-line-head" }), ++ readOnlyLine(import_react47.createElement, roster, actions, { key: "readonly", className: "bt-readonly-line-head" }), + shown === "usage" ? null : errorLine, -+ shown === "usage" ? null : (0, import_react43.createElement)( ++ shown === "usage" ? null : (0, import_react47.createElement)( "div", { key: pageKey, className: "bt-settings-scroll bt-settings-page", "data-move": last.current.move }, - errorLine, @@ -24865,33 +26306,34 @@ diff --git a/client.js b/client.js - shown === "secrets" ? (0, import_react28.createElement)(SecretsPage, { roster, actions, run, Section: SetSection }) : null, - shown === "feedback" ? (0, import_react28.createElement)(FeedbackPage, { actions, run, Section: SetSection, Row: SetRow }) : null, - shown === "about" ? (0, import_react28.createElement)(AboutPage, { useUpdate, actions, run, Section: SetSection, Row: SetRow }) : null -+ shown === "general" ? (0, import_react43.createElement)(GeneralPage, { roster, actions, run }) : null, -+ bot ? (0, import_react43.createElement)("div", { className: "bt-settings-form" }, (0, import_react43.createElement)(BotSettingsForm, { key: bot.id, bot, roster, actions, run })) : null, -+ shown === "bots" && !bot ? (0, import_react43.createElement)(BotsPage, { roster, actions, run }) : null, -+ room2 ? (0, import_react43.createElement)("div", { className: "bt-settings-form" }, (0, import_react43.createElement)(GroupSettingsForm, { key: room2.id, room: room2, roster, actions, run })) : null, -+ shown === "groups" && !room2 ? (0, import_react43.createElement)(GroupsPage, { roster, actions, run }) : null, -+ shown === "projects" ? (0, import_react43.createElement)(ProjectsPage, { roster, actions, run, call: call2 }) : null, -+ shown === "connectors" ? (0, import_react43.createElement)(ConnectorsPage, { roster, actions }) : null, -+ shown === "workflows" ? (0, import_react43.createElement)(WorkflowsPage, { call: call2, roster, start: id ?? void 0 }) : null, -+ pluginPage ? (0, import_react43.createElement)(SettingsPageSlot, { entry: pluginPage, props: { roster, actions, call: call2, run, t, Section: SetSection, Row: SetRow } }) : null, -+ shown === "capabilities" ? (0, import_react43.createElement)(CapabilitiesPage, { roster, actions, run }) : null, -+ shown === "plugins" ? (0, import_react43.createElement)(PluginsPage, { call: call2 }) : null, -+ shown === "schedules" ? (0, import_react43.createElement)(SchedulesPage, { roster, actions, start: id ?? void 0 }) : null, -+ shown === "secrets" ? (0, import_react43.createElement)(SecretsPage, { roster, actions, run, Section: SetSection }) : null, -+ shown === "feedback" ? (0, import_react43.createElement)(FeedbackPage, { roster, actions, run, Section: SetSection, Row: SetRow }) : null, -+ shown === "about" ? (0, import_react43.createElement)(AboutPage, { useUpdate, actions, run, Section: SetSection, Row: SetRow }) : null ++ shown === "general" ? (0, import_react47.createElement)(GeneralPage, { roster, actions, run }) : null, ++ bot ? (0, import_react47.createElement)("div", { className: "bt-settings-form" }, (0, import_react47.createElement)(BotSettingsForm, { key: bot.id, bot, roster, actions, run })) : null, ++ shown === "bots" && !bot ? (0, import_react47.createElement)(BotsPage, { roster, actions, run }) : null, ++ room2 ? (0, import_react47.createElement)("div", { className: "bt-settings-form" }, (0, import_react47.createElement)(GroupSettingsForm, { key: room2.id, room: room2, roster, actions, run })) : null, ++ shown === "groups" && !room2 ? (0, import_react47.createElement)(GroupsPage, { roster, actions, run }) : null, ++ shown === "projects" ? (0, import_react47.createElement)(ProjectsPage, { roster, actions, run, call: call2 }) : null, ++ shown === "connectors" ? (0, import_react47.createElement)(ConnectorsPage, { roster, actions }) : null, ++ shown === "channels" ? (0, import_react47.createElement)(ChannelsPage, { roster, actions }) : null, ++ shown === "workflows" ? (0, import_react47.createElement)(WorkflowsPage, { call: call2, roster, start: id ?? void 0 }) : null, ++ pluginPage ? (0, import_react47.createElement)(SettingsPageSlot, { entry: pluginPage, props: { roster, actions, call: call2, run, t, Section: SetSection, Row: SetRow } }) : null, ++ shown === "capabilities" ? (0, import_react47.createElement)(CapabilitiesPage, { roster, actions, run }) : null, ++ shown === "plugins" ? (0, import_react47.createElement)(PluginsPage, { call: call2 }) : null, ++ shown === "schedules" ? (0, import_react47.createElement)(SchedulesPage, { roster, actions, start: id ?? void 0 }) : null, ++ shown === "secrets" ? (0, import_react47.createElement)(SecretsPage, { roster, actions, run, Section: SetSection }) : null, ++ shown === "feedback" ? (0, import_react47.createElement)(FeedbackPage, { roster, actions, run, Section: SetSection, Row: SetRow }) : null, ++ shown === "about" ? (0, import_react47.createElement)(AboutPage, { useUpdate, actions, run, Section: SetSection, Row: SetRow }) : null ), - usageOpened ? (0, import_react28.createElement)( -+ usageOpened ? (0, import_react43.createElement)( ++ usageOpened ? (0, import_react47.createElement)( "div", { key: "usage", className: "bt-settings-scroll bt-settings-usage", "data-off": shown === "usage" ? void 0 : "", "aria-hidden": shown === "usage" ? void 0 : true }, shown === "usage" ? errorLine : null, - (0, import_react28.createElement)(UsagePage, { roster, actions, focusId: usageFocus }) -+ (0, import_react43.createElement)(UsagePage, { roster, actions, focusId: usageFocus }) ++ (0, import_react47.createElement)(UsagePage, { roster, actions, focusId: usageFocus }) ) : null ), - (0, import_react28.createElement)("button", { type: "button", className: "bt-settings-close", "aria-label": t("Close settings"), onClick: close }, (0, import_react28.createElement)(CloseIcon)) -+ (0, import_react43.createElement)("button", { type: "button", className: "bt-settings-close", "aria-label": t("Close settings"), onClick: close }, (0, import_react43.createElement)(CloseIcon)) ++ (0, import_react47.createElement)("button", { type: "button", className: "bt-settings-close", "aria-label": t("Close settings"), onClick: close }, (0, import_react47.createElement)(CloseIcon)) ) ); } @@ -24917,23 +26359,23 @@ diff --git a/client.js b/client.js + }; + const bound2 = members.filter((member) => member.projectId !== null && member.projectId !== void 0); + return [ -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( + SetSection, + { key: "projects", title: t("Projects · {count}", { count: projects.length }) }, -+ projects.length === 0 ? (0, import_react43.createElement)("div", { className: "bt-set-row" }, (0, import_react43.createElement)("div", { className: "bt-set-copy" }, (0, import_react43.createElement)("span", null, t(locked ? "No Project yet." : "No Project yet — create one.")))) : projects.flatMap((project) => { ++ projects.length === 0 ? (0, import_react47.createElement)("div", { className: "bt-set-row" }, (0, import_react47.createElement)("div", { className: "bt-set-copy" }, (0, import_react47.createElement)("span", null, t(locked ? "No Project yet." : "No Project yet — create one.")))) : projects.flatMap((project) => { + const chiefError = typeof project.chief?.error === "string" ? project.chief.error.trim() : ""; -+ const row = (0, import_react43.createElement)( ++ const row = (0, import_react47.createElement)( + SetRow, + { + key: project.id, + label: project.name, + hint: project.workDir === null || project.workDir === void 0 ? void 0 : project.workDir + }, -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( + "div", + { className: "bt-project-row-controls" }, -+ (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => openProjectBoard(project.id) }, t("Open board")), -+ locked ? null : (0, import_react43.createElement)( ++ (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => openProjectBoard(project.id) }, t("Open board")), ++ locked ? null : (0, import_react47.createElement)( + "select", + { + className: "bt-select", @@ -24943,8 +26385,8 @@ diff --git a/client.js b/client.js + void bind(event.target.value, project); + } + }, -+ (0, import_react43.createElement)("option", { value: "" }, t("Bind a Bot or group")), -+ members.map((member) => (0, import_react43.createElement)( ++ (0, import_react47.createElement)("option", { value: "" }, t("Bind a Bot or group")), ++ members.map((member) => (0, import_react47.createElement)( + "option", + { key: `${member.kind}:${member.id}`, value: `${member.kind}:${member.id}` }, + `${member.kind === "group" ? t("Group") : t("Bot")} · ${member.name}` @@ -24953,20 +26395,20 @@ diff --git a/client.js b/client.js + ) + ); + if (chiefError === "") return [row]; -+ return [row, (0, import_react43.createElement)("div", { key: `${project.id}:chief`, className: "bt-project-chief-error", role: "alert" }, t("Project Chief: {error}", { error: chiefError }))]; ++ return [row, (0, import_react47.createElement)("div", { key: `${project.id}:chief`, className: "bt-project-chief-error", role: "alert" }, t("Project Chief: {error}", { error: chiefError }))]; + }) + ), -+ bound2.length === 0 ? null : (0, import_react43.createElement)( ++ bound2.length === 0 ? null : (0, import_react47.createElement)( + SetSection, + { key: "bindings", title: t("Bindings") }, -+ bound2.map((member) => (0, import_react43.createElement)( ++ bound2.map((member) => (0, import_react47.createElement)( + SetRow, + { + key: `${member.kind}:${member.id}`, + label: member.name, + hint: member.kind === "group" ? t("Group") : t("Bot") + }, -+ locked ? null : (0, import_react43.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { ++ locked ? null : (0, import_react47.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => { + void unbind(member); + } }, t("Unbind")) + )) @@ -24974,14 +26416,14 @@ diff --git a/client.js b/client.js + ]; +} +function ProjectsPage({ roster, actions, run, call: call4 }) { -+ const [state, setState] = (0, import_react43.useState)({ projects: [], error: null }); -+ const [name, setName] = (0, import_react43.useState)(""); -+ const [workDir, setWorkDir] = (0, import_react43.useState)(null); -+ const reload = (0, import_react43.useCallback)(async () => { ++ const [state, setState] = (0, import_react47.useState)({ projects: [], error: null }); ++ const [name, setName] = (0, import_react47.useState)(""); ++ const [workDir, setWorkDir] = (0, import_react47.useState)(null); ++ const reload = (0, import_react47.useCallback)(async () => { + const listing = await call4("projects"); + setState({ projects: listing?.projects ?? [], error: null }); + }, [call4]); -+ (0, import_react43.useEffect)(() => { ++ (0, import_react47.useEffect)(() => { + void reload().catch((error) => setState({ projects: [], error: error?.message ?? String(error) })); + }, [reload]); + const create = async () => { @@ -25000,16 +26442,16 @@ diff --git a/client.js b/client.js + }; + const locked = lockedWindow(roster); + return [ -+ state.error === null ? null : (0, import_react43.createElement)("div", { key: "error", className: "bt-error", role: "alert" }, state.error), ++ state.error === null ? null : (0, import_react47.createElement)("div", { key: "error", className: "bt-error", role: "alert" }, state.error), + // The host refuses `project-create` and `project-bind` in a read-only window, so the page draws + // no control that would call them; the Project list and its facts stay readable. -+ locked ? null : (0, import_react43.createElement)( ++ locked ? null : (0, import_react47.createElement)( + SetSection, + { key: "new", title: t("New Project") }, -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( + SetRow, + { label: t("Name") }, -+ (0, import_react43.createElement)("input", { ++ (0, import_react47.createElement)("input", { + className: "bt-input", + "aria-label": t("Project name"), + value: name, @@ -25017,22 +26459,22 @@ diff --git a/client.js b/client.js + onChange: (event) => setName(event.target.value) + }) + ), -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( + SetRow, + { label: t("Working folder"), hint: t("Optional. Where this Project's work happens.") }, -+ (0, import_react43.createElement)(FolderMenu, { value: workDir, actions, run, onPick: setWorkDir }) ++ (0, import_react47.createElement)(FolderMenu, { value: workDir, actions, run, onPick: setWorkDir }) + ), -+ (0, import_react43.createElement)( ++ (0, import_react47.createElement)( + "div", + { className: "bt-actions" }, -+ (0, import_react43.createElement)("button", { ++ (0, import_react47.createElement)("button", { + type: "button", + className: "bt-primary bt-with-icon", + disabled: name.trim() === "", + onClick: () => { + void create(); + } -+ }, (0, import_react43.createElement)(PlusIcon), t("New Project")) ++ }, (0, import_react47.createElement)(PlusIcon), t("New Project")) + ) + ), + // The list is rendered here rather than as a child element: it holds no state of its own, @@ -25043,11 +26485,12 @@ diff --git a/client.js b/client.js // src/client/context-menu.js -var import_react29 = require("react"); -+var import_react44 = require("react"); - function ContextMenu({ menu, roster, actions, leaving = false }) { +-function ContextMenu({ menu, roster, actions, leaving = false }) { ++var import_react48 = require("react"); ++function ContextMenu({ menu, roster, actions, unread, leaving = false }) { useEscape(() => actions.closeMenu()); - (0, import_react29.useEffect)(() => { -+ (0, import_react44.useEffect)(() => { ++ (0, import_react48.useEffect)(() => { const onDown = (event) => { if (!(event.target instanceof Element) || !event.target.closest(".bt-menu")) actions.closeMenu(); }; @@ -25058,19 +26501,21 @@ diff --git a/client.js b/client.js - const [place, setPlace] = (0, import_react29.useState)({ left: menu.x, top: menu.y }); - (0, import_react29.useLayoutEffect)(() => { + const structure = useSidebarStructure(); -+ const ref = (0, import_react44.useRef)(null); -+ const [place, setPlace] = (0, import_react44.useState)({ left: menu.x, top: menu.y }); -+ (0, import_react44.useLayoutEffect)(() => { ++ const ref = (0, import_react48.useRef)(null); ++ const [place, setPlace] = (0, import_react48.useState)({ left: menu.x, top: menu.y }); ++ (0, import_react48.useLayoutEffect)(() => { const box = ref.current?.getBoundingClientRect(); if (!box) return; setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, window.innerHeight - box.height - 8)) }); }, [menu.x, menu.y]); - if (menu.kind === "agent" || menu.kind === "agent-session") return (0, import_react29.createElement)(AgentMenu, { menu, roster, actions, leaving }); -+ if (menu.kind === "agent" || menu.kind === "agent-session") return (0, import_react44.createElement)(AgentMenu, { menu, roster, actions, leaving }); ++ if (menu.kind === "agent" || menu.kind === "agent-session") return (0, import_react48.createElement)(AgentMenu, { menu, roster, actions, unread, leaving }); const bot = roster.byId[menu.id]; const room2 = roster.roomsById[menu.id]; const entry = bot ?? room2; -@@ -10884,37 +10884,49 @@ function ContextMenu({ menu, roster, actions, leaving = false }) { + if (entry === void 0) return null; ++ const marked = isManuallyUnread(unread, menu.id); ++ const unreadItem = marked ? [t("Clear unread mark"), UnreadIcon, () => actions.clearUnread(menu.id)] : [t("Mark as Unread"), UnreadIcon, () => actions.markUnread(menu.id)]; const isMainBot = isMainOf(roster, menu.id); const isTile = roster.mainBotId === menu.id; const mainCount = (roster.mainBotIds ?? []).length; @@ -25078,10 +26523,11 @@ diff --git a/client.js b/client.js + const locked = typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; + const groups = bot?.remote ? [ + [ -+ [t("Mark as Unread"), UnreadIcon, () => actions.markUnread(menu.id)] ++ unreadItem + ], [ - isTile ? null : [entry.pinned ? t("Unpin") : t("Pin"), PinIcon, () => actions.setFlags(menu.id, { pinned: !entry.pinned })], +- [t("Mark as Unread"), UnreadIcon, () => actions.markUnread(menu.id)] + [t("Bot settings"), GearIcon, () => actions.openSettings("bots", bot.id)] + ], + pluginItems(structure, bot, actions, roster).map(([label, run]) => [label, LinkIcon, run]), @@ -25089,7 +26535,7 @@ diff --git a/client.js b/client.js + ] : [ + [ + isTile || locked ? null : [entry.pinned ? t("Unpin") : t("Pin"), PinIcon, () => actions.setFlags(menu.id, { pinned: !entry.pinned })], - [t("Mark as Unread"), UnreadIcon, () => actions.markUnread(menu.id)] ++ unreadItem ], [ - bot ? [t("Rename Bot"), PencilIcon, () => actions.renameBot(bot.id)] : null, @@ -25120,37 +26566,38 @@ diff --git a/client.js b/client.js - return (0, import_react29.createElement)( + ]; + const shown = groups.map((group) => group.filter(Boolean)).filter((group) => group.length > 0); -+ return (0, import_react44.createElement)( ++ return (0, import_react48.createElement)( "div", { ref, className: "bt-menu", role: "menu", "aria-label": t("{name} actions", { name: bot?.name ?? room2.name }), style: place, "data-leaving": leaving || void 0 }, - groups.map((group, index) => (0, import_react29.createElement)( - import_react29.Fragment, -+ shown.map((group, index) => (0, import_react44.createElement)( -+ import_react44.Fragment, ++ shown.map((group, index) => (0, import_react48.createElement)( ++ import_react48.Fragment, { key: index }, - index > 0 ? (0, import_react29.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, - group.map(([label, Icon, run, danger]) => (0, import_react29.createElement)("button", { -+ index > 0 ? (0, import_react44.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, -+ group.map(([label, Icon, run, danger]) => (0, import_react44.createElement)("button", { ++ index > 0 ? (0, import_react48.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, ++ group.map(([label, Icon, run, danger]) => (0, import_react48.createElement)("button", { key: label, type: "button", role: "menuitem", -@@ -10923,43 +10923,46 @@ function ContextMenu({ menu, roster, actions, leaving = false }) { +@@ -10923,43 +10923,52 @@ function ContextMenu({ menu, roster, actions, leaving = false }) { actions.closeMenu(); void Promise.resolve(run()).catch((error) => actions.reportError(error, "menu")); } - }, (0, import_react29.createElement)(Icon), label)) -+ }, (0, import_react44.createElement)(Icon), label)) ++ }, (0, import_react48.createElement)(Icon), label)) )) ); } - function AgentMenu({ menu, roster, actions, leaving }) { +-function AgentMenu({ menu, roster, actions, leaving }) { - const ref = (0, import_react29.useRef)(null); - const [place, setPlace] = (0, import_react29.useState)({ left: menu.x, top: menu.y }); - (0, import_react29.useLayoutEffect)(() => { -+ const ref = (0, import_react44.useRef)(null); -+ const [place, setPlace] = (0, import_react44.useState)({ left: menu.x, top: menu.y }); -+ (0, import_react44.useLayoutEffect)(() => { ++function AgentMenu({ menu, roster, actions, unread, leaving }) { ++ const ref = (0, import_react48.useRef)(null); ++ const [place, setPlace] = (0, import_react48.useState)({ left: menu.x, top: menu.y }); ++ (0, import_react48.useLayoutEffect)(() => { const box = ref.current?.getBoundingClientRect(); if (!box) return; setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, window.innerHeight - box.height - 8)) }); @@ -25158,10 +26605,13 @@ diff --git a/client.js b/client.js const agent = roster.agentsById[menu.kind === "agent" ? menu.id : menu.agentId]; if (agent === void 0) return null; + const locked = typeof roster?.readOnly === "string" && roster.readOnly.trim() !== ""; ++ const marked = isManuallyUnread(unread, agent.id); ++ const unreadItem = marked ? [t("Clear unread mark"), UnreadIcon, () => actions.clearUnread(agent.id)] : [t("Mark as Unread"), UnreadIcon, () => actions.markUnread(agent.id)]; const groups = menu.kind === "agent" ? [ [ - [agent.pinned ? t("Unpin") : t("Pin"), PinIcon, () => actions.setFlags(agent.id, { pinned: !agent.pinned })] -+ locked ? null : [agent.pinned ? t("Unpin") : t("Pin"), PinIcon, () => actions.setFlags(agent.id, { pinned: !agent.pinned })] ++ locked ? null : [agent.pinned ? t("Unpin") : t("Pin"), PinIcon, () => actions.setFlags(agent.id, { pinned: !agent.pinned })], ++ unreadItem ], [ - [t("Remove DSH Agent"), TrashIcon, () => actions.removeAgent(agent.id), true] @@ -25170,6 +26620,9 @@ diff --git a/client.js b/client.js ] : [ [ - [t("Rename"), PencilIcon, () => actions.beginAgentRename(menu.id)] ++ unreadItem ++ ], ++ [ + locked ? null : [t("Rename"), PencilIcon, () => actions.beginAgentRename(menu.id)] ], [ @@ -25180,18 +26633,18 @@ diff --git a/client.js b/client.js - return (0, import_react29.createElement)( + const shown = groups.map((group) => group.filter(Boolean)).filter((group) => group.length > 0); + if (shown.length === 0) return null; -+ return (0, import_react44.createElement)( ++ return (0, import_react48.createElement)( "div", { ref, className: "bt-menu", role: "menu", "aria-label": menu.kind === "agent" ? "DSH Agent" : t("Session actions"), style: place, "data-leaving": leaving || void 0 }, - groups.map((group, index) => (0, import_react29.createElement)( - import_react29.Fragment, -+ shown.map((group, index) => (0, import_react44.createElement)( -+ import_react44.Fragment, ++ shown.map((group, index) => (0, import_react48.createElement)( ++ import_react48.Fragment, { key: index }, - index > 0 ? (0, import_react29.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, - group.map(([label, Icon, run, danger]) => (0, import_react29.createElement)("button", { -+ index > 0 ? (0, import_react44.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, -+ group.map(([label, Icon, run, danger]) => (0, import_react44.createElement)("button", { ++ index > 0 ? (0, import_react48.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null, ++ group.map(([label, Icon, run, danger]) => (0, import_react48.createElement)("button", { key: label, type: "button", role: "menuitem", @@ -25200,7 +26653,7 @@ diff --git a/client.js b/client.js void Promise.resolve(run()).catch((error) => console.warn("[ds-bot]", error)); } - }, (0, import_react29.createElement)(Icon), label)) -+ }, (0, import_react44.createElement)(Icon), label)) ++ }, (0, import_react48.createElement)(Icon), label)) )) ); } @@ -25228,16 +26681,10 @@ diff --git a/client.js b/client.js prefs: "ds-bot:prefs", surface: "ds-bot:surface", agentSessions: "ds-bot:agent-sessions", -@@ -11010,272 +11010,36 @@ var migrateBrowsers = (storage) => { - 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; +@@ -11016,266 +11016,30 @@ var migrateBrowsers = (storage) => { + 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); @@ -25495,12 +26942,6 @@ diff --git a/client.js b/client.js - if (hiddenTurns.includes(entry.turn)) continue; - if (entry.prompt && !HEADER.test(entry.prompt)) lines.push(`**${t("You")}:** ${entry.prompt.trim()}`); - if (entry.response) lines.push(`**${name}:** ${stripHeader(entry.response).trim()}`); -+ } -+ } -+}; -+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); @@ -25525,7 +26966,7 @@ diff --git a/client.js b/client.js } + +// src/client/details-drawer.js -+var import_react45 = require("react"); ++var import_react49 = require("react"); var TAB_LABELS = { details: "Details", browser: "Browser" }; var hostOf = (url) => { try { @@ -25534,11 +26975,11 @@ diff --git a/client.js b/client.js var DANGER = /* @__PURE__ */ new Set(["danger-full-access"]); function PermissionRow({ bot, roster, actions, run }) { - const [pending, setPending] = (0, import_react31.useState)(null); -+ const [pending, setPending] = (0, import_react45.useState)(null); ++ const [pending, setPending] = (0, import_react49.useState)(null); const catalog = roster.permissions; const saved = bot.permission ?? catalog?.defaultPreset; - (0, import_react31.useEffect)(() => { -+ (0, import_react45.useEffect)(() => { ++ (0, import_react49.useEffect)(() => { if (pending === saved) setPending(null); }, [pending, saved]); if (!catalog?.options?.length) return null; @@ -25547,17 +26988,17 @@ diff --git a/client.js b/client.js void run(actions.updateBot(bot.id, { permission: value })).catch(() => setPending(null)); }; - return (0, import_react31.createElement)( -+ return (0, import_react45.createElement)( ++ return (0, import_react49.createElement)( "div", { className: "bt-drawer-permission" }, - (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Permissions")), - (0, import_react31.createElement)( -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Permissions")), -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Permissions")), ++ (0, import_react49.createElement)( Segmented, { label: t("Permissions"), value: current }, - catalog.options.map((option) => (0, import_react31.createElement)("button", { -+ catalog.options.map((option) => (0, import_react45.createElement)("button", { ++ catalog.options.map((option) => (0, import_react49.createElement)("button", { key: option.value, type: "button", "aria-pressed": option.value === current, @@ -25571,39 +27012,39 @@ diff --git a/client.js b/client.js + const catalog = roster.permissions; + const preset = catalog?.options?.find((option) => option.value === (bot.permission ?? catalog?.defaultPreset)); + const folder = bot.workDir ?? ""; -+ return (0, import_react45.createElement)( -+ import_react45.Fragment, ++ return (0, import_react49.createElement)( ++ import_react49.Fragment, + null, -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( + "div", + { key: "model", className: "bt-drawer-model" }, -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Model")), -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Model")), ++ (0, import_react49.createElement)( + "div", + { className: "bt-model-copy bt-readonly-value", title: shown?.ref }, -+ (0, import_react45.createElement)("span", { className: "bt-model-name" }, shown?.name ?? t("Not set")), -+ shown ? (0, import_react45.createElement)("span", { className: "bt-model-provider" }, shown.served || models.length === 0 ? shown.provider : t("{provider} · not available", { provider: shown.provider })) : null ++ (0, import_react49.createElement)("span", { className: "bt-model-name" }, shown?.name ?? t("Not set")), ++ shown ? (0, import_react49.createElement)("span", { className: "bt-model-provider" }, shown.served || models.length === 0 ? shown.provider : t("{provider} · not available", { provider: shown.provider })) : null + ) + ), -+ preset ? (0, import_react45.createElement)( ++ preset ? (0, import_react49.createElement)( + "div", + { key: "permission", className: "bt-drawer-model" }, -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Permissions")), -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Permissions")), ++ (0, import_react49.createElement)( + "div", + { className: "bt-model-copy bt-readonly-value" }, -+ (0, import_react45.createElement)("span", { className: "bt-model-name" }, PERMISSION_LABELS[preset.value] ? t(PERMISSION_LABELS[preset.value]) : preset.name) ++ (0, import_react49.createElement)("span", { className: "bt-model-name" }, PERMISSION_LABELS[preset.value] ? t(PERMISSION_LABELS[preset.value]) : preset.name) + ) + ) : null, -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( + "div", + { key: "folder", className: "bt-drawer-model" }, -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Working folder")), -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Working folder")), ++ (0, import_react49.createElement)( + "div", + { className: "bt-model-copy bt-readonly-value", title: folder || void 0 }, -+ (0, import_react45.createElement)("span", { className: "bt-model-name" }, folder ? folderName(folder) : t("Team workspace")), -+ folder ? (0, import_react45.createElement)("span", { className: "bt-model-provider" }, folder) : null ++ (0, import_react49.createElement)("span", { className: "bt-model-name" }, folder ? folderName(folder) : t("Team workspace")), ++ folder ? (0, import_react49.createElement)("span", { className: "bt-model-provider" }, folder) : null + ) + ) + ); @@ -25612,56 +27053,56 @@ diff --git a/client.js b/client.js const state = useBrowserTabs((map) => map[bot.id] ?? EMPTY_TABS); const pages = useBrowserPages((map) => map); - (0, import_react31.useEffect)(() => { -+ (0, import_react45.useEffect)(() => { ++ (0, import_react49.useEffect)(() => { actions.browserEnsure?.(bot.id); }, [bot.id]); if (roster.browser !== true || !actions.browserShow) { - return (0, import_react31.createElement)("div", { className: "bt-muted" }, t("The browser is in the DSH Desktop app.")); -+ return (0, import_react45.createElement)("div", { className: "bt-muted" }, t("The browser is in the DSH Desktop app.")); ++ return (0, import_react49.createElement)("div", { className: "bt-muted" }, t("The browser is in the DSH Desktop app.")); } if (state.ids.length === 0) { - return (0, import_react31.createElement)( -+ return (0, import_react45.createElement)( ++ return (0, import_react49.createElement)( "div", { className: "bt-browser-empty-mark" }, - (0, import_react31.createElement)(BotMark, { bot, size: 40, state: "idle", live: true }), - (0, import_react31.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), - (0, import_react31.createElement)("div", { className: "bt-muted" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })), - (0, import_react31.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => actions.openBrowser(sessionId) }, t("Open browser")) -+ (0, import_react45.createElement)(BotMark, { bot, size: 40, state: "idle", live: true }), -+ (0, import_react45.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), -+ (0, import_react45.createElement)("div", { className: "bt-muted" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })), -+ (0, import_react45.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => actions.openBrowser(sessionId) }, t("Open browser")) ++ (0, import_react49.createElement)(BotMark, { bot, size: 40, state: "idle", live: true }), ++ (0, import_react49.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), ++ (0, import_react49.createElement)("div", { className: "bt-muted" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })), ++ (0, import_react49.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => actions.openBrowser(sessionId) }, t("Open browser")) ); } - return (0, import_react31.createElement)( -+ return (0, import_react45.createElement)( ++ return (0, import_react49.createElement)( "div", { className: "bt-bcards" }, state.ids.map((tabId, index) => { const page = pages[tabId] ?? {}; const label = page.title || shortUrl(page.url) || t("New tab"); - return (0, import_react31.createElement)( -+ return (0, import_react45.createElement)( ++ return (0, import_react49.createElement)( "div", { key: tabId, className: "bt-bcard", "data-active": state.active === tabId || void 0, style: { animationDelay: `${index * 30}ms` } }, - (0, import_react31.createElement)( -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( "button", { type: "button", className: "bt-bcard-shot", "aria-label": t("Open {title}", { title: label }), title: page.url, onClick: () => actions.browserPick(sessionId, tabId) }, - page.excerpt ? (0, import_react31.createElement)( -+ page.excerpt ? (0, import_react45.createElement)( ++ page.excerpt ? (0, import_react49.createElement)( "span", { className: "bt-bcard-preview" }, - (0, import_react31.createElement)("span", { className: "bt-bcard-ptitle" }, label), - (0, import_react31.createElement)("span", { className: "bt-bcard-excerpt" }, page.excerpt) - ) : (0, import_react31.createElement)("span", { className: "bt-bcard-blank" }, (0, import_react31.createElement)(GlobeIcon), (0, import_react31.createElement)("span", null, label)) -+ (0, import_react45.createElement)("span", { className: "bt-bcard-ptitle" }, label), -+ (0, import_react45.createElement)("span", { className: "bt-bcard-excerpt" }, page.excerpt) -+ ) : (0, import_react45.createElement)("span", { className: "bt-bcard-blank" }, (0, import_react45.createElement)(GlobeIcon), (0, import_react45.createElement)("span", null, label)) ++ (0, import_react49.createElement)("span", { className: "bt-bcard-ptitle" }, label), ++ (0, import_react49.createElement)("span", { className: "bt-bcard-excerpt" }, page.excerpt) ++ ) : (0, import_react49.createElement)("span", { className: "bt-bcard-blank" }, (0, import_react49.createElement)(GlobeIcon), (0, import_react49.createElement)("span", null, label)) ), - (0, import_react31.createElement)("button", { -+ (0, import_react45.createElement)("button", { ++ (0, import_react49.createElement)("button", { type: "button", className: "bt-bcard-x", "aria-label": t("Close tab"), @@ -25670,20 +27111,20 @@ diff --git a/client.js b/client.js } }, "×"), - (0, import_react31.createElement)( -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( "div", { className: "bt-bcard-row" }, - (0, import_react31.createElement)(Favicon, { src: page.favicon, className: "bt-bcard-fav" }), - (0, import_react31.createElement)("span", { className: "bt-bcard-title" }, label), - page.url ? (0, import_react31.createElement)("span", { className: "bt-bcard-host" }, hostOf(page.url)) : null -+ (0, import_react45.createElement)(Favicon, { src: page.favicon, className: "bt-bcard-fav" }), -+ (0, import_react45.createElement)("span", { className: "bt-bcard-title" }, label), -+ page.url ? (0, import_react45.createElement)("span", { className: "bt-bcard-host" }, hostOf(page.url)) : null ++ (0, import_react49.createElement)(Favicon, { src: page.favicon, className: "bt-bcard-fav" }), ++ (0, import_react49.createElement)("span", { className: "bt-bcard-title" }, label), ++ page.url ? (0, import_react49.createElement)("span", { className: "bt-bcard-host" }, hostOf(page.url)) : null ) ); }), - (0, import_react31.createElement)("button", { type: "button", className: "bt-bcard-new", style: { animationDelay: `${state.ids.length * 30}ms` }, onClick: () => actions.browserNewTab(sessionId) }, (0, import_react31.createElement)(PlusIcon), t("New tab")) -+ (0, import_react45.createElement)("button", { type: "button", className: "bt-bcard-new", style: { animationDelay: `${state.ids.length * 30}ms` }, onClick: () => actions.browserNewTab(sessionId) }, (0, import_react45.createElement)(PlusIcon), t("New tab")) ++ (0, import_react49.createElement)("button", { type: "button", className: "bt-bcard-new", style: { animationDelay: `${state.ids.length * 30}ms` }, onClick: () => actions.browserNewTab(sessionId) }, (0, import_react49.createElement)(PlusIcon), t("New tab")) ); } -function About({ text, title = "About" }) { @@ -25691,25 +27132,25 @@ diff --git a/client.js b/client.js - const long = text.split("\n").length > 5 || text.length > 240; - const body = (0, import_react31.useRef)(null); +function About({ text: text2, title = "About" }) { -+ const [open, setOpen] = (0, import_react45.useState)(false); ++ const [open, setOpen] = (0, import_react49.useState)(false); + const long = text2.split("\n").length > 5 || text2.length > 240; -+ const body = (0, import_react45.useRef)(null); ++ const body = (0, import_react49.useRef)(null); useMorph(body, open); - return (0, import_react31.createElement)( -+ return (0, import_react45.createElement)( ++ return (0, import_react49.createElement)( + "div", + null, -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t(title)), -+ (0, import_react45.createElement)("div", { ref: body, className: "bt-about", "data-open": open || void 0 }, text2), -+ long ? (0, import_react45.createElement)("button", { type: "button", className: "bt-more", onClick: () => setOpen((value) => !value) }, open ? t("Show less") : t("Show more")) : null ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t(title)), ++ (0, import_react49.createElement)("div", { ref: body, className: "bt-about", "data-open": open || void 0 }, text2), ++ long ? (0, import_react49.createElement)("button", { type: "button", className: "bt-more", onClick: () => setOpen((value) => !value) }, open ? t("Show less") : t("Show more")) : null + ); +} +function SharedRoomApprovals({ room: room2, roster }) { -+ const [items, setItems] = (0, import_react45.useState)(room2.pendingApprovals ?? []); -+ const [busy, setBusy] = (0, import_react45.useState)(""); -+ const [error, setError] = (0, import_react45.useState)(""); ++ const [items, setItems] = (0, import_react49.useState)(room2.pendingApprovals ?? []); ++ const [busy, setBusy] = (0, import_react49.useState)(""); ++ const [error, setError] = (0, import_react49.useState)(""); + const face = room2.origin === "face-to-face"; -+ (0, import_react45.useEffect)(() => { ++ (0, import_react49.useEffect)(() => { + const haveItems = Array.isArray(room2.pendingApprovals) && room2.pendingApprovals.length; + if (haveItems) setItems(room2.pendingApprovals); + if (room2.viewerRole !== "invited-owner" && !face) return void 0; @@ -25739,36 +27180,36 @@ diff --git a/client.js b/client.js + setBusy(""); + } + }; -+ return (0, import_react45.createElement)( ++ return (0, import_react49.createElement)( + "div", + { key: "approvals", className: "bt-shared-wait", "data-flybot": "room-pending-approvals" }, -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Waiting for your approval"), (0, import_react45.createElement)("span", { className: "bt-chip" }, t("{count} to approve", { count: items.length }))), ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Waiting for your approval"), (0, import_react49.createElement)("span", { className: "bt-chip" }, t("{count} to approve", { count: items.length }))), + items.map((item) => { + const at = typeof item.createdAt === "number" ? item.createdAt : Date.parse(item.createdAt); + const age = Number.isFinite(at) && at > 0 ? ` · ${relativeShort(at)}` : null; -+ return (0, import_react45.createElement)( ++ return (0, import_react49.createElement)( + "div", + { key: item.id, className: "bt-set-row" }, -+ (0, import_react45.createElement)("span", { className: "bt-set-copy" }, item.text || item.summary || item.to || t("Outbound reply"), age), -+ locked ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-mini", disabled: busy === item.id, onClick: () => decide(item, "approve") }, t("Approve")), -+ locked ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-mini", disabled: busy === item.id, onClick: () => decide(item, "reject") }, t("Reject")) ++ (0, import_react49.createElement)("span", { className: "bt-set-copy" }, item.text || item.summary || item.to || t("Outbound reply"), age), ++ locked ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-mini", disabled: busy === item.id, onClick: () => decide(item, "approve") }, t("Approve")), ++ locked ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-mini", disabled: busy === item.id, onClick: () => decide(item, "reject") }, t("Reject")) + ); + }), -+ error ? (0, import_react45.createElement)("div", { className: "bt-error", role: "alert" }, error) : null ++ error ? (0, import_react49.createElement)("div", { className: "bt-error", role: "alert" }, error) : null + ); +} +function FaceMembers({ room: room2, roster, actions }) { + const people2 = facePeople(room2, roster); + const pick2 = (bot) => call("social/face-lead", { roomId: room2.id, bot }); -+ return (0, import_react45.createElement)( ++ return (0, import_react49.createElement)( "div", null, - (0, import_react31.createElement)("div", { className: "bt-section-title" }, t(title)), - (0, import_react31.createElement)("div", { ref: body, className: "bt-about", "data-open": open || void 0 }, text), - long ? (0, import_react31.createElement)("button", { type: "button", className: "bt-more", onClick: () => setOpen((value) => !value) }, open ? t("Show less") : t("Show more")) : null -+ (0, import_react45.createElement)(FaceLead, { room: room2, roster, pick: pick2 }), -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: people2.length })), -+ (0, import_react45.createElement)("div", { className: "bt-members", role: "list" }, people2.map((person) => (0, import_react45.createElement)(FacePersonRow, { ++ (0, import_react49.createElement)(FaceLead, { room: room2, roster, pick: pick2 }), ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: people2.length })), ++ (0, import_react49.createElement)("div", { className: "bt-members", role: "list" }, people2.map((person) => (0, import_react49.createElement)(FacePersonRow, { + key: person.key, + person, + roster, @@ -25798,32 +27239,32 @@ diff --git a/client.js b/client.js + // P-544: the group overview's writes are gone in a locked window, so it says why once, above + // the reads it still draws. The approval card used to carry its own copy (#2381); one page, + // one sentence. -+ readOnlyLine(import_react45.createElement, roster, actions, { key: "read-only" }), -+ (0, import_react45.createElement)(FlyBotRoomOverview, { key: "plugin-overview", room: room2, roster, actions }), -+ invited && room2.sharedFrom && !face ? (0, import_react45.createElement)( ++ readOnlyLine(import_react49.createElement, roster, actions, { key: "read-only" }), ++ (0, import_react49.createElement)(FlyBotRoomOverview, { key: "plugin-overview", room: room2, roster, actions }), ++ invited && room2.sharedFrom && !face ? (0, import_react49.createElement)( + "div", + { key: "from", className: "bt-shared-from" }, -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, title), -+ (0, import_react45.createElement)("div", { className: "bt-set-hint" }, t("Your Bot was invited to this room by {name}", { name: room2.sharedFrom.inviterName })), -+ room2.sharedFrom.invitedAt ? (0, import_react45.createElement)("div", { className: "bt-set-hint" }, t("Invited {when}", { when: new Date(room2.sharedFrom.invitedAt).toLocaleString() })) : null, -+ locked ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-more", onClick: leaveMine }, t("Remove my Bot")) -+ ) : face ? null : room2.notice ? (0, import_react45.createElement)(About, { key: "notice", title: "Notice", text: room2.notice }) : (0, import_react45.createElement)("button", { key: "notice", type: "button", className: "bt-more", onClick: openSettings }, t("Add a notice in group settings")), -+ face ? null : (0, import_react45.createElement)(SharedRoomApprovals, { key: "approvals", room: room2, roster }), -+ face && (room2.face?.status === "candidate" || room2.face?.status === "joining") ? null : face ? (0, import_react45.createElement)(FaceMembers, { key: "members", room: room2, roster, actions }) : (0, import_react45.createElement)( ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, title), ++ (0, import_react49.createElement)("div", { className: "bt-set-hint" }, t("Your Bot was invited to this room by {name}", { name: room2.sharedFrom.inviterName })), ++ room2.sharedFrom.invitedAt ? (0, import_react49.createElement)("div", { className: "bt-set-hint" }, t("Invited {when}", { when: new Date(room2.sharedFrom.invitedAt).toLocaleString() })) : null, ++ locked ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-more", onClick: leaveMine }, t("Remove my Bot")) ++ ) : face ? null : room2.notice ? (0, import_react49.createElement)(About, { key: "notice", title: "Notice", text: room2.notice }) : (0, import_react49.createElement)("button", { key: "notice", type: "button", className: "bt-more", onClick: openSettings }, t("Add a notice in group settings")), ++ face ? null : (0, import_react49.createElement)(SharedRoomApprovals, { key: "approvals", room: room2, roster }), ++ face && (room2.face?.status === "candidate" || room2.face?.status === "joining") ? null : face ? (0, import_react49.createElement)(FaceMembers, { key: "members", room: room2, roster, actions }) : (0, import_react49.createElement)( "div", { key: "members" }, - (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length })), - (0, import_react31.createElement)("div", { className: "bt-members", role: "list" }, members.map((member) => { - const entry = entries2.find((item) => item.id === member.id); - return (0, import_react31.createElement)( -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length + humans.length + remotes.length })), -+ (0, import_react45.createElement)("div", { className: "bt-members", role: "list" }, [ -+ ...humans.map((person) => (0, import_react45.createElement)( ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length + humans.length + remotes.length })), ++ (0, import_react49.createElement)("div", { className: "bt-members", role: "list" }, [ ++ ...humans.map((person) => (0, import_react49.createElement)( "div", - { key: member.id, role: "listitem" }, - (0, import_react31.createElement)( + { key: person.id, role: "listitem" }, -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( "div", { className: "bt-member" }, - (0, import_react31.createElement)( @@ -25831,72 +27272,72 @@ diff --git a/client.js b/client.js - { type: "button", className: "bt-member-name", title: t("Open {name}'s chat", { name: member.name }), onClick: () => actions.openSession(member.id) }, - (0, import_react31.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room2.admin === member.id, live: false }), - (0, import_react31.createElement)("span", null, member.name) -+ (0, import_react45.createElement)("span", { className: "bt-member-name" }, (0, import_react45.createElement)("span", null, person.displayName || person.id)), -+ (0, import_react45.createElement)("span", { className: "bt-chip" }, t("Human")), -+ person.role === "admin" ? (0, import_react45.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null ++ (0, import_react49.createElement)("span", { className: "bt-member-name" }, (0, import_react49.createElement)("span", null, person.displayName || person.id)), ++ (0, import_react49.createElement)("span", { className: "bt-chip" }, t("Human")), ++ person.role === "admin" ? (0, import_react49.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null + ) + )), -+ ...remotes.map((person) => (0, import_react45.createElement)( ++ ...remotes.map((person) => (0, import_react49.createElement)( + "div", + { key: person.handle || person.id, role: "listitem" }, -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( + "div", + { className: "bt-member" }, -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( + "span", + { className: "bt-member-name" }, -+ (0, import_react45.createElement)(BotAvatar, { bot: lookBotForRemote(person, roster), size: 26, badge: false, live: false }), -+ (0, import_react45.createElement)("span", { title: person.handle || void 0 }, person.label || remoteBotTitle(person)) ++ (0, import_react49.createElement)(BotAvatar, { bot: lookBotForRemote(person, roster), size: 26, badge: false, live: false }), ++ (0, import_react49.createElement)("span", { title: person.handle || void 0 }, person.label || remoteBotTitle(person)) ), - room2.admin === member.id ? (0, import_react31.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null - ), - entry ? (0, import_react31.createElement)(MemberWork, { entry, bot: member, room: room2, roster, actions, now }) : null - ); - })) -+ face ? null : (0, import_react45.createElement)("span", { className: "bt-chip" }, t("Friend's Bot")) ++ face ? null : (0, import_react49.createElement)("span", { className: "bt-chip" }, t("Friend's Bot")) + ) + )), + ...members.map((member) => { + const entry = entries2.find((item) => item.id === member.id); -+ return (0, import_react45.createElement)( ++ return (0, import_react49.createElement)( + "div", + { key: member.id, role: "listitem" }, -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( + "div", + { className: "bt-member" }, -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( + "button", + { type: "button", className: "bt-member-name", title: t("Open {name}'s chat", { name: member.name }), onClick: () => actions.openSession(member.id) }, -+ (0, import_react45.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room2.admin === member.id, live: false }), -+ (0, import_react45.createElement)("span", null, member.name) ++ (0, import_react49.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room2.admin === member.id, live: false }), ++ (0, import_react49.createElement)("span", null, member.name) + ), -+ room2.admin === member.id ? (0, import_react45.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null ++ room2.admin === member.id ? (0, import_react49.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null + ), -+ entry ? (0, import_react45.createElement)(MemberWork, { entry, bot: member, room: room2, roster, actions, now }) : null ++ entry ? (0, import_react49.createElement)(MemberWork, { entry, bot: member, room: room2, roster, actions, now }) : null + ); + }) + ]) ), - (0, import_react31.createElement)( -+ face ? null : (0, import_react45.createElement)( ++ face ? null : (0, import_react49.createElement)( "div", { key: "mode" }, - (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Who answers")), - (0, import_react31.createElement)("div", { className: "bt-kv" }, (0, import_react31.createElement)("span", null, t(ROOM_MODES.find(([id]) => id === shownMode(room2, roster))?.[1] ?? "Everyone"))) -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Who answers")), -+ (0, import_react45.createElement)("div", { className: "bt-kv" }, (0, import_react45.createElement)("span", null, t(ROOM_MODES.find(([id]) => id === shownMode(room2, roster))?.[1] ?? "Everyone"))) ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Who answers")), ++ (0, import_react49.createElement)("div", { className: "bt-kv" }, (0, import_react49.createElement)("span", null, t(ROOM_MODES.find(([id]) => id === shownMode(room2, roster))?.[1] ?? "Everyone"))) ), - usage ? (0, import_react31.createElement)( -+ face || !usage ? null : (0, import_react45.createElement)( ++ face || !usage ? null : (0, import_react49.createElement)( "div", { key: "usage" }, - (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Usage")), - (0, import_react31.createElement)("div", { className: "bt-kv" }, (0, import_react31.createElement)("span", null, room2.name), (0, import_react31.createElement)("span", null, usage)) - ) : null -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Usage")), -+ (0, import_react45.createElement)("div", { className: "bt-kv" }, (0, import_react45.createElement)("span", null, room2.name), (0, import_react45.createElement)("span", null, usage)) ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Usage")), ++ (0, import_react49.createElement)("div", { className: "bt-kv" }, (0, import_react49.createElement)("span", null, room2.name), (0, import_react49.createElement)("span", null, usage)) + ), -+ (0, import_react45.createElement)(RoomSchedules, { key: "routines", room: room2, actions }) ++ (0, import_react49.createElement)(RoomSchedules, { key: "routines", room: room2, actions }) ]; } function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) { @@ -25904,21 +27345,21 @@ diff --git a/client.js b/client.js const part = owner ? currentPart(owner) : sessionId; const isMainBot = isMainOf(roster, owner?.id); - const [tab, setTab] = (0, import_react31.useState)("details"); -+ const [tab, setTab] = (0, import_react45.useState)("details"); ++ const [tab, setTab] = (0, import_react49.useState)("details"); const room2 = roster.roomsById[sessionId]; - const [view, setView] = (0, import_react31.useState)(startTab === "settings" && (owner || room2) ? "settings" : "overview"); - const [editing, setEditing] = (0, import_react31.useState)(Boolean(startRenaming && (roster.byId[sessionId] || roster.roomsById[sessionId]))); - const [draftName, setDraftName] = (0, import_react31.useState)(roster.byId[sessionId]?.name ?? (roster.roomsById[sessionId]?.named ? roster.roomsById[sessionId].name : "")); - const [copied, setCopied] = (0, import_react31.useState)(false); - const [error, setError] = (0, import_react31.useState)(""); -+ const [view, setView] = (0, import_react45.useState)(startTab === "settings" && (owner || room2) ? "settings" : "overview"); -+ const [editing, setEditing] = (0, import_react45.useState)(Boolean(startRenaming && (roster.byId[sessionId] || roster.roomsById[sessionId]))); -+ const [draftName, setDraftName] = (0, import_react45.useState)(roster.byId[sessionId]?.name ?? (roster.roomsById[sessionId]?.named ? roster.roomsById[sessionId].name : "")); -+ const [copied, setCopied] = (0, import_react45.useState)(false); -+ const [error, setError] = (0, import_react45.useState)(""); ++ const [view, setView] = (0, import_react49.useState)(startTab === "settings" && (owner || room2) ? "settings" : "overview"); ++ const [editing, setEditing] = (0, import_react49.useState)(Boolean(startRenaming && (roster.byId[sessionId] || roster.roomsById[sessionId]))); ++ const [draftName, setDraftName] = (0, import_react49.useState)(roster.byId[sessionId]?.name ?? (roster.roomsById[sessionId]?.named ? roster.roomsById[sessionId].name : "")); ++ const [copied, setCopied] = (0, import_react49.useState)(false); ++ const [error, setError] = (0, import_react49.useState)(""); const glide = useGlide(tab); - const last = (0, import_react31.useRef)({ view, tab, move: void 0 }); -+ const last = (0, import_react45.useRef)({ view, tab, move: void 0 }); ++ const last = (0, import_react49.useRef)({ view, tab, move: void 0 }); if (last.current.view !== view) last.current = { view, tab, move: view === "settings" ? "in" : "out" }; else if (last.current.tab !== tab) last.current = { view, tab, move: "tab" }; const move = last.current.move; @@ -25953,51 +27394,51 @@ diff --git a/client.js b/client.js }; - const errorLine = error ? (0, import_react31.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null; - if ((bot || room2) && view === "settings") { -+ const errorLine = error ? (0, import_react45.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null; ++ const errorLine = error ? (0, import_react49.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null; + if ((bot || room2) && view === "settings" && !bot?.remote) { return [ - (0, import_react31.createElement)( -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( "div", { key: "head", className: "bt-subhead", "data-move": move }, - (0, import_react31.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to details"), onClick: () => setView("overview") }, (0, import_react31.createElement)(ChevronLeftIcon)), - (0, import_react31.createElement)("span", { className: "bt-subhead-title" }, bot ? t("Settings") : t("Group settings")), - hasStrip ? null : (0, import_react31.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close details"), onClick: close }, (0, import_react31.createElement)(CloseIcon)) -+ (0, import_react45.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to details"), onClick: () => setView("overview") }, (0, import_react45.createElement)(ChevronLeftIcon)), -+ (0, import_react45.createElement)("span", { className: "bt-subhead-title" }, bot ? t("Settings") : t("Group settings")), -+ hasStrip ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close details"), onClick: close }, (0, import_react45.createElement)(CloseIcon)) ++ (0, import_react49.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to details"), onClick: () => setView("overview") }, (0, import_react49.createElement)(ChevronLeftIcon)), ++ (0, import_react49.createElement)("span", { className: "bt-subhead-title" }, bot ? t("Settings") : t("Group settings")), ++ hasStrip ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close details"), onClick: close }, (0, import_react49.createElement)(CloseIcon)) ), - (0, import_react31.createElement)( + errorLine, -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( "div", { key: "set-body", className: "bt-drawer-body bt-set-body", "data-move": move }, - errorLine, - bot ? (0, import_react31.createElement)(BotSettingsForm, { bot, roster, actions, run }) : (0, import_react31.createElement)(GroupSettingsForm, { room: room2, roster, actions, run, onDeleted: close }) + // #2387: the lock is the window's, not the Bot's — a read-only window draws the host's sentence + // in place of a group's form too, exactly as it already did for a Bot's. -+ lockedWindow(roster) ? readOnlyLine(import_react45.createElement, roster, actions) : bot ? (0, import_react45.createElement)(BotSettingsForm, { bot, roster, actions, run }) : (0, import_react45.createElement)(GroupSettingsForm, { room: room2, roster, actions, run, onDeleted: close }) ++ lockedWindow(roster) ? readOnlyLine(import_react49.createElement, roster, actions) : bot ? (0, import_react49.createElement)(BotSettingsForm, { bot, roster, actions, run }) : (0, import_react49.createElement)(GroupSettingsForm, { room: room2, roster, actions, run, onDeleted: close }) ) ]; } - const top = (0, import_react31.createElement)( -+ const top = (0, import_react45.createElement)( ++ const top = (0, import_react49.createElement)( "div", { className: "bt-drawer-top", "data-move": side }, - bot || room2 ? (0, import_react31.createElement)("button", { type: "button", className: "bt-round", "aria-label": bot ? t("Edit Bot") : t("Group settings"), title: bot ? t("Edit Bot") : t("Group settings"), "data-info-row": "settings", onClick: () => setView("settings") }, (0, import_react31.createElement)(GearIcon)) : null, - bot && roster.browser === true && actions.openBrowser ? (0, import_react31.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Open browser"), title: t("Open this Bot's browser"), onClick: () => actions.openBrowser(sessionId) }, (0, import_react31.createElement)(GlobeIcon)) : null, - bot || room2 ? (0, import_react31.createElement)("button", { type: "button", className: "bt-round", "aria-label": copied ? t("Copied conversation") : t("Share conversation"), title: copied ? t("Copied") : t("Copy conversation as Markdown"), onClick: share }, copied ? (0, import_react31.createElement)("span", { key: "copied", className: "bt-pop-in" }, "✓") : (0, import_react31.createElement)(ShareIcon)) : null, - hasStrip ? null : (0, import_react31.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Close details"), onClick: close }, (0, import_react31.createElement)(CloseIcon)) -+ bot || room2 ? (0, import_react45.createElement)("button", { ++ bot || room2 ? (0, import_react49.createElement)("button", { + type: "button", + className: "bt-round", + "aria-label": bot ? bot.remote ? t("Bot settings") : t("Edit Bot") : t("Group settings"), + title: bot ? bot.remote ? t("Bot settings") : t("Edit Bot") : t("Group settings"), + "data-info-row": "settings", + onClick: () => bot?.remote ? actions.openSettings("bots", bot.id) : setView("settings") -+ }, (0, import_react45.createElement)(GearIcon)) : null, -+ bot && !bot.remote && roster.browser === true && actions.openBrowser ? (0, import_react45.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Open browser"), title: t("Open this Bot's browser"), onClick: () => actions.openBrowser(sessionId) }, (0, import_react45.createElement)(GlobeIcon)) : null, -+ bot || room2 ? (0, import_react45.createElement)("button", { ++ }, (0, import_react49.createElement)(GearIcon)) : null, ++ bot && !bot.remote && roster.browser === true && actions.openBrowser ? (0, import_react49.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Open browser"), title: t("Open this Bot's browser"), onClick: () => actions.openBrowser(sessionId) }, (0, import_react49.createElement)(GlobeIcon)) : null, ++ bot || room2 ? (0, import_react49.createElement)("button", { + type: "button", + className: "bt-round", + // #1347: the accessible name says what the click does, which is copy — "Share conversation" @@ -26006,15 +27447,15 @@ diff --git a/client.js b/client.js + "aria-label": copied ? t("Copied conversation") : t("Copy conversation"), + title: copied ? t("Copied") : t("Copy conversation as Markdown"), + onClick: share -+ }, copied ? (0, import_react45.createElement)("span", { key: "copied", className: "bt-pop-in" }, "✓") : (0, import_react45.createElement)(ShareIcon)) : null, -+ hasStrip ? null : (0, import_react45.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Close details"), onClick: close }, (0, import_react45.createElement)(CloseIcon)) ++ }, copied ? (0, import_react49.createElement)("span", { key: "copied", className: "bt-pop-in" }, "✓") : (0, import_react49.createElement)(ShareIcon)) : null, ++ hasStrip ? null : (0, import_react49.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Close details"), onClick: close }, (0, import_react49.createElement)(CloseIcon)) ); if (!bot && !room2) { return [ - (0, import_react31.createElement)(import_react31.Fragment, { key: "top" }, top), - (0, import_react31.createElement)("div", { key: "body", className: "bt-drawer-body" }, (0, import_react31.createElement)("div", { className: "bt-muted" }, t("This conversation is not part of your Bot team."))) -+ (0, import_react45.createElement)(import_react45.Fragment, { key: "top" }, top), -+ (0, import_react45.createElement)("div", { key: "body", className: "bt-drawer-body" }, (0, import_react45.createElement)("div", { className: "bt-muted" }, t("This conversation is not part of your Bot team."))) ++ (0, import_react49.createElement)(import_react49.Fragment, { key: "top" }, top), ++ (0, import_react49.createElement)("div", { key: "body", className: "bt-drawer-body" }, (0, import_react49.createElement)("div", { className: "bt-muted" }, t("This conversation is not part of your Bot team."))) ]; } const current = bot?.name ?? room2.name; @@ -26024,14 +27465,14 @@ diff --git a/client.js b/client.js return [ - (0, import_react31.createElement)(import_react31.Fragment, { key: "top" }, top), - (0, import_react31.createElement)( -+ (0, import_react45.createElement)(import_react45.Fragment, { key: "top" }, top), -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)(import_react49.Fragment, { key: "top" }, top), ++ (0, import_react49.createElement)( "div", { key: "id", className: "bt-drawer-id", "data-move": side }, - bot ? (0, import_react31.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react31.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), - editing ? (0, import_react31.createElement)("input", { -+ bot ? (0, import_react45.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react45.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), -+ bot?.remote ? (0, import_react45.createElement)("div", { className: "bt-drawer-name" }, current) : bot && lockedWindow(roster) ? (0, import_react45.createElement)("div", { className: "bt-drawer-name", title: current }, current) : room2?.origin === "face-to-face" ? (0, import_react45.createElement)("div", { className: "bt-drawer-name bt-drawer-name-face", title: current }, current) : room2 && lockedWindow(roster) ? (0, import_react45.createElement)("div", { className: "bt-drawer-name", title: current }, current) : editing ? (0, import_react45.createElement)("input", { ++ bot ? (0, import_react49.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react49.createElement)(RoomAvatar, { room: room2, roster, size: 64 }), ++ bot?.remote ? (0, import_react49.createElement)("div", { className: "bt-drawer-name" }, current) : bot && lockedWindow(roster) ? (0, import_react49.createElement)("div", { className: "bt-drawer-name", title: current }, current) : room2?.origin === "face-to-face" ? (0, import_react49.createElement)("div", { className: "bt-drawer-name bt-drawer-name-face", title: current }, current) : room2 && lockedWindow(roster) ? (0, import_react49.createElement)("div", { className: "bt-drawer-name", title: current }, current) : editing ? (0, import_react49.createElement)("input", { className: "bt-drawer-name-input", autoFocus: true, value: draftName, @@ -26040,85 +27481,85 @@ diff --git a/client.js b/client.js } } - }) : (0, import_react31.createElement)("button", { type: "button", className: "bt-drawer-name", "aria-label": t("Rename {name}", { name: current }), title: t("Rename"), onClick: () => { -+ }) : (0, import_react45.createElement)("button", { type: "button", className: "bt-drawer-name", "aria-label": t("Rename {name}", { name: current }), title: t("Rename"), onClick: () => { ++ }) : (0, import_react49.createElement)("button", { type: "button", className: "bt-drawer-name", "aria-label": t("Rename {name}", { name: current }), title: t("Rename"), onClick: () => { setDraftName(room2 && !room2.named ? "" : current); setEditing(true); } }, current), - subtitle ? (0, import_react31.createElement)("span", { className: "bt-drawer-role" }, subtitle) : null -+ subtitle ? (0, import_react45.createElement)("span", { className: "bt-drawer-role" }, subtitle) : bot?.remote ? (0, import_react45.createElement)("span", { className: "bt-drawer-role" }, t("Friend's Bot")) : null ++ subtitle ? (0, import_react49.createElement)("span", { className: "bt-drawer-role" }, subtitle) : bot?.remote ? (0, import_react49.createElement)("span", { className: "bt-drawer-role" }, t("Friend's Bot")) : null ), - (0, import_react31.createElement)( -+ bot?.remote ? null : (0, import_react45.createElement)( ++ bot?.remote ? null : (0, import_react49.createElement)( "div", { key: "tabs", ref: glide.box, className: "bt-tabs", role: "tablist", "data-move": side }, - (0, import_react31.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), - tabs.map((key) => (0, import_react31.createElement)("button", { key, type: "button", role: "tab", className: "bt-tab", "aria-selected": tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key]))) -+ (0, import_react45.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), -+ tabs.map((key) => (0, import_react45.createElement)("button", { key, type: "button", role: "tab", className: "bt-tab", "aria-selected": tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key]))) ++ (0, import_react49.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }), ++ tabs.map((key) => (0, import_react49.createElement)("button", { key, type: "button", role: "tab", className: "bt-tab", "aria-selected": tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key]))) ), - (0, import_react31.createElement)( + // #2385/P-542: the refused-write line is a sibling above the scrolling body here too — the body + // is `overflow-y:auto` (`styles.js:389`), so the first child's sentence lands where the person + // scrolled past, not where the press happened. + errorLine, -+ (0, import_react45.createElement)( ++ (0, import_react49.createElement)( "div", { key: `body:${tab}`, className: "bt-drawer-body", "data-move": move }, - errorLine, - room2 && tab === "details" ? (0, import_react31.createElement)(GroupOverview, { room: room2, roster, actions, usage, useWork, openSettings: () => setView("settings") }) : null, - bot && tab === "details" ? [ - (0, import_react31.createElement)( -+ room2 && tab === "details" ? (0, import_react45.createElement)(GroupOverview, { room: room2, roster, actions, usage, useWork, openSettings: () => setView("settings") }) : null, ++ room2 && tab === "details" ? (0, import_react49.createElement)(GroupOverview, { room: room2, roster, actions, usage, useWork, openSettings: () => setView("settings") }) : null, + bot && bot.remote && tab === "details" ? [ -+ bot.remote.handle ? (0, import_react45.createElement)("div", { key: "handle", className: "bt-muted" }, bot.remote.handle) : null, -+ (0, import_react45.createElement)(FlyBotDetails, { key: "social", bot, roster, actions }) ++ bot.remote.handle ? (0, import_react49.createElement)("div", { key: "handle", className: "bt-muted" }, bot.remote.handle) : null, ++ (0, import_react49.createElement)(FlyBotDetails, { key: "social", bot, roster, actions }) + ] : null, + bot && !bot.remote && tab === "details" ? [ + // P-542/P-487: the overview's own model, permission and folder entries are writes too, and a + // locked window refuses every one of them. Say so once at the top and draw the read half only, + // which is the values themselves (P-547) — the name above is already text, and the settings + // gear still opens the page that explains the window. -+ lockedWindow(roster) ? readOnlyLine(import_react45.createElement, roster, actions, { key: "read-only" }) : null, -+ lockedWindow(roster) ? (0, import_react45.createElement)(ReadOnlyOverview, { key: "read", bot, roster }) : null, -+ lockedWindow(roster) ? null : (0, import_react45.createElement)( ++ lockedWindow(roster) ? readOnlyLine(import_react49.createElement, roster, actions, { key: "read-only" }) : null, ++ lockedWindow(roster) ? (0, import_react49.createElement)(ReadOnlyOverview, { key: "read", bot, roster }) : null, ++ lockedWindow(roster) ? null : (0, import_react49.createElement)( "div", { key: "model", className: "bt-drawer-model" }, - (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Model")), - (0, import_react31.createElement)(ModelMenu, { bot, roster, actions, run, wide: true }), - modelOf(bot, roster) ? null : (0, import_react31.createElement)("div", { className: "bt-note" }, t("Pick a model and {name} can start.", { name: bot.name })) -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Model")), -+ (0, import_react45.createElement)(ModelMenu, { bot, roster, actions, run, wide: true }), -+ modelOf(bot, roster) ? null : (0, import_react45.createElement)("div", { className: "bt-note" }, t("Pick a model and {name} can start.", { name: bot.name })) ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Model")), ++ (0, import_react49.createElement)(ModelMenu, { bot, roster, actions, run, wide: true }), ++ modelOf(bot, roster) ? null : (0, import_react49.createElement)("div", { className: "bt-note" }, t("Pick a model and {name} can start.", { name: bot.name })) ), - (0, import_react31.createElement)(PermissionRow, { key: "permission", bot, roster, actions, run }), - (0, import_react31.createElement)( -+ lockedWindow(roster) ? null : (0, import_react45.createElement)(PermissionRow, { key: "permission", bot, roster, actions, run }), -+ lockedWindow(roster) ? null : (0, import_react45.createElement)( ++ lockedWindow(roster) ? null : (0, import_react49.createElement)(PermissionRow, { key: "permission", bot, roster, actions, run }), ++ lockedWindow(roster) ? null : (0, import_react49.createElement)( "div", { key: "folder", className: "bt-drawer-model" }, - (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Working folder")), - (0, import_react31.createElement)(FolderMenu, { value: bot.workDir, actions, run, wide: true, onPick: (workDir) => run(actions.updateBot(bot.id, { workDir })) }) -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Working folder")), -+ (0, import_react45.createElement)(FolderMenu, { value: bot.workDir, actions, run, wide: true, onPick: (workDir) => run(actions.updateBot(bot.id, { workDir })) }) ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Working folder")), ++ (0, import_react49.createElement)(FolderMenu, { value: bot.workDir, actions, run, wide: true, onPick: (workDir) => run(actions.updateBot(bot.id, { workDir })) }) ), - bot.instructions ? (0, import_react31.createElement)(About, { key: "about", text: bot.instructions }) : (0, import_react31.createElement)("button", { key: "about", type: "button", className: "bt-more", onClick: () => setView("settings") }, t("Add instructions in Bot settings")), - roster.memory === false ? null : (0, import_react31.createElement)(MemoryRow, { key: "memory", bot, actions }), - usage ? (0, import_react31.createElement)( -+ bot.instructions ? (0, import_react45.createElement)(About, { key: "about", text: bot.instructions }) : (0, import_react45.createElement)("button", { key: "about", type: "button", className: "bt-more", onClick: () => setView("settings") }, t("Add instructions in Bot settings")), -+ roster.memory === false ? null : (0, import_react45.createElement)(MemoryRow, { key: "memory", bot, actions }), -+ usage ? (0, import_react45.createElement)( ++ bot.instructions ? (0, import_react49.createElement)(About, { key: "about", text: bot.instructions }) : (0, import_react49.createElement)("button", { key: "about", type: "button", className: "bt-more", onClick: () => setView("settings") }, t("Add instructions in Bot settings")), ++ roster.memory === false ? null : (0, import_react49.createElement)(MemoryRow, { key: "memory", bot, actions }), ++ usage ? (0, import_react49.createElement)( "div", { key: "usage" }, - (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Usage")), - (0, import_react31.createElement)("div", { className: "bt-kv" }, (0, import_react31.createElement)("span", null, bot.name), (0, import_react31.createElement)("span", null, usage)) -+ (0, import_react45.createElement)("div", { className: "bt-section-title" }, t("Usage")), -+ (0, import_react45.createElement)("div", { className: "bt-kv" }, (0, import_react45.createElement)("span", null, bot.name), (0, import_react45.createElement)("span", null, usage)) ++ (0, import_react49.createElement)("div", { className: "bt-section-title" }, t("Usage")), ++ (0, import_react49.createElement)("div", { className: "bt-kv" }, (0, import_react49.createElement)("span", null, bot.name), (0, import_react49.createElement)("span", null, usage)) ) : null, - (0, import_react31.createElement)(ScheduleSummary, { key: "routines", bot, actions }) -+ (0, import_react45.createElement)(ScheduleSummary, { key: "routines", bot, roster, actions }) ++ (0, import_react49.createElement)(ScheduleSummary, { key: "routines", bot, roster, actions }) ] : null, - bot && tab === "browser" ? (0, import_react31.createElement)(BrowserCards, { bot, sessionId, roster, actions, useBrowserTabs, useBrowserPages }) : null -+ bot && !bot.remote && tab === "browser" ? (0, import_react45.createElement)(BrowserCards, { bot, sessionId, roster, actions, useBrowserTabs, useBrowserPages }) : null ++ bot && !bot.remote && tab === "browser" ? (0, import_react49.createElement)(BrowserCards, { bot, sessionId, roster, actions, useBrowserTabs, useBrowserPages }) : null ) ]; } @@ -26126,7 +27567,7 @@ diff --git a/client.js b/client.js // src/client/browser-pane.js -var import_react32 = require("react"); -var import_react_dom8 = require("react-dom"); -+var import_react46 = require("react"); ++var import_react50 = require("react"); +var import_react_dom10 = require("react-dom"); var PANEL_LINGER_MS = 300; var WIDTH_KEY = STORAGE.browserWidth; @@ -26143,11 +27584,11 @@ diff --git a/client.js b/client.js -var icon = (paths) => function BrowserIcon() { - return (0, import_react32.createElement)( +var icon2 = (paths) => function BrowserIcon() { -+ return (0, import_react46.createElement)( ++ return (0, import_react50.createElement)( "svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, - paths.map((d, index) => (0, import_react32.createElement)("path", { key: index, d })) -+ paths.map((d, index) => (0, import_react46.createElement)("path", { key: index, d })) ++ paths.map((d, index) => (0, import_react50.createElement)("path", { key: index, d })) ); }; -var GlobeIcon = icon(["M10 3a7 7 0 1 0 0 14 7 7 0 0 0 0-14z", "M3 10h14", "M10 3c2 2.2 2.9 4.5 2.9 7S12 14.8 10 17c-2-2.2-2.9-4.5-2.9-7S8 5.2 10 3z"]); @@ -26170,9 +27611,9 @@ diff --git a/client.js b/client.js - const [failed, setFailed] = (0, import_react32.useState)(null); - if (!src || failed === src) return (0, import_react32.createElement)("span", { className: `${className} bt-ptab-globe` }, (0, import_react32.createElement)(GlobeIcon)); - return (0, import_react32.createElement)("img", { className, src, alt: "", "aria-hidden": true, onError: () => setFailed(src) }); -+ const [failed, setFailed] = (0, import_react46.useState)(null); -+ if (!src || failed === src) return (0, import_react46.createElement)("span", { className: `${className} bt-ptab-globe` }, (0, import_react46.createElement)(GlobeIcon)); -+ return (0, import_react46.createElement)("img", { className, src, alt: "", "aria-hidden": true, onError: () => setFailed(src) }); ++ const [failed, setFailed] = (0, import_react50.useState)(null); ++ if (!src || failed === src) return (0, import_react50.createElement)("span", { className: `${className} bt-ptab-globe` }, (0, import_react50.createElement)(GlobeIcon)); ++ return (0, import_react50.createElement)("img", { className, src, alt: "", "aria-hidden": true, onError: () => setFailed(src) }); } var savedWidth = () => { try { @@ -26198,11 +27639,11 @@ diff --git a/client.js b/client.js - const spot = (0, import_react32.useRef)(null); - const under = (0, import_react32.useRef)(null); - (0, import_react32.useLayoutEffect)(() => { -+ const wrap = (0, import_react46.useRef)(null); -+ const ind = (0, import_react46.useRef)(null); -+ const spot = (0, import_react46.useRef)(null); -+ const under = (0, import_react46.useRef)(null); -+ (0, import_react46.useLayoutEffect)(() => { ++ const wrap = (0, import_react50.useRef)(null); ++ const ind = (0, import_react50.useRef)(null); ++ const spot = (0, import_react50.useRef)(null); ++ const under = (0, import_react50.useRef)(null); ++ (0, import_react50.useLayoutEffect)(() => { const box = wrap.current; const capsule = ind.current; if (!box || !capsule) return void 0; @@ -26211,7 +27652,7 @@ diff --git a/client.js b/client.js }; }); - (0, import_react32.useEffect)(() => { -+ (0, import_react46.useEffect)(() => { ++ (0, import_react50.useEffect)(() => { const box = wrap.current; if (!box) return void 0; const observer = new ResizeObserver(() => { @@ -26220,15 +27661,15 @@ diff --git a/client.js b/client.js return () => observer.disconnect(); }, []); - return (0, import_react32.createElement)( -+ return (0, import_react46.createElement)( ++ return (0, import_react50.createElement)( "div", { className: "bt-ptabs", role: "tablist", "aria-label": t("Panel tabs") }, - (0, import_react32.createElement)( -+ (0, import_react46.createElement)( ++ (0, import_react50.createElement)( "div", { className: "bt-ptabs-in", ref: wrap }, - (0, import_react32.createElement)( -+ (0, import_react46.createElement)( ++ (0, import_react50.createElement)( "button", { type: "button", @@ -26238,14 +27679,14 @@ diff --git a/client.js b/client.js }, - (0, import_react32.createElement)(BotMark, { bot, size: 20, state: reading ? "searching" : "idle" }), - view === "details" ? (0, import_react32.createElement)("span", { className: "bt-ptab-name" }, bot.name) : null -+ (0, import_react46.createElement)(BotMark, { bot, size: 20, state: reading ? "searching" : "idle" }), -+ view === "details" ? (0, import_react46.createElement)("span", { className: "bt-ptab-name" }, bot.name) : null ++ (0, import_react50.createElement)(BotMark, { bot, size: 20, state: reading ? "searching" : "idle" }), ++ view === "details" ? (0, import_react50.createElement)("span", { className: "bt-ptab-name" }, bot.name) : null ), ids.map((tabId) => { const page = pages[tabId] ?? EMPTY_PAGE; const on = view === "browser" && tabId === active; - return (0, import_react32.createElement)( -+ return (0, import_react46.createElement)( ++ return (0, import_react50.createElement)( "button", { key: tabId, @@ -26256,9 +27697,9 @@ diff --git a/client.js b/client.js - (0, import_react32.createElement)(Favicon, { src: page.favicon, className: "bt-ptab-fav" }), - (0, import_react32.createElement)("span", { className: "bt-ptab-title" }, tabLabel(page)), - (0, import_react32.createElement)("span", { -+ (0, import_react46.createElement)(Favicon, { src: page.favicon, className: "bt-ptab-fav" }), -+ (0, import_react46.createElement)("span", { className: "bt-ptab-title" }, tabLabel(page)), -+ (0, import_react46.createElement)("span", { ++ (0, import_react50.createElement)(Favicon, { src: page.favicon, className: "bt-ptab-fav" }), ++ (0, import_react50.createElement)("span", { className: "bt-ptab-title" }, tabLabel(page)), ++ (0, import_react50.createElement)("span", { className: "bt-ptab-x", role: "button", "aria-label": t("Close tab"), @@ -26267,13 +27708,13 @@ diff --git a/client.js b/client.js ); }), - (0, import_react32.createElement)("span", { ref: ind, className: "bt-ptab-ind", "aria-hidden": true }) -+ (0, import_react46.createElement)("span", { ref: ind, className: "bt-ptab-ind", "aria-hidden": true }) ++ (0, import_react50.createElement)("span", { ref: ind, className: "bt-ptab-ind", "aria-hidden": true }) ), // New tab and Close stay outside the scrolling tabs, so a narrow panel keeps both. - (0, import_react32.createElement)("button", { type: "button", className: "bt-ptab-new", "aria-label": t("New tab"), title: t("New tab"), onClick: () => actions.browserNewTab(subject) }, (0, import_react32.createElement)(PlusTabIcon)), - (0, import_react32.createElement)("button", { type: "button", className: "bt-icon-btn bt-ptab-close", "aria-label": t("Close panel"), title: t("Close panel"), onClick: () => actions.closePanel() }, (0, import_react32.createElement)(CloseIcon2)) -+ (0, import_react46.createElement)("button", { type: "button", className: "bt-ptab-new", "aria-label": t("New tab"), title: t("New tab"), onClick: () => actions.browserNewTab(subject) }, (0, import_react46.createElement)(PlusTabIcon)), -+ (0, import_react46.createElement)("button", { type: "button", className: "bt-icon-btn bt-ptab-close", "aria-label": t("Close panel"), title: t("Close panel"), onClick: () => actions.closePanel() }, (0, import_react46.createElement)(CloseIcon2)) ++ (0, import_react50.createElement)("button", { type: "button", className: "bt-ptab-new", "aria-label": t("New tab"), title: t("New tab"), onClick: () => actions.browserNewTab(subject) }, (0, import_react50.createElement)(PlusTabIcon)), ++ (0, import_react50.createElement)("button", { type: "button", className: "bt-icon-btn bt-ptab-close", "aria-label": t("Close panel"), title: t("Close panel"), onClick: () => actions.closePanel() }, (0, import_react50.createElement)(CloseIcon2)) ); } function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) { @@ -26281,12 +27722,12 @@ diff --git a/client.js b/client.js - const frame = (0, import_react32.useRef)(null); - const input = (0, import_react32.useRef)(null); - const [draft, setDraft] = (0, import_react32.useState)(null); -+ const frame = (0, import_react46.useRef)(null); -+ const input = (0, import_react46.useRef)(null); -+ const [draft, setDraft] = (0, import_react46.useState)(null); ++ const frame = (0, import_react50.useRef)(null); ++ const input = (0, import_react50.useRef)(null); ++ const [draft, setDraft] = (0, import_react50.useState)(null); const showGuest = landed && !leaving && Boolean(page.url) && !page.error; - (0, import_react32.useLayoutEffect)(() => { -+ (0, import_react46.useLayoutEffect)(() => { ++ (0, import_react50.useLayoutEffect)(() => { const element = frame.current; if (!element || leaving || !tabId) { void actions.browserShow(null); @@ -26295,7 +27736,7 @@ diff --git a/client.js b/client.js }; }, [tabId, showGuest, leaving]); - (0, import_react32.useEffect)(() => { -+ (0, import_react46.useEffect)(() => { ++ (0, import_react50.useEffect)(() => { setDraft(null); if (landed && !page.url) input.current?.focus(); }, [tabId, landed]); @@ -26315,19 +27756,19 @@ diff --git a/client.js b/client.js const editing = draft !== null; const secure = /^https:/i.test(page.url); - return (0, import_react32.createElement)( -+ return (0, import_react46.createElement)( ++ return (0, import_react50.createElement)( "div", { className: "bt-panel-view bt-panel-browser", "aria-label": t("{name}'s browser", { name: bot.name }) }, - (0, import_react32.createElement)( -+ (0, import_react46.createElement)( ++ (0, import_react50.createElement)( "div", { className: "bt-browser-bar" }, - (0, import_react32.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back"), title: t("Back"), disabled: !page.canGoBack, onClick: () => actions.browserCommand(tabId, "back") }, (0, import_react32.createElement)(BackIcon)), - (0, import_react32.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Forward"), title: t("Forward"), disabled: !page.canGoForward, onClick: () => actions.browserCommand(tabId, "forward") }, (0, import_react32.createElement)(ForwardIcon)), - (0, import_react32.createElement)("button", { -+ (0, import_react46.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back"), title: t("Back"), disabled: !page.canGoBack, onClick: () => actions.browserCommand(tabId, "back") }, (0, import_react46.createElement)(BackIcon)), -+ (0, import_react46.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Forward"), title: t("Forward"), disabled: !page.canGoForward, onClick: () => actions.browserCommand(tabId, "forward") }, (0, import_react46.createElement)(ForwardIcon)), -+ (0, import_react46.createElement)("button", { ++ (0, import_react50.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back"), title: t("Back"), disabled: !page.canGoBack, onClick: () => actions.browserCommand(tabId, "back") }, (0, import_react50.createElement)(BackIcon)), ++ (0, import_react50.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Forward"), title: t("Forward"), disabled: !page.canGoForward, onClick: () => actions.browserCommand(tabId, "forward") }, (0, import_react50.createElement)(ForwardIcon)), ++ (0, import_react50.createElement)("button", { type: "button", className: "bt-icon-btn", disabled: !page.url, @@ -26336,14 +27777,14 @@ diff --git a/client.js b/client.js onClick: () => actions.browserCommand(tabId, page.loading ? "stop" : "reload") - }, (0, import_react32.createElement)(page.loading ? StopIcon : ReloadIcon)), - (0, import_react32.createElement)( -+ }, (0, import_react46.createElement)(page.loading ? StopIcon : ReloadIcon)), -+ (0, import_react46.createElement)( ++ }, (0, import_react50.createElement)(page.loading ? StopIcon : ReloadIcon)), ++ (0, import_react50.createElement)( "form", { className: "bt-browser-address", onSubmit: go, "data-editing": editing || void 0 }, - (0, import_react32.createElement)("span", { className: "bt-browser-scheme", "aria-hidden": true }, (0, import_react32.createElement)(secure && !editing ? LockIcon2 : GlobeIcon)), - (0, import_react32.createElement)("input", { -+ (0, import_react46.createElement)("span", { className: "bt-browser-scheme", "aria-hidden": true }, (0, import_react46.createElement)(secure && !editing ? LockIcon2 : GlobeIcon)), -+ (0, import_react46.createElement)("input", { ++ (0, import_react50.createElement)("span", { className: "bt-browser-scheme", "aria-hidden": true }, (0, import_react50.createElement)(secure && !editing ? LockIcon2 : GlobeIcon)), ++ (0, import_react50.createElement)("input", { ref: input, type: "text", spellCheck: false, @@ -26352,38 +27793,43 @@ diff --git a/client.js b/client.js }) ), - page.loading ? (0, import_react32.createElement)("span", { className: "bt-browser-progress", "aria-hidden": true }) : null -+ page.loading ? (0, import_react46.createElement)("span", { className: "bt-browser-progress", "aria-hidden": true }) : null ++ page.loading ? (0, import_react50.createElement)("span", { className: "bt-browser-progress", "aria-hidden": true }) : null ), - (0, import_react32.createElement)( -+ (0, import_react46.createElement)( ++ (0, import_react50.createElement)( "div", { ref: frame, className: "bt-browser-frame", "data-guest": showGuest || void 0 }, - page.error ? (0, import_react32.createElement)( -+ page.error ? (0, import_react46.createElement)( ++ page.error ? (0, import_react50.createElement)( "div", { className: "bt-browser-empty" }, - (0, import_react32.createElement)("div", { className: "bt-browser-empty-title" }, t("This page didn’t load")), - (0, import_react32.createElement)("div", { className: "bt-browser-empty-text" }, t(page.error)), - page.url ? (0, import_react32.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => { -+ (0, import_react46.createElement)("div", { className: "bt-browser-empty-title" }, t("This page didn’t load")), -+ (0, import_react46.createElement)("div", { className: "bt-browser-empty-text" }, t(page.error)), -+ page.url ? (0, import_react46.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => { ++ (0, import_react50.createElement)("div", { className: "bt-browser-empty-title" }, t("This page didn’t load")), ++ (0, import_react50.createElement)("div", { className: "bt-browser-empty-text" }, t(page.error)), ++ page.url ? (0, import_react50.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => { void actions.browserNavigate(tabId, page.url); } }, t("Try again")) : null - ) : !page.url ? (0, import_react32.createElement)( -+ ) : !page.url ? (0, import_react46.createElement)( ++ ) : !page.url ? (0, import_react50.createElement)( "div", { className: "bt-browser-empty" }, - (0, import_react32.createElement)(BotMark, { bot, size: 48, state: "idle", live: true }), - (0, import_react32.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), - (0, import_react32.createElement)("div", { className: "bt-browser-empty-text" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })) -+ (0, import_react46.createElement)(BotMark, { bot, size: 48, state: "idle", live: true }), -+ (0, import_react46.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), -+ (0, import_react46.createElement)("div", { className: "bt-browser-empty-text" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })) ++ (0, import_react50.createElement)(BotMark, { bot, size: 48, state: "idle", live: true }), ++ (0, import_react50.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })), ++ (0, import_react50.createElement)("div", { className: "bt-browser-empty-text" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })) ) : null ) ); -@@ -11907,41 +11907,41 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu +@@ -11903,45 +11903,45 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) + function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) { + const bot = roster.byId[pane.id]; + const canBrowse = Boolean(bot && roster.browser === true && actions.browserShow); +- const view = pane.view === "browser" && canBrowse ? "browser" : "details"; ++ const view = pane.view === "browser" && canBrowse ? "browser" : pane.view === "document" && pane.document ? "document" : "details"; const tabState = useBrowserTabs((map) => bot ? map[bot.id] ?? EMPTY_TABS2 : EMPTY_TABS2); const active = tabState.active; const page = useBrowserPages((pages) => (active ? pages[active] : null) ?? EMPTY_PAGE); @@ -26397,29 +27843,29 @@ diff --git a/client.js b/client.js - const [resizing, setResizing] = (0, import_react32.useState)(false); - const instant = dragging || resizing; - const [reading, setReading] = (0, import_react32.useState)(false); -+ const root = (0, import_react46.useRef)(null); -+ const fly = (0, import_react46.useRef)(null); -+ const [landed, setLanded] = (0, import_react46.useState)(false); -+ const [settling, setSettling] = (0, import_react46.useState)(false); -+ const [width, setWidth] = (0, import_react46.useState)(savedWidth); -+ const [viewport, setViewport] = (0, import_react46.useState)(() => window.innerWidth); -+ const [dragging, setDragging] = (0, import_react46.useState)(false); -+ const [resizing, setResizing] = (0, import_react46.useState)(false); ++ const root = (0, import_react50.useRef)(null); ++ const fly = (0, import_react50.useRef)(null); ++ const [landed, setLanded] = (0, import_react50.useState)(false); ++ const [settling, setSettling] = (0, import_react50.useState)(false); ++ const [width, setWidth] = (0, import_react50.useState)(savedWidth); ++ const [viewport, setViewport] = (0, import_react50.useState)(() => window.innerWidth); ++ const [dragging, setDragging] = (0, import_react50.useState)(false); ++ const [resizing, setResizing] = (0, import_react50.useState)(false); + const instant2 = dragging || resizing; -+ const [reading, setReading] = (0, import_react46.useState)(false); ++ const [reading, setReading] = (0, import_react50.useState)(false); const panelWidth = fitWidth(width ?? (view === "browser" ? DEFAULT_WIDTH : DETAILS_WIDTH), widthRange(view, viewport)); - (0, import_react32.useLayoutEffect)(() => { -+ (0, import_react46.useLayoutEffect)(() => { ++ (0, import_react50.useLayoutEffect)(() => { if (view === "browser" && width === null) setWidth(DEFAULT_WIDTH); }, [view, width]); - (0, import_react32.useLayoutEffect)(() => { - chatRoom.hold(instant); - }, [instant]); - const [last, setLast] = (0, import_react32.useState)({ view, width: panelWidth }); -+ (0, import_react46.useLayoutEffect)(() => { ++ (0, import_react50.useLayoutEffect)(() => { + chatRoom.hold(instant2); + }, [instant2]); -+ const [last, setLast] = (0, import_react46.useState)({ view, width: panelWidth }); ++ const [last, setLast] = (0, import_react50.useState)({ view, width: panelWidth }); if (last.view !== view || last.width !== panelWidth) { setLast({ view, width: panelWidth }); - if (last.view !== view) setSettling(last.width !== panelWidth && !instant); @@ -26427,8 +27873,8 @@ diff --git a/client.js b/client.js } - const shownView = (0, import_react32.useRef)(view); - (0, import_react32.useLayoutEffect)(() => { -+ const shownView = (0, import_react46.useRef)(view); -+ (0, import_react46.useLayoutEffect)(() => { ++ const shownView = (0, import_react50.useRef)(view); ++ (0, import_react50.useLayoutEffect)(() => { const switched = settling && shownView.current !== view; shownView.current = view; if (switched) chatRoom.hold(true); @@ -26436,12 +27882,12 @@ diff --git a/client.js b/client.js if (switched) chatRoom.hold(false); }, [view, panelWidth, leaving]); - (0, import_react32.useEffect)(() => () => { -+ (0, import_react46.useEffect)(() => () => { ++ (0, import_react50.useEffect)(() => () => { chatRoom.set(null); chatRoom.hold(false); }, []); - (0, import_react32.useEffect)(() => { -+ (0, import_react46.useEffect)(() => { ++ (0, import_react50.useEffect)(() => { let timer; const onResize = () => { setResizing(true); @@ -26450,34 +27896,34 @@ diff --git a/client.js b/client.js }; }, []); - (0, import_react32.useEffect)(() => { -+ (0, import_react46.useEffect)(() => { ++ (0, import_react50.useEffect)(() => { if (!settling) return void 0; const timer = setTimeout(() => setSettling(false), SPRING_SHAPE.duration + 40); return () => clearTimeout(timer); }, [settling, view]); - (0, import_react32.useEffect)(() => { -+ (0, import_react46.useEffect)(() => { ++ (0, import_react50.useEffect)(() => { const timer = setTimeout(() => setLanded(true), 360); return () => clearTimeout(timer); }, []); - (0, import_react32.useEffect)(() => { -+ (0, import_react46.useEffect)(() => { ++ (0, import_react50.useEffect)(() => { if (canBrowse) actions.browserEnsure(bot.id); }, [bot?.id, canBrowse]); - (0, import_react32.useEffect)(() => { -+ (0, import_react46.useEffect)(() => { ++ (0, import_react50.useEffect)(() => { if (view === "browser" && (active === null || !tabState.ids.includes(active))) actions.setPanelView("details"); }, [view, active, tabState.ids.length]); - (0, import_react32.useEffect)(() => { -+ (0, import_react46.useEffect)(() => { ++ (0, import_react50.useEffect)(() => { if (view !== "browser" || leaving) void actions.browserShow?.(null); }, [view, leaving]); - (0, import_react32.useEffect)(() => () => { -+ (0, import_react46.useEffect)(() => () => { ++ (0, import_react50.useEffect)(() => () => { void actions.browserShow?.(null); }, []); - (0, import_react32.useEffect)(() => { -+ (0, import_react46.useEffect)(() => { ++ (0, import_react50.useEffect)(() => { if (!page.readAt || Date.now() - page.readAt > READ_FLASH_MS) return void 0; setReading(true); const timer = setTimeout(() => setReading(false), READ_FLASH_MS); @@ -26486,20 +27932,23 @@ diff --git a/client.js b/client.js }; } - (0, import_react32.useLayoutEffect)(() => { -+ (0, import_react46.useLayoutEffect)(() => { ++ (0, import_react50.useLayoutEffect)(() => { const move = fly.current; if (!move) return; fly.current = null; -@@ -12096,7 +12096,7 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu +@@ -12096,32 +12096,36 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu for (const name of ends) grip.addEventListener(name, onEnd); }; const hasStrip = canBrowse && tabState.ids.length > 0; - return (0, import_react32.createElement)( -+ return (0, import_react46.createElement)( ++ return (0, import_react50.createElement)( "aside", { ref: root, -@@ -12106,22 +12106,22 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu + className: "bt-panel", + "data-view": view, +- "aria-label": view === "browser" && bot ? t("{name}'s browser", { name: bot.name }) : t("Conversation details"), ++ "aria-label": view === "browser" && bot ? t("{name}'s browser", { name: bot.name }) : view === "document" ? pane.document?.title || t("Document") : t("Conversation details"), "data-leaving": leaving || void 0, "aria-hidden": leaving || void 0, "data-settling": settling || void 0, @@ -26512,19 +27961,23 @@ diff --git a/client.js b/client.js } }, - leaving ? null : (0, import_react32.createElement)("div", { className: "bt-panel-grip", role: "separator", "aria-orientation": "vertical", "aria-label": t("Resize panel"), onPointerDown: startResize }), -+ leaving ? null : (0, import_react46.createElement)("div", { className: "bt-panel-grip", role: "separator", "aria-orientation": "vertical", "aria-label": t("Resize panel"), onPointerDown: startResize }), ++ leaving ? null : (0, import_react50.createElement)("div", { className: "bt-panel-grip", role: "separator", "aria-orientation": "vertical", "aria-label": t("Resize panel"), onPointerDown: startResize }), // Over the whole window while dragging: the cursor stays a resize cursor and the // pages underneath (the chat, the guest) see no pointer. - dragging ? (0, import_react_dom8.createPortal)((0, import_react32.createElement)("div", { className: "bt-drag-shield", "aria-hidden": true }), document.body) : null, - hasStrip ? (0, import_react32.createElement)(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null, - view === "browser" && bot ? (0, import_react32.createElement)(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) : (0, import_react32.createElement)( -+ dragging ? (0, import_react_dom10.createPortal)((0, import_react46.createElement)("div", { className: "bt-drag-shield", "aria-hidden": true }), document.body) : null, -+ hasStrip ? (0, import_react46.createElement)(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null, -+ view === "browser" && bot ? (0, import_react46.createElement)(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) : (0, import_react46.createElement)( ++ dragging ? (0, import_react_dom10.createPortal)((0, import_react50.createElement)("div", { className: "bt-drag-shield", "aria-hidden": true }), document.body) : null, ++ hasStrip ? (0, import_react50.createElement)(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null, ++ view === "browser" && bot ? (0, import_react50.createElement)(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) : view === "document" ? (0, import_react50.createElement)( ++ "div", ++ { key: `document:${pane.id}:${pane.document?.title ?? ""}`, className: "bt-panel-view" }, ++ (0, import_react50.createElement)(DocumentPane, { document: pane.document, onClose: () => actions.closePanel() }) ++ ) : (0, import_react50.createElement)( "div", { key: `details:${pane.id}:${pane.renaming ? "rename" : ""}:${pane.tab ?? ""}`, className: "bt-panel-view" }, - (0, import_react32.createElement)(DetailsDrawer, { -+ (0, import_react46.createElement)(DetailsDrawer, { ++ (0, import_react50.createElement)(DetailsDrawer, { sessionId: pane.id, startRenaming: pane.renaming, startTab: pane.tab, @@ -26533,7 +27986,7 @@ diff --git a/client.js b/client.js `; +// src/client/remote-bot-settings.js -+var import_react47 = require("react"); ++var import_react51 = require("react"); +var REMOTE_BOT_SETTINGS_CSS = ` +.bt-remote-sheet-layer{position:fixed;inset:0;z-index:120;isolation:isolate;display:flex;align-items:flex-end;justify-content:center;padding:16px;pointer-events:none} +.bt-remote-sheet-layer[data-leaving]{pointer-events:none} @@ -26557,8 +28010,8 @@ diff --git a/client.js b/client.js +function RemoteBotSettingsSheet({ bot, roster, actions, leaving = false }) { + const close = () => actions.closeSettings(); + useEscape(close); -+ const dialog = (0, import_react47.useRef)(null); -+ (0, import_react47.useEffect)(() => { ++ const dialog = (0, import_react51.useRef)(null); ++ (0, import_react51.useEffect)(() => { + const before = document.activeElement; + dialog.current?.focus?.({ preventScroll: true }); + return () => { @@ -26573,30 +28026,30 @@ diff --git a/client.js b/client.js + }; + if (!bot?.remote) return null; + const who = bot.remote.homeName || bot.remote.owner || bot.remote.home || t("Friend's Bot"); -+ return (0, import_react47.createElement)( ++ return (0, import_react51.createElement)( + "div", + { className: "bt-remote-sheet-layer", "data-leaving": leaving || void 0, "data-flybot": "remote-bot-sheet" }, -+ (0, import_react47.createElement)("div", { className: "bt-scrim", onMouseDown: close }), -+ (0, import_react47.createElement)( ++ (0, import_react51.createElement)("div", { className: "bt-scrim", onMouseDown: close }), ++ (0, import_react51.createElement)( + "div", + { className: "bt-remote-sheet", role: "dialog", "aria-modal": true, "aria-label": t("Bot settings"), tabIndex: -1, ref: dialog, onKeyDown }, -+ (0, import_react47.createElement)( ++ (0, import_react51.createElement)( + "div", + { className: "bt-remote-sheet-head" }, -+ (0, import_react47.createElement)(BotMark, { bot, size: 40, live: true }), -+ (0, import_react47.createElement)( ++ (0, import_react51.createElement)(BotMark, { bot, size: 40, live: true }), ++ (0, import_react51.createElement)( + "div", + { className: "bt-remote-sheet-who" }, -+ (0, import_react47.createElement)("span", { className: "bt-remote-sheet-name" }, bot.name), -+ (0, import_react47.createElement)("span", { className: "bt-remote-sheet-sub" }, who) ++ (0, import_react51.createElement)("span", { className: "bt-remote-sheet-name" }, bot.name), ++ (0, import_react51.createElement)("span", { className: "bt-remote-sheet-sub" }, who) + ), -+ (0, import_react47.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close settings"), onClick: close }, (0, import_react47.createElement)(CloseIcon)) ++ (0, import_react51.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close settings"), onClick: close }, (0, import_react51.createElement)(CloseIcon)) + ), -+ (0, import_react47.createElement)( ++ (0, import_react51.createElement)( + "div", + { className: "bt-remote-sheet-body" }, -+ bot.remote.handle ? (0, import_react47.createElement)("div", { className: "bt-muted", style: { marginBottom: 8, fontSize: 12 } }, bot.remote.handle) : null, -+ (0, import_react47.createElement)(FlyBotDetails, { bot, roster, actions }) ++ bot.remote.handle ? (0, import_react51.createElement)("div", { className: "bt-muted", style: { marginBottom: 8, fontSize: 12 } }, bot.remote.handle) : null, ++ (0, import_react51.createElement)(FlyBotDetails, { bot, roster, actions }) + ) + ) + ); @@ -26605,33 +28058,37 @@ diff --git a/client.js b/client.js // src/client/overlays.js -var import_react33 = require("react"); -var import_react_dom9 = require("react-dom"); -+var import_react48 = require("react"); ++var import_react52 = require("react"); +var import_react_dom11 = require("react-dom"); var DIALOG_EXIT_MS = 160; var MENU_EXIT_MS3 = 120; function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity, useWork, useRegistry, useBrowserPages, useBrowserTabs, useUpdate, actions }) { -@@ -12227,15 +12227,15 @@ function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity +@@ -12227,37 +12227,44 @@ function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity const ui2 = useUi((value) => value); useRegistry((value) => value); const current = useSessions((list) => Object.values(list.byId).find((session) => (session?.retainedBy?.mainView ?? 0) > 0)?.id ?? null); - const previous = (0, import_react33.useRef)(current); - (0, import_react33.useEffect)(() => { -+ const previous = (0, import_react48.useRef)(current); -+ (0, import_react48.useEffect)(() => { ++ const previous = (0, import_react52.useRef)(current); ++ (0, import_react52.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 } : null; +- const open = ui2.details ? { id: ui2.details, view: ui2.view ?? "details", renaming: ui2.renaming, tab: ui2.tab } : null; - const [kept, setKept] = (0, import_react33.useState)(open); - (0, import_react33.useEffect)(() => { -+ const [kept, setKept] = (0, import_react48.useState)(open); -+ (0, import_react48.useEffect)(() => { ++ const open = ui2.details ? { id: ui2.details, view: ui2.view ?? "details", renaming: ui2.renaming, tab: ui2.tab, document: ui2.document ?? null } : null; ++ const [kept, setKept] = (0, import_react52.useState)(open); ++ (0, import_react52.useEffect)(() => { if (open) { setKept(open); return void 0; -@@ -12245,19 +12245,26 @@ function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity - }, [ui2.details, ui2.view, ui2.renaming, ui2.tab]); + } + const timer = setTimeout(() => setKept(null), PANEL_LINGER_MS); + return () => clearTimeout(timer); +- }, [ui2.details, ui2.view, ui2.renaming, ui2.tab]); ++ }, [ui2.details, ui2.view, ui2.renaming, ui2.tab, ui2.document]); const pane = open ?? kept; const [settings, settingsLeaving] = useLinger(ui2.settings, DIALOG_EXIT_MS); + const remoteBotId = ui2.remoteBotSettings && roster.byId[ui2.remoteBotSettings]?.remote ? ui2.remoteBotSettings : null; @@ -26642,8 +28099,8 @@ diff --git a/client.js b/client.js - import_react33.Fragment, + const [inbox, inboxLeaving] = useLinger(ui2.inbox ?? null, DIALOG_EXIT_MS); + const [board, boardLeaving] = useLinger(ui2.board ?? null, DIALOG_EXIT_MS); -+ return (0, import_react48.createElement)( -+ import_react48.Fragment, ++ return (0, import_react52.createElement)( ++ import_react52.Fragment, null, - pane ? (0, import_react_dom9.createPortal)((0, import_react33.createElement)(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }), document.body) : null, - ui2.newChat ? (0, import_react_dom9.createPortal)((0, import_react33.createElement)(NewChat, { key: ui2.newChat, mode: ui2.newChat, roster, actions }), document.body) : null, @@ -26653,17 +28110,17 @@ diff --git a/client.js b/client.js - menu ? (0, import_react_dom9.createPortal)((0, import_react33.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_react33.createElement)(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null, - memory && roster.byId[memory] ? (0, import_react_dom9.createPortal)((0, import_react33.createElement)(MemoryDialog, { key: memory, bot: roster.byId[memory], actions, leaving: memoryLeaving }), document.body) : null -+ pane ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }), document.body) : null, -+ ui2.newChat ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(NewChat, { key: ui2.newChat, mode: ui2.newChat, roster, actions }), document.body) : null, -+ ui2.palette ? (0, import_react_dom11.createPortal)((0, import_react48.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_dom11.createPortal)((0, import_react48.createElement)(ExchangeDialog, { pair: ui2.exchange, roster, actions }), document.body) : null, -+ ui2.voice ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(VoiceMode, { key: ui2.voice, sessionId: ui2.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null, -+ menu ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(ContextMenu, { key: `${menu.kind ?? ""}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, leaving: menuLeaving }), document.body) : null, -+ settings ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null, -+ remoteBotSettings ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(RemoteBotSettingsSheet, { key: remoteBotSettings, bot: roster.byId[remoteBotSettings], roster, actions, leaving: remoteLeaving }), document.body) : null, -+ memory && roster.byId[memory] ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(MemoryDialog, { key: memory, bot: roster.byId[memory], roster, actions, leaving: memoryLeaving }), document.body) : null, -+ inbox ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(InboxDialog, { roster, useWork, useSessions, actions, leaving: inboxLeaving }), document.body) : null, -+ board ? (0, import_react_dom11.createPortal)((0, import_react48.createElement)(KanbanDialog, { roster, actions, leaving: boardLeaving }), document.body) : null ++ pane ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }), document.body) : null, ++ ui2.newChat ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(NewChat, { key: ui2.newChat, mode: ui2.newChat, roster, actions }), document.body) : null, ++ ui2.palette ? (0, import_react_dom11.createPortal)((0, import_react52.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_dom11.createPortal)((0, import_react52.createElement)(ExchangeDialog, { pair: ui2.exchange, roster, actions }), document.body) : null, ++ ui2.voice ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(VoiceMode, { key: ui2.voice, sessionId: ui2.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null, ++ menu ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(ContextMenu, { key: `${menu.kind ?? ""}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, unread: ui2.unread, leaving: menuLeaving }), document.body) : null, ++ settings ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null, ++ remoteBotSettings ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(RemoteBotSettingsSheet, { key: remoteBotSettings, bot: roster.byId[remoteBotSettings], roster, actions, leaving: remoteLeaving }), document.body) : null, ++ memory && roster.byId[memory] ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(MemoryDialog, { key: memory, bot: roster.byId[memory], roster, actions, leaving: memoryLeaving }), document.body) : null, ++ inbox ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(InboxDialog, { roster, useWork, useSessions, actions, leaving: inboxLeaving }), document.body) : null, ++ board ? (0, import_react_dom11.createPortal)((0, import_react52.createElement)(KanbanDialog, { roster, actions, leaving: boardLeaving }), document.body) : null ); } @@ -26855,7 +28312,7 @@ diff --git a/client.js b/client.js } } }; -@@ -13052,11 +13052,118 @@ function serveBrowserReads({ browsers, post, clientId = globalThis.crypto.random +@@ -13052,11 +13052,129 @@ function serveBrowserReads({ browsers, post, clientId = globalThis.crypto.random }; } @@ -26863,6 +28320,17 @@ diff --git a/client.js b/client.js +var MOBILE_MAX_WIDTH = 640; +var MOBILE_CSS = ` +@media (max-width:${MOBILE_MAX_WIDTH}px){ ++.bt-appearance-seg{flex-wrap:wrap} ++.bt-appearance-seg button{height:auto;min-height:36px;white-space:normal;overflow-wrap:anywhere} ++.bt-ng-split{grid-template-columns:minmax(0,1fr);min-height:0} ++.bt-mem-shell{flex-direction:column} ++.bt-mem-nav{width:auto;max-height:36vh;border-right:0;border-bottom:.5px solid var(--bt-line)} ++.bt-menu{max-width:calc(100vw - 16px)} ++.bt-message-note{white-space:normal;overflow-wrap:anywhere;padding:6px 8px;max-width:220px} ++.bt-utools,.bt-tools{opacity:1;visibility:visible} ++.bt-umsg{flex-wrap:wrap} ++.bt-menu-reacts{flex-wrap:wrap} ++ +.bt-held-actions{max-width:100%} +.bt-held-card{padding:10px 12px} +:is(.bt-held-card,.bt-flybot-approval) .bt-flybot-approval-actions{gap:8px;margin-top:8px} @@ -27034,11 +28502,11 @@ diff --git a/client.js b/client.js + // src/client/user-message.js -var import_react34 = require("react"); -+var import_react49 = require("react"); ++var import_react53 = require("react"); var ui = __toESM(require("@deepseek-ai/dsh-client-ui-primitives"), 1); var canDrawUserMessages = () => typeof ui.projectUserText === "function"; function contentParts(content) { -@@ -13119,87 +13119,165 @@ function contentParts(content) { +@@ -13119,87 +13119,194 @@ function contentParts(content) { } return { text: texts2.join("\n"), attachments, rest }; } @@ -27129,50 +28597,68 @@ diff --git a/client.js b/client.js - part.label - ) : (0, import_react34.createElement)(import_react34.Fragment, { key: index }, ui.projectUserText(part.text, referenceLabels, skillNames, "skill", references))); +function UserText({ text: text2, bots, referenceLabels, skillNames, references, actions }) { -+ const chip = (part) => [(0, import_react49.createElement)(BotMark, { bot: part.bot.draw ?? part.bot, size: 16 }), `@${part.bot.mentionLabel ?? part.label}`]; ++ const chip = (part) => [(0, import_react53.createElement)(BotMark, { bot: part.bot.draw ?? part.bot, size: 16 }), `@${part.bot.mentionLabel ?? part.label}`]; + return userTextParts(text2, bots, referenceLabels).map((part, index) => { -+ if (!part.bot) return (0, import_react49.createElement)(import_react49.Fragment, { key: index }, ui.projectUserText(part.text, referenceLabels, skillNames, "skill", references)); ++ if (!part.bot) return (0, import_react53.createElement)(import_react53.Fragment, { key: index }, ui.projectUserText(part.text, referenceLabels, skillNames, "skill", references)); + const title = `@${part.bot.name}`; -+ return typeof part.bot.id === "string" ? (0, import_react49.createElement)("button", { key: index, type: "button", className: "bt-umention", title, onClick: () => actions.openSession(part.bot.id) }, chip(part)) : (0, import_react49.createElement)("span", { key: index, className: "bt-umention", title }, chip(part)); ++ return typeof part.bot.id === "string" ? (0, import_react53.createElement)("button", { key: index, type: "button", className: "bt-umention", title, onClick: () => actions.openSession(part.bot.id) }, chip(part)) : (0, import_react53.createElement)("span", { key: index, className: "bt-umention", title }, chip(part)); + }); } function Attachments({ attachments, renderMessageImages }) { const compact2 = attachments.length > 1; - return (0, import_react34.createElement)("div", { className: "bt-uattach" }, attachments.map((block, index) => { -+ return (0, import_react49.createElement)("div", { className: "bt-uattach" }, attachments.map((block, index) => { ++ return (0, import_react53.createElement)("div", { className: "bt-uattach" }, attachments.map((block, index) => { if (block.type === "image") { - return renderMessageImages ? (0, import_react34.createElement)(import_react34.Fragment, { key: index }, renderMessageImages({ images: [{ attachment: block.attachment }], align: "end", compact: compact2 })) : null; -+ return renderMessageImages ? (0, import_react49.createElement)(import_react49.Fragment, { key: index }, renderMessageImages({ images: [{ attachment: block.attachment }], align: "end", compact: compact2 })) : null; ++ return renderMessageImages ? (0, import_react53.createElement)(import_react53.Fragment, { key: index }, renderMessageImages({ images: [{ attachment: block.attachment }], align: "end", compact: compact2 })) : null; } const file = block.attachment; const meta = [ui.fileExtension?.(file.name)?.toUpperCase().slice(0, 8), ui.fileSizeText?.(file.bytes)].filter(Boolean).join(" · "); - return (0, import_react34.createElement)( -+ return (0, import_react49.createElement)( ++ return (0, import_react53.createElement)( "span", { key: index, className: "bt-ufile", title: file.name }, - ui.FileTypeIcon ? (0, import_react34.createElement)(ui.FileTypeIcon, { path: file.name, className: "bt-ufile-icon" }) : null, - (0, import_react34.createElement)("span", { className: "bt-ufile-text" }, (0, import_react34.createElement)("span", { className: "bt-ufile-name" }, file.name), meta ? (0, import_react34.createElement)("span", { className: "bt-ufile-meta" }, meta) : null) -+ ui.FileTypeIcon ? (0, import_react49.createElement)(ui.FileTypeIcon, { path: file.name, className: "bt-ufile-icon" }) : null, -+ (0, import_react49.createElement)("span", { className: "bt-ufile-text" }, (0, import_react49.createElement)("span", { className: "bt-ufile-name" }, file.name), meta ? (0, import_react49.createElement)("span", { className: "bt-ufile-meta" }, meta) : null) ++ ui.FileTypeIcon ? (0, import_react53.createElement)(ui.FileTypeIcon, { path: file.name, className: "bt-ufile-icon" }) : null, ++ (0, import_react53.createElement)("span", { className: "bt-ufile-text" }, (0, import_react53.createElement)("span", { className: "bt-ufile-name" }, file.name), meta ? (0, import_react53.createElement)("span", { className: "bt-ufile-meta" }, meta) : null) ); })); } -function CopyButton({ text }) { - const [copied, setCopied] = (0, import_react34.useState)(false); -+function CopyButton({ text: text2 }) { -+ const [copied, setCopied] = (0, import_react49.useState)(false); - const copy2 = () => { +- const copy2 = () => { - void navigator.clipboard?.writeText(text).then(() => { -+ void navigator.clipboard?.writeText(text2).then(() => { - setCopied(true); - setTimeout(() => setCopied(false), 1e3); - }); - }; +- setCopied(true); +- setTimeout(() => setCopied(false), 1e3); +- }); +- }; - return (0, import_react34.createElement)("button", { type: "button", className: "bt-tool", "aria-label": copied ? t("Copied") : t("Copy"), title: copied ? t("Copied") : t("Copy"), onClick: copy2 }, copied ? (0, import_react34.createElement)(CheckIcon) : (0, import_react34.createElement)(CopyIcon)); -+ return (0, import_react49.createElement)("button", { type: "button", className: "bt-tool", "aria-label": copied ? t("Copied") : t("Copy"), title: copied ? t("Copied") : t("Copy"), onClick: copy2 }, copied ? (0, import_react49.createElement)(CheckIcon) : (0, import_react49.createElement)(CopyIcon)); - } +-} var clock3 = (time) => typeof time === "number" ? new Date(time).toLocaleTimeString(dateLocale(), { hour: "numeric", minute: "2-digit" }) : void 0; - function UserMessageCell({ node, sessionId, useRoster, actions, renderMessageImages, openFile, openSkill }) { +-function UserMessageCell({ node, sessionId, useRoster, actions, renderMessageImages, openFile, openSkill }) { ++function userBody({ text: text2, rest, roster, sessionId, incoming, author, referenceLabels, skillNames, references, actions, time }) { ++ if (text2 === "" && rest.length === 0) return null; ++ const folding = foldingOf(roster.prefs); ++ const card = text2 !== "" && showsDocumentCard(text2, folding); ++ const message = text2 === "" ? null : (0, import_react53.createElement)(FoldedContent, { text: text2, folding, actions, sessionId }, card ? void 0 : (shown) => (0, import_react53.createElement)(UserText, { ++ text: shown, ++ bots: mentionableBots(roster, sessionId, { fromFriend: Boolean(incoming && author.ownerName) }), ++ referenceLabels, ++ skillNames, ++ references, ++ actions ++ })); ++ if (card && rest.length === 0) return message; ++ return (0, import_react53.createElement)( ++ "div", ++ { className: "bt-ubody", title: clock3(time) }, ++ card ? null : message, ++ rest.map((block, index) => ui.JsonBlock ? (0, import_react53.createElement)(ui.JsonBlock, { key: index, label: t("Content"), payload: block }) : null), ++ card ? message : null ++ ); ++} ++function UserMessageCell({ node, sessionId, useRoster, useUi, actions, renderMessageImages, openFile, openSkill }) { const roster = useRoster((value) => value); const data = node.data ?? {}; - const { text, attachments, rest } = contentParts(data.content); @@ -27188,7 +28674,13 @@ diff --git a/client.js b/client.js + const person = incoming && author.authorKind === "human" && !author.ownerName; + const faceMine = Boolean(room2?.origin === "face-to-face" && !incoming); + const myName = faceMine ? facePeople(room2, roster).find((entry) => entry.mine)?.name || cleanPeerName(roster.self?.displayName, "") || author?.name || "" : ""; -+ return (0, import_react49.createElement)( ++ const reactKey = userMessageReactKey(sessionId, node); ++ const reactions = typeof useUi === "function" ? useUi((state) => reactKey ? state.reactions?.[reactKey] ?? null : null) : null; ++ const picked = reactions?.[0] ?? []; ++ const [contextAt, setContextAt] = (0, import_react53.useState)(null); ++ const react = reactKey && typeof actions?.toggleReaction === "function" ? (emoji) => actions.toggleReaction(reactKey, 0, emoji) : void 0; ++ const who = incoming ? author?.name || "message" : myName || t("You"); ++ return (0, import_react53.createElement)( "div", - { className: "bt-umsg", "data-steering": steering || void 0 }, - (0, import_react34.createElement)( @@ -27198,30 +28690,45 @@ diff --git a/client.js b/client.js + "data-face-mine": faceMine || void 0, + "data-author": author?.authorId, + "data-author-kind": author?.authorKind, -+ "data-author-name": author?.name ++ "data-author-name": author?.name, ++ onContextMenu: text2.trim() ? (event) => onMessageContextMenu(event, setContextAt) : void 0 + }, -+ person ? (0, import_react49.createElement)("span", { className: "bt-lead", title: author.name }, (0, import_react49.createElement)(PersonMark, { name: author.name })) : null, -+ faceMine ? (0, import_react49.createElement)("span", { className: "bt-lead", title: myName || void 0 }, (0, import_react49.createElement)(PersonMark, { name: myName || void 0 })) : null, -+ (0, import_react49.createElement)( ++ person ? (0, import_react53.createElement)("span", { className: "bt-lead", title: author.name }, (0, import_react53.createElement)(PersonMark, { name: author.name })) : null, ++ faceMine ? (0, import_react53.createElement)("span", { className: "bt-lead", title: myName || void 0 }, (0, import_react53.createElement)(PersonMark, { name: myName || void 0 })) : null, ++ (0, import_react53.createElement)( "div", { className: "bt-ustack" }, - attachments.length > 0 ? (0, import_react34.createElement)(Attachments, { attachments, renderMessageImages }) : null, - text !== "" || rest.length > 0 ? (0, import_react34.createElement)( -+ faceMine && myName ? (0, import_react49.createElement)("span", { className: "bt-uauthor" }, myName) : author && (incoming || multiHuman) ? (0, import_react49.createElement)("span", { className: "bt-uauthor" }, author.name, author.ownerName ? (0, import_react49.createElement)("span", { className: "bt-chip" }, t("Friend's Bot")) : null) : null, -+ attachments.length > 0 ? (0, import_react49.createElement)(Attachments, { attachments, renderMessageImages }) : null, -+ text2 !== "" || rest.length > 0 ? (0, import_react49.createElement)( - "div", - { className: "bt-ubody", title: clock3(data.time) }, +- "div", +- { className: "bt-ubody", title: clock3(data.time) }, - (0, import_react34.createElement)(UserText, { text, bots: mentionableBots(roster, sessionId), referenceLabels, skillNames: data.skillNames ?? [], references, actions }), - rest.map((block, index) => ui.JsonBlock ? (0, import_react34.createElement)(ui.JsonBlock, { key: index, label: t("Content"), payload: block }) : null) -+ (0, import_react49.createElement)(UserText, { text: text2, bots: mentionableBots(roster, sessionId, { fromFriend: Boolean(incoming && author.ownerName) }), referenceLabels, skillNames: data.skillNames ?? [], references, actions }), -+ rest.map((block, index) => ui.JsonBlock ? (0, import_react49.createElement)(ui.JsonBlock, { key: index, label: t("Content"), payload: block }) : null) - ) : null, +- ) : null, - referenceLabels.length > 0 ? (0, import_react34.createElement)("div", { className: "bt-urefs" }, t("Referenced {labels}", { labels: referenceLabels.join(t(", ")) })) : null -+ referenceLabels.length > 0 ? (0, import_react49.createElement)("div", { className: "bt-urefs" }, t("Referenced {labels}", { labels: referenceLabels.join(t(", ")) })) : null ++ faceMine && myName ? (0, import_react53.createElement)("span", { className: "bt-uauthor" }, myName) : author && (incoming || multiHuman) ? (0, import_react53.createElement)("span", { className: "bt-uauthor" }, author.name, author.ownerName ? (0, import_react53.createElement)("span", { className: "bt-chip" }, t("Friend's Bot")) : null) : null, ++ attachments.length > 0 ? (0, import_react53.createElement)(Attachments, { attachments, renderMessageImages }) : null, ++ userBody({ text: text2, rest, roster, sessionId, incoming, author, referenceLabels, skillNames: data.skillNames ?? [], references, actions, time: data.time }), ++ referenceLabels.length > 0 ? (0, import_react53.createElement)("div", { className: "bt-urefs" }, t("Referenced {labels}", { labels: referenceLabels.join(t(", ")) })) : null, ++ picked.length ? (0, import_react53.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react53.createElement)("button", { ++ key: emoji, ++ type: "button", ++ className: "bt-react", ++ "aria-label": t("Remove reaction {emoji}", { emoji }), ++ onClick: () => actions.toggleReaction(reactKey, 0, emoji) ++ }, emoji))) : null ), - text === "" ? null : (0, import_react34.createElement)("div", { className: "bt-utools" }, (0, import_react34.createElement)(CopyButton, { text })) -+ text2 === "" ? null : (0, import_react49.createElement)("div", { className: "bt-utools" }, (0, import_react49.createElement)(CopyButton, { text: text2 })) ++ (0, import_react53.createElement)(MessageTools, { ++ text: text2, ++ name: who, ++ sessionId, ++ react, ++ actions, ++ roster, ++ contextAt, ++ className: "bt-utools" ++ }) ); } var USER_MESSAGE_CSS = ` @@ -27238,7 +28745,14 @@ diff --git a/client.js b/client.js .bt-ubody a{color:inherit} .bt-umention{display:inline-flex;align-items:center;gap:3px;vertical-align:-3px;max-width:100%;padding:0 1px;border:0;background:none;color:inherit;font:inherit;font-weight:600;line-height:inherit;cursor:pointer;border-radius:6px;white-space:nowrap} .bt-umention:hover{text-decoration:underline;text-underline-offset:2px} -@@ -13216,42 +13216,125 @@ var USER_MESSAGE_CSS = ` +@@ -13212,46 +13212,131 @@ var USER_MESSAGE_CSS = ` + .bt-ufile-meta{font-size:12px;line-height:15px;color:var(--bt-ink-3);white-space:nowrap;overflow:hidden;text-overflow:ellipsis} + .bt-urefs{font-size:13px;line-height:18px;color:var(--bt-ink-3)} + .bt-utools{display:flex;flex:none;gap:2px;opacity:0;visibility:hidden;transition:opacity .12s ease,visibility .12s} +-.bt-umsg:hover .bt-utools,.bt-umsg:focus-within .bt-utools{opacity:1;visibility:visible} ++.bt-umsg:hover .bt-utools,.bt-umsg:focus-within .bt-utools,.bt-utools[data-open]{opacity:1;visibility:visible} ++.bt-umsg .bt-reacts{justify-content:flex-end} ++.bt-umsg-other .bt-reacts{justify-content:flex-start} `; // src/client/approval-notices.js @@ -27325,7 +28839,7 @@ diff --git a/client.js b/client.js +} + +// src/client/stats-dock.js -+var import_react50 = require("react"); ++var import_react54 = require("react"); +var STATS_DOCK = "conversation.composer.dock"; +var STATS_ID = "stats"; +var STATS_IDS = [STATS_ID, "activity"]; @@ -27341,17 +28855,17 @@ diff --git a/client.js b/client.js +function statsDock(entriesOf, id = STATS_ID) { + const shell = () => (entriesOf(STATS_DOCK) ?? []).find((entry) => entry?.component !== StatsDock && entry?.options?.id === id); + function StatsDock(props) { -+ const t2 = (0, import_react50.useMemo)(() => typeof props.t === "function" ? pluralStats(props.t) : props.t, [props.t]); ++ const t2 = (0, import_react54.useMemo)(() => typeof props.t === "function" ? pluralStats(props.t) : props.t, [props.t]); + const entry = shell(); + if (!entry || typeof props.usePerformanceUsage !== "function") return null; -+ return (0, import_react50.createElement)(entry.component, { ...props, t: t2 }); ++ return (0, import_react54.createElement)(entry.component, { ...props, t: t2 }); + } + return { component: StatsDock, inject: (...args) => shell()?.inject?.(...args) ?? {} }; +} +var statsDocks = (entriesOf) => STATS_IDS.map((id) => ({ id, ...statsDock(entriesOf, id) })); // src/client/index.js -+var import_react51 = require("react"); ++var import_react55 = require("react"); var inject = ["sessions", "uiWorkspace", "uiConversation", "slots", "theme", "layout"]; function apply(ctx) { + const flybot = createClientApi2(); @@ -27390,13 +28904,16 @@ diff --git a/client.js b/client.js + } catch { + friendLines = null; + } -+ const ui2 = createSource({ details: null, view: "details", renaming: false, tab: null, newChat: null, exchange: null, menu: null, voice: null, palette: null, quote: null, settings: null, remoteBotSettings: null, memory: null, toast: null, signIn: null, renameAgent: null, unread: savedUnread, reactions: savedReactions, visits: {} }); ++ const ui2 = createSource({ details: null, view: "details", document: null, renaming: false, tab: null, newChat: null, exchange: null, menu: null, voice: null, palette: null, quote: null, settings: null, remoteBotSettings: null, memory: null, toast: null, signIn: null, renameAgent: null, unread: savedUnread, reactions: savedReactions, visits: {} }); const surface = createSource({ mode: readMode(), plain: false }); let agentSessionCache = /* @__PURE__ */ new Set(); try { -@@ -13294,9 +13294,16 @@ function apply(ctx) { +@@ -13292,11 +13292,18 @@ function apply(ctx) { + }; + let expected = null; const setPlain = (plain) => surface.set((state) => state.plain === plain ? state : { ...state, plain }); - const dropPanels = () => ui2.set((state) => state.details || state.renaming ? { ...state, details: null, view: "details", renaming: false, tab: null } : state); +- const dropPanels = () => ui2.set((state) => state.details || state.renaming ? { ...state, details: null, view: "details", renaming: false, tab: null } : state); ++ const dropPanels = () => ui2.set((state) => state.details || state.renaming || state.document ? { ...state, details: null, view: "details", document: null, renaming: false, tab: null } : state); const seenKey = (id) => roster.getSnapshot().byId?.[id]?.id ?? id; + const visitTails = {}; const leaveVisits = (ids) => { @@ -27515,24 +29032,86 @@ diff --git a/client.js b/client.js return () => { offRoster(); offRegistry(); -@@ -13520,7 +13520,7 @@ function apply(ctx) { +@@ -13512,38 +13512,64 @@ function apply(ctx) { + const style = installStyles("", "theme"); + let key = ""; + let releaseTokens = null; +- const render = () => { ++ const originalDark = document.body.hasAttribute("data-ds-dark-theme"); ++ const prefsNow = () => { + const snapshot = roster.getSnapshot(); +- const prefs = snapshot.ready ? snapshot.prefs ?? {} : savedPrefs; ++ return { snapshot, prefs: snapshot.ready ? snapshot.prefs ?? {} : savedPrefs }; ++ }; ++ const applyDark = (force = false) => { ++ const { prefs } = prefsNow(); ++ const wanted = isDarkAppearance(prefs, /* @__PURE__ */ new Date(), systemDark()); ++ const current = document.body.hasAttribute("data-ds-dark-theme"); ++ if (wanted === current) return; ++ const busy = !force && document.body.querySelector('[data-bt-running], [data-session-running], [aria-busy="true"]'); ++ if (busy) return; ++ applyAppearanceAttribute(wanted); ++ }; ++ const render = () => { ++ const { snapshot, prefs } = prefsNow(); + const themes = allThemes(); +- const id = themes[prefs.theme] ? prefs.theme : "deepseek"; ++ const id = resolveThemeId(prefs, themes); const accent = isHex(prefs.accent) ? prefs.accent : void 0; const motion = prefs.motion === "quiet" || prefs.motion === "lively" ? prefs.motion : "normal"; ++ const appearance = appearanceOf(prefs); document.body.dataset.btMotion = motion; - const next = `${id}|${accent ?? ""}|${motion}|${registry.getSnapshot()}`; -+ const next = `${id}|${accent ?? ""}|${motion}|${registry3.getSnapshot()}`; - if (next === key) return; - key = next; - style.textContent = themeCss(themes[id], accent); -@@ -13536,7 +13536,7 @@ function apply(ctx) { +- if (next === key) return; +- key = next; +- style.textContent = themeCss(themes[id], accent); +- const release = releaseTokens; +- releaseTokens = ctx.theme.overrideTokens("ds-bot", shellTokens(themes[id])); +- if (typeof release === "function") release(); +- if (snapshot.ready) { +- try { +- localStorage.setItem(PREFS_KEY, JSON.stringify({ theme: prefs.theme, accent: prefs.accent, motion: prefs.motion })); +- } catch { ++ document.body.dataset.btAppearance = appearance.mode; ++ const next = `${id}|${accent ?? ""}|${motion}|${appearance.mode}|${appearance.auto}|${appearance.from}|${appearance.to}|${registry3.getSnapshot()}`; ++ const changed2 = next !== key; ++ if (changed2) { ++ key = next; ++ style.textContent = themeCss(themes[id], accent); ++ const release = releaseTokens; ++ releaseTokens = ctx.theme.overrideTokens("ds-bot", shellTokens(themes[id])); ++ if (typeof release === "function") release(); ++ if (snapshot.ready) { ++ try { ++ localStorage.setItem(PREFS_KEY, JSON.stringify(themePrefsRecord(prefs))); ++ } catch { ++ } + } + } ++ applyDark(changed2); }; render(); const offRoster = roster.subscribe(render); - const offRegistry = registry.subscribe(render); + const offRegistry = registry3.subscribe(render); ++ const media = typeof matchMedia === "function" ? matchMedia("(prefers-color-scheme: dark)") : null; ++ const onScheme = () => applyDark(); ++ media?.addEventListener?.("change", onScheme); ++ const tick = setInterval(() => applyDark(), 6e4); return () => { offRoster(); offRegistry(); ++ media?.removeEventListener?.("change", onScheme); ++ clearInterval(tick); ++ applyAppearanceAttribute(originalDark); + try { + if (typeof releaseTokens === "function") releaseTokens(); + } finally { + delete document.body.dataset.btMotion; ++ delete document.body.dataset.btAppearance; + style.remove(); + } + }; @@ -13588,6 +13588,7 @@ function apply(ctx) { // or the click appears to do nothing. isAgentSession: (id) => isAgentSessionId(id), @@ -27541,7 +29120,7 @@ diff --git a/client.js b/client.js if (isAgentSessionId(id)) return actions.openAgentSession(id); ui2.set((state) => state.newChat || state.exchange || state.menu || state.palette ? { ...state, newChat: null, exchange: null, menu: null, palette: null } : state); setPlain(false); -@@ -13653,18 +13653,31 @@ function apply(ctx) { +@@ -13653,21 +13653,36 @@ function apply(ctx) { }, // `last` is the Bot conversation the view held before it cleared: when that part // was archived for a fresh one, the view goes on in the fresh one. @@ -27576,9 +29155,51 @@ diff --git a/client.js b/client.js openNewChat: (mode) => { ui2.set((state) => ({ ...state, newChat: mode, menu: null, palette: null })); }, -@@ -13706,12 +13706,18 @@ function apply(ctx) { ++ searchMessages: (body, signal) => call("search-messages", body, signal), ++ readHistoryHit: (body, signal) => call("history-hit", body, signal), + openPalette: (query = "") => { + ui2.set((state) => ({ ...state, palette: { query, token: Date.now() }, newChat: null, menu: null })); + }, +@@ -13687,31 +13687,50 @@ function apply(ctx) { + toggleDetails: (id, force) => { + ui2.set((state) => { + const details = force || state.details !== id || state.view !== "details" ? id : null; +- return { ...state, renaming: false, tab: null, details, view: "details" }; ++ return { ...state, renaming: false, tab: null, details, view: "details", document: null }; + }); + }, ++ // A long-document card opens its full text in the side panel, beside the conversation. ++ openDocument: ({ title, text: text2, sessionId }) => { ++ const id = sessionId; ++ if (!id || text2 == null || String(text2) === "") return; ++ ui2.set((state) => ({ ++ ...state, ++ details: id, ++ view: "document", ++ document: { title: title || "Document", text: String(text2) }, ++ renaming: false, ++ tab: null ++ })); ++ }, + // The open panel follows the main view; a subject with no browser (a group + // chat, an outside Session) settles on the details view. + followPanel: (id) => { + ui2.set((state) => { + if (!state.details || state.details === id) return state; +- const view = state.view === "browser" && roster.getSnapshot().byId[id] === void 0 ? "details" : state.view; +- return { ...state, details: id, view, renaming: false, tab: null }; ++ const view = state.view === "browser" && roster.getSnapshot().byId[id] === void 0 ? "details" : state.view === "document" ? "details" : state.view; ++ return { ...state, details: id, view, document: view === "document" ? state.document : null, renaming: false, tab: null }; + }); + }, + showDetails: (id, tab = null) => { +- ui2.set((state) => ({ ...state, details: id, view: "details", renaming: false, tab })); ++ ui2.set((state) => ({ ...state, details: id, view: "details", document: null, renaming: false, tab })); + }, + // Opening the conversation would move focus to its composer and blur the name field. renameBot: (id) => { - ui2.set((state) => ({ ...state, details: id, view: "details", renaming: true, tab: null })); +- ui2.set((state) => ({ ...state, details: id, view: "details", renaming: true, tab: null })); ++ ui2.set((state) => ({ ...state, details: id, view: "details", document: null, renaming: true, tab: null })); }, - // `id` opens one Bot (page 'bots') or one group chat (page 'groups'). - openSettings: (page = "general", id = null) => { @@ -27624,7 +29245,7 @@ diff --git a/client.js b/client.js if (surface.getSnapshot().mode === mode) return; if (mode === "agent") { - ui2.set((state) => ({ ...state, details: null, view: "details", settings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, toast: null })); -+ ui2.set((state) => ({ ...state, details: null, view: "details", settings: null, remoteBotSettings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, inbox: null, board: null, toast: null })); ++ ui2.set((state) => ({ ...state, details: null, view: "details", document: null, settings: null, remoteBotSettings: null, palette: null, newChat: null, menu: null, voice: null, exchange: null, memory: null, inbox: null, board: null, toast: null })); } writeMode(mode); surface.set((state) => ({ ...state, mode })); @@ -27730,9 +29351,43 @@ diff --git a/client.js b/client.js dismissToast: (token) => ui2.set((state) => state.toast && (token === void 0 || state.toast.token === token) ? { ...state, toast: null } : state) }; if (browsers) { -@@ -13890,6 +13890,7 @@ function apply(ctx) { +@@ -13856,7 +13856,7 @@ function apply(ctx) { + if (!bot) return; + browsers.ensureTabs(bot.id); + if (browsers.tabs.getSnapshot()[bot.id]?.active == null) browsers.openTab(bot.id); +- ui2.set((state) => ({ ...state, details: id, view: "browser", renaming: false, tab: null })); ++ ui2.set((state) => ({ ...state, details: id, view: "browser", document: null, renaming: false, tab: null })); + }, + // '+' on the strip or the drawer's new-tab card: a blank tab in the browser view. + browserNewTab: (id) => { +@@ -13864,7 +13864,7 @@ function apply(ctx) { + if (!bot) return null; + browsers.ensureTabs(bot.id); + const tabId = browsers.openTab(bot.id); +- ui2.set((state) => ({ ...state, details: id, view: "browser", renaming: false, tab: null })); ++ ui2.set((state) => ({ ...state, details: id, view: "browser", document: null, renaming: false, tab: null })); + return tabId; + }, + // A drawer card: its tab active, the panel on the browser view. +@@ -13872,7 +13872,7 @@ function apply(ctx) { + const bot = roster.getSnapshot().byId[id]; + if (!bot) return; + browsers.activate(bot.id, tabId); +- ui2.set((state) => ({ ...state, details: id, view: "browser" })); ++ ui2.set((state) => ({ ...state, details: id, view: "browser", document: null })); + }, + browserEnsure: (botId) => browsers.ensureTabs(botId), + browserCloseTab: (botId, tabId) => browsers.closeTab(botId, tabId), +@@ -13885,11 +13885,12 @@ function apply(ctx) { + } + actions.setPanelView = (view) => { + if (view !== "details" && view !== "browser") return; +- ui2.set((state) => state.details && state.view !== view ? { ...state, view } : state); ++ ui2.set((state) => state.details && state.view !== view ? { ...state, view, document: view === "document" ? state.document : null } : state); + }; actions.closePanel = () => { - ui2.set((state) => state.details ? { ...state, details: null, view: "details", renaming: false, tab: null } : state); +- ui2.set((state) => state.details ? { ...state, details: null, view: "details", renaming: false, tab: null } : state); ++ ui2.set((state) => state.details ? { ...state, details: null, view: "details", document: null, renaming: false, tab: null } : state); }; + actions.flybotSlotEntries = (name) => ctx.slots.entries?.(name) ?? []; actions.signInEntry = () => ctx.slots.entries?.("settings.models.sign-in")?.[0] ?? null; @@ -27809,7 +29464,7 @@ diff --git a/client.js b/client.js actions.referenceChat = (sessionId, span) => { const controller = atMenu?.controllerOf(sessionId); if (controller === void 0 || span === void 0) return; -@@ -14019,33 +14019,51 @@ function apply(ctx) { +@@ -14019,33 +14019,53 @@ function apply(ctx) { installCompiledStyles(SHELL_CSS, "shell"), installCompiledStyles(SIDEBAR_CSS, "sidebar"), installCompiledStyles(SECRET_CSS, "secrets"), @@ -27824,6 +29479,7 @@ diff --git a/client.js b/client.js + installCompiledStyles(FLYBOT_CSS, "flybot"), installCompiledStyles(MEMBER_CSS, "members"), installCompiledStyles(USER_MESSAGE_CSS, "user-messages"), ++ installCompiledStyles(PARITY_SHELL_CSS, "parity-shell"), + installCompiledStyles(MOBILE_CSS, "mobile"), + installCompiledStyles(PANE_MIN_WIDTH_CSS, "panes"), + installCompiledStyles(PROJECT_BOARD_CSS, "project-board"), @@ -27854,6 +29510,7 @@ diff --git a/client.js b/client.js ]; const installConversation = () => [ installCompiledStyles(CONVERSATION_CSS, "conversation"), ++ installCompiledStyles(PARITY_SHELL_CSS, "parity-shell-conversation"), installMentions(), installAtMenu(), - shadow("conversation.session.header", { priority: -10, inject: face }, HeaderPill), @@ -27893,7 +29550,7 @@ diff --git a/client.js b/client.js shadow("conversation.input.right", { id: "bot-voice", order: 100, inject: face }, ComposerVoice), shadow("conversation.composer", { priority: -10, -@@ -14074,8 +14074,17 @@ function apply(ctx) { +@@ -14074,12 +14074,22 @@ function apply(ctx) { shadow("conversation.input.dock", { id: "bot-members", order: -120, inject: face }, MemberDock), shadow("conversation.input.dock", { id: "bot-model", order: -110, inject: face }, ModelChoiceDock), shadow("conversation.input.dock", { id: "bot-question", order: -100, inject: face }, QuestionDock), @@ -27903,7 +29560,7 @@ diff --git a/client.js b/client.js ]; + ctx.effect(() => { + const style = installStyles(TURN_FAILURES_CSS, "turn-failures"); -+ const off = registry().register("flybot.session.dock", { id: "flybot-turn-failures", order: 20, component: (props) => (0, import_react51.createElement)(TurnFailures, { ...props, work }) }); ++ const off = registry().register("flybot.session.dock", { id: "flybot-turn-failures", order: 20, component: (props) => (0, import_react55.createElement)(TurnFailures, { ...props, work }) }); + return () => { + off(); + style.remove(); @@ -27912,3 +29569,8 @@ diff --git a/client.js b/client.js ctx.effect(() => { const style = installStyles(RETURN_CSS, "return"); return () => style.remove(); + }, "ds-bot: return styles"); ++ ctx.effect(() => installSendShortcut(roster), "ds-bot: send shortcut"); + shadow("sidebar.footer.action", { id: "bot-return", order: -300, inject: face }, BotReturn); + ctx.effect(() => { + let previous; diff --git a/patches/ds-bot/0012-room-membership.patch b/patches/ds-bot/0012-room-membership.patch index b4df76998..84fbd24c3 100644 --- a/patches/ds-bot/0012-room-membership.patch +++ b/patches/ds-bot/0012-room-membership.patch @@ -3,7 +3,14 @@ FlyBot patch 0012-room-membership on Fei2411/DeepSeek-Bot@2b10c70 (ds-bot/). Gen diff --git a/src/client/api.js b/src/client/api.js --- a/src/client/api.js +++ b/src/client/api.js -@@ -9,10 +9,15 @@ export const call = async (endpoint, payload, signal) => { +@@ -3,16 +3,21 @@ import { markNoted, noteClientError } from './diagnostics.js' + + const ROUTE = 'api/bot' + // Refusals carry a message meant for the user, who sees it where they acted. +-const REFUSALS = new Set(['bot/refused', 'bot/invalid', 'bot/read-only', 'bot/not-found', 'bot/browser-off']) ++const REFUSALS = new Set(['bot/history-unavailable', 'bot/search-unavailable', 'bot/refused', 'bot/invalid', 'bot/read-only', 'bot/not-found', 'bot/browser-off']) + + export const call = async (endpoint, payload, signal) => { let response try { // Document-relative so the Web UI keeps working under a mounted base path. @@ -37,7 +44,7 @@ diff --git a/src/client/api.js b/src/client/api.js diff --git a/src/client/composer.js b/src/client/composer.js --- a/src/client/composer.js +++ b/src/client/composer.js -@@ -1,9 +1,10 @@ +@@ -1,9 +1,14 @@ import { createElement as h, Fragment, useEffect, useRef, useState } from 'react' import { createPortal } from 'react-dom' import { ChatsIcon, ClockIcon, MicIcon, PaperclipIcon, PeopleIcon, PlusIcon, WaveIcon } from './icons.js' @@ -46,9 +53,43 @@ diff --git a/src/client/composer.js b/src/client/composer.js import { useLinger } from './motion.js' import { t } from './i18n.js' +import { lockedWindow } from './schedules.js' ++import { ++ composerCardOf, composerFieldOf, findSendButton, handleComposerSendKey, ++ insertComposerNewline, sendKeyOf, ++} from './appearance.js' // ------------------------------------------------------------------------- // Composer: dictation mic and the voice-chat button. The shell's send +@@ -13,6 +13,29 @@ import { t } from './i18n.js' + export const speechApi = () => window.SpeechRecognition ?? window.webkitSpeechRecognition + const keepComposerFocus = event => event.preventDefault() + ++// The shell's composer sends on Enter. When the team chose Shift+Enter to send, ++// this capture-phase listener flips that: Enter inserts a newline, Shift+Enter ++// presses the card's send button. The default Enter-to-send path is left alone. ++export function installSendShortcut(useRoster) { ++ const onKey = (event) => { ++ if (event.defaultPrevented) return ++ const field = composerFieldOf(event) ++ if (!field) return ++ const card = composerCardOf(field) ++ if (!card) return ++ const snapshot = useRoster?.getSnapshot?.() ++ if (lockedWindow(snapshot) || field.disabled || field.readOnly || field.getAttribute?.('aria-readonly') === 'true') return ++ const prefs = snapshot?.prefs ?? {} ++ handleComposerSendKey(event, sendKeyOf(prefs), { ++ send: () => { const button = findSendButton(card); if (button && !button.disabled && button.getAttribute?.('aria-disabled') !== 'true') button.click() }, ++ insertNewline: () => insertComposerNewline(field), ++ }) ++ } ++ window.addEventListener('keydown', onKey, true) ++ return () => window.removeEventListener('keydown', onKey, true) ++} ++ ++ + export function useDictation(onText) { + const [listening, setListening] = useState(false) + const [note, setNote] = useState('') @@ -53,6 +53,20 @@ export function useDictation(onText) { return { listening, note, start, stop } } @@ -100,12 +141,27 @@ diff --git a/src/client/composer.js b/src/client/composer.js // The chats open in the shell's "@" menu at the caret, so the pick lands where the // user was typing. const reference = () => { -@@ -153,5 +153,5 @@ export function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { +@@ -151,7 +151,18 @@ export function ComposerPlus({ sessionId, inputActions, useRoster, actions }) { + ref: menu, className: 'bt-menu bt-menu-up bt-plus-menu', role: 'menu', 'aria-label': t('Add'), + style: { left: shown.left, bottom: shown.bottom }, 'data-leaving': leaving || undefined, }, - h('button', { type: 'button', role: 'menuitem', onClick: attach }, h(PaperclipIcon), h('span', { className: 'bt-menu-label' }, t('Add files'))), - canReference ? h('button', { type: 'button', role: 'menuitem', onMouseDown: keepComposerFocus, onClick: reference }, h(ChatsIcon), h('span', { className: 'bt-menu-label' }, t('Reference a chat'))) : null, +- h('button', { type: 'button', role: 'menuitem', onClick: attach }, h(PaperclipIcon), h('span', { className: 'bt-menu-label' }, t('Add files'))), +- canReference ? h('button', { type: 'button', role: 'menuitem', onMouseDown: keepComposerFocus, onClick: reference }, h(ChatsIcon), h('span', { className: 'bt-menu-label' }, t('Reference a chat'))) : null, - h('button', { type: 'button', role: 'menuitem', onClick: schedule }, h(ClockIcon), h('span', { className: 'bt-menu-label' }, t('Scheduled task')))), document.body) : null) -+ locked ? null : h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(null); actions.openSettings('schedules', target) } }, h(ClockIcon), h('span', { className: 'bt-menu-label' }, t('Scheduled task')))), document.body) : null) ++ h('div', { className: 'bt-plus-group', role: 'group', 'aria-label': t('Attach') }, ++ h('button', { type: 'button', role: 'menuitem', onClick: attach }, h(PaperclipIcon), h('span', { className: 'bt-menu-label' }, t('Add files')))), ++ h('div', { className: 'bt-plus-group', role: 'group', 'aria-label': t('Reference a chat') }, ++ canReference ++ ? h('button', { type: 'button', role: 'menuitem', onMouseDown: keepComposerFocus, onClick: reference }, h(ChatsIcon), h('span', { className: 'bt-menu-label' }, t('Reference a chat'))) ++ : h('button', { type: 'button', role: 'menuitem', disabled: true, title: t('Reference a chat is available in a Bot or group chat.') }, ++ h(ChatsIcon), h('span', { className: 'bt-menu-label' }, t('Reference a chat')), ++ h('span', { className: 'bt-menu-hint' }, t('Reference a chat is available in a Bot or group chat.')))), ++ h('div', { className: 'bt-plus-group', role: 'group', 'aria-label': t('Scheduled tasks') }, ++ locked ++ ? h('button', { type: 'button', role: 'menuitem', disabled: true, title: t('A read-only window cannot create a scheduled task.') }, ++ h(ClockIcon), h('span', { className: 'bt-menu-label' }, t('Scheduled task')), ++ h('span', { className: 'bt-menu-hint' }, t('A read-only window cannot create a scheduled task.'))) ++ : h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(null); actions.openSettings('schedules', target) } }, h(ClockIcon), h('span', { className: 'bt-menu-label' }, t('Scheduled task'))))), document.body) : null) } diff --git a/src/client/details-drawer.js b/src/client/details-drawer.js --- a/src/client/details-drawer.js @@ -490,11 +546,12 @@ diff --git a/src/client/details-drawer.js b/src/client/details-drawer.js diff --git a/src/client/group-settings.js b/src/client/group-settings.js --- a/src/client/group-settings.js +++ b/src/client/group-settings.js -@@ -1,11 +1,16 @@ +@@ -1,11 +1,17 @@ import { createElement as h, useEffect, useState } from 'react' import { isMainOf } from './sources.js' - import { PlusIcon, ChevronRightIcon } from './icons.js' +-import { PlusIcon, ChevronRightIcon } from './icons.js' -import { AdminStar, BotAvatar, BotMark, RoomAvatar } from './mark.js' ++import { PlusIcon, ChevronRightIcon, SearchIcon } from './icons.js' +import { AdminStar, BotAvatar, BotMark, PersonMark, RoomAvatar, lookAvoidingLocals, lookBotForRemote, lookKey, lookOf } from './mark.js' +import { setLocalBots } from './characters.js' import { Card, Row, InlineText, SwitchRow } from './bot-settings.js' @@ -505,7 +562,8 @@ diff --git a/src/client/group-settings.js b/src/client/group-settings.js +import { hostText, t } from './i18n.js' +import { StandingApprovalsCard } from './standing-approvals.js' +import { FlyBotRoomMembers } from './flybot-slots.js' -+import { remoteBotName, remoteBotTitle } from '../shared/remote-label.js' ++import { listedChatBots, pickerBotLabel, remoteBotName, remoteBotTitle, splitRoomPicks } from '../shared/remote-label.js' ++import { canCreateGroup, groupMemberMatches } from '../shared/group-create.js' export const ROOM_MODES = [ ['admin', 'Admin leads', 'Plain messages go to the admin, who calls others with @Name.'], @@ -801,35 +859,180 @@ diff --git a/src/client/group-settings.js b/src/client/group-settings.js h('button', { type: 'button', className: 'bt-set-row bt-bs-row bt-bs-danger', 'data-confirm': confirming || undefined, onClick: remove }, h('span', { className: 'bt-set-copy' }, h('span', { className: 'bt-bs-label' }, confirming ? t('Delete {name}?', { name: room.name }) : t('Delete group')), -@@ -112,11 +112,14 @@ export function NewGroupForm({ roster, actions, run, onCreated, onCancel }) { +@@ -103,46 +103,141 @@ export function GroupSettingsForm({ room, roster, actions, run, onDeleted }) { + h('span', { className: 'bt-chevron' }, h(ChevronRightIcon))))) + } + +-// A new group chat from Settings: its admin first, then the other members, then a name +-// if the member names will not do. ++// A new group chat from Settings: optional name, searchable member list, selected pane, ++// and Create disabled until a local admin and one more member are picked. + export function NewGroupForm({ roster, actions, run, onCreated, onCancel }) { + const [admin, setAdmin] = useState(null) + const [members, setMembers] = useState([]) + const [name, setName] = useState('') ++ const [query, setQuery] = useState('') const [busy, setBusy] = useState(false) - const toggle = id => setMembers(list => (list.includes(id) ? list.filter(item => item !== id) : [...list, id])) - const pickAdmin = (id) => { setAdmin(id); setMembers(list => list.filter(item => item !== id)) } +- const toggle = id => setMembers(list => (list.includes(id) ? list.filter(item => item !== id) : [...list, id])) +- const pickAdmin = (id) => { setAdmin(id); setMembers(list => list.filter(item => item !== id)) } + // A read-only window keeps the pickers as a preview and offers no create: the host could only + // answer `bot/read-only` after the press (#2307's form, P-570). + const locked = lockedWindow(roster) ++ const bots = listedChatBots(roster) ++ const selectedIds = admin === null ? members : [admin, ...members] ++ const selected = selectedIds.map(id => roster.byId[id]).filter(Boolean) ++ const available = bots.filter(bot => !selectedIds.includes(bot.id) && groupMemberMatches(bot, query)) ++ const ready = canCreateGroup(admin, members) ++ const add = (bot) => { ++ if (admin === null && !bot.remote) { setAdmin(bot.id); return } ++ setMembers(list => list.includes(bot.id) ? list : [...list, bot.id]) ++ } ++ const remove = (id) => { ++ if (id === admin) { ++ const nextAdmin = members.find(other => !roster.byId[other]?.remote) ?? null ++ setAdmin(nextAdmin) ++ setMembers(list => list.filter(item => item !== nextAdmin)) ++ return ++ } ++ setMembers(list => list.filter(item => item !== id)) ++ } ++ const pickAdmin = (id) => { ++ if (id === admin || roster.byId[id]?.remote) return ++ setMembers(list => { ++ const without = list.filter(item => item !== id) ++ return admin === null ? without : [...without, admin] ++ }) ++ setAdmin(id) ++ } const create = async () => { - if (busy || admin === null || members.length === 0) return -+ if (locked || busy || admin === null || members.length === 0) return ++ if (locked || busy || !ready) return setBusy(true) let room - const done = await run(actions.createRoom([admin, ...members], { admin, greet: true, ...(name.trim() ? { name: name.trim() } : {}) }).then((value) => { room = value })) -+ const done = await run(actions.createRoom([admin, ...members], { admin, ...(name.trim() ? { name: name.trim() } : {}) }).then((value) => { room = value })) ++ const { members: localIds, remotes } = splitRoomPicks(roster, [admin, ...members]) ++ const participants = remotes.length === 0 ? undefined : [ ++ ...localIds.map(id => ({ kind: 'bot', id, role: id === admin ? 'admin' : 'member' })), ++ ...remotes, ++ ] ++ const done = await run(actions.createRoom(localIds, { ++ admin, ++ ...(name.trim() ? { name: name.trim() } : {}), ++ ...(participants ? { participants } : {}), ++ }).then((value) => { room = value })) if (done && room) onCreated(room) else setBusy(false) } -@@ -137,7 +137,9 @@ export function NewGroupForm({ roster, actions, run, onCreated, onCancel }) { - h('input', { className: 'bt-bs-input', value: name, maxLength: 60, placeholder: t('Name after members'), onChange: event => setName(event.target.value) })), +- const chip = (bot, on, onClick, role) => h('button', { +- key: bot.id, type: 'button', role, className: 'bt-ng-chip', 'aria-checked': on, onClick, +- }, h(BotAvatar, { bot, size: 22, badge: false, live: false }), h('span', { className: 'bt-ng-name' }, bot.name), on && role === 'radio' ? h(AdminStar) : null) ++ const pickRow = (bot, selectedRow) => h('button', { ++ key: bot.id, type: 'button', className: selectedRow ? 'bt-ng-pick bt-ng-pick-on' : 'bt-ng-pick', ++ 'data-bot-id': bot.id, ++ role: selectedRow ? (bot.id === admin ? 'radio' : 'checkbox') : 'option', ++ 'aria-checked': selectedRow ? true : undefined, ++ onClick: () => { selectedRow ? remove(bot.id) : add(bot) }, ++ }, ++ h(BotAvatar, { bot, size: 22, badge: false, live: false }), ++ h('span', { className: 'bt-ng-name' }, pickerBotLabel(bot)), ++ selectedRow && bot.id === admin ? h(AdminStar) : null, ++ selectedRow && bot.id !== admin && !bot.remote ++ ? h('span', { ++ className: 'bt-ng-make-admin', role: 'button', tabIndex: 0, ++ 'aria-label': t('Make admin'), ++ onClick: (event) => { event.preventDefault(); event.stopPropagation(); pickAdmin(bot.id) }, ++ onKeyDown: (event) => { ++ if (event.key === 'Enter' || event.key === ' ') { event.preventDefault(); event.stopPropagation(); pickAdmin(bot.id) } ++ }, ++ }, h(AdminStar)) ++ : null) ++ const availHint = bots.every(bot => selectedIds.includes(bot.id)) ++ ? t('No more Bots to add') ++ : t('No Bots match') + return h('div', { className: 'bt-set-card bt-ng' }, +- h('div', { className: 'bt-set-row bt-bs-row bt-bs-stack' }, +- h('span', { className: 'bt-set-copy' }, h('span', { className: 'bt-bs-label bt-ng-label' }, h(AdminStar), t('Choose the group admin'))), +- h('div', { className: 'bt-ng-picks', role: 'radiogroup', 'aria-label': t('Group admin') }, +- roster.bots.map(bot => chip(bot, admin === bot.id, () => pickAdmin(bot.id), 'radio')))), +- admin === null ? null : h('div', { className: 'bt-set-row bt-bs-row bt-bs-stack bt-ng-step' }, +- h('span', { className: 'bt-set-copy' }, h('span', { className: 'bt-bs-label' }, t('Who to chat with…'))), +- h('div', { className: 'bt-ng-picks', role: 'group', 'aria-label': t('Members') }, +- roster.bots.filter(bot => bot.id !== admin).map(bot => chip(bot, members.includes(bot.id), () => toggle(bot.id), 'checkbox')))), +- admin === null || members.length === 0 ? null : h('label', { className: 'bt-set-row bt-bs-row bt-ng-step' }, +- h('span', { className: 'bt-set-copy' }, h('span', { className: 'bt-bs-label' }, t('Name'))), +- h('input', { className: 'bt-bs-input', value: name, maxLength: 60, placeholder: t('Name after members'), onChange: event => setName(event.target.value) })), ++ h('p', { className: 'bt-ng-intro' }, t('Add a name, then pick Bots to chat with.')), ++ h('label', { className: 'bt-ng-name-row' }, ++ h('span', { className: 'bt-ng-name-label' }, t('Group name')), ++ h('input', { ++ className: 'bt-ng-name-input', value: name, maxLength: 60, ++ placeholder: t('Group name (optional)'), ++ 'aria-label': t('Group name'), ++ onChange: event => setName(event.target.value), ++ })), ++ h('div', { className: 'bt-ng-split' }, ++ h('div', { className: 'bt-ng-col' }, ++ h('label', { className: 'bt-ng-search' }, ++ h(SearchIcon), ++ h('input', { ++ className: 'bt-ng-search-input', type: 'search', value: query, ++ placeholder: t('Search'), 'aria-label': t('Search members'), ++ onChange: event => setQuery(event.target.value), ++ })), ++ available.length === 0 ++ ? h('div', { className: 'bt-ng-empty' }, availHint) ++ : h('div', { className: 'bt-ng-list', role: 'listbox', 'aria-label': t('Members') }, ++ available.map(bot => pickRow(bot, false)))), ++ h('div', { className: 'bt-ng-col' }, ++ h('div', { className: 'bt-ng-sel-head' }, t('Selected {count}', { count: selected.length })), ++ selected.length === 0 ++ ? h('div', { className: 'bt-ng-empty' }, t('No members selected')) ++ : h('div', { className: 'bt-ng-list', role: 'group', 'aria-label': t('Selected members') }, ++ selected.map(bot => pickRow(bot, true))))), h('div', { className: 'bt-set-row bt-task-foot' }, h('button', { type: 'button', className: 'bt-soft bt-soft-sm', onClick: onCancel }, t('Cancel')), - h('button', { type: 'button', className: 'bt-send bt-soft-sm', disabled: busy || admin === null || members.length === 0, onClick: () => void create() }, t('Create group chat')))) + locked + ? h('div', { className: 'bt-hint bt-read-only', role: 'status' }, hostText(roster.readOnly)) -+ : h('button', { type: 'button', className: 'bt-send bt-soft-sm', disabled: busy || admin === null || members.length === 0, onClick: () => void create() }, t('Create group chat')))) ++ : h('button', { type: 'button', className: 'bt-send bt-soft-sm', disabled: busy || !ready, onClick: () => void create() }, t('Create group chat')))) } export const GROUP_SETTINGS_CSS = ` -@@ -157,6 +157,15 @@ export const GROUP_SETTINGS_CSS = ` +-.bt-ng{animation:bt-q-in .4s cubic-bezier(.22,1,.36,1),bt-veil-in .2s ease-out} +-.bt-ng-step{animation:bt-veil-in .22s ease-out} ++.bt-ng{padding:16px 16px 8px;animation:bt-q-in .4s cubic-bezier(.22,1,.36,1),bt-veil-in .2s ease-out} ++.bt-ng-intro{margin:0 0 14px;color:var(--bt-ink-2);font-size:13px;line-height:18px} ++.bt-ng-name-row{display:flex;align-items:center;gap:12px;margin:0 0 12px} ++.bt-ng-name-label{flex:none;min-width:4.5em;font-size:13px;color:var(--bt-ink)} ++.bt-ng-name-input{flex:1;min-width:0;height:36px;box-sizing:border-box;padding:0 12px;border:.5px solid var(--bt-line-2);border-radius:10px;background:var(--bt-main);color:var(--bt-ink);font:inherit;font-size:13px;outline:none} ++.bt-ng-name-input::placeholder{color:var(--bt-ink-3)} ++.bt-ng-split{display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:10px;min-height:220px;margin:0 0 8px} ++.bt-ng-col{display:flex;flex-direction:column;min-width:0;min-height:220px;border:.5px solid var(--bt-line);border-radius:12px;background:var(--bt-main);overflow:hidden} ++.bt-ng-search{display:flex;align-items:center;gap:8px;margin:8px;padding:0 10px;height:32px;border-radius:999px;background:var(--bt-card);border:.5px solid var(--bt-line-2);color:var(--bt-ink-2)} ++.bt-ng-search svg{flex:none;width:14px;height:14px} ++.bt-ng-search-input{flex:1;min-width:0;border:0;background:none;color:var(--bt-ink);font:inherit;font-size:13px;outline:none} ++.bt-ng-sel-head{display:flex;align-items:center;min-height:32px;margin:8px 12px 0;color:var(--bt-ink-2);font-size:13px} ++.bt-ng-list{flex:1;overflow:auto;padding:4px 8px 8px;display:flex;flex-direction:column;gap:2px} ++.bt-ng-empty{flex:1;display:flex;align-items:center;justify-content:center;padding:16px;color:var(--bt-ink-3);font-size:13px;text-align:center} ++.bt-ng-pick{display:flex;align-items:center;gap:8px;width:100%;border:0;background:none;color:inherit;font:inherit;font-size:13px;padding:6px 8px;border-radius:8px;cursor:pointer;text-align:left} ++.bt-ng-pick:hover{background:var(--bt-hover)} ++.bt-ng-pick-on{background:var(--bt-card)} ++.bt-ng-make-admin{display:inline-flex;margin-left:auto;padding:2px;border-radius:999px;color:var(--bt-ink-3)} ++.bt-ng-make-admin:hover{color:var(--bt-ink);background:var(--bt-hover)} ++.bt-ng-pick-on>.bt-admin-star{margin-left:auto} ++.bt-ng-name{max-width:160px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} + .bt-ng-label{display:inline-flex;align-items:center;gap:6px} + .bt-ng-picks{display:flex;flex-wrap:wrap;gap:6px} + .bt-ng-chip{display:inline-flex;align-items:center;gap:6px;height:32px;padding:0 10px 0 5px;border-radius:999px;border:.5px solid var(--bt-line);background:var(--bt-card);color:var(--bt-ink-2);font:inherit;font-size:13px;cursor:pointer;transition:background-color .12s ease,color .12s ease,border-color .12s ease,scale .3s cubic-bezier(.34,1.56,.64,1)} +@@ -150,13 +150,21 @@ export const GROUP_SETTINGS_CSS = ` + .bt-ng-chip:active{scale:.96} + .bt-ng-chip[aria-checked=true]{background:var(--bt-active);border-color:var(--bt-line-2);color:var(--bt-ink)} + .bt-ng-chip .bt-admin-star{animation:bt-check-pop .4s cubic-bezier(.34,1.56,.64,1)} +-.bt-ng-name{max-width:140px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +-@media (prefers-reduced-motion:reduce){.bt-ng,.bt-ng-step,.bt-ng-chip .bt-admin-star{animation:none}} ++@media (prefers-reduced-motion:reduce){.bt-ng,.bt-ng-chip .bt-admin-star{animation:none}} + .bt-gs-member{gap:8px} + .bt-gs-who{flex:1;display:flex;align-items:center;gap:8px;min-width:0;padding:0;border:0;background:none;color:inherit;font:inherit;text-align:left;cursor:pointer} .bt-gs-who .bt-row-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .bt-gs-who:hover .bt-row-title{text-decoration:underline;text-underline-offset:2px} .bt-gs-add{gap:8px;color:var(--bt-ink-2)} @@ -848,12 +1051,13 @@ diff --git a/src/client/group-settings.js b/src/client/group-settings.js diff --git a/src/client/header.js b/src/client/header.js --- a/src/client/header.js +++ b/src/client/header.js -@@ -1,11 +1,15 @@ +@@ -1,11 +1,17 @@ import { createElement as h, Fragment, useEffect, useLayoutEffect, useRef, useState } from 'react' import { createPortal } from 'react-dom' -import { currentPart, latestMemoryChange } from './text.js' +-import { ArrowUpIcon, CloseIcon, ArrowDownIcon, MemoryIcon } from './icons.js' +import { currentPart, faceRowTitle, latestMemoryChange } from './text.js' - import { ArrowUpIcon, CloseIcon, ArrowDownIcon, MemoryIcon } from './icons.js' ++import { ArrowUpIcon, CloseIcon, ArrowDownIcon, DotsIcon, GearIcon, MemoryIcon, ShareIcon, SearchIcon, UnreadIcon, PinIcon } from './icons.js' import { botState, BotAvatar, RoomAvatar } from './mark.js' +import { clockLabel, movedOnSince, openingTurn, unseenSince } from './cells.js' import { ActivityIndicator } from './activity-row.js' @@ -863,14 +1067,93 @@ diff --git a/src/client/header.js b/src/client/header.js +import { call } from './api.js' +import { ProjectAgentEntry, projectAgentFor } from './project-board.js' +import { friendBotTitle, roomTitle } from '../shared/remote-label.js' ++import { isManuallyUnread, unreadEntryId } from '../shared/session-unread.js' ++import { canPinSession, sessionPinned } from '../shared/session-pin.js' // ------------------------------------------------------------------------- // Conversation header -@@ -42,7 +42,7 @@ function MemoryNotice({ shown }) { +@@ -42,7 +42,84 @@ function MemoryNotice({ shown }) { h('span', { className: 'bt-pill-mem-in', ref: inner }, h('span', { className: 'bt-pill-mem-ico' }, h(MemoryIcon)), label)) } -export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSession, useActivity, useMemoryNews, useTurnClock, useUi, useLive, actions }) { ++function SessionOverflow({ sessionId, roster, actions, unread }) { ++ const [open, setOpen] = useState(false) ++ const [note, setNote] = useState('') ++ const button = useRef(null) ++ const menu = useRef(null) ++ const [box, setBox] = useState(null) ++ const bot = roster.byId?.[sessionId] ++ const targetId = unreadEntryId(roster, sessionId) ++ const marked = isManuallyUnread(unread, targetId) ++ const social = typeof globalThis !== 'undefined' ? globalThis.__flybot__?.social : undefined ++ const canInvite = Boolean(bot && !bot.remote && typeof social?.createInvite === 'function' && social.canInvite?.(bot.id) !== false) ++ useEffect(() => { ++ if (!open) return undefined ++ const onDown = (event) => { ++ if ([button.current, menu.current].some(node => node?.contains(event.target))) return ++ setOpen(false) ++ } ++ const onKey = (event) => { if (event.key === 'Escape') { event.stopPropagation(); setOpen(false); button.current?.focus() } } ++ window.addEventListener('mousedown', onDown) ++ window.addEventListener('keydown', onKey, true) ++ return () => { window.removeEventListener('mousedown', onDown); window.removeEventListener('keydown', onKey, true) } ++ }, [open]) ++ useEffect(() => { ++ if (!note) return undefined ++ const timer = setTimeout(() => setNote(''), 2400) ++ return () => clearTimeout(timer) ++ }, [note]) ++ const toggle = () => { ++ const rect = button.current?.getBoundingClientRect() ++ if (rect) setBox({ right: window.innerWidth - rect.right, top: rect.bottom + 6 }) ++ setOpen(value => !value) ++ setNote('') ++ } ++ const openDetails = () => { setOpen(false); actions.toggleDetails(sessionId) } ++ const copyInvite = async () => { ++ try { ++ const invite = await social.createInvite(bot.id) ++ const link = invite?.link ?? invite?.url ?? invite?.text ++ if (!link) throw new Error('missing link') ++ await navigator.clipboard.writeText(link) ++ setNote(t('Invite link copied')) ++ } catch { ++ setNote(t('Could not copy the invite link')) ++ } ++ } ++ return h(Fragment, null, ++ h('div', { className: 'bt-head-actions' }, ++ typeof actions?.openPalette === 'function' ++ ? h('button', { ++ type: 'button', className: 'bt-head-more', 'aria-label': t('Search'), title: t('Search'), ++ onClick: () => actions.openPalette(), ++ }, h(SearchIcon)) ++ : null, ++ h('button', { ++ ref: button, type: 'button', className: 'bt-head-more', 'aria-label': t('Conversation settings'), ++ title: t('Conversation settings'), 'aria-haspopup': 'menu', 'aria-expanded': open, onClick: toggle, ++ }, h(DotsIcon))), ++ open && box ? createPortal(h('div', { ++ ref: menu, className: 'bt-menu bt-head-menu', role: 'menu', 'aria-label': t('Conversation settings'), ++ style: { right: box.right, top: box.top }, ++ }, ++ h('button', { type: 'button', role: 'menuitem', onClick: openDetails }, h(GearIcon), h('span', { className: 'bt-menu-label' }, t('Conversation settings'))), ++ typeof actions?.openPalette === 'function' ++ ? h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(false); actions.openPalette() } }, h(SearchIcon), h('span', { className: 'bt-menu-label' }, t('Search'))) ++ : null, ++ marked ++ ? h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(false); actions.clearUnread?.(targetId) } }, h(UnreadIcon), h('span', { className: 'bt-menu-label' }, t('Clear unread mark'))) ++ : h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(false); actions.markUnread?.(targetId) } }, h(UnreadIcon), h('span', { className: 'bt-menu-label' }, t('Mark as Unread'))), ++ canPinSession(roster, sessionId) && typeof actions?.setFlags === 'function' ++ ? h('button', { type: 'button', role: 'menuitem', onClick: () => { setOpen(false); void Promise.resolve(actions.setFlags(sessionId, { pinned: !sessionPinned(roster, sessionId) })).catch(error => actions.reportError?.(error, 'menu')) } }, h(PinIcon), h('span', { className: 'bt-menu-label' }, sessionPinned(roster, sessionId) ? t('Unpin') : t('Pin'))) ++ : null, ++ canInvite ++ ? h('button', { type: 'button', role: 'menuitem', onClick: () => { void copyInvite() } }, h(ShareIcon), h('span', { className: 'bt-menu-label' }, t('Copy invite link'))) ++ : null, ++ note ? h('div', { className: 'bt-menu-hint', role: 'status' }, note) : null), document.body) : null) ++} ++ +export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus, useSession, useActivity, useBusyAcks, useMemoryNews, useTurnClock, useUi, useLive, actions }) { const roster = useRoster(value => value) const title = useSessions(list => list.byId[sessionId]?.displayTitle ?? list.byId[sessionId]?.title ?? '') @@ -887,7 +1170,7 @@ diff --git a/src/client/header.js b/src/client/header.js const opening = useTurnClock((state) => { const first = openingTurn(state[sessionId], firstTurns, hiddenTurns) return first && !unseenSince(visit, first.start) ? clockLabel(first.start) : '' -@@ -66,43 +66,42 @@ export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus +@@ -66,43 +66,44 @@ export function HeaderPill({ sessionId, useRoster, useSessions, useSessionStatus const owner = roster.byId[sessionId]?.id ?? sessionId const doing = useActivity(map => map[owner]) const bot = roster.byId[sessionId] @@ -897,6 +1180,7 @@ diff --git a/src/client/header.js b/src/client/header.js const room = roster.roomsById[sessionId] const detailsOpen = useUi(state => state.details === sessionId) - const name = bot?.name ?? room?.name ?? '' ++ const unread = useUi(state => state.unread) + const full = bot?.remote + ? friendBotTitle(bot) + : (roomTitle(room) || bot?.name || '') @@ -945,7 +1229,8 @@ diff --git a/src/client/header.js b/src/client/header.js + }), + h(NewMessagePills, { key: sessionId, sessionId, hiddenTurns, useSessions, useUi, useTurnClock, actions }), + h(ActivityIndicator, { key: `activity:${sessionId}`, sessionId, useRoster, useSessionStatus, useSession, useLive, actions }), -+ h(BusyAckBubble, { key: `busy-ack:${sessionId}`, sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive })) ++ h(BusyAckBubble, { key: `busy-ack:${sessionId}`, sessionId, useRoster, useBusyAcks, useSessionStatus, useSession, useLive }), ++ h(SessionOverflow, { sessionId, roster, actions, unread })) } // New-message pills. "N new messages ↓" takes Back to bottom's place when diff --git a/patches/ds-bot/0014-flybot-branding.patch b/patches/ds-bot/0014-flybot-branding.patch index dcc9ec5c0..92f8d9820 100644 --- a/patches/ds-bot/0014-flybot-branding.patch +++ b/patches/ds-bot/0014-flybot-branding.patch @@ -293,11 +293,16 @@ diff --git a/src/client/secret-card.js b/src/client/secret-card.js diff --git a/src/client/settings.js b/src/client/settings.js --- a/src/client/settings.js +++ b/src/client/settings.js -@@ -2,29 +2,35 @@ import { createElement as h, useCallback, useEffect, useRef, useState } from 're +@@ -1,30 +1,39 @@ + import { createElement as h, useCallback, useEffect, useRef, useState } from 'react' import { ACCENT_INKS, INKS } from './inks.js' import { isMainOf } from './sources.js' - import { allThemes } from './themes.js' +-import { allThemes } from './themes.js' -import { CloseIcon, ChevronLeftIcon, ChevronRightIcon, ClockIcon, ConnectorIcon, InfoIcon, PlugIcon, PlusIcon, SlidersIcon, SETTINGS_ICONS } from './icons.js' ++import { allThemes, resolveThemeId } from './themes.js' ++import { appearanceOf, sendKeyOf } from './appearance.js' ++import { foldingOf } from './message-fold.js' ++import { ChannelsPage } from './connectors.js' +import { WorkflowIcon } from './icons.js' +import { WorkflowsPage } from './workflows.js' +import { CloseIcon, ChevronLeftIcon, ChevronRightIcon, ClockIcon, ConnectorIcon, FolderIcon, InfoIcon, PlugIcon, PlusIcon, SlidersIcon, SETTINGS_ICONS } from './icons.js' @@ -322,7 +327,8 @@ diff --git a/src/client/settings.js b/src/client/settings.js import { FeedbackIcon, FeedbackPage } from './feedback.js' +import { FolderMenu } from './folder-menu.js' import { AboutPage } from './about.js' - import { t } from './i18n.js' +-import { t } from './i18n.js' ++import { canSetLocale, languageLabel, setInterfaceLocale, t } from './i18n.js' +import { readOnlyLine } from './read-only.js' const capitalize = word => word[0].toUpperCase() + word.slice(1) @@ -331,12 +337,12 @@ diff --git a/src/client/settings.js b/src/client/settings.js // their members, and one opens on its own settings form. Usage widens the dialog. -const SETTINGS_PAGES = [['general', 'General'], ['bots', 'Bots'], ['groups', 'Group chats'], ['connectors', 'Connectors'], ['capabilities', 'Capabilities'], ['schedules', 'Scheduled tasks'], ['usage', 'Usage'], ['secrets', 'Secrets'], ['feedback', 'Feedback'], ['about', 'About DS Bot']] -const PAGE_ICONS = { ...SETTINGS_ICONS, connectors: ConnectorIcon, capabilities: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon } -+const SETTINGS_PAGES = [['general', 'General'], ['bots', 'Bots'], ['groups', 'Group chats'], ['projects', 'Projects'], ['connectors', 'Connectors'], ['capabilities', 'Capabilities'], ['plugins', 'Plugins'], ['schedules', 'Scheduled tasks'], ['workflows', 'Workflows'], ['usage', 'Usage'], ['secrets', 'Secrets'], ['feedback', 'Feedback'], ['about', 'About FlyBot']] -+const PAGE_ICONS = { ...SETTINGS_ICONS, projects: FolderIcon, connectors: ConnectorIcon, workflows: WorkflowIcon, capabilities: PlugIcon, plugins: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon } ++const SETTINGS_PAGES = [['general', 'General'], ['bots', 'Bots'], ['groups', 'Group chats'], ['projects', 'Projects'], ['connectors', 'Connectors'], ['channels', 'Channels'], ['capabilities', 'Capabilities'], ['plugins', 'Plugins'], ['schedules', 'Scheduled tasks'], ['workflows', 'Workflows'], ['usage', 'Usage'], ['secrets', 'Secrets'], ['feedback', 'Feedback'], ['about', 'About FlyBot']] ++const PAGE_ICONS = { ...SETTINGS_ICONS, projects: FolderIcon, connectors: ConnectorIcon, channels: ConnectorIcon, workflows: WorkflowIcon, capabilities: PlugIcon, plugins: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon } function SetSection({ title, children }) { return h('section', { className: 'bt-set-section' }, h('h3', null, title), h('div', { className: 'bt-set-card' }, children)) -@@ -35,6 +35,68 @@ function SetRow({ label, hint, children }) { +@@ -35,10 +35,96 @@ function SetRow({ label, hint, children }) { children ? h('div', { className: 'bt-set-control' }, children) : null) } @@ -401,22 +407,62 @@ diff --git a/src/client/settings.js b/src/client/settings.js + return h(PluginsView, { answer, error, onFlip: flip }) +} + -+// General is Appearance and Notifications; the switch to classic Agent mode is the account menu's (#393). ++// General is Appearance, language, send shortcut, and Notifications; the switch ++// to classic Agent mode is the account menu's (#393). ++const APPEARANCE_MODES = [ ++ ['light', 'Light theme'], ++ ['dark', 'Dark theme'], ++ ['auto', 'Automatic'], ++ ['system', 'Match system'], ++] ++const AUTO_KINDS = [['sun', 'Estimated night hours (time-zone based)'], ['custom', 'Custom hours']] ++const SEND_KEYS = [['enter', 'Enter to send'], ['shift-enter', 'Shift+Enter to send']] ++const appearanceLabel = appearance => APPEARANCE_MODES.find(([id]) => id === appearance.mode)?.[1] ?? 'Match system' ++const autoLabel = appearance => appearance.auto === 'custom' ++ ? `${appearance.from} – ${appearance.to}` ++ : 'Estimated night hours (time-zone based)' ++const sendKeyLabel = key => SEND_KEYS.find(([id]) => id === key)?.[1] ?? 'Enter to send' ++const FOLD_MODE_OPTIONS = [ ++ ['compact', 'Compact', 'A very short preview, for scanning a conversation.'], ++ ['standard', 'Standard', 'A moderate preview. Recommended.'], ++ ['none', 'No folding', 'Show every message in full. Long messages push the conversation off the screen.'], ++] ++const foldModeLabel = mode => FOLD_MODE_OPTIONS.find(([id]) => id === mode)?.[1] ?? 'Standard' ++ function GeneralPage({ roster, actions, run }) { const prefs = roster.prefs ?? {} const themes = allThemes() -@@ -47,6 +47,19 @@ function GeneralPage({ roster, actions, run }) { +- const current = themes[prefs.theme] ? prefs.theme : 'deepseek' ++ const current = resolveThemeId(prefs, themes) ++ const appearance = appearanceOf(prefs) ++ const sendKey = sendKeyOf(prefs) ++ const folding = foldingOf(prefs) + const [custom, setCustom] = useState(prefs.accent ?? '#4d6bfe') + const timer = useRef(0) + useEffect(() => () => clearTimeout(timer.current), []) +@@ -47,8 +47,49 @@ function GeneralPage({ roster, actions, run }) { clearTimeout(timer.current) timer.current = setTimeout(() => run(actions.setPrefs({ accent: value })), 350) } ++ const setAppearance = (patch) => run(actions.setPrefs({ appearance: { ...appearance, ...patch } })) ++ const localeChooser = canSetLocale() + // The host refuses `set-prefs` in a read-only window, so the page says what is chosen + // instead of drawing the controls that would ask for it (#2474). + if (lockedWindow(roster)) { + const accent = ACCENT_INKS.find(ink => INKS[ink][0] === prefs.accent) + return [ + h(SetSection, { key: 'look', title: t('Appearance') }, ++ h(SetRow, { label: t('Appearance'), hint: t(appearanceLabel(appearance)) }), ++ appearance.mode === 'auto' ? h(SetRow, { label: t('Automatic switch'), hint: t(autoLabel(appearance)) }) : null, + h(SetRow, { label: t('Theme'), hint: t(themes[current].label) }), + h(SetRow, { label: t('Accent'), hint: accent ? t(capitalize(accent)) : prefs.accent ?? t('Default') })), ++ h(SetSection, { key: 'language', title: t('Language') }, ++ h(SetRow, { label: t('Interface language'), hint: t(languageLabel()) })), ++ h(SetSection, { key: 'shortcuts', title: t('Shortcuts') }, ++ h(SetRow, { label: t('Send shortcut'), hint: t(sendKeyLabel(sendKey)) })), ++ h(SetSection, { key: 'folding', title: t('Message folding') }, ++ h(SetRow, { label: t('Message folding'), hint: t(foldModeLabel(folding.mode)) }), ++ h(SetRow, { label: t('Collapse long documents into cards'), hint: folding.documentCards ? t('On') : t('Off') })), + h(SetSection, { key: 'notify', title: t('Notifications') }, + h(SetRow, { label: t('In other chats'), hint: prefs.notifications !== false ? t('On') : t('Off') }), + NOTIFY_KINDS.map(([kind, label]) => h(SetRow, { key: kind, label: t(label), hint: prefs.notifications !== false && prefs.notify?.[kind] !== false ? t('On') : t('Off') }))), @@ -424,14 +470,68 @@ diff --git a/src/client/settings.js b/src/client/settings.js + } return [ h(SetSection, { key: 'look', title: t('Appearance') }, ++ h(SetRow, { label: t('Appearance'), hint: t('How this window looks: light, dark, automatic, or match the system.') }, ++ h(Segmented, { label: t('Appearance'), value: appearance.mode, className: 'bt-appearance-seg' }, APPEARANCE_MODES.map(([id, label]) => h('button', { ++ key: id, type: 'button', 'aria-pressed': appearance.mode === id, ++ onClick: () => { if (appearance.mode !== id) setAppearance({ mode: id }) }, ++ }, t(label))))), ++ appearance.mode === 'auto' ? h(SetRow, { label: t('Automatic switch'), hint: t('Switches about a minute after the chosen time, and not in the middle of a turn.') }, ++ h(Segmented, { label: t('Automatic switch'), value: appearance.auto, className: 'bt-appearance-seg' }, AUTO_KINDS.map(([id, label]) => h('button', { ++ key: id, type: 'button', 'aria-pressed': appearance.auto === id, ++ onClick: () => { if (appearance.auto !== id) setAppearance({ auto: id }) }, ++ }, t(label))))) : null, ++ appearance.mode === 'auto' && appearance.auto === 'custom' ++ ? h(SetRow, { label: t('Custom hours') }, ++ h('label', { className: 'bt-time-field' }, t('Dark from'), ++ h('input', { className: 'bt-input', type: 'time', 'aria-label': t('Dark from'), value: appearance.from, onChange: event => setAppearance({ from: event.target.value }) })), ++ h('label', { className: 'bt-time-field' }, t('Dark until'), ++ h('input', { className: 'bt-input', type: 'time', 'aria-label': t('Dark until'), value: appearance.to, onChange: event => setAppearance({ to: event.target.value }) }))) ++ : null, h(SetRow, { label: t('Theme'), hint: t('Colors for the whole team, on every device.') }, -@@ -61,9 +61,17 @@ function GeneralPage({ roster, actions, run }) { + h('select', { className: 'bt-select', 'aria-label': t('Theme'), value: current, onChange: event => run(actions.setPrefs({ theme: event.target.value })) }, + Object.entries(themes).map(([id, theme]) => h('option', { key: id, value: id }, t(theme.label))))), +@@ -61,9 +61,52 @@ function GeneralPage({ roster, actions, run }) { })), h('label', { className: 'bt-swatch bt-swatch-custom', title: t('Custom accent'), 'data-on': Boolean(prefs.accent) && !ACCENT_INKS.some(ink => INKS[ink][0] === prefs.accent) }, h('input', { type: 'color', value: custom, 'aria-label': t('Custom accent'), onChange: event => pickCustom(event.target.value) }))))), - h(SetSection, { key: 'mode', title: t('Mode') }, - h(SetRow, { label: t('Classic Agent mode') }, - h('button', { type: 'button', className: 'bt-soft bt-soft-sm', onClick: () => actions.setSurface('agent') }, t('Switch')))), ++ h(SetSection, { key: 'language', title: t('Language') }, ++ localeChooser ++ ? h(SetRow, { label: t('Interface language') }, ++ h(Segmented, { label: t('Interface language'), value: languageLabel() === 'Simplified Chinese' ? 'zh' : 'en', className: 'bt-appearance-seg' }, [ ++ h('button', { key: 'en', type: 'button', 'aria-pressed': languageLabel() !== 'Simplified Chinese', onClick: () => setInterfaceLocale('en') }, t('English')), ++ h('button', { key: 'zh', type: 'button', 'aria-pressed': languageLabel() === 'Simplified Chinese', onClick: () => setInterfaceLocale('zh') }, t('Simplified Chinese')), ++ ])) ++ : h(SetRow, { label: t('Interface language'), hint: `${t(languageLabel())}. ${t('Follows the DeepSeek Harness language.')}` })), ++ h(SetSection, { key: 'shortcuts', title: t('Shortcuts') }, ++ h(SetRow, { ++ label: t('Send shortcut'), ++ hint: t(sendKey === 'shift-enter' ? 'Enter inserts a new line.' : 'Shift+Enter inserts a new line.'), ++ }, ++ h(Segmented, { label: t('Send shortcut'), value: sendKey, className: 'bt-appearance-seg' }, SEND_KEYS.map(([id, label]) => h('button', { ++ key: id, type: 'button', 'aria-pressed': sendKey === id, ++ onClick: () => { if (sendKey !== id) run(actions.setPrefs({ sendKey: id === 'enter' ? null : id })) }, ++ }, t(label)))))), ++ h(SetSection, { key: 'folding', title: t('Message folding') }, ++ h('div', { className: 'bt-fold-modes', role: 'radiogroup', 'aria-label': t('Message folding') }, ++ h('p', { className: 'bt-fold-lead' }, t('Choose how much of a long message to show before it folds.')), ++ FOLD_MODE_OPTIONS.map(([id, label, hint]) => h('button', { ++ key: id, type: 'button', role: 'radio', className: 'bt-fold-mode', ++ 'aria-checked': folding.mode === id, ++ onClick: () => { if (folding.mode !== id) run(actions.setPrefs({ folding: { mode: id, documentCards: folding.documentCards } })) }, ++ }, ++ h('span', { className: 'bt-fold-radio', 'aria-hidden': true }), ++ h('span', { className: 'bt-fold-mode-copy' }, ++ h('span', { className: 'bt-fold-mode-label' }, t(label)), ++ h('span', { className: 'bt-set-hint' }, t(hint)))))), ++ h(SwitchRow, { ++ label: t('Collapse long documents into cards'), ++ hint: t('Messages with several sections appear as a card you can open beside the conversation.'), ++ on: folding.documentCards, ++ onChange: on => run(actions.setPrefs({ folding: { mode: folding.mode, documentCards: on } })), ++ })), + // One switch for every system notification (#353), then one per kind (#469). + h(SetSection, { key: 'notify', title: t('Notifications') }, + h(SwitchRow, { @@ -524,7 +624,7 @@ diff --git a/src/client/settings.js b/src/client/settings.js + const extra = useSettingsPages().map(entry => ({ entry, key: `plugin:${entry.id}` })) + // #2877: the Projects page is a Project surface like the sidebar row; with the plugin off or + // absent it is not in the list, so a page asked for by name falls back to General below. -+ const pages = SETTINGS_PAGES.flatMap(item => (item[0] === 'connectors' ? [item, ...extra.map(({ entry, key }) => [key, entry.label ?? entry.id])] : [item])).filter(([key]) => key !== 'projects' || projectPresent()) ++ const pages = SETTINGS_PAGES.flatMap(item => (item[0] === 'channels' ? [item, ...extra.map(({ entry, key }) => [key, entry.label ?? entry.id])] : [item])).filter(([key]) => key !== 'projects' || projectPresent()) + const shown = pages.some(([key]) => key === page) ? page : 'general' + const pluginPage = extra.find(({ key }) => key === shown)?.entry const usageFocus = shown === 'usage' && id ? id : null @@ -533,7 +633,7 @@ diff --git a/src/client/settings.js b/src/client/settings.js const back = bot ? t('Back to Bots') : room ? t('Back to group chats') : usageFocus ? t('All usage') : null const nav = useGlide(shown, { axis: 'y' }) // A page enters from the right when it is one level in, from the left when it comes -@@ -178,38 +178,168 @@ export function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = +@@ -178,38 +178,169 @@ export function SettingsDialog({ page, id, roster, actions, useUpdate, leaving = // rendered state off screen (content-visibility). const [usageOpened, setUsageOpened] = useState(shown === 'usage') if (shown === 'usage' && !usageOpened) setUsageOpened(true) @@ -580,6 +680,7 @@ diff --git a/src/client/settings.js b/src/client/settings.js shown === 'groups' && !room ? h(GroupsPage, { roster, actions, run }) : null, + shown === 'projects' ? h(ProjectsPage, { roster, actions, run, call }) : null, shown === 'connectors' ? h(ConnectorsPage, { roster, actions }) : null, ++ shown === 'channels' ? h(ChannelsPage, { roster, actions }) : null, + shown === 'workflows' ? h(WorkflowsPage, { call, roster, start: id ?? undefined }) : null, + pluginPage ? h(SettingsPageSlot, { entry: pluginPage, props: { roster, actions, call, run, t, Section: SetSection, Row: SetRow } }) : null, shown === 'capabilities' ? h(CapabilitiesPage, { roster, actions, run }) : null, diff --git a/patches/ds-bot/files/dev/bench-preflight.mjs b/patches/ds-bot/files/dev/bench-preflight.mjs index db5db7cef..b90f9d03c 100644 --- a/patches/ds-bot/files/dev/bench-preflight.mjs +++ b/patches/ds-bot/files/dev/bench-preflight.mjs @@ -9,7 +9,7 @@ // // Exit 0 when the bench can start, 1 with the remedy on stderr when it cannot, 2 on bad usage. import { spawnSync } from 'node:child_process' -import { existsSync } from 'node:fs' +import { existsSync, realpathSync } from 'node:fs' import { dirname, join } from 'node:path' import { pathToFileURL } from 'node:url' @@ -81,6 +81,7 @@ export function main(argv = process.argv.slice(2)) { return 1 } -if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) { +// Node resolves import.meta.url through symlinks; argv keeps the invoked spelling. +if (process.argv[1] && existsSync(process.argv[1]) && import.meta.url === pathToFileURL(realpathSync(process.argv[1])).href) { process.exit(main()) } diff --git a/patches/ds-bot/files/dev/history-hit-review/.gitignore b/patches/ds-bot/files/dev/history-hit-review/.gitignore new file mode 100644 index 000000000..397b4a762 --- /dev/null +++ b/patches/ds-bot/files/dev/history-hit-review/.gitignore @@ -0,0 +1 @@ +*.log diff --git a/patches/ds-bot/files/dev/history-hit-review/feature-parity.md b/patches/ds-bot/files/dev/history-hit-review/feature-parity.md new file mode 100644 index 000000000..1a2ec631e --- /dev/null +++ b/patches/ds-bot/files/dev/history-hit-review/feature-parity.md @@ -0,0 +1,19 @@ +# Feature parity 补记 + +- 历史搜索:**已实现但范围有限**。当前实例、当前actor拥有的本地Bot own-chat各分段;中文/NFKC字面匹配、有界分页。 +- 旧命中闭环:**已实现只读上下文查看**,不是精确 turn 导航。真实宿主没有满足“不激活Agent”的公开精确turn导航路径;不可把当前聊天当旧命中落点。 +- 安全/资源:服务端每次授权重验;stale/revoke/delete/跨权限分页有测试。并发/长度/分段/扫描文本/输出JSON/取消受约束,**cold Session物化前的硬字节预算未解决**。 +- 浏览器/真实后端:**未验收**;file:// 策略拒绝仍然有效,没有重试或替代输送。 +- 测试:focused 84/84、全量3367/3367,build/check/lint通过,无skip/阈值变更。 + +## PR 交付验证(2026-11-16,Asia/Shanghai) + +本轮提交前重新验证 core3367/3367、social721/721、project148/148;build/check/lint通过。与原修复树逐文件核对:社交/项目和schedule测试一致,schedule仅清理未使用localInput,i18n包含全部原新增项。真实组件fixture已改为本目录忽略的dist输出,来源manifest与20项SSR重跑通过,仍未浏览器验收。生成的core/client.js按仓库规范随源提交;依赖、日志、render-check、效果稿/截图不提交。PR仅覆盖已实现部分,关联#3110但不关闭总目标。 + +## 已实际交付的 PR(2026-11-16,Asia/Shanghai) + +- FlyBot:https://github.com/ThinkFlowLab/FlyBot/pull/3112 ,`pr/teamily-parity-20261116` → `main`。阶段性实现,Related #3110,不关闭总目标。 +- Bot Social:https://github.com/Birfy/bot-social/pull/789 ,`pr/grant-friend-regression-20261116` → `master`。同步后发现源码防线已由上游 #778 等落地,因此单独 PR 仅补 HTTP 回归;没有用旧9行补丁覆盖更完整的新实现或改变历史授权语义。45/45相关测试和tsc通过(Node22匹配SQLite ABI)。原脏树未改。 +- 最终目标是完整开源 Teamily;缺少的模型/API/运行时仍须补齐。服务端架构明确为管理 server + FlyBot 容器:管理 server 负责账号/工作区/权限/容器生命周期,FlyBot 容器承载 Agent;两部分均开源可自托管。容器分配粒度与编排技术未定,不能擅自当作已决策。本批不临时大重构。 +- 下一批建议先交付管理 server 最小控制面及 FlyBot 容器的认证/权限/生命周期适配契约与可运行自托管部署,再以作品/Artifacts 的真实存储与展示作为新能力切片;不能仅画入口。记忆关系边/图谱、技能与MCP、协作同步/调度随后逐项对照验收。 +- 本地core3367、social721、project148通过;源码/patch check和canonical、仓库政策检查通过。CI结果应在PR页独立查看,不把本地全绿当GitHub CI已绿。浏览器和真实后端仍未验收。无自动合并/部署。 diff --git a/patches/ds-bot/files/dev/history-hit-review/progress.md b/patches/ds-bot/files/dev/history-hit-review/progress.md new file mode 100644 index 000000000..8d80b97b3 --- /dev/null +++ b/patches/ds-bot/files/dev/history-hit-review/progress.md @@ -0,0 +1,48 @@ +# 历史搜索命中闭环进度 + +2026-11-16,Asia/Shanghai。仅 `/workspace/flybot-ui-parity` 隔离树。 + +## 已完成 + +- 调查已安装宿主导航:可接受 SessionId,但没有 seq/turn anchor;现有 FlyBot 会打开当前 part,原生冷 Session 打开可能激活 Agent。故不伪装历史定位,改为真实只读上下文视图。 +- `history-hit` API + `HistoryHitDialog` + Palette 点击闭环,原始命中/同段附近最多四条可见文字,明确分段、Session、seq/turn、只读且不是当前聊天。无发送、编辑、写数据、Agent 激活。 +- opaque ticket 绑定本实例/actor/分段/快照/原文摘要,60秒、最多512;读取前后和 dispose 后/返回前重验权限与隐藏 turn。stale/撤权/删除/过期拒绝并提示重搜;已知 roster 权限/账号/分段变化清空旧视图,旧异步不能覆盖新视图。 +- 加入共享并发1/actor、4/实例、256字符、500分段、扫描文本2MiB、搜索JSON64KiB、上下文JSON24KiB及取消等可执行限制。JSON 转义也计入,Unicode surrogate 边界不截断;超限有 limited/截断/失败说明而非假装全库完成。 +- 中文单字/NFKC、未加载历史、错误/空/长 query、四标签/退化及原隔离边界维持。 + +## 最终验证(不降阈值、不跳过) + +- Focused:84/84,通过,0跳过,`focused-frozen.log`。 +- 全量 core:3367/3367,通过,0失败/0取消/0跳过,`full-frozen.log`(约52秒)。相对上轮3351新增16项测试。 +- `npm run build`:通过,`build.log`。 +- `node scripts/build-client.mjs --check`:通过,`build-check.log`。 +- `npm run lint`:通过,仅既有 warnings,`lint-frozen.log`。 +- 全量前一次3366/3366也通过,随后补边界并重跑;保留 `full.log`。测试只用独立内存示例/VM React harness,未读真实历史,不是浏览器验收。 + +## 明确缺口 / 风险 + +- cold observation **仍在返回前物化整个 Session**,100000事件/文本字节检查是之后的限制;最多4个 Session 同时物化仍可能有大峰值。6秒是合作取消,不是可抢占 native 同步工作的硬超时。没有硬磁盘字节/峰值内存预算,也没有声称已经解决;需宿主提供只读分页/窗口与物化前预算。 +- 不是精确滚动/高亮当前聊天;查看的是历史原始文本窗口,超长按编码字节截断。不含图片/附件/工具/model replacement,群聊/远程/Agent 仍 loaded-outline-only。 +- 服务端每次读取/返回重验;不能收回此前已合法交付到客户端的字节,也未验证原生真实后端/浏览器 UI。 +- 没有浏览器 dispatch/file:// 重试、替代端口、截图、网络/防火墙改动、:3320/生产、提交/推送或 GitHub。 + +## 文档位置 + +- 主审查:`core/dev/history-search-review.md`。 +- 本轮映射:同目录 `replicate-map.md`、`feature-parity.md`。 +- 质量回顾:`changelog.d/teamily-integrated-quality-review.fixed.md`。 +- 旧 canonical progress/map 位于树外,本轮遵守“只在隔离树改”没有同步;父代理如需汇总,引用本补记,不要误报树外文件已更新。 + +## PR 交付验证(2026-11-16,Asia/Shanghai) + +本轮提交前重新验证 core3367/3367、social721/721、project148/148;build/check/lint通过。与原修复树逐文件核对:社交/项目和schedule测试一致,schedule仅清理未使用localInput,i18n包含全部原新增项。真实组件fixture已改为本目录忽略的dist输出,来源manifest与20项SSR重跑通过,仍未浏览器验收。生成的core/client.js按仓库规范随源提交;依赖、日志、render-check、效果稿/截图不提交。PR仅覆盖已实现部分,关联#3110但不关闭总目标。 + +PR policy 复查修正:changelog fragments 按 ..md 命名;Unicode 损坏检测测试改用等价 `\uFFFD` escape,避免测试源码本身触发仓库 mojibake 守卫。没有移除或放宽断言。 + +## 已实际交付的 PR(2026-11-16,Asia/Shanghai) + +- FlyBot:https://github.com/ThinkFlowLab/FlyBot/pull/3112 ,`pr/teamily-parity-20261116` → `main`。阶段性实现,Related #3110,不关闭总目标。 +- Bot Social:https://github.com/Birfy/bot-social/pull/789 ,`pr/grant-friend-regression-20261116` → `master`。同步后发现源码防线已由上游 #778 等落地,因此单独 PR 仅补 HTTP 回归;没有用旧9行补丁覆盖更完整的新实现或改变历史授权语义。45/45相关测试和tsc通过(Node22匹配SQLite ABI)。原脏树未改。 +- 最终目标是完整开源 Teamily;缺少的模型/API/运行时仍须补齐。服务端架构明确为管理 server + FlyBot 容器:管理 server 负责账号/工作区/权限/容器生命周期,FlyBot 容器承载 Agent;两部分均开源可自托管。容器分配粒度与编排技术未定,不能擅自当作已决策。本批不临时大重构。 +- 下一批建议先交付管理 server 最小控制面及 FlyBot 容器的认证/权限/生命周期适配契约与可运行自托管部署,再以作品/Artifacts 的真实存储与展示作为新能力切片;不能仅画入口。记忆关系边/图谱、技能与MCP、协作同步/调度随后逐项对照验收。 +- 本地core3367、social721、project148通过;源码/patch check和canonical、仓库政策检查通过。CI结果应在PR页独立查看,不把本地全绿当GitHub CI已绿。浏览器和真实后端仍未验收。无自动合并/部署。 diff --git a/patches/ds-bot/files/dev/history-hit-review/replicate-map.md b/patches/ds-bot/files/dev/history-hit-review/replicate-map.md new file mode 100644 index 000000000..de86a167a --- /dev/null +++ b/patches/ds-bot/files/dev/history-hit-review/replicate-map.md @@ -0,0 +1,25 @@ +# 历史命中闭环对照(本轮补记) + +2026-11-16,Asia/Shanghai;路径均相对 `/workspace/flybot-ui-parity/core`。 + +| 需求 | 真实实现 | 验证/边界 | +|---|---|---| +| 旧分段命中不是打开当前会话 | `src/client/palette.js` → `HistoryHitDialog` / `src/client/history-hit.js` → `history-hit` | palette UI 断言不调用 openSession;组件真实分段/原文/只读标识。不是精准聊天滚动 | +| 只读原始上下文 | `src/host/message-search.js` 的 readHistoryHit;`src/host/channel.js` READS;`src/host/authz.js` | 原始 append transcript,同段前后各最多2可见消息;无 Agent 激活/发送/写回 | +| 权限/过期/删除闭环 | actor+实例 opaque ticket、快照和摘要;读取前后及 dispose 后复检;hook 清空/abort | stale append/modify、Bot/Session删除、part移除、隐藏 turn、await/dispose撤权、跨权限分页测试 | +| 资源控制 | 共享并发、query/目标分段/扫描/字节/TTL cap、native signal | 查询/上下文实际UTF-8 JSON预算,转义与Unicode边界测试;不是物化前硬内存/I/O预算 | +| 四标签/退化不变 | `src/client/history-search.js` + palette | All/Messages检索;Chats/Commands不检索;失败明确loaded-only,其他实例/群聊/Agent不假装覆盖 | + +证据:focused 84/84;完整 core 3367/3367;build/check/lint通过,0跳过。日志同目录。无真实数据/浏览器验收/截图/端口/部署/提交。 + +## PR 交付验证(2026-11-16,Asia/Shanghai) + +本轮提交前重新验证 core3367/3367、social721/721、project148/148;build/check/lint通过。与原修复树逐文件核对:社交/项目和schedule测试一致,schedule仅清理未使用localInput,i18n包含全部原新增项。真实组件fixture已改为本目录忽略的dist输出,来源manifest与20项SSR重跑通过,仍未浏览器验收。生成的core/client.js按仓库规范随源提交;依赖、日志、render-check、效果稿/截图不提交。PR仅覆盖已实现部分,关联#3110但不关闭总目标。 + +## 已实际交付的 PR(2026-11-16,Asia/Shanghai) + +- FlyBot:https://github.com/ThinkFlowLab/FlyBot/pull/3112 ,`pr/teamily-parity-20261116` → `main`。阶段性实现,Related #3110,不关闭总目标。 +- Bot Social:https://github.com/Birfy/bot-social/pull/789 ,`pr/grant-friend-regression-20261116` → `master`。同步后发现源码防线已由上游 #778 等落地,因此单独 PR 仅补 HTTP 回归;没有用旧9行补丁覆盖更完整的新实现或改变历史授权语义。45/45相关测试和tsc通过(Node22匹配SQLite ABI)。原脏树未改。 +- 最终目标是完整开源 Teamily;缺少的模型/API/运行时仍须补齐。服务端架构明确为管理 server + FlyBot 容器:管理 server 负责账号/工作区/权限/容器生命周期,FlyBot 容器承载 Agent;两部分均开源可自托管。容器分配粒度与编排技术未定,不能擅自当作已决策。本批不临时大重构。 +- 下一批建议先交付管理 server 最小控制面及 FlyBot 容器的认证/权限/生命周期适配契约与可运行自托管部署,再以作品/Artifacts 的真实存储与展示作为新能力切片;不能仅画入口。记忆关系边/图谱、技能与MCP、协作同步/调度随后逐项对照验收。 +- 本地core3367、social721、project148通过;源码/patch check和canonical、仓库政策检查通过。CI结果应在PR页独立查看,不把本地全绿当GitHub CI已绿。浏览器和真实后端仍未验收。无自动合并/部署。 diff --git a/patches/ds-bot/files/dev/history-search-review.md b/patches/ds-bot/files/dev/history-search-review.md new file mode 100644 index 000000000..f055a23bd --- /dev/null +++ b/patches/ds-bot/files/dev/history-search-review.md @@ -0,0 +1,63 @@ +# 历史消息搜索:范围、只读边界与回归 + +2026-11-16,Asia/Shanghai;本轮补齐历史命中只读查看闭环。仅隔离源码树;不提交/部署、不接触生产/:3320、不启动端口、不再尝试被拒绝的 file:// 浏览器导航。无截图、无手写 HTML。 + +## 查明的宿主能力 + +- 现有 `src/host/chat-index.js` 可搜索 Bot 所有分段,但 `eventsBackwards` 会 `resolveAgent`,SQLite catch-up 会写派生索引,不能直接作为这次严格只读查询。 +- 安装的 `dsh-experimental-session-search/lib/index.js` 只是 `export {}`,不能据包名假定有可调用搜索。 +- `dsh-api-session-controller` 的 `search` 是真实能力,但会通过 `sessionQuery.searchSessions` 枚举宿主可见 corpus;SQLite provider 可创建/更新索引,而且只检索 current model surface。既不适合在 FlyBot owner 授权前跨实例扫描,也不等同于压缩前的人类对话历史。因此本轮没有调用它。 +- `ctx.get('sessionQuery').observeSession(sessionId, {signal, projectionMode:'none'})` 提供 cold-safe、特定 Session 的不可变 observation,不激活 Agent、不计算 projections;冷历史恢复与 interrupted-turn 平衡在内存完成。返回 lease 必须 dispose。这是新查询实际使用的接口。 +- `dsh-session.isAppendSurfaceEvent` 的源码注释明确:append-origin 才是 human transcript;model replacement 并非原对话。本轮保留压缩前原消息,不检索 model-only replacement 摘要。 + +上述为安装包源码审查与隔离适配器测试结论,未调用任何真实运行实例来读用户历史。 + +## 本轮实现 + +- 新 `src/host/message-search.js`,由 core/index.js 注册;`search-messages` 接入现有 `/api/bot`,加入只读白名单。 +- 认证继续由 `x-flybot-member-session` 解析;authz 在成员模式拒绝匿名,新服务再按当前 actor 过滤。payload 仅接受 `{query, limit?, cursor?}`;actorId/sessionId/home/path 等多余 selector 一律拒绝。 +- 只枚举**当前 FlyBot state.bots 中本地且属于 actor 的 Bot 的 own-chat 当前分段和 segments**,并调用现有 `sessionOwnedBy` 再检查 Session。每次 await 前后、发结果前、翻页均重验。不按目录扫描,不调用 listSessions、远程实例或插件文件搜索。 +- 未开启成员认证时沿用既有单人实例规则,仅当前 state 登记的本地 Bot。不会因此查询 DSH 全部 Session。 +- 文本仅来自 append-origin `user/message` 且 source.kind=user 和 `assistant/message` 的 text block。工具参数/结果、plugin records、后台 source.kind=ds-bot 输入、附件、图片、model replacement 不搜索。exchangeTurns 隐藏 turn 排除;带隐藏 turn 的会话中无法确定 turn 的消息 fail closed。 +- NFKC + 大小写不敏感的字面子串;支持单字中文,无 SQL/正则/FTS 执行语义。不是分词、模糊或语义检索。 +- API 返回 snippet、botId、sessionId、seq/turn、是否较早分段,不返回路径、header、配置、工具内容或底层错误。底层失败只给 incomplete,错误消息不回传日志路径/配置。 +- 无 save/bootstrap/resolveAgent/flush、无 SQLite/文件写入。cursor 仅进程内随机 opaque token,绑定实例闭包、actor、规范化 query;60 秒过期,最多 64 个。历史变动使当前分段续页失效,必须重搜,不拿旧游标猜。 +- 限额:API 默认20/最多50条;每请求最多8次 observation,6秒 cooperative timeout;每轮最多500个已授权 Session 分段、200个读取批次,每批最多1000个候选消息;单源超过100000原始事件跳过并标 limited;每 actor 最多1个、实例最多4个并发查询。每分段从新到旧,分段按 Bot 注册顺序/由新到旧;不是全局时间或相关性排名。 + +## Palette 接入 + +- 新 `src/client/history-search.js`:250ms debounce、忽略过期异步结果、卸载保护、显式继续检索、前端最多100条。只在 All/Messages 查询;Chats/Commands 不发历史读取。 +- 保留原四标签与 loaded turnOutline 搜索。历史单独标为「本机 Bot 对话历史」,仍有已加载结果;相同 Session/turn 的结果尽量去重。 +- 明确标注「本实例中你拥有的本机 Bot;其他对话仅已加载」。空、查询中、后续未检索、部分失败、达到上限与只读适配器不可用均有不同说明,不把不完整扫描写成全库无结果。 +- 旧宿主缺 service 或任何查询失败,明确退化为 loaded-only;不返回底层错误、不保留失败请求的旧历史结果。 +- 历史命中现在**不再调用 openSession**,而打开真实 `HistoryHitDialog` + `history-hit` 只读查看:展示实际 Session、分段序号、seq/turn、原始命中文本及同段前后各最多2条可见消息。明确标注「分段历史,不是当前聊天;不激活 Bot」。不发送、编辑、写回或假装定位成功;只有返回搜索和重新读取上下文。 +- 点击只发送进程内 opaque hitToken(最多512个、60秒、绑定 actor/实例/快照摘要);不接受指定任意 Session/seq/path。上下文读取前、native await 后、lease dispose 后与返回前重新核验当前 owner、Session 归属/分段存在、隐藏 turn;原文摘要/快照变化、删除、过期均拒绝,提示重新搜索。 +- 实际宿主导航契约 `dsh-client-ui-workspace/lib/types/client/navigation.d.ts:21` 仅 `openSession(SessionTarget)`;`dsh-api-session-controller/lib/types/client/contract/sessions.d.ts:20` 的 target 只有 SessionId/SubagentAddress,无 turn/seq anchor。FlyBot 自身 openSession 又归约为当前 part;原生打开冷历史可能提升为 Agent,故不用它冒充定位。 +- 搜索和上下文 hook 均用 AbortController + generation guard。切换命中、已知账号/owner/parts 变化、删除 Bot、卸载时清空旧上下文并取消旧请求;失败不拿搜索 snippet 伪装原始上下文。权限校验保证每次服务端读取/返回的当前权限,不宣称能收回已交付到客户端的内容。 + +## 未覆盖/缺口 + +1. 群聊、共享房间的 membership-window 历史、远端 Bot、DSH Agent/子代理、已删除/不在当前 state 的 Bot 尚未历史检索;仍只用已加载大纲,不能宣传「所有聊天历史」。未来群聊应先用 roomHistory(actor) 的窗口过滤,绝不能搜索成员内部 group Session 代替房间可见记录。 +2. 非索引扫描会重复读取特定分段。宿主 observation 在返回前会物化单个逻辑 Session;100000事件防护是返回后的防护,**不等于硬性磁盘字节/内存上限**,超大历史读取和阻塞工作可能不能即时响应取消。需宿主提供有权限范围、只读、按转录分页的查询接口才能彻底解决;本轮不越界写新索引。 +3. 未验证真实宿主版本差异、真实持久化后端、浏览器点击/焦点/窄屏;全部新测试只用独立内存示例。不会把真实组件/VM测试当浏览器验收。file:// 策略阻断仍有效,未尝试任何替代传输。 +4. 不读取密钥/配置文件,也不检索工具结果。正常用户/助手对话文本的内容没有通过额外读取密钥库作全局脱敏;服务不会为了搜索去访问该类私有文件。 + +## 可执行资源边界(两类只读请求共用并发额度) + +- 每 actor 同时1个、实例最多4个,超出直接拒绝;6秒 cooperative signal,浏览器发起端取消同时传到底层 observation。 +- Query 最多256 Unicode 字符,并在展开前拒绝超1024 UTF-16长度;空/非法/长 query 有测试。每轮目标最多500分段,每次最多8 observations;最多200读取批次、每批1000候选消息、单源最多100000事件(最后一项是物化后检查)。 +- 单消息提取上限262144 UTF-8字节、最多10000 content blocks;每请求扫描文本最多2097152字节。超大消息跳过并标 limited;扫描预算耗尽保留准确的续读位置。 +- 搜索最多50条/页;items 的 JSON UTF-8预算65536减1024 envelope reserve,达到预算保留下一命中的位置;客户端最多显示100条。上下文 JSON UTF-8预算24576减64 envelope reserve;命中/邻居文本编码后 JSON 字节各最多8192/2048,考虑反斜线/控制字符转义,明确截断,不把 surrogate pair 截成碎片。 +- 这些限制**不是 native cold observation 的硬内存/磁盘字节预算**。宿主先物化整个逻辑 Session,之后我们才检查事件数/提取字节;取消依赖宿主合作,不能抢占同步阻塞。并发4也意味着可同时物化至多4个未知大小 Session,仍可能有明显峰值。没有用文件系统旁路读取或创建索引。 +- 根治需要宿主提供按 Session、按权限、只读的 transcript-window / scan-page API,支持创建 observation 前的硬字节上限、分页快照及可中断读取;当前公开契约没有这套能力。本轮不声称解决该宿主差距。 + +## 测试与证据 + +- `test/message-history-search.test.js`:25项,新增真实旧分段原文、opaque ticket/actor/实例边界、stale追加/修改/删除/隐藏、await/dispose 撤权、跨权限分页、消息/扫描/响应字节、中文与 Unicode、JSON 转义预算、共享并发与取消。既有未加载历史、错误/空/长 query、只读 channel 认证/白名单测试保留。仅内存示例;fixture.invalid 的 Request 直接交 handler,不发网络。 +- `test/history-search-state.test.js` 4项;新增 `test/history-hit-state.test.js` 3项,覆盖取消/切换/账号/owner/parts/删除/错误/retry。复用 `test/history-hook-harness.js` 的 VM hook/effect 约定。 +- `test/history-hit-view.test.js` 2项,执行实际组件,验证分段、原文作为 React text(不注入 HTML)、只读控件、截断/加载/失败/删除状态不露旧正文。不是浏览器验收。 +- `test/palette-history-ui.test.js` 3项,明确断言历史点击只打开只读组件、不会调用 openSession;四标签、加载/不完整/续页/失败退化保留。 +- 本轮 focused **84/84**,0失败/0跳过:`dev/history-hit-review/focused-frozen.log`。 +- `npm run build`、`node scripts/build-client.mjs --check`、`npm run lint` 通过(仅既有 warnings):`build.log`、`build-check.log`、`lint-frozen.log`,均在 `dev/history-hit-review/`。 +- 首次完整回归3366/3366通过;再补 Unicode 起始边界及 JSON 转义预算测试后冻结版全量 **3367/3367通过,0失败/0跳过**,见 `dev/history-hit-review/full-frozen.log` 与同目录 progress。未改阈值、未跳过测试。 +- 历史基线3351/3351。未测试真实用户历史、未开浏览器、未截图;file:// 拒绝没有被绕过。全部本轮改动/证据留在 `/workspace/flybot-ui-parity`,无提交/推送/部署。 diff --git a/patches/ds-bot/files/dev/offline-fixture/.gitignore b/patches/ds-bot/files/dev/offline-fixture/.gitignore new file mode 100644 index 000000000..0d4512695 --- /dev/null +++ b/patches/ds-bot/files/dev/offline-fixture/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +render-check.mjs +dist/ diff --git a/patches/ds-bot/files/dev/offline-fixture/README.md b/patches/ds-bot/files/dev/offline-fixture/README.md new file mode 100644 index 000000000..221b232e3 --- /dev/null +++ b/patches/ds-bot/files/dev/offline-fixture/README.md @@ -0,0 +1,66 @@ +# FlyBot 真实组件离线集成 fixture(待浏览器验收) + +2026-11-16 14:18 Asia/Shanghai。**不是手写同样 DOM 的效果稿,也不是生产宿主或实机验收。** + +## 打开与重建 +- `file:////core/dev/offline-fixture/dist/index.html#chat` +- `file:////core/dev/offline-fixture/dist/index.html#settings` +- `file:////core/dev/offline-fixture/dist/index.html#memory` +- `file:////core/dev/offline-fixture/dist/index.html#group` +- `file:////core/dev/offline-fixture/dist/index.html#search` + +将 `` 替换为本地 checkout 的绝对路径。此前 box browser 在导航前策略拒绝 file://,因此没有点击或截图,也未尝试替代端口/传输;这里仅提供未来获准后可用的重建入口,不声称浏览器验收通过。 + +源码:`core/dev/offline-fixture/`。构建输出在本目录 `dist/`,不提交输出 bundle、render-check 或 node_modules。 +重建:在 core 运行 `node dev/offline-fixture/build.mjs --render-check`;非浏览器渲染检查:`node dev/offline-fixture/check.mjs`。 +`fixture.js` 是自包含 classic IIFE,不依赖 dev server、ESM fetch、CDN 或端口。`index.html` 只包含 root、meta 与相对脚本。CSP 禁止 connect、远程脚本/图片与表单提交;没有真实 API transport。`bundle-inputs.json` 是 esbuild 原始来源清单。 + +运行时依赖是 npm 本地缓存中的 React/react-dom **19.3.1** 与 scheduler 0.28.0,通过 npm --offline --ignore-scripts 安装;没有联网下载。生产宿主 peer React 版本可能不同,不能据此确认宿主兼容性。重建依赖本目录 node_modules;在本目录运行 `npm ci --ignore-scripts`(已有缓存时可加 `--offline`),package.json/lock 记录来源。源码、bundle 均无账号数据。 + +## 实际组件来源(均位于 core/src/client) +| 范围 | 直接 bundle 的源码 | +|---|---| +| 设置 | settings.js: SettingsDialog / GeneralPage(GeneralPage 不是复制实现) | +| 发送快捷键 | composer.js: installSendShortcut;appearance.js 快捷键/插入换行与主题辅助函数 | +| 长文折叠、卡片、侧栏 | message-fold.js: FoldedContent / DocumentCard / DocumentPane;shared/message-fold.js | +| 记忆目录/搜索 | memory-panel.js: MemoryDialog | +| 建群 | group-settings.js: NewGroupForm | +| 会话筛选/未读列表 | sidebar.js: TeamSidebar(包含真实 SessionFilter、BotRow、RoomRow) | +| 搜索 | palette.js: CommandPalette | +| 未读/置顶顶栏入口 | header.js: HeaderPill / SessionOverflow;shared/session-unread.js / session-pin.js | +| 消息右键/悬停菜单 | message-tools.js: MessageTools / onMessageContextMenu | +| 外观 | styles.js / sidebar.js / group-settings.js / mobile.js 原 CSS | +| 中文 | i18n.js 原 DICTIONARY 与 installLocale | + +构建会断言这些源码存在于输入清单、真实 api.js 不在 bundle、浏览器输出无外部 import。 + +## Mock 边界(务必保留) +- React 正常 hooks/portal;不是单测的伪 React。现有 `test/harness-resolve.mjs` 仍用于整批单测;它的 VM hook harness 不适合直接充当浏览器 React DOM。 +- **仅 fixture 控制条、外层布局、模拟输入框、示例消息容器和操作日志是 harness 自写。** 并未宣称它们是宿主 composer 或 Bubbles/UserMessage 的完整装配。 +- host.js 替代真实 api.js;不支持的调用明确 reject。设置 prefs、手动未读、置顶、建群只写 React 内存,刷新即清空;不触碰真实 roster、文件或网络。fixture 没有重新实现 host 偏好校验。 +- 模拟输入框带宿主 selector,与真实 installSendShortcut 接线(含 getSnapshot)。发送只增加计数,引用只填到这个框。无法验证真实宿主 textarea/contenteditable DOM、真实消息发送或模型运行。 +- 示例 A/B/C 和一组群;B 初始有手动未读,C 有固定 completionUnread。打开会话只清 mock 手动未读,不确认真实系统状态;系统状态保持,便于验证手动清除不等于系统确认。 +- DSH primitives 缺失:**MarkdownText 替为显式 data-fixture-mock 的 pre 纯文本**;FishLogo 替为标记符。可验卡片/折叠切换/侧栏内容传递,**不能验真实 Markdown、代码高亮、链接、脚注、附件或真实 logo 的视觉**。不把替代物当正式 UI。 +- 记忆读取返回固定示例,ask/forget 明确拒绝,不编造模型回答或持久化。建群只增加模拟 room,不邀请、不分享。 +- session 行右键菜单、宿主详情抽屉、inbox/连接器/更新不在此 fixture;会显示 mock 边界日志。未读与置顶请通过实际顶栏菜单验证。 +- 剪贴板和下载使用实际 MessageTools 的浏览器能力,未伪造成功;file:// 下剪贴板可能被拒绝,应看到失败说明。下载会创建本地 blob 文件,只有人工/父代理验证时才会触发。 +- streaming checkbox 仅切换实际组件的 streaming prop,不模拟 token transport;主题只接真实辅助函数,不接 index.js 的宿主主题生命周期、分钟计时和 streaming 延迟调度。 +- 目前非浏览器检查为 5 路由 × 中英 × 只读/可写的 **20 个服务器渲染**,不是点击、effects、布局、焦点验收。React 19 发现既有 inbox StatusIcon 缺少 key 警告,未隐去,留作后续专项。 + +## 交给父代理的操作验收清单(尚未执行) +1. 默认页明确显示示例/MOCK HOST;file:// 无模块/CSP 错误,无网络请求。若浏览器拒绝 file: script,报告具体限制;不要改端口、防火墙、代理或拿手写 HTML 替代。 +2. settings:General 切换 light/dark/auto/system、中英、Enter/Shift+Enter、紧凑/标准/不折叠和文档卡;退出后仍在同一次页面 session 中反映。只读只展示设置;刷新重置。 +3. chat:按当前快捷键测试发送计数/换行,输入中文 IME 不误发送;只读不发送。注意这个计数不代表真实消息。 +4. 折叠:卡片内显示/隐藏全文、侧栏打开/关闭;关卡片后紧凑/标准折叠;none 显示全文;勾 streaming 不折叠不显示消息菜单。 +5. memory:等待 mock read effect 后目录/条数、主题、搜索和无匹配;询问/删除拒绝应明确;只读隐藏写操作。 +6. group:无选中禁创建,筛选成员、至少本地管理员+另一成员才可创建;移除/切管理员;创建只新增内存 room;只读不创建。 +7. sidebar:全部/群聊/单聊/未读真实筛选;B 手动未读、C 系统未读。切到 A 顶栏标未读→未读筛选有 A→清除手动标记→A 消失,C 仍存在;pin/unpin 改列表排序。 +8. search:四个真实标签、空态、输入绝无匹配词、输入 kiwi 查已加载示例消息;切标签与方向键;Esc/关闭按钮;不宣称搜索全部宿主历史。 +9. 消息悬停/右键:表情本地反馈、引用完整原文到模拟输入框;菜单方向键/Esc/关闭后立即重开;复制成功或真实权限失败;人工允许时下载 .md;只读没有引用入口。 +10. 宽屏与 390px:设置、记忆、建群、菜单不溢出;Tab/Shift+Tab、可读标签、焦点与中文换行。记录真实浏览器 console 和截图,不能拿本目录 render-check 当已通过。 + +旧手写 HTML 效果稿继续仅为 HAND-AUTHORED MOCKUP,不入本 fixture,也不作为真实截图。 + +最终补记(2026-11-16 14:19(Asia/Shanghai)):完整 core **3330/3330 通过,0 失败,0 跳过**(历史验证记录);bench-preflight **8/8**;client build / --check / lint 通过。fixture source manifest / 无真实 transport / 无外部 imports 断言通过,20 个 SSR smoke 通过。**无浏览器验收、无新增截图。** + +PR 交付补记:当前 core 完整回归为3367项;fixture 重建仅写本地忽略的 dist/。这份 fixture 未 mock 新历史搜索服务,搜索路线仅验证 loaded-outline 与明确退化状态,不能用它验收真实历史搜索/权限/后端。 diff --git a/patches/ds-bot/files/dev/offline-fixture/app.js b/patches/ds-bot/files/dev/offline-fixture/app.js new file mode 100644 index 000000000..1eab22b5a --- /dev/null +++ b/patches/ds-bot/files/dev/offline-fixture/app.js @@ -0,0 +1,76 @@ +import {createElement as h, useState, useEffect, Component} from 'react' +import {createRoot} from 'react-dom/client' +import {SettingsDialog} from '../../src/client/settings.js' +import {MemoryDialog} from '../../src/client/memory-panel.js' +import {NewGroupForm, GROUP_SETTINGS_CSS} from '../../src/client/group-settings.js' +import {TeamSidebar, SIDEBAR_CSS} from '../../src/client/sidebar.js' +import {HeaderPill} from '../../src/client/header.js' +import {CommandPalette} from '../../src/client/palette.js' +import {FoldedContent, DocumentPane, foldingOf} from '../../src/client/message-fold.js' +import {MessageTools, onMessageContextMenu} from '../../src/client/message-tools.js' +import {installSendShortcut} from '../../src/client/composer.js' +import {isDarkAppearance, applyAppearanceAttribute} from '../../src/client/appearance.js' +import {SHELL_CSS, CONVERSATION_CSS} from '../../src/client/styles.js' +import {MOBILE_CSS} from '../../src/client/mobile.js' +import {installLocale, DICTIONARY} from '../../src/client/i18n.js' +export const routes = ['chat','settings','memory','group','search'] +const longText = '# 示例离线文档\n'+['背景','方案','边界'].map(x=>'## '+x+'\n'+('这段内容是示例数据,不代表真实对话。'.repeat(35))+'\n').join('\n') +const bot = (id,name) => ({id,name,role:'示例 Bot',createdAt:1,parts:[id],look:{}}) +const bots = [bot('demo-a','示例助手 A'),bot('demo-b','示例助手 B'),bot('demo-c','示例助手 C')] +const room = {id:'demo-group',name:'示例讨论组',admin:'demo-a',members:['demo-a','demo-b'],createdAt:1} +const entries = [{scope:'own',topic:'偏好',text:'示例:回复使用中文。',id:'sample-1'},{scope:'team',topic:'项目',text:'示例:仅本地验证,不部署。',id:'sample-2'}] +const memory = {entries,summary:{at:Date.now(),text:'# 示例记忆\n仅用于离线验证。'},fresh:true,summarizing:false,sizes:{own:12,team:15},limits:{main:4000}} +const sessions = {ids:['demo-a','demo-b','demo-c','demo-group'],byId:Object.fromEntries([...bots,room].map(x=>[x.id,{id:x.id,displayTitle:x.name,updatedAt:1,projectionValues:{turnOutline:[{turn:0,prompt:'示例搜索 kiwi',response:'示例回答:本地 fixture'}]}}]))} +const select = value => Object.assign(pick => pick(value), {getSnapshot:()=>value}) +class Boundary extends Component { + constructor(props){ super(props); this.state={error:null} } + static getDerivedStateFromError(error){return {error:String(error.stack ?? error)}} + render(){return this.state.error ? h('pre',{role:'alert'},'Fixture render failed (not hidden):\n'+this.state.error) : this.props.children} +} +export function App({initialRoute='chat',initialLocked=false,initialLang='zh'}={}) { + const [route,setRoute]=useState(initialRoute), [prefs,setPrefs]=useState({appearance:{mode:'light'},folding:{mode:'standard',documentCards:true}}) + const [locked,setLocked]=useState(initialLocked),[lang,setLang]=useState(initialLang),[active,setActive]=useState('demo-a') + const [unread,setUnread]=useState({'demo-b':true}),[rooms,setRooms]=useState([room]),[flags,setFlags]=useState({}),[doc,setDoc]=useState(null),[streaming,setStreaming]=useState(false) + const [quote,setQuote]=useState(''),[sent,setSent]=useState(0),[log,setLog]=useState([]),[reactions,setReactions]=useState([]),[contextAt,setContext]=useState(null),[page,setPage]=useState('general') + const note=text=>setLog(old=>[String(text),...old].slice(0,8)) + const roster={bots:bots.map(x=>({...x,...flags[x.id]})),rooms:rooms.map(x=>({...x,...flags[x.id]})),agents:[],prefs,exchangeTurns:{},questions:{},self:{name:'示例用户'},mainBotId:null,readOnly:locked?'离线示例:只读窗口。':'',themes:[],projects:[]} + roster.byId=Object.fromEntries(roster.bots.map(x=>[x.id,x]));roster.roomsById=Object.fromEntries(roster.rooms.map(x=>[x.id,x])) + const actions={ + reportError:e=>note(e?.message??e), + setPrefs:async patch=>{if(locked)throw Error('Mock host: read-only');setPrefs(p=>({...p,...patch}));note('mock set-prefs '+JSON.stringify(patch))}, + setFlags:async(id,patch)=>{if(locked)throw Error('Mock host: read-only');setFlags(old=>({...old,[id]:{...old[id],...patch}}));note('mock setFlags '+id)}, + markUnread:id=>{setUnread(old=>({...old,[id]:true}));note(`manual unread ${id}=true`)}, + clearUnread:id=>{setUnread(old=>({...old,[id]:false}));note(`manual unread ${id}=false; system status untouched`)}, + openMenu:()=>note('示例边界:会话行菜单未挂载,请用真实顶栏菜单验证未读/置顶'), + openInbox:()=>note('示例边界:inbox 不在本轮 fixture 范围'), + openConnectors:()=>note('示例边界:连接器不接入真实宿主'), + selectPanel:()=>note('示例边界:宿主面板未接入'), + openSession:id=>{setActive(id);setUnread(old=>({...old,[id]:false}));setRoute('chat')}, + openSettings:next=>{setPage(next??'general');setRoute('settings')},closeSettings:()=>setRoute('chat'), + openPalette:()=>setRoute('search'),closePalette:()=>setRoute('chat'),openNewChat:()=>setRoute('group'), + openMemory:()=>setRoute('memory'),closeMemory:()=>setRoute('chat'),memoryView:async()=>memory, + memoryAsk:async()=>{throw Error('离线 fixture 不模拟模型回答或持久化记忆')},memoryForget:async()=>{throw Error('离线 fixture 不写入记忆')}, + createRoom:async(ids,opts)=>{if(locked)throw Error('Mock host: read-only');const next={id:'demo-created-'+rooms.length,members:ids,...opts};setRooms(old=>[...old,next]);note('mock createRoom '+JSON.stringify(next));return next}, + quote:(_,text)=>{setQuote('> '+text.split('\n').join('\n> ')+'\n\n');note('quoted into mock composer')}, + openDocument:setDoc,toggleDetails:()=>note('宿主详情抽屉未接入 fixture'),reloadTeam:async()=>note('mock reload only'), + } + const useRoster=select(roster),useUi=select({unread,visits:{}}),useSessions=select(sessions),empty=select({}) + const useSessionStatus=select(new Map([['demo-c',{completionUnread:true}]])) + const props={actions,useRoster,useUi,useSessions,useSessionStatus,useRegistry:empty,useActivity:empty,useSessionRetainInfo:(_,pick)=>pick({retainedBy:{mainView:0}}),useUpdate:select(null),useTurnClock:empty,useSession:empty,useBusyAcks:empty,useLive:empty} + installLocale({register:()=>()=>{},bind:()=> (key,params)=>{const text=(lang==='zh'?DICTIONARY.zh[key]:null)??key;return text.replace(/\{(\w+)\}/g,(m,k)=>params?.[k]??m)},getLocale:()=>({active:lang}),setLocale:async tag=>setLang(tag)}) + useEffect(()=>installSendShortcut(useRoster),[prefs,locked]) + useEffect(()=>{applyAppearanceAttribute(isDarkAppearance(prefs));},[prefs]) + const button=(label,click)=>h('button',{type:'button',onClick:click},label) + const composer=h('div',{'data-composer-card':'',style:{marginTop:16}},h('label',null,'模拟宿主输入框(真实 installSendShortcut)',h('textarea',{'data-composer-input':'',defaultValue:quote,key:quote,readOnly:locked,rows:5,style:{display:'block',width:'100%'}})),h('button',{type:'button','data-send':'',disabled:locked,onClick:()=>{setSent(n=>n+1);note('mock send: no network')}},'发送(仅本地计数)'),h('output',null,` 已触发 ${sent} 次`)) + const chat=h('div',null,h(HeaderPill,{...props,sessionId:active}), + h('label',null,h('input',{type:'checkbox',checked:streaming,onChange:e=>setStreaming(e.target.checked)}),'模拟 streaming(只改变 prop,不模拟 token 传输)'), + h('article',{className:'bt-bubble',onContextMenu:e=>onMessageContextMenu(e,setContext,{live:streaming})}, + h(FoldedContent,{text:longText,folding:foldingOf(prefs),streaming,actions,sessionId:active},text=>h('pre',{style:{whiteSpace:'pre-wrap',overflowWrap:'anywhere'}},text)), + !streaming?h(MessageTools,{text:longText,name:'fixture',sessionId:active,roster,actions,contextAt,react:emoji=>{setReactions(old=>[...old,emoji]);note('local reaction '+emoji)}}):null), + h('output',null,reactions.join(' ')),composer,doc?h(DocumentPane,{document:doc,onClose:()=>setDoc(null)}):null) + const view=route==='settings'?h(SettingsDialog,{page,roster,actions,useUpdate:select(null)}):route==='memory'?h(MemoryDialog,{bot:bots[0],roster,actions}):route==='group'?h(NewGroupForm,{roster,actions,run:async promise=>{try{await promise;return true}catch(e){note(e.message);return false}},onCancel:()=>setRoute('chat'),onCreated:()=>setRoute('chat')}):route==='search'?h(CommandPalette,{roster,actions,useSessions,token:'fixture'}):chat + return h('div',null,h('style',null,SHELL_CSS+CONVERSATION_CSS+SIDEBAR_CSS+GROUP_SETTINGS_CSS+MOBILE_CSS+'\nbody{margin:0;background:var(--bt-main);color:var(--bt-ink);font:14px system-ui}button,input,textarea{font:inherit} .fixture-bar{position:relative;z-index:2147483647;padding:10px;background:var(--bt-card);border-bottom:2px solid #fa0;display:flex;gap:8px;flex-wrap:wrap}.fixture-layout{display:grid;grid-template-columns:290px minmax(0,1fr);gap:18px;padding:12px}.fixture-layout main{min-width:0}.fixture-log{white-space:pre-wrap;overflow-wrap:anywhere} @media(max-width:640px){.fixture-layout{grid-template-columns:1fr}}'), + h('header',{className:'fixture-bar'},h('strong',null,'FlyBot — 真实源码组件 / 示例数据 / MOCK HOST / 非实机验收'),...routes.map(r=>button(r,()=>setRoute(r))),button(locked?'切换可写':'切换只读',()=>setLocked(x=>!x)),button(lang==='zh'?'English':'中文',()=>setLang(x=>x==='zh'?'en':'zh'))), + h('div',{className:'fixture-layout'},h('aside',null,h(TeamSidebar,{...props,wide:true})),h('main',null,h(Boundary,{key:route+locked},view),h('pre',{className:'fixture-log','aria-label':'Mock host operation log'},log.join('\n'))))) +} +if (typeof document!=='undefined') createRoot(document.getElementById('root')).render(h(App,{initialRoute:location.hash.slice(1)||'chat'})) diff --git a/patches/ds-bot/files/dev/offline-fixture/build.mjs b/patches/ds-bot/files/dev/offline-fixture/build.mjs new file mode 100644 index 000000000..57c4f43c8 --- /dev/null +++ b/patches/ds-bot/files/dev/offline-fixture/build.mjs @@ -0,0 +1,20 @@ +import assert from 'node:assert/strict' +import {build} from 'esbuild' +import {mkdir,writeFile} from 'node:fs/promises' +import {dirname,resolve} from 'node:path' +import {fileURLToPath} from 'node:url' +const here=dirname(fileURLToPath(import.meta.url)) +const out=resolve(here,'dist') +await mkdir(out,{recursive:true}) +const options={entryPoints:[resolve(here,'app.js')],bundle:true,format:'iife',platform:'browser',outfile:resolve(out,'fixture.js'),metafile:true,nodePaths:[resolve(here,'node_modules')],define:{'process.env.NODE_ENV':'"development"'},plugins:[{name:'explicit-mock-boundaries',setup(b){b.onResolve({filter:/^@deepseek-ai\/dsh-client-ui-primitives$/},()=>({path:resolve(here,'primitives.js')}));b.onResolve({filter:/^\.\/api\.js$/},()=>({path:resolve(here,'host.js')}))}}]} +const result=await build(options) +if (process.argv.includes('--render-check')) await build({...options,format:'esm',platform:'node',outfile:resolve(here,'render-check.mjs'),external:['react','react-dom','react-dom/*']}) +await writeFile(resolve(out,'index.html'),'FlyBot real-component offline fixture · MOCK HOST
') +await writeFile(resolve(out,'bundle-inputs.json'),JSON.stringify(result.metafile,null,2)) +console.log(out+'/index.html') + +const inputs=Object.keys(result.metafile.inputs) +for (const file of ['settings','composer','message-fold','memory-panel','group-settings','sidebar','palette','message-tools','header']) assert.ok(inputs.some(path=>path.endsWith('src/client/'+file+'.js')), 'Missing actual component '+file) +assert.ok(!inputs.some(path=>path.endsWith('src/client/api.js')), 'Real host transport must not be bundled') +for (const output of Object.values(result.metafile.outputs)) assert.equal(output.imports.length,0,'Browser bundle must be self contained') +console.log('PASS actual source manifest and no external browser imports / real host transport') diff --git a/patches/ds-bot/files/dev/offline-fixture/check.mjs b/patches/ds-bot/files/dev/offline-fixture/check.mjs new file mode 100644 index 000000000..572ce47e7 --- /dev/null +++ b/patches/ds-bot/files/dev/offline-fixture/check.mjs @@ -0,0 +1,10 @@ +// Render smoke only, not browser effects, layout or interaction acceptance. +import assert from 'node:assert/strict' +import {createElement} from 'react' +import {renderToString} from 'react-dom/server' +import {App,routes} from './render-check.mjs' +for (const initialRoute of routes) for (const initialLocked of [false,true]) for (const initialLang of ['zh','en']) { + const html=renderToString(createElement(App,{initialRoute,initialLocked,initialLang})) + assert.match(html,/MOCK HOST/) + console.log('PASS source-component server render',initialRoute,initialLocked,initialLang,html.length) +} diff --git a/patches/ds-bot/files/dev/offline-fixture/host.js b/patches/ds-bot/files/dev/offline-fixture/host.js new file mode 100644 index 000000000..c7901f634 --- /dev/null +++ b/patches/ds-bot/files/dev/offline-fixture/host.js @@ -0,0 +1,5 @@ +// MOCK HOST ONLY. No transport is installed and unsupported calls reject visibly. +export async function call(method, body) { + if (typeof globalThis.__fixtureCall === 'function') return globalThis.__fixtureCall(method, body) + throw new Error(`Offline fixture: unsupported host call ${method}`) +} diff --git a/patches/ds-bot/files/dev/offline-fixture/package-lock.json b/patches/ds-bot/files/dev/offline-fixture/package-lock.json new file mode 100644 index 000000000..5e3e850af --- /dev/null +++ b/patches/ds-bot/files/dev/offline-fixture/package-lock.json @@ -0,0 +1,41 @@ +{ + "name": "offline-fixture", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "react": "https://registry.npmjs.org/react/-/react-19.3.1.tgz", + "react-dom": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.1.tgz", + "scheduler": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz" + } + }, + "node_modules/react": { + "version": "19.3.1", + "resolved": "https://registry.npmjs.org/react/-/react-19.3.1.tgz", + "integrity": "sha512-QNhWdt7nrgVWWQG58QuGsAR3jv3Hbe4mb4vz7w2csnHavciZJgda1CPNaldF6eVxv90ud3jUXpKlHL69gO38yw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "19.3.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.1.tgz", + "integrity": "sha512-Y0bARz53lhEC1NMCASs0/j+faB/zqt3R8hpvg1e8+61ZVJ4UL0UdC4cBbXfZMcIuhrfgeILTLe+ZeBCavQPtKQ==", + "license": "MIT", + "dependencies": { + "scheduler": "^0.28.0" + }, + "peerDependencies": { + "react": "^19.3.1" + } + }, + "node_modules/scheduler": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz", + "integrity": "sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw==", + "license": "MIT" + } + } +} diff --git a/patches/ds-bot/files/dev/offline-fixture/package.json b/patches/ds-bot/files/dev/offline-fixture/package.json new file mode 100644 index 000000000..f7a5be88e --- /dev/null +++ b/patches/ds-bot/files/dev/offline-fixture/package.json @@ -0,0 +1,7 @@ +{ + "dependencies": { + "react": "https://registry.npmjs.org/react/-/react-19.3.1.tgz", + "react-dom": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.1.tgz", + "scheduler": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz" + } +} diff --git a/patches/ds-bot/files/dev/offline-fixture/primitives.js b/patches/ds-bot/files/dev/offline-fixture/primitives.js new file mode 100644 index 000000000..666b062d6 --- /dev/null +++ b/patches/ds-bot/files/dev/offline-fixture/primitives.js @@ -0,0 +1,5 @@ +// DSH is absent: these marked dependency substitutes are NOT renderer acceptance. +import { createElement as h } from 'react' +export const MarkdownText = ({text}) => h('pre', {'data-fixture-mock':'DSH MarkdownText', style:{whiteSpace:'pre-wrap',overflowWrap:'anywhere'}}, text) +export const FishLogo = () => h('span', {'data-fixture-mock':'DSH FishLogo', 'aria-label':'FlyBot mock logo'}, '◈') +export const projectUserText = text => ({text:String(text ?? ''), images:[], attachments:[]}) diff --git a/patches/ds-bot/files/src/client/appearance.js b/patches/ds-bot/files/src/client/appearance.js new file mode 100644 index 000000000..1c3b956cf --- /dev/null +++ b/patches/ds-bot/files/src/client/appearance.js @@ -0,0 +1,244 @@ +// Appearance for this window: light, dark, automatic (sunset-to-sunrise or a custom +// night window), or match the system. The chosen palette still comes from themes.js; +// this module only decides whether `data-ds-dark-theme` is on. +// Send-key preference lives here too: it is a General setting persisted with prefs. + +export const APPEARANCE_MODES = ['light', 'dark', 'auto', 'system'] +export const AUTO_KINDS = ['sun', 'custom'] +export const SEND_KEYS = ['enter', 'shift-enter'] +export const DEFAULT_APPEARANCE = { mode: 'system', auto: 'sun', from: '19:00', to: '07:00' } +export const DEFAULT_SEND_KEY = 'enter' +export const DEFAULT_LATITUDE = 40 +const TIME = /^([01]\d|2[0-3]):[0-5]\d$/ + +// A coarse latitude for the solar estimate when the account has no coordinates. +// Asia/Shanghai is the owner's zone; other common zones are listed so the curve +// is not stuck at mid-latitudes everywhere. +const TZ_LATITUDE = { + 'Asia/Shanghai': 31.23, + 'Asia/Chongqing': 29.56, + 'Asia/Hong_Kong': 22.32, + 'Asia/Taipei': 25.03, + 'Asia/Tokyo': 35.68, + 'Asia/Seoul': 37.57, + 'Asia/Singapore': 1.35, + 'Asia/Kolkata': 28.61, + 'Europe/London': 51.51, + 'Europe/Paris': 48.86, + 'Europe/Berlin': 52.52, + 'America/New_York': 40.71, + 'America/Chicago': 41.88, + 'America/Denver': 39.74, + 'America/Los_Angeles': 34.05, + 'America/Sao_Paulo': -23.55, + 'Australia/Sydney': -33.87, + UTC: 0, +} + +export function timezoneOf(date = new Date(), timeZone) { + if (typeof timeZone === 'string' && timeZone) return timeZone + try { + return Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC' + } catch { + return 'UTC' + } +} + +export function latitudeForZone(timeZone) { + return TZ_LATITUDE[timeZone] ?? DEFAULT_LATITUDE +} + +export function parseClock(value) { + if (typeof value !== 'string' || !TIME.test(value)) return null + const [hours, minutes] = value.split(':').map(Number) + return hours * 60 + minutes +} + +export function formatClock(minutes) { + const wrapped = ((Math.round(minutes) % 1440) + 1440) % 1440 + const hours = Math.floor(wrapped / 60) + const mins = wrapped % 60 + return `${String(hours).padStart(2, '0')}:${String(mins).padStart(2, '0')}` +} + +// Local wall-clock minutes past midnight in `timeZone`. +export function localMinutes(date, timeZone) { + const zone = timezoneOf(date, timeZone) + const parts = new Intl.DateTimeFormat('en-US', { + timeZone: zone, hour: '2-digit', minute: '2-digit', hourCycle: 'h23', + }).formatToParts(date) + const hour = Number(parts.find(part => part.type === 'hour')?.value ?? 0) + const minute = Number(parts.find(part => part.type === 'minute')?.value ?? 0) + return hour * 60 + minute +} + +function dayOfYear(date, timeZone) { + const zone = timezoneOf(date, timeZone) + const parts = new Intl.DateTimeFormat('en-US', { + timeZone: zone, year: 'numeric', month: 'numeric', day: 'numeric', + }).formatToParts(date) + const year = Number(parts.find(part => part.type === 'year')?.value) + const month = Number(parts.find(part => part.type === 'month')?.value) + const day = Number(parts.find(part => part.type === 'day')?.value) + const utc = Date.UTC(year, month - 1, day) + const start = Date.UTC(year, 0, 0) + return Math.round((utc - start) / 86_400_000) +} + +// Compact solar estimate: sunrise and sunset as local minutes. Good enough for +// an automatic theme flip; not an almanac. Polar day/night clamps to always +// light or always dark. +export function sunMinutes(date, { latitude, timeZone } = {}) { + const zone = timezoneOf(date, timeZone) + const latDeg = Number.isFinite(latitude) ? latitude : latitudeForZone(zone) + const decl = -23.44 * Math.cos((2 * Math.PI / 365) * (dayOfYear(date, zone) + 10)) * (Math.PI / 180) + const lat = latDeg * (Math.PI / 180) + const cosHa = -Math.tan(lat) * Math.tan(decl) + if (cosHa >= 1) return { sunrise: 12 * 60, sunset: 12 * 60, alwaysDark: true } + if (cosHa <= -1) return { sunrise: 0, sunset: 24 * 60, alwaysDark: false, alwaysLight: true } + const minutesFromNoon = (Math.acos(cosHa) * 180 / Math.PI) / 15 * 60 + const noon = 12 * 60 + return { sunrise: noon - minutesFromNoon, sunset: noon + minutesFromNoon } +} + +export function afterSunset(date, options) { + const sun = sunMinutes(date, options) + if (sun.alwaysDark) return true + if (sun.alwaysLight) return false + const now = localMinutes(date, options?.timeZone) + return now >= sun.sunset || now < sun.sunrise +} + +// Custom night window: dark from `from` until `to`. A window that wraps midnight +// (19:00–07:00) is the usual case. Equal clocks are treated as no window (light). +export function inNightWindow(date, from, to, timeZone) { + const start = parseClock(from) + const end = parseClock(to) + if (start === null || end === null || start === end) return false + const now = localMinutes(date, timeZone) + return start < end ? now >= start && now < end : now >= start || now < end +} + +export function normalizeAppearance(value) { + const mode = APPEARANCE_MODES.includes(value?.mode) ? value.mode : DEFAULT_APPEARANCE.mode + const auto = AUTO_KINDS.includes(value?.auto) ? value.auto : DEFAULT_APPEARANCE.auto + const from = parseClock(value?.from) !== null ? value.from : DEFAULT_APPEARANCE.from + const to = parseClock(value?.to) !== null ? value.to : DEFAULT_APPEARANCE.to + return { mode, auto, from, to } +} + +export function appearanceOf(prefs) { + return normalizeAppearance(prefs?.appearance) +} + +export function normalizeSendKey(value) { + return SEND_KEYS.includes(value) ? value : DEFAULT_SEND_KEY +} + +export function sendKeyOf(prefs) { + return normalizeSendKey(prefs?.sendKey) +} + +export function systemDark(media = globalThis.matchMedia) { + try { + return typeof media === 'function' ? Boolean(media.call(globalThis, '(prefers-color-scheme: dark)')?.matches) : false + } catch { + return false + } +} + +export function isDarkAppearance(prefs, now = new Date(), darkSystem = systemDark(), options = {}) { + const appearance = appearanceOf(prefs) + if (appearance.mode === 'light') return false + if (appearance.mode === 'dark') return true + if (appearance.mode === 'system') return Boolean(darkSystem) + const zone = options.timeZone + if (appearance.auto === 'custom') return inNightWindow(now, appearance.from, appearance.to, zone) + return afterSunset(now, { timeZone: zone, latitude: options.latitude }) +} + +export function applyAppearanceAttribute(dark, root) { + const doc = root?.ownerDocument ?? root ?? (typeof document === 'undefined' ? null : document) + if (!doc?.documentElement) return dark ? 'dark' : 'light' + const body = doc.body ?? doc.documentElement + if (dark) body.setAttribute('data-ds-dark-theme', '') + else body.removeAttribute('data-ds-dark-theme') + return dark ? 'dark' : 'light' +} + +// The General page and installTheme share this so a stored record, a form draft, +// and the live attribute stay in one shape. +export function appearanceRecord(appearance, { clear = false } = {}) { + if (clear || appearance == null) return null + const next = normalizeAppearance(appearance) + if (next.mode === DEFAULT_APPEARANCE.mode && next.auto === DEFAULT_APPEARANCE.auto + && next.from === DEFAULT_APPEARANCE.from && next.to === DEFAULT_APPEARANCE.to) return null + return next +} + +export function shouldSendOnKey(event, sendKey) { + if (!event || event.key !== 'Enter' || event.metaKey || event.ctrlKey || event.altKey || event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229 || event.which === 229) return false + return normalizeSendKey(sendKey) === 'shift-enter' ? event.shiftKey === true : event.shiftKey !== true +} + +export function shouldBreakOnKey(event, sendKey) { + if (!event || event.key !== 'Enter' || event.metaKey || event.ctrlKey || event.altKey || event.isComposing || event.nativeEvent?.isComposing || event.keyCode === 229 || event.which === 229) return false + return normalizeSendKey(sendKey) === 'shift-enter' ? event.shiftKey !== true : event.shiftKey === true +} + +// When the user chose Shift+Enter to send, intercept the shell's Enter-to-send +// composer: Enter inserts a newline, Shift+Enter presses the card's send button. +export function handleComposerSendKey(event, sendKey, { send, insertNewline } = {}) { + const key = normalizeSendKey(sendKey) + if (key === DEFAULT_SEND_KEY) return false + if (shouldSendOnKey(event, key)) { + event.preventDefault() + event.stopPropagation() + send?.() + return 'send' + } + if (shouldBreakOnKey(event, key)) { + event.preventDefault() + event.stopPropagation() + insertNewline?.(event) + return 'break' + } + return false +} + +export function composerCardOf(node) { + return node instanceof Element ? node.closest('[data-composer-card]') : null +} + +export function composerFieldOf(event) { + const target = event?.target + if (!(target instanceof Element)) return null + return target.closest('[data-composer-input], textarea, [contenteditable="true"]') +} + +export function findSendButton(card) { + if (!card) return null + const named = card.querySelector('button[type=submit], button[data-send], [data-composer-send]') + if (named) return named + return [...card.querySelectorAll('button')].find((button) => { + const label = `${button.getAttribute('aria-label') ?? ''} ${button.getAttribute('title') ?? ''} ${button.textContent ?? ''}` + return /send|发送/i.test(label) && !/dictate|mic|voice|add|plus|录音|听写|添加/i.test(label) + }) ?? null +} + +export function insertComposerNewline(field) { + if (!field) return + if (typeof field.value === 'string' && typeof field.selectionStart === 'number') { + const start = field.selectionStart + const end = field.selectionEnd ?? start + const value = field.value + field.value = `${value.slice(0, start)}\n${value.slice(end)}` + field.selectionStart = field.selectionEnd = start + 1 + field.dispatchEvent(new Event('input', { bubbles: true })) + return + } + if (field.isContentEditable || field.getAttribute?.('contenteditable') === 'true') { + const doc = field.ownerDocument ?? document + if (typeof doc.execCommand === 'function') doc.execCommand('insertText', false, '\n') + } +} diff --git a/patches/ds-bot/files/src/client/history-hit.js b/patches/ds-bot/files/src/client/history-hit.js new file mode 100644 index 000000000..2166b11f2 --- /dev/null +++ b/patches/ds-bot/files/src/client/history-hit.js @@ -0,0 +1,64 @@ +// A separate read-only history view, never a navigation to the current Agent. +import { createElement as h, useEffect, useRef, useState } from 'react' +import { useDialogFocus, useEscape } from './overlay-hooks.js' +import { CloseIcon } from './icons.js' +import { t } from './i18n.js' + +export function useHistoryHit(read, hitToken, accessKey) { + const [attempt, setAttempt] = useState(0) + const [state, setState] = useState({ key: '', status: 'loading', value: null }) + const serial = useRef(0) + const key = `${hitToken ?? ''}:${accessKey}:${attempt}` + useEffect(() => { + const ticket = ++serial.current + const abort = new AbortController() + setState({ key, status: 'loading', value: null }) + if (!hitToken || typeof read !== 'function') { + setState({ key, status: 'error', value: null }) + return () => { serial.current += 1; abort.abort() } + } + void Promise.resolve().then(() => read({ hitToken }, abort.signal)).then(value => { + if (serial.current !== ticket || abort.signal.aborted) return + if (value?.scope !== 'read-only-history' || !Array.isArray(value.entries)) throw new Error('Invalid history response') + setState({ key, status: 'ready', value }) + }).catch(() => { + if (serial.current === ticket && !abort.signal.aborted) setState({ key, status: 'error', value: null }) + }) + return () => { serial.current += 1; abort.abort() } + }, [read, key]) + return { ...(state.key === key ? state : { status: 'loading', value: null }), reload: () => setAttempt(value => value + 1) } +} + +export function HistoryHitDialog({ hit, roster, actions, onBack }) { + const ref = useRef(null) + useEscape(onBack) + useDialogFocus(ref) + const bot = roster.byId[hit.botId] + // Roster-driven account/ownership/part changes clear displayed content before + // another authenticated read. No cached search snippet is used as context. + const accessKey = JSON.stringify([Boolean(bot), bot?.ownerId, bot?.sessionId, bot?.parts, roster.self?.memberId]) + const state = useHistoryHit(actions.readHistoryHit, bot ? hit.hitToken : null, accessKey) + const view = state.status === 'ready' ? state.value : null + return h('div', { className: 'bt-palette-layer' }, + h('div', { className: 'bt-backdrop', onMouseDown: onBack }), + h('section', { className: 'bt-palette bt-history-view', role: 'dialog', 'aria-modal': true, 'aria-label': t('Read-only history match'), tabIndex: -1, ref }, + h('header', { className: 'bt-palette-head' }, h('h2', null, t('Read-only history match')), + h('button', { type: 'button', className: 'bt-palette-clear', 'aria-label': t('Back to search'), onClick: onBack }, h(CloseIcon))), + h('p', { className: 'bt-history-disclaimer' }, t('This is segment history, not the current chat. No Bot is activated.')), + h('p', { className: 'bt-history-disclaimer' }, t('Shows the match and up to two nearby visible messages on each side.')), + h('div', { className: 'bt-history-content' }, + state.status === 'loading' ? h('p', { role: 'status' }, t('Loading authorized history…')) : null, + state.status === 'error' ? h('p', { role: 'alert' }, t('History changed, expired, or is no longer accessible. Search again.')) : null, + view ? h('div', null, + h('p', null, t('Segment {part} of {count}', { part: view.part, count: view.partCount })), + h('p', null, t('History session'), ': ', h('code', null, view.sessionId)), + view.entries.map(entry => h('section', { key: entry.seq, className: 'bt-history-entry', 'data-hit': entry.hit || undefined }, + h('h3', null, entry.hit ? t('Matched message') : t('Nearby message'), ' · ', t(entry.role === 'user' ? 'You' : 'Bot'), ' · ', t('Sequence'), ' ', entry.seq, + entry.turn === null ? null : ` · ${t('Turn')} ${entry.turn}`), + entry.omittedBefore ? h('span', null, '…') : null, + h('pre', null, entry.text), + entry.truncated ? h('p', { className: 'bt-hint' }, t('Text truncated by the byte limit; this is not complete history.')) : null))) : null), + h('footer', { className: 'bt-history-foot' }, + h('button', { type: 'button', className: 'bt-soft', onClick: onBack }, t('Back to search')), + h('button', { type: 'button', className: 'bt-soft', disabled: state.status === 'loading', onClick: state.reload }, t('Reload history context'))))) +} diff --git a/patches/ds-bot/files/src/client/history-search.js b/patches/ds-bot/files/src/client/history-search.js new file mode 100644 index 000000000..6abcd87d5 --- /dev/null +++ b/patches/ds-bot/files/src/client/history-search.js @@ -0,0 +1,44 @@ +// Async history state separated from the palette's loaded-outline fallback. +import { useEffect, useRef, useState } from 'react' +export const HISTORY_DISPLAY_MAX = 100 +export function useHistorySearch(search, query) { + const [state, setState] = useState({ query: '', items: [], status: 'idle', cursor: null }) + const latest = useRef(0) + const alive = useRef(true) + const activeAbort = useRef(null) + useEffect(() => { alive.current = true; return () => { alive.current = false; latest.current += 1; activeAbort.current?.abort() } }, []) + const request = async (wanted, previous, ticket) => { + activeAbort.current?.abort() + const abort = new AbortController() + activeAbort.current = abort + try { + const reply = await search({ query: wanted, limit: Math.min(20, HISTORY_DISPLAY_MAX - previous.items.length), ...(previous.cursor ? { cursor: previous.cursor } : {}) }, abort.signal) + if (!alive.current || latest.current !== ticket) return + if (reply?.scope !== 'local-bot-chats' || !Array.isArray(reply.items)) throw new Error('Unsupported history response') + const items = [...previous.items, ...reply.items].slice(0, HISTORY_DISPLAY_MAX) + setState({ query: wanted, items, status: 'ready', cursor: items.length < HISTORY_DISPLAY_MAX ? reply.cursor : null, incomplete: reply.incomplete, + limited: reply.limited || (items.length >= HISTORY_DISPLAY_MAX && Boolean(reply.cursor)) }) + } catch { + if (alive.current && latest.current === ticket) setState({ query: wanted, items: [], status: 'error', cursor: null }) + } finally { if (activeAbort.current === abort) activeAbort.current = null } + } + useEffect(() => { + const ticket = ++latest.current + const initial = { query, items: [], cursor: null } + if (typeof search !== 'function' || !query.trim() || [...query].length > 256) { + setState({ ...initial, status: 'idle' }) + return undefined + } + setState({ ...initial, status: 'loading' }) + const timer = setTimeout(() => { void request(query, initial, ticket) }, 250) + return () => { clearTimeout(timer); activeAbort.current?.abort() } + }, [search, query]) + const current = state.query === query ? state : { query, items: [], cursor: null, status: typeof search === 'function' && query.trim() ? 'loading' : 'idle' } + const more = () => { + if (current.status !== 'ready' || !current.cursor) return + const ticket = ++latest.current + setState({ ...current, status: 'loading' }) + void request(query, current, ticket) + } + return { ...current, more } +} diff --git a/patches/ds-bot/files/src/client/message-fold.js b/patches/ds-bot/files/src/client/message-fold.js new file mode 100644 index 000000000..5a288e8db --- /dev/null +++ b/patches/ds-bot/files/src/client/message-fold.js @@ -0,0 +1,88 @@ +// Long-message folding in chat bubbles, and the General setting that drives it. +// Compact / standard / no folding set how much of a long message is shown as a +// preview; a long document with several sections can collapse into a card +// opened beside the conversation. + +import { createElement as h, useEffect, useState } from 'react' +import { MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives' +import { CloseIcon } from './icons.js' +import { t } from './i18n.js' +import { + DEFAULT_FOLDING, documentHeadings, documentTitle as titleOf, + previewOf, shouldFold, showsDocumentCard, +} from '../shared/message-fold.js' + +export { + DEFAULT_FOLDING, FOLD_MODES, FOLD_THRESHOLDS, documentHeadings, documentTitle, + exceedsThreshold, foldingOf, isLongDocument, previewOf, shouldFold, showsDocumentCard, +} from '../shared/message-fold.js' + +export function FoldedContent({ text, folding, streaming = false, actions, sessionId, children }) { + const [open, setOpen] = useState(false) + const mode = folding?.mode ?? DEFAULT_FOLDING.mode + const cards = folding?.documentCards === true || (folding?.documentCards !== false && DEFAULT_FOLDING.documentCards) + useEffect(() => { setOpen(false) }, [mode, cards, text]) + + const render = typeof children === 'function' + ? children + : (Array.isArray(children) && children.length === 1 && typeof children[0] === 'function' ? children[0] : null) + const raw = String(text ?? '') + if (streaming) return render ? render(raw) : null + if (mode !== 'none' && showsDocumentCard(raw, { ...folding, documentCards: cards })) { + const title = titleOf(raw) || t('Document') + const count = Math.max(documentHeadings(raw).length, 1) + return h('div', { className: 'bt-document-message' }, + h(DocumentCard, { title, count, onOpen: () => actions?.openDocument?.({ title, text: raw, sessionId }) }), + h('button', { type: 'button', className: 'bt-fold-toggle', 'aria-expanded': open, + onClick: () => setOpen(value => !value) }, t(open ? 'Hide message text' : 'Show message text')), + open ? (render ? render(raw) : h(MarkdownText, { text: raw, labels: mdLabels(), variant: 'compact' })) : null) + + } + if (!shouldFold(raw, mode)) return render ? render(raw) : null + const shown = open ? raw : previewOf(raw, mode) + return h('div', { className: 'bt-fold', 'data-folded': open ? undefined : '' }, + render ? render(shown) : null, + h('button', { + type: 'button', + className: 'bt-fold-toggle', + 'aria-expanded': open, + onClick: (event) => { event.preventDefault(); event.stopPropagation(); setOpen(value => !value) }, + }, t(open ? 'Show less' : 'Show more'))) +} + +export function DocumentCard({ title, count, onOpen }) { + const sections = t('{count} sections', { count }) + return h('button', { + type: 'button', + className: 'bt-doc-card', + onClick: (event) => { event.preventDefault(); event.stopPropagation(); onOpen?.() }, + 'aria-label': `${title}. ${sections}. ${t('Open beside the conversation')}`, + }, + h('span', { className: 'bt-doc-card-icon', 'aria-hidden': true }, h(DocIcon)), + h('span', { className: 'bt-doc-card-copy' }, + h('span', { className: 'bt-doc-card-title' }, title), + h('span', { className: 'bt-doc-card-meta' }, sections)), + h('span', { className: 'bt-doc-card-go' }, t('Open beside the conversation'))) +} + +function DocIcon() { + return h('svg', { width: 22, height: 22, viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor', strokeWidth: 1.6, strokeLinecap: 'round', strokeLinejoin: 'round', 'aria-hidden': true }, + h('path', { d: 'M7 3.5h7l5 5V20a1.5 1.5 0 0 1-1.5 1.5h-10.5A1.5 1.5 0 0 1 5.5 20V5A1.5 1.5 0 0 1 7 3.5z' }), + h('path', { d: 'M14 3.5V9h5.5' }), + h('path', { d: 'M8.5 13h7M8.5 16.5h5' })) +} + +const mdLabels = () => ({ code: { copyLabel: t('Copy'), copiedLabel: t('Copied') }, footnotes: t('Footnotes') }) + +export function DocumentPane({ document, onClose }) { + const title = document?.title || t('Document') + const text = String(document?.text ?? '') + return h('div', { className: 'bt-doc-pane', 'aria-label': title }, + h('div', { className: 'bt-doc-pane-head' }, + h('div', { className: 'bt-doc-pane-copy' }, + h('h2', { className: 'bt-doc-pane-title' }, title), + h('p', { className: 'bt-doc-pane-hint' }, t('Opened beside the conversation.'))), + h('button', { type: 'button', className: 'bt-icon-btn', 'aria-label': t('Close document'), onClick: onClose }, h(CloseIcon))), + h('div', { className: 'bt-doc-pane-body' }, + h(MarkdownText, { text, labels: mdLabels(), variant: 'compact' }))) +} diff --git a/patches/ds-bot/files/src/client/message-tools.js b/patches/ds-bot/files/src/client/message-tools.js new file mode 100644 index 000000000..1f1f4b4e4 --- /dev/null +++ b/patches/ds-bot/files/src/client/message-tools.js @@ -0,0 +1,150 @@ +import { createElement as h, useEffect, useRef, useState } from 'react' +import { createPortal } from 'react-dom' +import { SmileIcon, ReplyIcon, DotsIcon, CheckIcon, DownloadIcon, CopyIcon } from './icons.js' +import { t } from './i18n.js' +import { MESSAGE_REACTIONS, isLockedRoster, messageActionIds } from '../shared/message-actions.js' + +// Closes a popover on a press outside the given elements or on Escape. +export function useDismiss(open, close, refs) { + useEffect(() => { + if (!open) return undefined + const onDown = (event) => { + if (refs.some(ref => ref.current?.contains(event.target))) return + close() + } + const onKey = (event) => { if (event.key === 'Escape') { event.stopPropagation(); close() } } + window.addEventListener('mousedown', onDown) + window.addEventListener('keydown', onKey, true) + return () => { window.removeEventListener('mousedown', onDown); window.removeEventListener('keydown', onKey, true) } + }, [open, close]) +} + +function downloadMessage(text, name) { + const url = URL.createObjectURL(new Blob([text], { type: 'text/markdown' })) + const link = Object.assign(document.createElement('a'), { href: url, download: `${name}-message.md` }) + link.click() + setTimeout(() => URL.revokeObjectURL(url), 1000) +} + +// The hover toolbar and the overflow / right-click menu for one message. Only +// actions the client can run are drawn: add a reaction, quote into the composer, +// copy, or download. A locked window hides Reply (it writes into the composer). +export function MessageTools({ + text, + name, + sessionId, + react, + actions, + roster, + contextAt, + className = 'bt-tools', +}) { + const [panel, setPanel] = useState(null) + const [place, setPlace] = useState(null) + const [copied, setCopied] = useState(false) + const tools = useRef(null) + const pop = useRef(null) + const locked = isLockedRoster(roster) + const ids = messageActionIds({ + text, + sessionId, + canReact: typeof react === 'function', + canReply: typeof actions?.quote === 'function', + locked, + }) + const [dismissed, setDismissed] = useState(null) + const [note, setNote] = useState('') + const close = () => { + setDismissed(contextAt?.token ?? dismissed) + setPanel(null) + } + const cursorPlace = (at) => { + if (!at) return null + const width = typeof window === 'undefined' ? 1400 : window.innerWidth + const height = typeof window === 'undefined' ? 800 : window.innerHeight + const below = at.y + 220 < height + return { + left: Math.max(8, Math.min(at.x, width - 228)), + ...(below ? { top: at.y } : { bottom: height - at.y + 4, '--bt-origin': 'bottom left' }), + } + } + const openFromContext = Boolean(contextAt?.token && contextAt.token !== dismissed && ids.length > 0) + const shown = openFromContext ? 'more' : panel + const menuPlace = openFromContext ? cursorPlace(contextAt) : place + const openAt = (kind, event, { cursor = false } = {}) => { + if (!cursor && panel === kind) { close(); return } + setDismissed(contextAt?.token ?? dismissed) + const width = typeof window === 'undefined' ? 1400 : window.innerWidth + const height = typeof window === 'undefined' ? 800 : window.innerHeight + const rect = event?.currentTarget?.getBoundingClientRect?.() + const below = cursor + ? event.clientY + 220 < height + : rect && rect.bottom + 220 < height + const left = cursor + ? Math.min(event.clientX, width - 228) + : Math.min(rect.left, width - 228) + setPlace(kind === 'react' && !cursor + ? { left: rect.left + rect.width / 2, top: rect.top - 6, '--bt-origin': 'bottom center' } + : { left: Math.max(8, left), ...(below + ? { top: cursor ? event.clientY : rect.bottom + 4 } + : { bottom: height - (cursor ? event.clientY : rect.top) + 4, '--bt-origin': 'bottom left' }) }) + setPanel(kind) + } + useDismiss(shown !== null, close, [tools, pop]) + useEffect(() => { if (shown) pop.current?.querySelector?.('button')?.focus?.() }, [shown, contextAt?.token]) + const copy = async () => { + try { + if (typeof navigator.clipboard?.writeText !== 'function') { setNote(t('Clipboard unavailable')); return } + await navigator.clipboard.writeText(text) + setCopied(true) + setNote(t('Copied')) + setTimeout(() => setCopied(false), 1000) + } catch { setNote(t('Could not copy message')) } + } + const download = () => { + try { downloadMessage(text, name); close() } + catch { setNote(t('Could not download message')) } + } + const reply = () => actions.quote(sessionId, text) + const item = (label, Icon, run, keepOpen = false) => h('button', { key: label, type: 'button', role: 'menuitem', onClick: () => { if (!keepOpen) close(); run() } }, h(Icon), label) + const menuItems = [] + if (ids.includes('reply')) menuItems.push(item(t('Reply'), ReplyIcon, reply)) + if (ids.includes('copy')) menuItems.push(item(copied ? t('Copied') : t('Copy'), copied ? CheckIcon : CopyIcon, copy, true)) + if (ids.includes('download')) menuItems.push(item(t('Download'), DownloadIcon, download, true)) + if (ids.length === 0) return null + return h('div', { ref: tools, className, 'data-open': shown !== null || undefined }, + ids.includes('react') ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('Add reaction'), title: t('Add reaction'), 'aria-expanded': shown === 'react', onClick: event => openAt('react', event) }, h(SmileIcon)) : null, + ids.includes('reply') ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('Reply'), title: t('Reply'), onClick: reply }, h(ReplyIcon)) : null, + menuItems.length > 0 || ids.includes('react') + ? h('button', { type: 'button', className: 'bt-tool', 'aria-label': t('More message actions'), title: t('More'), 'aria-haspopup': 'menu', 'aria-expanded': shown === 'more', onClick: event => openAt('more', event) }, copied ? h(CheckIcon) : h(DotsIcon)) + : null, + shown === 'react' ? createPortal(h('div', { ref: pop, className: 'bt-react-strip', role: 'menu', 'aria-label': t('Reactions'), style: menuPlace }, + MESSAGE_REACTIONS.map(emoji => h('button', { key: emoji, type: 'button', role: 'menuitem', 'aria-label': emoji, onClick: () => { close(); react(emoji) } }, emoji))), document.body) : null, + shown === 'more' ? createPortal(h('div', { ref: pop, className: 'bt-menu', role: 'menu', 'aria-label': t('Message actions'), style: menuPlace, + onKeyDown: event => { + if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return + const buttons = [...(pop.current?.querySelectorAll?.('button:not(:disabled)') ?? [])] + if (!buttons.length) return + event.preventDefault() + const at = buttons.indexOf(document.activeElement) + const next = event.key === 'Home' ? 0 : event.key === 'End' ? buttons.length - 1 : (at + (event.key === 'ArrowDown' ? 1 : -1) + buttons.length) % buttons.length + buttons[next].focus() + } }, + ids.includes('react') + ? h('div', { key: 'reacts', className: 'bt-menu-reacts', role: 'group', 'aria-label': t('Reactions') }, + MESSAGE_REACTIONS.map(emoji => h('button', { key: emoji, type: 'button', role: 'menuitem', 'aria-label': emoji, onClick: () => { close(); react(emoji) } }, emoji))) + : null, + ids.includes('react') && menuItems.length > 0 ? h('div', { key: 'sep', className: 'bt-menu-sep', role: 'separator' }) : null, + ...menuItems, + note ? h('div', { role: 'status', 'aria-live': 'polite', className: 'bt-menu-hint bt-message-note' }, note) : null), document.body) : null) +} + +let contextToken = 0 + +export function onMessageContextMenu(event, setContextAt, { live = false } = {}) { + if (live) return + if (event.target?.closest?.('a[href], input, textarea, [role="menu"]')) return + event.preventDefault() + event.stopPropagation() + setContextAt({ x: event.clientX, y: event.clientY, token: ++contextToken }) +} diff --git a/patches/ds-bot/files/src/client/mobile.js b/patches/ds-bot/files/src/client/mobile.js index 8256cc98d..5d0dd823b 100644 --- a/patches/ds-bot/files/src/client/mobile.js +++ b/patches/ds-bot/files/src/client/mobile.js @@ -9,6 +9,17 @@ export const MOBILE_MAX_WIDTH = 640 export const MOBILE_CSS = ` @media (max-width:${MOBILE_MAX_WIDTH}px){ +.bt-appearance-seg{flex-wrap:wrap} +.bt-appearance-seg button{height:auto;min-height:36px;white-space:normal;overflow-wrap:anywhere} +.bt-ng-split{grid-template-columns:minmax(0,1fr);min-height:0} +.bt-mem-shell{flex-direction:column} +.bt-mem-nav{width:auto;max-height:36vh;border-right:0;border-bottom:.5px solid var(--bt-line)} +.bt-menu{max-width:calc(100vw - 16px)} +.bt-message-note{white-space:normal;overflow-wrap:anywhere;padding:6px 8px;max-width:220px} +.bt-utools,.bt-tools{opacity:1;visibility:visible} +.bt-umsg{flex-wrap:wrap} +.bt-menu-reacts{flex-wrap:wrap} + .bt-held-actions{max-width:100%} .bt-held-card{padding:10px 12px} :is(.bt-held-card,.bt-flybot-approval) .bt-flybot-approval-actions{gap:8px;margin-top:8px} diff --git a/patches/ds-bot/files/src/client/parity-shell.js b/patches/ds-bot/files/src/client/parity-shell.js new file mode 100644 index 000000000..5d8a7a016 --- /dev/null +++ b/patches/ds-bot/files/src/client/parity-shell.js @@ -0,0 +1,55 @@ +// Chat-shell details measured from the visual-reference screenshots +// at 1920×1072 (see ui-reference.md). Values are calibrated CSS, not copied +// brand assets. The product name and mark stay FlyBot. +export const ICON_RAIL_WIDTH = 72 +export const CHAT_LIST_WIDTH = 360 +export const SHELL_LEFT_WIDTH = ICON_RAIL_WIDTH + CHAT_LIST_WIDTH +export const COMPOSER_HEIGHT = 86 +export const HEADER_HEIGHT = 56 + +export const PARITY_SHELL_CSS = ` +.bt-side.bt-side-split{display:flex;flex-direction:row;align-items:stretch;min-height:100%;background:var(--bt-sidebar);min-width:0} +.bt-icon-rail{flex:none;width:72px;display:flex;flex-direction:column;align-items:center;gap:6px;padding:16px 8px 12px;box-sizing:border-box;border-right:1px solid var(--bt-line);background:color-mix(in srgb,var(--bt-sidebar) 92%,#000 8%)} +.bt-brand-rail{display:flex;align-items:center;justify-content:center;width:40px;height:40px;flex:none} +.bt-brand-rail .bt-mark,.bt-brand-rail .bt-mark svg{width:28px;height:28px} +.bt-rail-btn{width:40px;height:40px;border:0;border-radius:12px;padding:0;background:transparent;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;transition:background-color .12s ease,color .12s ease,opacity .12s ease} +.bt-rail-btn svg{width:20px;height:20px} +.bt-rail-btn:hover{background:var(--bt-hover);color:var(--bt-ink)} +.bt-rail-btn[aria-current=page],.bt-icon-rail .bt-row[aria-current=page]{background:var(--bt-selected,color-mix(in srgb,var(--bt-accent) 28%,transparent));color:var(--bt-ink)} +.bt-rail-btn:disabled{opacity:.4;cursor:not-allowed} +.bt-rail-btn:focus-visible,.bt-brand-rail:focus-visible,.bt-icon-rail .bt-row:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px} +.bt-chat-col{flex:1 1 auto;min-width:0;display:flex;flex-direction:column;background:var(--bt-sidebar)} +.bt-side.bt-side-split .bt-side-top{display:flex;align-items:center;padding:10px 12px 8px;gap:8px} +.bt-side.bt-side-split .bt-brand{align-items:center} +.bt-side.bt-side-split .bt-row{min-height:48px;padding:8px 10px;border-radius:12px;align-items:center} +.bt-side.bt-side-split .bt-row:hover{background:var(--bt-hover)} +.bt-side.bt-side-split .bt-row[aria-current=page]{background:var(--bt-selected,color-mix(in srgb,var(--bt-accent) 22%,transparent))} +.bt-side.bt-side-split .bt-row-name{font-size:14px;line-height:20px;font-weight:500;color:var(--bt-ink)} +.bt-side.bt-side-split .bt-row[aria-current=page] .bt-row-name{font-weight:600} +.bt-side.bt-side-split .bt-row-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0} +.bt-side.bt-side-split .bt-row-preview{font-size:12px;line-height:16px;font-weight:400;color:var(--bt-ink-2);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bt-side.bt-side-split .bt-list{flex:1 1 auto;min-height:0;overflow-x:hidden;overflow-y:auto;scrollbar-width:thin;padding:4px 8px 12px} +.bt-side.bt-side-split .bt-hint{margin:24px 12px;padding:0;text-align:center;color:var(--bt-ink-3);font-size:13px;line-height:18px} +.bt-plus-menu{border-radius:16px;border:1px solid var(--bt-line-2);background:var(--bt-card);padding:8px} + +@media (min-width:1025px){ +[class*="_sidebar"]:has(.bt-side-split),[class*="Sidebar"]:has(.bt-side-split){width:432px;min-width:432px;max-width:432px;flex:none} +.bt-chat-col{width:360px;max-width:360px} +} + +@media (min-width:641px){ +[class*="_header"]:has(.bt-head){min-height:56px;margin:8px 12px 0;padding:0 12px;border-radius:16px;background:var(--bt-card);border:1px solid var(--bt-line);box-sizing:border-box;display:flex;align-items:center} +[data-composer-card]{min-height:86px!important;border-radius:20px!important;padding:10px 14px!important;background:var(--bt-bubble)!important;border:1px solid color-mix(in srgb,var(--bt-ink) 22%,transparent)!important;box-shadow:none!important;align-items:center!important} +[data-composer-card]:has(> [data-slot="conversation.input.attachments"] *),[data-composer-card]:has([data-composer-input] br + *),[data-composer-card]:has([data-composer-input] > :nth-child(2)){border-radius:16px!important;align-items:flex-end!important} +[class*="_root"]:has(> [data-composer-card]){padding:8px 16px 12px!important} +[data-composer-card] [class*="_tools"]{order:1;flex:none;align-self:center;margin:0;gap:6px!important} +[data-composer-card]>[data-input-scroll]{order:2;flex:1 1 0;min-width:0;min-height:44px;padding:6px 12px!important;margin:0!important} +[data-composer-card] [class*="_trailing"]{order:3;flex:none;align-self:center;margin:0;gap:8px} +[data-composer-card] [data-composer-input]{min-height:44px;padding:8px 0!important;font-size:14px;line-height:20px} +[data-composer-card] [data-composer-placeholder]::after{font-size:14px;line-height:20px;color:var(--bt-ink-3)} +[data-composer-card] .bt-plus,.bt-mic,.bt-voice,[data-composer-card] button[class*="_primary"]{width:32px!important;height:32px!important} +[data-composer-card] .bt-plus svg,.bt-mic svg,.bt-voice svg,[data-composer-card] button[class*="_primary"] svg{width:18px;height:18px} +[data-composer-card] .bt-plus:disabled,.bt-mic:disabled,.bt-voice:disabled,[data-composer-card] button:disabled{opacity:.4;cursor:not-allowed} +[data-composer-card] .bt-plus:focus-visible,.bt-mic:focus-visible,.bt-voice:focus-visible,[data-composer-card] button:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px} +} +`; diff --git a/patches/ds-bot/files/src/host/authz.js b/patches/ds-bot/files/src/host/authz.js index b62eba237..0981324fd 100644 --- a/patches/ds-bot/files/src/host/authz.js +++ b/patches/ds-bot/files/src/host/authz.js @@ -292,6 +292,8 @@ export function install(rt) { // signed-in member ever asked for. Any signed-in actor may list, and the data layer // answers only their own rows (`schedulesView(actor)` in schedules.js). The `schedule-*` // writes keep their Session and target gates below, unchanged. + // Search derives its own allowlist from this instance's owner-scoped local Bots. + if (ep === 'search-messages' || ep === 'history-hit') return ALLOW if (ep === 'schedules') return ALLOW if (BOT_TARGETED.has(ep)) { diff --git a/patches/ds-bot/files/src/host/message-search.js b/patches/ds-bot/files/src/host/message-search.js new file mode 100644 index 000000000..541f9e400 --- /dev/null +++ b/patches/ds-bot/files/src/host/message-search.js @@ -0,0 +1,274 @@ +// Read-only, instance-local chat history search. Do not reuse chat-index: its catch-up +// resolves Agents and writes SQLite. Only cold-safe query observations are allowed here. +// No session enumeration API, filesystem path, caller-supplied session or plugin-file scan. +import { createHash, randomUUID } from 'node:crypto' + +export const SEARCH_LIMITS = { query: 256, results: 50, sessions: 500, pagesPerRequest: 8, pages: 200, events: 1000, cursors: 64, concurrent: 4, ttl: 60_000, sourceEvents: 100_000, resultBytes: 65_536, contextBytes: 24_576, messageBytes: 262_144, scanBytes: 2_097_152, tickets: 512 } +const invalid = message => Object.assign(new Error(message), { code: 'bot/invalid' }) +const unavailable = () => Object.assign(new Error('Chat history search is unavailable'), { code: 'bot/search-unavailable' }) +const normalized = text => text.normalize('NFKC').toLowerCase() +const textOf = content => { + if (!Array.isArray(content)) return '' + if (content.length > 10_000) return null + const blocks = [] + let bytes = 0 + for (const block of content) { + if (block?.type !== 'text' || typeof block.text !== 'string') continue + if (block.text.length > SEARCH_LIMITS.messageBytes) return null + bytes += Buffer.byteLength(block.text) + 1 + if (bytes > SEARCH_LIMITS.messageBytes) return null + blocks.push(block.text) + } + return blocks.join('\n') +} +const digest = text => createHash('sha256').update(text).digest('hex') +const historyUnavailable = () => Object.assign(new Error('History result is no longer available. Search again.'), { code: 'bot/history-unavailable' }) +export function utf8Prefix(text, bytes) { + let low = 0, high = Math.min(text.length, bytes) + while (low < high) { + const middle = Math.ceil((low + high) / 2) + if (Buffer.byteLength(text.slice(0, middle)) <= bytes) low = middle + else high = middle - 1 + } + if (low > 0 && text.charCodeAt(low - 1) >= 0xd800 && text.charCodeAt(low - 1) <= 0xdbff) low -= 1 + return text.slice(0, low) +} +const alignedStart = (text, at) => at > 0 && text.charCodeAt(at) >= 0xdc00 && text.charCodeAt(at) <= 0xdfff ? at - 1 : at +const jsonTextPrefix = (text, bytes) => { + const raw = utf8Prefix(text, bytes) + let low = 0, high = raw.length + while (low < high) { + const middle = Math.ceil((low + high) / 2) + if (Buffer.byteLength(JSON.stringify(raw.slice(0, middle))) <= bytes) low = middle + else high = middle - 1 + } + return utf8Prefix(raw.slice(0, low), bytes) +} +const messageText = event => event?.type === 'assistant/message' ? textOf(event.data?.message?.content) + : event?.type === 'user/message' && event.data?.source?.kind === 'user' ? textOf(event.data?.content) : '' +const turnMap = raw => { + const turns = new Map() + let turn + for (const event of raw) { + if (event.type === 'turn/start') turn = event.seq + turns.set(event.seq, Number.isInteger(event.data?.turn) ? event.data.turn : turn) + } + return turns +} + +export function install(rt) { + const cursors = new Map() + const running = new Set() + const tickets = new Map() + const enforced = () => rt.authzEnforced?.() === true + const principal = actor => enforced() ? actor?.memberId : 'legacy-single-human' + const parts = id => rt.partsOf(id).map(part => part.sessionId).filter(id => typeof id === 'string' && id !== '' && id.length <= 256) + const allowed = (actor, target) => { + if (enforced() && !actor) return false + const bot = rt.state.bots?.[target.botId] + return Boolean(typeof target.botId === 'string' && target.botId.length <= 256 && bot && !bot.remote && (!enforced() || bot.ownerId === actor.memberId) + && parts(target.botId).includes(target.sessionId) + && (!enforced() || rt.sessionOwnedBy?.(actor, target.sessionId) === true)) + } + const keep = job => { + const now = Date.now() + for (const [token, saved] of cursors) if (saved.expires <= now) cursors.delete(token) + while (cursors.size >= SEARCH_LIMITS.cursors) cursors.delete(cursors.keys().next().value) + const token = randomUUID() + cursors.set(token, { ...job, expires: now + SEARCH_LIMITS.ttl }) + return token + } + const visibleTurn = (sessionId, turn) => { + const hidden = rt.state.exchangeTurns?.[sessionId] ?? [] + return !hidden.includes(turn) && !(turn === undefined && hidden.length > 0) + } + const ticketFor = data => { + for (const [token, ticket] of tickets) if (ticket.expires <= Date.now()) tickets.delete(token) + while (tickets.size >= SEARCH_LIMITS.tickets) tickets.delete(tickets.keys().next().value) + const token = randomUUID() + tickets.set(token, { ...data, expires: Date.now() + SEARCH_LIMITS.ttl }) + return token + } + const appendPredicate = async () => { + try { + const { isAppendSurfaceEvent } = await import('@deepseek-ai/dsh-session') + if (typeof isAppendSurfaceEvent !== 'function') throw unavailable() + return isAppendSurfaceEvent + } catch { throw unavailable() } + } + const search = async (body, actor, parentSignal) => { + if (!body || typeof body !== 'object' || Array.isArray(body) + || Object.keys(body).some(key => !['query', 'cursor', 'limit'].includes(key)) + || typeof body.query !== 'string' || body.query.length > 1024 || [...body.query].length > SEARCH_LIMITS.query || [...body.query].some(char => char.charCodeAt(0) < 32 && !'\t\n\r'.includes(char))) throw invalid('Search query must be text of at most 256 characters') + if (enforced() && !actor) throw Object.assign(new Error('Sign in first'), { code: 'bot/unauthorized' }) + const query = normalized(body.query.trim()) + const limit = body.limit ?? 20 + if (!Number.isInteger(limit) || limit < 1 || limit > SEARCH_LIMITS.results) throw invalid('Search limit must be between 1 and 50') + const empty = { items: [], cursor: null, scope: 'local-bot-chats', incomplete: false, limited: false } + if (!query) return empty + const provider = rt.ctx.get?.('sessionQuery') + if (typeof provider?.observeSession !== 'function') throw unavailable() + // Native full-text search may index all visible Sessions and only searches + // the current model surface. Human history is append-origin, including turns + // compacted out of model context, never replacement summaries or tool records. + const isAppend = await appendPredicate() + let job + if (body.cursor !== undefined && body.cursor !== null) { + const saved = typeof body.cursor === 'string' && body.cursor.length <= 64 ? cursors.get(body.cursor) : undefined + if (!saved || saved.expires <= Date.now() || saved.principal !== principal(actor) || saved.query !== query) throw invalid('Search page expired; search again') + job = { ...saved } + } else { + const targets = [] + let limited = false + const seen = new Set() + outer: for (const bot of Object.values(rt.state.bots ?? {})) { + if (bot.remote || (enforced() && bot.ownerId !== actor.memberId)) continue + for (const sessionId of parts(bot.id).reverse()) { + const target = { botId: bot.id, sessionId } + if (!allowed(actor, target) || seen.has(sessionId)) continue + if (targets.length === SEARCH_LIMITS.sessions) { limited = true; break outer } + seen.add(sessionId) + targets.push(target) + } + } + job = { targets, at: 0, through: undefined, before: undefined, pages: 0, incomplete: false, limited, principal: principal(actor), query } + } + const items = [] + const signal = parentSignal ? AbortSignal.any([parentSignal, AbortSignal.timeout(6000)]) : AbortSignal.timeout(6000) + const advance = () => { job.at += 1; job.through = undefined; job.before = undefined } + let requests = 0, scannedBytes = 0, resourceStop = false + while (job.at < job.targets.length && items.length < limit && requests < SEARCH_LIMITS.pagesPerRequest && job.pages < SEARCH_LIMITS.pages && !resourceStop) { + signal.throwIfAborted() + const target = job.targets[job.at] + if (!allowed(actor, target)) { advance(); continue } + let observation + try { + requests += 1 + job.pages += 1 + observation = await provider.observeSession(target.sessionId, { signal, projectionMode: 'none' }) + signal.throwIfAborted() + if (!allowed(actor, target)) { advance(); continue } + if (observation.header?.id !== target.sessionId || !Array.isArray(observation.events) || !Number.isSafeInteger(observation.cursor) || observation.cursor < -1) throw unavailable() + // Do not create an index or compute projections. Append-origin is the + // durable human transcript, not the replaceable model context. + const raw = observation.events + if (raw.length > SEARCH_LIMITS.sourceEvents) { job.limited = true; advance(); continue } + if (job.through !== undefined && job.through !== observation.cursor) { + throw invalid('Search history changed; search again') + } + job.through = observation.cursor + const turns = turnMap(raw) + const bySeq = new Map(raw.map(event => [event.seq, event])) + const docs = raw.filter(doc => isAppend(doc) + && ['user/message', 'assistant/message'].includes(doc.type) + && (job.before === undefined || doc.seq < job.before)).slice(-SEARCH_LIMITS.events) + for (let index = docs.length - 1; index >= 0; index -= 1) { + const doc = docs[index] + const previousBefore = job.before + job.before = doc.seq + const event = bySeq.get(doc.seq) + const turn = turns.get(doc.seq) + if (!visibleTurn(target.sessionId, turn)) continue + const text = messageText(event) + if (text === null) { job.limited = true; continue } + scannedBytes += Buffer.byteLength(text) + if (scannedBytes > SEARCH_LIMITS.scanBytes) { job.before = previousBefore; resourceStop = true; break } + const clean = text.normalize('NFKC') + const hit = normalized(clean).indexOf(query) + if (hit < 0) continue + const start = alignedStart(clean, Math.max(0, hit - 50)) + const item = { botId: target.botId, sessionId: target.sessionId, seq: event.seq, ...(turn === undefined ? {} : { turn }), + snippet: utf8Prefix((start ? '…' : '') + clean.slice(start, hit + query.length + 100), 1024), earlier: target.sessionId !== rt.chatOf(target.botId), hitToken: randomUUID() } + if (Buffer.byteLength(JSON.stringify([...items, item])) > SEARCH_LIMITS.resultBytes - 1024) { job.before = previousBefore; resourceStop = true; break } + item.hitToken = ticketFor({ ...target, seq: event.seq, turn, through: observation.cursor, hash: digest(text), query, principal: principal(actor) }) + items.push(item) + if (items.length >= limit) break + } + if (!resourceStop && (docs.length === 0 || (docs.length < SEARCH_LIMITS.events && job.before === docs[0].seq))) advance() + } catch (error) { + if (error.code === 'bot/invalid') throw error + if (signal.aborted) throw unavailable() + job.incomplete = true + advance() + } finally { + try { observation?.[Symbol.dispose]?.() } catch { job.incomplete = true } + } + } + // Recheck at delivery too, including when another request revoked access during await. + const visible = items.filter(item => { + const hidden = rt.state.exchangeTurns?.[item.sessionId] ?? [] + return allowed(actor, item) && !(hidden.includes(item.turn) || (item.turn === undefined && hidden.length > 0)) + }) + if (job.pages >= SEARCH_LIMITS.pages && job.at < job.targets.length) job.limited = true + const cursor = job.at < job.targets.length && job.pages < SEARCH_LIMITS.pages ? keep(job) : null + return { items: visible, cursor, scope: 'local-bot-chats', incomplete: job.incomplete, limited: job.limited || resourceStop } + } + const context = async (body, actor, parentSignal) => { + if (!body || typeof body !== 'object' || Object.keys(body).some(key => key !== 'hitToken') + || typeof body.hitToken !== 'string' || body.hitToken.length > 64) throw historyUnavailable() + const ticket = tickets.get(body.hitToken) + const valid = () => ticket && ticket.expires > Date.now() && ticket.principal === principal(actor) + && allowed(actor, ticket) && visibleTurn(ticket.sessionId, ticket.turn) + if (!valid()) throw historyUnavailable() + const provider = rt.ctx.get?.('sessionQuery') + if (typeof provider?.observeSession !== 'function') throw historyUnavailable() + const isAppend = await appendPredicate() + if (!valid()) throw historyUnavailable() + const signal = parentSignal ? AbortSignal.any([parentSignal, AbortSignal.timeout(6000)]) : AbortSignal.timeout(6000) + let observation, result + try { + signal.throwIfAborted() + observation = await provider.observeSession(ticket.sessionId, { signal, projectionMode: 'none' }) + signal.throwIfAborted() + if (!valid() || observation.header?.id !== ticket.sessionId || observation.cursor !== ticket.through + || !Array.isArray(observation.events) || observation.events.length > SEARCH_LIMITS.sourceEvents) throw historyUnavailable() + const raw = observation.events + const turns = turnMap(raw) + const messages = raw.filter(event => isAppend(event) && ['user/message', 'assistant/message'].includes(event.type) + && visibleTurn(ticket.sessionId, turns.get(event.seq)) + && (event.type !== 'user/message' || event.data?.source?.kind === 'user')) + const at = messages.findIndex(event => event.seq === ticket.seq) + const anchor = at >= 0 ? messageText(messages[at]) : null + if (anchor === null || digest(anchor) !== ticket.hash || !normalized(anchor).includes(ticket.query)) throw historyUnavailable() + const entries = messages.slice(Math.max(0, at - 2), at + 3).map(event => { + const original = messageText(event) + const hit = event.seq === ticket.seq + // Preserve original text; locate the normalized match with a prefix-length + // binary search so width/composition normalization does not replace history. + let start = 0 + if (hit) { + const wanted = normalized(original).indexOf(ticket.query) + let low = 0, high = original.length + while (low < high) { + const middle = Math.floor((low + high) / 2) + if (normalized(original.slice(0, middle)).length < wanted) low = middle + 1 + else high = middle + } + start = alignedStart(original, Math.max(0, low - 256)) + } + const text = original === null ? '' : jsonTextPrefix(original.slice(start), hit ? 8192 : 2048) + return { seq: event.seq, turn: turns.get(event.seq) ?? null, role: event.type === 'user/message' ? 'user' : 'assistant', hit, + text, truncated: original === null || start > 0 || text.length < original.length, omittedBefore: start > 0 } + }) + const list = rt.partsOf(ticket.botId) + result = { scope: 'read-only-history', botId: ticket.botId, sessionId: ticket.sessionId, seq: ticket.seq, + part: list.findIndex(part => part.sessionId === ticket.sessionId) + 1, partCount: list.length, entries } + if (Buffer.byteLength(JSON.stringify(result)) > SEARCH_LIMITS.contextBytes - 64) throw historyUnavailable() + } catch { throw historyUnavailable() } + finally { + try { observation?.[Symbol.dispose]?.() } catch { result = undefined } + } + // Disposal is synchronous but can still reveal a permission change in an + // adapter; recheck after releasing the lease, immediately before delivery. + if (!result || !valid() || result.entries.some(entry => !visibleTurn(ticket.sessionId, entry.turn ?? undefined))) throw historyUnavailable() + return result + } + const bounded = run => async (body, actor, signal) => { + const key = principal(actor) + if (running.has(key) || running.size >= SEARCH_LIMITS.concurrent) throw unavailable() + running.add(key) + try { return await run(body, actor, signal) } finally { running.delete(key) } + } + rt.searchMessages = bounded(search) + rt.readHistoryHit = bounded(context) +} diff --git a/patches/ds-bot/files/src/shared/appearance-prefs.js b/patches/ds-bot/files/src/shared/appearance-prefs.js new file mode 100644 index 000000000..8a32e04d5 --- /dev/null +++ b/patches/ds-bot/files/src/shared/appearance-prefs.js @@ -0,0 +1,36 @@ +// Host-side validation for appearance and send-key prefs. The client module +// (`src/client/appearance.js`) decides how they look; this file only says +// what may be stored. + +const MODES = new Set(['light', 'dark', 'auto', 'system']) +const AUTO = new Set(['sun', 'custom']) +const SEND = new Set(['enter', 'shift-enter']) +const TIME = /^([01]\d|2[0-3]):[0-5]\d$/ +const DEFAULTS = { mode: 'system', auto: 'sun', from: '19:00', to: '07:00' } + +function clock(value, fallback) { + return typeof value === 'string' && TIME.test(value) ? value : fallback +} + +// `null` clears the record (back to the default). An invalid object is refused, +// never stored as "always dark". +export function readAppearance(body, current) { + if (body === null) return undefined + if (typeof body !== 'object' || Array.isArray(body)) return false + const mode = body.mode === undefined ? (current?.mode ?? DEFAULTS.mode) : body.mode + if (!MODES.has(mode)) return false + const auto = body.auto === undefined ? (current?.auto ?? DEFAULTS.auto) : body.auto + if (!AUTO.has(auto)) return false + const from = clock(body.from, current?.from ?? DEFAULTS.from) + const to = clock(body.to, current?.to ?? DEFAULTS.to) + if (body.from !== undefined && (typeof body.from !== 'string' || !TIME.test(body.from))) return false + if (body.to !== undefined && (typeof body.to !== 'string' || !TIME.test(body.to))) return false + if (auto === 'custom' && from === to) return false + return { mode, auto, from, to } +} + +export function readSendKey(value) { + if (value === null || value === 'enter') return undefined + if (SEND.has(value)) return value === 'enter' ? undefined : value + return false +} diff --git a/patches/ds-bot/files/src/shared/group-create.js b/patches/ds-bot/files/src/shared/group-create.js new file mode 100644 index 000000000..88bad7101 --- /dev/null +++ b/patches/ds-bot/files/src/shared/group-create.js @@ -0,0 +1,25 @@ +// Helpers for the New group form. The host already creates a room from an +// admin plus members; this file only matches a search and says when Create +// can run, so the form can align its layout and empty states without a +// second create path. + +import { pickerBotLabel } from './remote-label.js' + +export function groupMemberQuery(query) { + return String(query ?? '').trim().toLowerCase() +} + +export function groupMemberMatches(bot, query) { + const wanted = groupMemberQuery(query) + if (!wanted) return true + if (!bot) return false + const name = String(bot.name ?? '').toLowerCase() + const role = String(bot.role ?? '').toLowerCase() + const label = pickerBotLabel(bot).toLowerCase() + return name.includes(wanted) || role.includes(wanted) || label.includes(wanted) +} + +// A group needs a local admin and at least one more member (local or a friend's Bot). +export function canCreateGroup(admin, members) { + return admin != null && admin !== '' && Array.isArray(members) && members.length > 0 +} diff --git a/patches/ds-bot/files/src/shared/memory-catalog.js b/patches/ds-bot/files/src/shared/memory-catalog.js new file mode 100644 index 000000000..ee65b7a0b --- /dev/null +++ b/patches/ds-bot/files/src/shared/memory-catalog.js @@ -0,0 +1,48 @@ +// Directory and search over a memory panel view. The host already loaded the +// entries; this file only groups them into topics and filters them, so the +// panel can draw a real catalog without inventing pages or a graph. + +export function memoryTopics(entries) { + const map = new Map() + for (const entry of entries ?? []) { + const scope = entry.scope === 'team' ? 'team' : 'own' + const topic = typeof entry.topic === 'string' && entry.topic.trim() !== '' ? entry.topic : null + const key = `${scope}:${topic ?? ''}` + const item = map.get(key) + if (item) item.count += 1 + else map.set(key, { scope, topic, count: 1 }) + } + return [...map.values()].sort((a, b) => { + if (a.scope !== b.scope) return a.scope === 'own' ? -1 : 1 + if ((a.topic === null) !== (b.topic === null)) return a.topic === null ? -1 : 1 + return String(a.topic ?? '').localeCompare(String(b.topic ?? '')) + }) +} + +export function memoryStats(entries) { + const list = entries ?? [] + const topics = new Set() + for (const entry of list) { + if (typeof entry.topic === 'string' && entry.topic.trim() !== '') topics.add(`${entry.scope === 'team' ? 'team' : 'own'}:${entry.topic.trim()}`) + } + return { entries: list.length, topics: topics.size } +} + +// Every whitespace-separated term must appear in the entry text, topic, or author. +export function filterMemoryEntries(entries, query) { + const terms = String(query ?? '').trim().toLowerCase().split(/\s+/).filter(Boolean) + if (terms.length === 0) return [...(entries ?? [])] + return (entries ?? []).filter((entry) => { + const hay = `${entry.text ?? ''} ${entry.topic ?? ''} ${entry.by ?? ''}`.toLowerCase() + return terms.every(term => hay.includes(term)) + }) +} + +export function topicKey(item) { + if (!item) return '' + return `${item.scope === 'team' ? 'team' : 'own'}:${item.topic ?? ''}` +} + +export function sameTopic(a, b) { + return Boolean(a) && Boolean(b) && topicKey(a) === topicKey(b) +} diff --git a/patches/ds-bot/files/src/shared/message-actions.js b/patches/ds-bot/files/src/shared/message-actions.js new file mode 100644 index 000000000..ee03a5da3 --- /dev/null +++ b/patches/ds-bot/files/src/shared/message-actions.js @@ -0,0 +1,48 @@ +// Actions a message toolbar, overflow, or right-click menu may offer. Only ids the +// client can actually run belong here: a reaction stored in local UI state, a quote +// into the open composer, or a copy/download of the message text. There is no host +// API to translate, forward, save to Artifacts, recall, re-edit a turn, pin a +// message, or report one, so those ids are never returned. + +export const MESSAGE_REACTIONS = ['👍', '❤️', '😂', '😮', '😢', '🙏'] + +export function hasMessageText(text) { + return String(text ?? '').trim() !== '' +} + +export function isLockedRoster(roster) { + return typeof roster?.readOnly === 'string' && roster.readOnly.trim() !== '' +} + +// A user bubble only gets a reaction key when the turn identity is stable across reloads. +export function userMessageReactKey(sessionId, node) { + if (sessionId == null || sessionId === '') return undefined + const location = node?.location + const rawTurn = location && (location.kind === 'turn' || location.kind === 'step' || location.turn != null) + ? location.turn + : node?.data?.turn + const turn = typeof rawTurn === 'object' ? rawTurn?.turn : rawTurn + if (!Number.isInteger(turn) || turn < 0) return undefined + return `${sessionId}:${turn}:user` +} + +export function messageActionIds({ + text, + sessionId, + canReact = false, + canReply = false, + locked = false, +} = {}) { + const ids = [] + if (canReact) ids.push('react') + if (canReply && sessionId && !locked && hasMessageText(text)) ids.push('reply') + if (hasMessageText(text)) { + ids.push('copy') + ids.push('download') + } + return ids +} + +export function hasMessageActions(flags) { + return messageActionIds(flags).length > 0 +} diff --git a/patches/ds-bot/files/src/shared/message-fold-prefs.js b/patches/ds-bot/files/src/shared/message-fold-prefs.js new file mode 100644 index 000000000..7b772704f --- /dev/null +++ b/patches/ds-bot/files/src/shared/message-fold-prefs.js @@ -0,0 +1,20 @@ +// Host-side validation for message-folding prefs. The client module +// (`src/client/message-fold.js`) decides how bubbles look; this file only says +// what may be stored. + +const MODES = new Set(['compact', 'standard', 'none']) +export const DEFAULT_FOLDING = { mode: 'standard', documentCards: true } + +// `null` clears the record (back to the default). An invalid object is refused, +// never stored as "always unfolded". +export function readFolding(body, current) { + if (body === null) return undefined + if (typeof body !== 'object' || Array.isArray(body)) return false + const mode = body.mode === undefined ? (current?.mode ?? DEFAULT_FOLDING.mode) : body.mode + if (!MODES.has(mode)) return false + const documentCards = body.documentCards === undefined + ? (current?.documentCards ?? DEFAULT_FOLDING.documentCards) + : body.documentCards + if (typeof documentCards !== 'boolean') return false + return { mode, documentCards } +} diff --git a/patches/ds-bot/files/src/shared/message-fold.js b/patches/ds-bot/files/src/shared/message-fold.js new file mode 100644 index 000000000..c179f99a9 --- /dev/null +++ b/patches/ds-bot/files/src/shared/message-fold.js @@ -0,0 +1,143 @@ +// Pure helpers for long-message folding. The client module draws the bubble +// and the document card; this file is the thresholds, the preview cut, and +// the long-document test, so unit tests can import them without React. + +import { DEFAULT_FOLDING } from './message-fold-prefs.js' + +export { DEFAULT_FOLDING } +export const FOLD_MODES = ['compact', 'standard', 'none'] + +// A message folds when it exceeds either cap for the chosen mode. The preview +// is the shorter of "first N lines" and "first M characters", ending on a line +// or word boundary. Equal-to-the-cap messages stay open — only values *over* +// the threshold fold. +export const FOLD_THRESHOLDS = { + compact: { lines: 4, chars: 240 }, + standard: { lines: 12, chars: 800 }, +} + +const DOCUMENT_MIN_HEADINGS = 2 +const DOCUMENT_MIN_BREAKS = 3 +const MODE_SET = new Set(FOLD_MODES) + +export function foldingOf(prefs) { + const raw = prefs?.folding + if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return { ...DEFAULT_FOLDING } + const mode = MODE_SET.has(raw.mode) ? raw.mode : DEFAULT_FOLDING.mode + const documentCards = typeof raw.documentCards === 'boolean' ? raw.documentCards : DEFAULT_FOLDING.documentCards + return { mode, documentCards } +} + +function clipWord(line, max) { + if (line.length <= max) return line + const slice = line.slice(0, max) + let breakAt = -1 + for (const mark of [' ', '\t', ',', '。', '、', ';', ':', ',', '.', ';', ':', '!', '?', '!', '?']) { + breakAt = Math.max(breakAt, slice.lastIndexOf(mark)) + } + if (breakAt >= Math.min(8, Math.floor(max * 0.4))) return slice.slice(0, breakAt) + return slice +} + +// An odd number of ``` fences means the preview opened a code block it did not +// close. Cut before that opener when there is still prose; otherwise close it +// so the renderer is not left hanging. +function closeFences(preview) { + let fence = null + let offset = 0 + for (const line of preview.split('\n')) { + const match = line.match(/^ {0,3}(`{3,}|~{3,})(.*)$/) + if (match) { + const mark = match[1] + if (!fence) fence = { char: mark[0], length: mark.length, offset } + else if (mark[0] === fence.char && mark.length >= fence.length && match[2].trim() === '') fence = null + } + offset += line.length + 1 + } + if (!fence) return preview + if (preview.slice(0, fence.offset).trim()) return preview.slice(0, fence.offset).trimEnd() + return `${preview}\n${fence.char.repeat(fence.length)}` +} + +// Classify headings/section breaks only outside fenced code. +function proseLines(text) { + let fence = null + return String(text ?? '').split('\n').filter(line => { + const match = line.match(/^ {0,3}(`{3,}|~{3,})(.*)$/) + if (match) { + if (!fence) fence = match[1] + else if (match[1][0] === fence[0] && match[1].length >= fence.length && !match[2].trim()) fence = null + return false + } + return !fence + }) +} + +export function exceedsThreshold(text, cap) { + if (!cap) return false + const raw = String(text ?? '') + if (raw.length > cap.chars) return true + return raw.split('\n').length > cap.lines +} + +export function previewOf(text, mode) { + const cap = FOLD_THRESHOLDS[mode] + const raw = String(text ?? '') + if (!cap) return raw + const lines = raw.split('\n') + const out = [] + let chars = 0 + for (let i = 0; i < lines.length && out.length < cap.lines; i++) { + const line = lines[i] + const extra = (out.length === 0 ? 0 : 1) + line.length + if (out.length === 0 && line.length > cap.chars) { + out.push(clipWord(line, cap.chars)) + break + } + if (out.length > 0 && chars + extra > cap.chars) { + const budget = cap.chars - chars - 1 + if (budget > 0) out.push(clipWord(line, budget)) + break + } + out.push(line) + chars += extra + } + return closeFences(out.join('\n')) +} + +export function shouldFold(text, mode) { + const cap = FOLD_THRESHOLDS[mode] + if (!cap) return false + const raw = String(text ?? '') + if (!exceedsThreshold(raw, cap)) return false + return previewOf(raw, mode) !== raw +} + +export function documentHeadings(text) { + const heads = [] + for (const line of proseLines(text)) { + const match = line.match(/^(#{1,6})\s+(.+?)\s*$/) + if (match) heads.push({ level: match[1].length, title: match[2] }) + } + return heads +} + +export function isLongDocument(text) { + if (!exceedsThreshold(text, FOLD_THRESHOLDS.standard)) return false + if (documentHeadings(text).length >= DOCUMENT_MIN_HEADINGS) return true + const sections = proseLines(text).join('\n').split(/^\s*---\s*$/m).filter(part => part.trim() !== '') + return sections.length >= DOCUMENT_MIN_BREAKS +} + +export function documentTitle(text) { + const first = documentHeadings(text)[0]?.title + if (first) return first + const line = String(text ?? '').split('\n').find(item => item.trim() !== '') ?? '' + const plain = line.replace(/^#{1,6}\s+/, '').trim() + return plain.length > 80 ? `${plain.slice(0, 80).trim()}…` : plain +} + +export function showsDocumentCard(text, folding, { streaming = false } = {}) { + if (streaming || folding?.mode === 'none') return false + return Boolean(folding?.documentCards) && isLongDocument(text) +} diff --git a/patches/ds-bot/files/src/shared/palette-search.js b/patches/ds-bot/files/src/shared/palette-search.js new file mode 100644 index 000000000..61c08b3f3 --- /dev/null +++ b/patches/ds-bot/files/src/shared/palette-search.js @@ -0,0 +1,21 @@ +// Command-palette filters and empty copy. Message hits only come from +// turn outlines already in the session list; the UI must not claim a +// search across chats the host has not loaded. + +export const PALETTE_FILTERS = ['all', 'chats', 'messages', 'commands'] +export const PALETTE_MESSAGE_MIN = 2 + +export function paletteFilterAllows(filter, kind) { + if (filter === 'chats') return kind === 'chats' + if (filter === 'messages') return kind === 'messages' + if (filter === 'commands') return kind === 'commands' + return true +} + +// kind: 'empty' | 'short' | 'none' +export function paletteEmptyKind(query, filter, min = PALETTE_MESSAGE_MIN) { + const wanted = String(query ?? '').trim() + if (wanted === '') return 'empty' + if (filter === 'messages' && wanted.length < min) return 'short' + return 'none' +} diff --git a/patches/ds-bot/files/src/shared/session-list-filter.js b/patches/ds-bot/files/src/shared/session-list-filter.js new file mode 100644 index 000000000..6227a29ec --- /dev/null +++ b/patches/ds-bot/files/src/shared/session-list-filter.js @@ -0,0 +1,36 @@ +// Filters for the sidebar session list. Only kinds the list already has: +// rooms are group chats, Bots and the coding agent are direct chats, and +// unread uses the same marks the rows already draw (completion, a pending +// bot interaction, or a manual unread mark). There is no separate "read" +// filter: it would only be the complement of unread. + +export const SESSION_FILTERS = ['all', 'group', 'direct', 'unread'] + +export function sessionStatusOf(map, id) { + if (id == null || map == null) return undefined + if (typeof map.get === 'function') return map.get(id) + return map[id] +} + +// Session id for a Bot row matches currentPart in the client: sessionId ?? id. +export function sessionIsUnread(entry, statusMap, markedUnread) { + const item = entry?.item + if (!item) return false + if (markedUnread?.[item.id]) return true + if (entry.kind === 'agent') { + return (item.sessions ?? []).some(id => sessionStatusOf(statusMap, id)?.completionUnread === true) + } + if (entry.kind === 'room') { + return sessionStatusOf(statusMap, item.id)?.completionUnread === true + } + const part = item.sessionId ?? item.id + const status = sessionStatusOf(statusMap, part) + return status?.completionUnread === true || status?.pendingInteraction !== undefined +} + +export function matchesSessionFilter(entry, filter, unread = false) { + if (filter === 'group') return entry?.kind === 'room' + if (filter === 'direct') return entry?.kind === 'bot' || entry?.kind === 'agent' + if (filter === 'unread') return unread === true + return true +} diff --git a/patches/ds-bot/files/src/shared/session-pin.js b/patches/ds-bot/files/src/shared/session-pin.js new file mode 100644 index 000000000..dec7bc2f8 --- /dev/null +++ b/patches/ds-bot/files/src/shared/session-pin.js @@ -0,0 +1,23 @@ +// Session pin is a host flag (`setFlags({ pinned })`). Only Bot and room rows the +// sidebar already pins may offer Pin/Unpin. Remote friend Bots, the main-Bot tile, +// agent sessions, and a read-only window have no such write. + +import { isLockedRoster } from './message-actions.js' + +export function sessionPinTarget(roster, sessionId) { + if (sessionId == null || sessionId === '') return null + return roster?.byId?.[sessionId] ?? roster?.roomsById?.[sessionId] ?? null +} + +export function canPinSession(roster, sessionId) { + if (isLockedRoster(roster)) return false + const entry = sessionPinTarget(roster, sessionId) + if (entry == null) return false + if (roster?.byId?.[sessionId]?.remote) return false + if (roster?.mainBotId === sessionId) return false + return true +} + +export function sessionPinned(roster, sessionId) { + return sessionPinTarget(roster, sessionId)?.pinned === true +} diff --git a/patches/ds-bot/files/src/shared/session-unread.js b/patches/ds-bot/files/src/shared/session-unread.js new file mode 100644 index 000000000..3fa66b7dd --- /dev/null +++ b/patches/ds-bot/files/src/shared/session-unread.js @@ -0,0 +1,25 @@ +// Manual unread marks live in UI state (localStorage). Opening a chat +// clears the mark only when the session *becomes* active, so Mark as +// Unread on the open chat stays until the user leaves and comes back. +// completionUnread is a DSH flag that clears when the session is the +// main view; there is no host API to ack it without opening the chat. + +export function shouldClearManualUnread({ active, wasActive, marked }) { + return Boolean(marked) && active === true && wasActive !== true +} + +// The id the sidebar stores in ui.unread: a Bot's roster id, a room id, +// or the coding agent's id — not a Bot's alternate sessionId. +export function unreadEntryId(roster, sessionId) { + if (sessionId == null || sessionId === '') return sessionId + if (roster?.byId?.[sessionId] || roster?.roomsById?.[sessionId]) return sessionId + const bot = (roster?.bots ?? []).find(item => (item.sessionId ?? item.id) === sessionId) + if (bot) return bot.id + const agent = (roster?.agents ?? []).find(item => item.id === sessionId || (item.sessions ?? []).includes(sessionId)) + if (agent) return agent.id + return sessionId +} + +export function isManuallyUnread(unread, id) { + return Boolean(id) && unread?.[id] === true +} diff --git a/patches/ds-bot/files/test/appearance.test.js b/patches/ds-bot/files/test/appearance.test.js new file mode 100644 index 000000000..f848e1747 --- /dev/null +++ b/patches/ds-bot/files/test/appearance.test.js @@ -0,0 +1,113 @@ +// Appearance modes, sunset/custom windows, and the Shift+Enter send-key flip. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { + afterSunset, appearanceOf, applyAppearanceAttribute, handleComposerSendKey, + inNightWindow, isDarkAppearance, latitudeForZone, normalizeSendKey, parseClock, + sendKeyOf, shouldBreakOnKey, shouldSendOnKey, sunMinutes, +} from '../src/client/appearance.js' +import { readAppearance, readSendKey } from '../src/shared/appearance-prefs.js' + +test('fresh prefs match the system; a saved mode is kept', () => { + assert.deepEqual(appearanceOf(undefined), { mode: 'system', auto: 'sun', from: '19:00', to: '07:00' }) + assert.equal(appearanceOf({ appearance: { mode: 'dark' } }).mode, 'dark') + assert.equal(appearanceOf({ appearance: { mode: 'auto', auto: 'custom', from: '18:30', to: '06:45' } }).from, '18:30') + assert.equal(sendKeyOf({}), 'enter') + assert.equal(sendKeyOf({ sendKey: 'shift-enter' }), 'shift-enter') + assert.equal(normalizeSendKey('tab'), 'enter') +}) + +test('light and dark modes ignore the clock and the system', () => { + const noon = new Date('2026-06-21T12:00:00+08:00') + const midnight = new Date('2026-06-21T00:30:00+08:00') + assert.equal(isDarkAppearance({ appearance: { mode: 'light' } }, midnight, true), false) + assert.equal(isDarkAppearance({ appearance: { mode: 'dark' } }, noon, false), true) + assert.equal(isDarkAppearance({ appearance: { mode: 'system' } }, noon, true), true) + assert.equal(isDarkAppearance({ appearance: { mode: 'system' } }, noon, false), false) +}) + +test('automatic sunset-to-sunrise is dark after sunset in Asia/Shanghai', () => { + const zone = 'Asia/Shanghai' + const midsummer = new Date('2026-06-21T12:00:00+08:00') + const sun = sunMinutes(midsummer, { timeZone: zone, latitude: latitudeForZone(zone) }) + assert.ok(sun.sunrise < 6 * 60, `midsummer sunrise should be before 06:00, got ${sun.sunrise}`) + assert.ok(sun.sunset > 18 * 60, `midsummer sunset should be after 18:00, got ${sun.sunset}`) + const midwinter = new Date('2026-12-21T12:00:00+08:00') + const winter = sunMinutes(midwinter, { timeZone: zone, latitude: latitudeForZone(zone) }) + assert.ok(winter.sunrise > sun.sunrise, 'winter sunrise is later than summer') + assert.ok(winter.sunset < sun.sunset, 'winter sunset is earlier than summer') + const afterDark = new Date('2026-12-21T22:00:00+08:00') + const morning = new Date('2026-12-21T08:00:00+08:00') + assert.equal(afterSunset(afterDark, { timeZone: zone, latitude: 31.23 }), true) + assert.equal(afterSunset(morning, { timeZone: zone, latitude: 31.23 }), false) + assert.equal(isDarkAppearance({ appearance: { mode: 'auto', auto: 'sun' } }, afterDark, false, { timeZone: zone, latitude: 31.23 }), true) + assert.equal(isDarkAppearance({ appearance: { mode: 'auto', auto: 'sun' } }, morning, true, { timeZone: zone, latitude: 31.23 }), false) +}) + +test('a custom night window wraps midnight', () => { + const evening = new Date('2026-11-16T20:15:00+08:00') + const afternoon = new Date('2026-11-16T15:00:00+08:00') + const dawn = new Date('2026-11-16T06:00:00+08:00') + assert.equal(inNightWindow(evening, '19:00', '07:00', 'Asia/Shanghai'), true) + assert.equal(inNightWindow(dawn, '19:00', '07:00', 'Asia/Shanghai'), true) + assert.equal(inNightWindow(afternoon, '19:00', '07:00', 'Asia/Shanghai'), false) + assert.equal(isDarkAppearance({ appearance: { mode: 'auto', auto: 'custom', from: '19:00', to: '07:00' } }, afternoon, true, { timeZone: 'Asia/Shanghai' }), false) + assert.equal(parseClock('7:00'), null) + assert.equal(parseClock('19:00'), 19 * 60) +}) + +test('the host refuses a broken appearance or send-key record', () => { + assert.equal(readAppearance(null), undefined) + assert.equal(readAppearance({ mode: 'neon' }), false) + assert.equal(readAppearance({ mode: 'auto', auto: 'custom', from: '19:00', to: '19:00' }), false) + assert.deepEqual(readAppearance({ mode: 'dark' }), { mode: 'dark', auto: 'sun', from: '19:00', to: '07:00' }) + assert.equal(readSendKey('enter'), undefined) + assert.equal(readSendKey('shift-enter'), 'shift-enter') + assert.equal(readSendKey('tab'), false) +}) + +test('Shift+Enter to send intercepts only when that pref is on', () => { + const enter = { key: 'Enter', shiftKey: false, metaKey: false, ctrlKey: false, altKey: false } + const shift = { ...enter, shiftKey: true } + assert.equal(shouldSendOnKey(enter, 'enter'), true) + assert.equal(shouldBreakOnKey(shift, 'enter'), true) + assert.equal(shouldSendOnKey(shift, 'shift-enter'), true) + assert.equal(shouldBreakOnKey(enter, 'shift-enter'), true) + let sent = 0 + let broke = 0 + const event = { ...enter, preventDefault() {}, stopPropagation() {} } + assert.equal(handleComposerSendKey(event, 'enter', { send: () => sent++, insertNewline: () => broke++ }), false) + assert.equal(sent + broke, 0) + assert.equal(handleComposerSendKey(event, 'shift-enter', { send: () => sent++, insertNewline: () => broke++ }), 'break') + assert.equal(broke, 1) + const shiftEvent = { ...shift, preventDefault() {}, stopPropagation() {} } + assert.equal(handleComposerSendKey(shiftEvent, 'shift-enter', { send: () => sent++, insertNewline: () => broke++ }), 'send') + assert.equal(sent, 1) +}) + +test('applyAppearanceAttribute toggles data-ds-dark-theme on a body', () => { + const attrs = new Map() + const body = { + setAttribute(name, value) { attrs.set(name, value) }, + removeAttribute(name) { attrs.delete(name) }, + hasAttribute(name) { return attrs.has(name) }, + } + const doc = { documentElement: {}, body } + assert.equal(applyAppearanceAttribute(true, doc), 'dark') + assert.equal(attrs.has('data-ds-dark-theme'), true) + assert.equal(applyAppearanceAttribute(false, doc), 'light') + assert.equal(attrs.has('data-ds-dark-theme'), false) +}) + + +test('legacy IME keycode 229 never sends or inserts a newline', () => { + for (const shiftKey of [false, true]) { + let invoked = 0 + const result = handleComposerSendKey({ key: 'Enter', keyCode: 229, shiftKey, + preventDefault() { invoked++ }, stopPropagation() { invoked++ } }, 'shift-enter', { + send() { invoked++ }, insertNewline() { invoked++ }, + }) + assert.equal(result, false) + assert.equal(invoked, 0) + } +}) diff --git a/patches/ds-bot/files/test/bench-preflight.test.js b/patches/ds-bot/files/test/bench-preflight.test.js index 2a04fc986..6585fd3e0 100644 --- a/patches/ds-bot/files/test/bench-preflight.test.js +++ b/patches/ds-bot/files/test/bench-preflight.test.js @@ -128,3 +128,13 @@ function runBench({ root, path, harness }, action) { if (result.error) assert.fail(`could not run bench.sh: ${result.error.message}`) return result } + +// Explicit symlink regression, independent of whether node_modules happens to be symlinked. +test('CLI entry still runs when invoked through a symlink', () => { + const { root } = tree() + const entry = join(root, 'preflight.mjs') + symlinkSync(join(here, '../dev/bench-preflight.mjs'), entry) + const result = spawnSync(process.execPath, [entry], { encoding: 'utf8', env: { ...process.env, DSH_HARNESS: '' } }) + assert.equal(result.status, 2) + assert.match(result.stderr, /usage: node dev\/bench-preflight.mjs/) +}) diff --git a/patches/ds-bot/files/test/composer-locked.test.js b/patches/ds-bot/files/test/composer-locked.test.js index 72e9fdf83..c02ef557a 100644 --- a/patches/ds-bot/files/test/composer-locked.test.js +++ b/patches/ds-bot/files/test/composer-locked.test.js @@ -76,7 +76,7 @@ test('read-only window: no menu row opens the schedules page', () => { const rows = menuRows(tree).map(row => all(row).filter(item => typeof item === 'string').join('')) assert.ok(!rows.includes('Scheduled task'), `a read-only window still offers the row: ${JSON.stringify(rows)}`) const scheduleRows = menuRows(tree).filter(row => all(row).includes('Scheduled task')) - for (const row of scheduleRows) row.props.onClick() + for (const row of scheduleRows) row.props.onClick?.() assert.deepEqual(actions.log, []) - assert.deepEqual(scheduleRows.map(row => all(row).filter(item => typeof item === 'string').join('')), []) + assert.ok(scheduleRows.every(row => row.props.disabled === true), 'a visible scheduled-task entry is disabled in a read-only window') }) diff --git a/patches/ds-bot/files/test/context-menu-agent-readonly.test.js b/patches/ds-bot/files/test/context-menu-agent-readonly.test.js index 18c9cfa09..204751751 100644 --- a/patches/ds-bot/files/test/context-menu-agent-readonly.test.js +++ b/patches/ds-bot/files/test/context-menu-agent-readonly.test.js @@ -92,7 +92,7 @@ const AGENT_WRITES = ['Pin', 'Unpin', 'Remove DSH Agent'] const SESSION_WRITES = ['Rename', 'Archive'] const actions = () => ({ - closeMenu: () => {}, markUnread: () => {}, openSettings: () => {}, setFlags: () => {}, renameBot: () => {}, + closeMenu: () => {}, markUnread: () => {}, clearUnread: () => {}, openSettings: () => {}, setFlags: () => {}, renameBot: () => {}, duplicateBot: async () => ({ id: 'copy' }), openSession: () => {}, setMain: () => {}, deleteBot: () => {}, deleteRoom: () => {}, reportError: () => {}, removeAgent: () => {}, beginAgentRename: () => {}, archiveAgentSession: () => {}, @@ -112,22 +112,24 @@ test('a read-only window offers no write in the DSH Agent menus', () => { assert.deepEqual(labels.session.filter(label => SESSION_WRITES.includes(label)), [], 'the session menu still offers a write') }) -test('a read-only window draws no empty menu box', () => { - const menus = menusOf(rosterOf({ readOnly: 'read only' })) - for (const [menu, tree] of Object.entries(menus)) assert.equal(tree, null, `the read-only ${menu} menu drew a box`) +test('a read-only window still offers Mark as Unread, which only touches local UI state', () => { + const labels = labelsOf(menusOf(rosterOf({ readOnly: 'read only' }))) + assert.deepEqual(labels.agent, ['Mark as Unread']) + assert.deepEqual(labels.pinned, ['Mark as Unread']) + assert.deepEqual(labels.session, ['Mark as Unread']) }) -test('a writable window keeps every Agent write exactly as it is', () => { +test('a writable window keeps every Agent write and the unread entry', () => { const labels = labelsOf(menusOf(rosterOf())) - assert.deepEqual(labels.agent, ['Pin', 'Remove DSH Agent']) - assert.deepEqual(labels.pinned, ['Unpin', 'Remove DSH Agent']) - assert.deepEqual(labels.session, ['Rename', 'Archive']) + assert.deepEqual(labels.agent, ['Pin', 'Mark as Unread', 'Remove DSH Agent']) + assert.deepEqual(labels.pinned, ['Unpin', 'Mark as Unread', 'Remove DSH Agent']) + assert.deepEqual(labels.session, ['Mark as Unread', 'Rename', 'Archive']) }) test('a host sentence that trims to nothing is a writable window', () => { for (const readOnly of [undefined, '', ' ']) { const labels = labelsOf(menusOf(rosterOf({ readOnly }))) - assert.deepEqual(labels.agent, ['Pin', 'Remove DSH Agent'], `readOnly ${JSON.stringify(readOnly)} hid the agent writes`) - assert.deepEqual(labels.session, ['Rename', 'Archive'], `readOnly ${JSON.stringify(readOnly)} hid the session writes`) + assert.deepEqual(labels.agent, ['Pin', 'Mark as Unread', 'Remove DSH Agent'], `readOnly ${JSON.stringify(readOnly)} hid the agent writes`) + assert.deepEqual(labels.session, ['Mark as Unread', 'Rename', 'Archive'], `readOnly ${JSON.stringify(readOnly)} hid the session writes`) } }) diff --git a/patches/ds-bot/files/test/context-menu-readonly.test.js b/patches/ds-bot/files/test/context-menu-readonly.test.js index e4f6b4332..aa9094e2f 100644 --- a/patches/ds-bot/files/test/context-menu-readonly.test.js +++ b/patches/ds-bot/files/test/context-menu-readonly.test.js @@ -95,7 +95,7 @@ const WRITES = ['Pin', 'Unpin', 'Duplicate', 'Make Main Bot', 'Remove Main Bot r const KEEPS = ['Mark as Unread', 'Copy conversation ID'] const actions = () => ({ - closeMenu: () => {}, markUnread: () => {}, openSettings: () => {}, setFlags: () => {}, renameBot: () => {}, + closeMenu: () => {}, markUnread: () => {}, clearUnread: () => {}, openSettings: () => {}, setFlags: () => {}, renameBot: () => {}, duplicateBot: async () => ({ id: 'copy' }), openSession: () => {}, setMain: () => {}, deleteBot: () => {}, deleteRoom: () => {}, reportError: () => {}, }) @@ -141,3 +141,27 @@ test('a host sentence that trims to nothing is a writable window', () => { assert.ok(labels.room.includes('Delete group'), `readOnly ${JSON.stringify(readOnly)} hid the room writes`) } }) + +test('a manually unread chat offers Clear unread mark, which clears the local mark', () => { + const calls = [] + const actionsOf = { ...actions(), markUnread: id => calls.push(['unread', id]), clearUnread: id => calls.push(['read', id]) } + const tree = draw(() => ContextMenu({ + menu: { kind: 'bot', id: 'writer', x: 10, y: 10 }, + roster: rosterOf(), actions: actionsOf, unread: { writer: true }, leaving: false, + })) + const items = menuItems(tree) + assert.ok(items.includes('Clear unread mark')) + assert.equal(items.includes('Mark as Unread'), false) + const row = (function find(node) { + if (!node || typeof node !== 'object') return null + if (node.props?.role === 'menuitem' && textOf(node) === 'Clear unread mark') return node + for (const child of node.children ?? []) { + const hit = find(child) + if (hit) return hit + } + return null + })(tree) + assert.ok(row) + row.props.onClick() + assert.deepEqual(calls, [['read', 'writer']]) +}) diff --git a/patches/ds-bot/files/test/flybot-client.test.js b/patches/ds-bot/files/test/flybot-client.test.js index c6d85750a..12173f53c 100644 --- a/patches/ds-bot/files/test/flybot-client.test.js +++ b/patches/ds-bot/files/test/flybot-client.test.js @@ -215,7 +215,7 @@ test('the account menu names each destination as it is named elsewhere (#392, #3 const settings = readFileSync(new URL('../src/client/settings.js', import.meta.url), 'utf8').replace(/\r\n/g, '\n') const menu = source.slice(source.indexOf('const groups = ['), source.indexOf('return h(Fragment, null,', source.indexOf('const groups = ['))) const labels = [...menu.matchAll(/\[t\('([^']+)'\)/g)].map(match => match[1]) - assert.deepEqual(labels, ['Usage', 'Connect apps', 'Plugins', 'Scheduled tasks', 'Settings', 'Switch to classic Agent mode']) + assert.deepEqual(labels, ['Usage', 'Connect apps', 'Channels', 'Plugins', 'Scheduled tasks', 'Settings', 'Switch to classic Agent mode']) // Connectors: the footer button's words, not the second name "Connectors". assert.doesNotMatch(menu, /t\('Connectors'\)/) // Scheduled tasks: the Settings page and a Bot's details use that name, and the row opens that page. diff --git a/patches/ds-bot/files/test/group-create-readonly.test.js b/patches/ds-bot/files/test/group-create-readonly.test.js index b9d4203f1..5cadebc48 100644 --- a/patches/ds-bot/files/test/group-create-readonly.test.js +++ b/patches/ds-bot/files/test/group-create-readonly.test.js @@ -119,7 +119,6 @@ const press = (nodes, predicate) => { node.props.onClick?.() return node } -const chips = nodes => nodes.filter(node => hasClass(node, 'bt-ng-chip')) const groupCreate = nodes => nodes.filter(node => hasClass(node, 'bt-send') && ownText(node).trim() === 'Create group chat') const readOnlyLine = nodes => nodes.filter(node => hasClass(node, 'bt-read-only')) @@ -129,12 +128,10 @@ const settingsGroup = async (roster) => { const { calls, actions } = actionsOf() const form = mount(NewGroupForm, { roster, actions, run, onCreated() {}, onCancel() {} }) let nodes = form.draw() - const adminChip = chips(nodes).find(node => node.props.role === 'radio' && ownText(node).includes('Chief')) - press(nodes, node => node === adminChip) + press(nodes, node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option' && ownText(node).includes('Chief')) await flush() nodes = form.draw() - const memberChip = chips(nodes).find(node => node.props.role === 'checkbox' && ownText(node).includes('Scout')) - press(nodes, node => node === memberChip) + press(nodes, node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option' && ownText(node).includes('Scout')) await flush() nodes = form.draw() const create = groupCreate(nodes)[0] @@ -197,3 +194,58 @@ test('a writable window keeps both group-create controls and still writes', asyn assert.equal(readOnlyLine(pane.nodes).length, 0, 'no read-only line in a writable window') } }) + +const nameInput = nodes => nodes.filter(node => node.type === 'input' && node.props?.['aria-label'] === 'Group name') +const searchInput = nodes => nodes.filter(node => node.type === 'input' && node.props?.['aria-label'] === 'Search members') +const empty = nodes => nodes.filter(node => hasClass(node, 'bt-ng-empty')) + +test('New group form shows the name, search, empty selected pane, and a disabled Create', () => { + const { actions } = actionsOf() + const form = mount(NewGroupForm, { roster: rosterWith(), actions, run, onCreated() {}, onCancel() {} }) + const nodes = form.draw() + assert.equal(nameInput(nodes).length, 1, 'the optional name is visible before anyone is picked') + assert.equal(searchInput(nodes).length, 1, 'members can be searched') + assert.ok(empty(nodes).some(node => ownText(node).includes('No members selected')), 'the selected pane has an empty state') + const create = groupCreate(nodes)[0] + assert.ok(create, 'Create group chat is drawn') + assert.equal(create.props.disabled, true, 'Create stays disabled until members are selected') + assert.equal(ownText(nodes.find(node => hasClass(node, 'bt-ng-intro'))), 'Add a name, then pick Bots to chat with.') +}) + +test('searching hides unmatched Bots, and Create enables after an admin and a member', async () => { + const { actions } = actionsOf() + const form = mount(NewGroupForm, { roster: rosterWith(), actions, run, onCreated() {}, onCancel() {} }) + let nodes = form.draw() + const search = searchInput(nodes)[0] + search.props.onChange({ target: { value: 'Scout' } }) + await flush() + nodes = form.draw() + const options = nodes.filter(node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option') + assert.deepEqual(options.map(ownText), ['Scout']) + search.props.onChange({ target: { value: 'nobody-here' } }) + await flush() + nodes = form.draw() + assert.ok(empty(nodes).some(node => ownText(node).includes('No Bots match'))) + search.props.onChange({ target: { value: '' } }) + await flush() + nodes = form.draw() + press(nodes, node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option' && ownText(node).includes('Chief')) + await flush() + nodes = form.draw() + assert.equal(groupCreate(nodes)[0].props.disabled, true, 'one pick is only the admin') + press(nodes, node => hasClass(node, 'bt-ng-pick') && node.props.role === 'option' && ownText(node).includes('Scout')) + await flush() + nodes = form.draw() + assert.equal(groupCreate(nodes)[0].props.disabled, false) + assert.ok(nodes.some(node => ownText(node).includes('Selected 2'))) +}) + +test('New… group mode draws a disabled Create and an optional name before anyone is picked', () => { + const { actions } = actionsOf() + const pane = mount(NewChat, { mode: 'group', roster: rosterWith(), actions }) + const nodes = pane.draw() + const create = groupCreate(nodes)[0] + assert.ok(create, 'Create group chat is drawn from the start') + assert.equal(create.props.disabled, true) + assert.equal(nameInput(nodes).length, 1) +}) diff --git a/patches/ds-bot/files/test/group-create.test.js b/patches/ds-bot/files/test/group-create.test.js new file mode 100644 index 000000000..c81397324 --- /dev/null +++ b/patches/ds-bot/files/test/group-create.test.js @@ -0,0 +1,28 @@ +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { canCreateGroup, groupMemberMatches, groupMemberQuery } from '../src/shared/group-create.js' + +const chief = { id: 'chief', name: 'Chief', role: 'Coordinator' } +const scout = { id: 'scout', name: 'Scout', role: 'Researcher' } +const remote = { id: 'pat', name: 'Pat', remote: { handle: '@pat.home', ownerName: 'Pat' } } + +test('create stays off until an admin and at least one member are picked', () => { + assert.equal(canCreateGroup(null, []), false) + assert.equal(canCreateGroup('chief', []), false) + assert.equal(canCreateGroup(null, ['scout']), false) + assert.equal(canCreateGroup('', ['scout']), false) + assert.equal(canCreateGroup('chief', ['scout']), true) + assert.equal(canCreateGroup('chief', ['scout', 'pat']), true) +}) + +test('member search matches name, role, or the picker label, and ignores case', () => { + assert.equal(groupMemberQuery(' Scout '), 'scout') + assert.equal(groupMemberMatches(chief, ''), true) + assert.equal(groupMemberMatches(chief, ' '), true) + assert.equal(groupMemberMatches(chief, 'chief'), true) + assert.equal(groupMemberMatches(scout, 'COORD'), false) + assert.equal(groupMemberMatches(scout, 'research'), true) + assert.equal(groupMemberMatches(remote, 'pat'), true) + assert.equal(groupMemberMatches(chief, 'scout'), false) + assert.equal(groupMemberMatches(undefined, 'chief'), false) +}) diff --git a/patches/ds-bot/files/test/held-line.test.js b/patches/ds-bot/files/test/held-line.test.js index d92eec09b..6cd13b831 100644 --- a/patches/ds-bot/files/test/held-line.test.js +++ b/patches/ds-bot/files/test/held-line.test.js @@ -54,7 +54,7 @@ const roomWith = (pendingApprovals, origin = 'face-to-face') => ({ id: 'g1', ori const draw = (room, replies) => { const roster = { bots: [chief], byId: { chief }, roomsById: { g1: room } } const content = [{ type: 'text', text: JSON.stringify({ replies }) }] - return expand(GroupReplies({ sessionId: 'g1', callId: 'c1', done: true, content, roster, actions: {}, useUi: () => null }), ['GroupMessage', 'Bubbles']) + return expand(GroupReplies({ sessionId: 'g1', callId: 'c1', done: true, content, roster, actions: {}, useUi: () => null }), ['GroupMessage', 'Bubbles', 'FoldedContent']) } const said = (text, seq) => ({ botId: 'chief', name: 'Chief', text, ...(seq !== undefined ? { seq } : {}) }) const shownText = drawn => find(drawn, node => node.type?.name === 'MarkdownText').map(node => node.props.text) @@ -137,7 +137,7 @@ test('the held line waits only for the Bot that sent it: another Bot saying the { botId: 'writer', name: 'Writer', text: 'Draft: ship it on Friday' }, { botId: 'chief', name: 'Chief', text: 'Draft: ship it on Friday' }, ] }) }] - const drawn = expand(GroupReplies({ sessionId: 'g1', callId: 'c1', done: true, content, roster, actions: {}, useUi: () => null }), ['GroupMessage', 'Bubbles']) + const drawn = expand(GroupReplies({ sessionId: 'g1', callId: 'c1', done: true, content, roster, actions: {}, useUi: () => null }), ['GroupMessage', 'Bubbles', 'FoldedContent']) assert.equal(find(drawn, node => node.props?.className === 'bt-group-msg').length, 1, 'only Chief\'s line is left out') assert.deepEqual(shownText(drawn), ['Draft: ship it on Friday'], 'Writer\'s identical line is drawn') assert.equal(isHeldLine(room, 'Draft: ship it on Friday', writer), false) diff --git a/patches/ds-bot/files/test/history-hit-state.test.js b/patches/ds-bot/files/test/history-hit-state.test.js new file mode 100644 index 000000000..a54e91f2d --- /dev/null +++ b/patches/ds-bot/files/test/history-hit-state.test.js @@ -0,0 +1,34 @@ +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { historyHookHarness } from './history-hook-harness.js' +const mount=await historyHookHarness('../src/client/history-hit.js','useHistoryHit') +const settle=async()=>{for(let i=0;i<6;i++)await Promise.resolve()} +const view=id=>({scope:'read-only-history',sessionId:id,entries:[{text:'authorized '+id}]}) +test('context uses only the opaque ticket and AbortSignal; switching hit discards stale content immediately',async()=>{ + const env=mount(),pending=[],calls=[] + const read=(body,signal)=>{calls.push({body,signal});return new Promise(resolve=>pending.push(resolve))} + env.draw(read,'old-ticket','alice');await settle();pending[0](view('old'));await settle() + assert.equal(env.draw(read,'old-ticket','alice').value.sessionId,'old') + const changed=env.draw(read,'new-ticket','alice');assert.equal(changed.value,null);assert.equal(changed.status,'loading') + assert.equal(calls[0].signal.aborted,true);await settle() + assert.equal(JSON.stringify(calls[1].body),JSON.stringify({hitToken:'new-ticket'})) + pending[1](view('new'));await settle();assert.equal(env.draw(read,'new-ticket','alice').value.sessionId,'new') +}) +test('account/ownership/part changes clear context before revalidation, and a revoked response exposes no old text',async()=>{ + const env=mount();let count=0 + const read=async()=>{if(count++)throw Error('/secret/config');return view('old')} + env.draw(read,'ticket','alice:old-parts');await settle();assert.ok(env.draw(read,'ticket','alice:old-parts').value) + assert.equal(env.draw(read,'ticket','bob:new-parts').value,null);await settle() + const state=env.draw(read,'ticket','bob:new-parts');assert.equal(state.status,'error');assert.equal(state.value,null);assert.equal(JSON.stringify(state).includes('config'),false) +}) +test('late response after unmount is ignored; deletion disables reads and retry reauthenticates',async()=>{ + const env=mount();let finish,seen + const read=(_body,signal)=>{seen=signal;return new Promise(resolve=>{finish=resolve})} + env.draw(read,'ticket','alive');await settle();env.unmount();assert.equal(seen.aborted,true) + finish(view('late'));await settle();assert.equal(env.draw(read,'ticket','alive').value,null) + const deleted=mount();let reads=0 + const quick=async()=>{reads++;return view('restored')} + deleted.draw(quick,null,'deleted');await settle();assert.equal(reads,0);assert.equal(deleted.draw(quick,null,'deleted').status,'error') + deleted.draw(quick,'ticket','restored');await settle();const ready=deleted.draw(quick,'ticket','restored');assert.equal(ready.value.sessionId,'restored') + ready.reload();deleted.draw(quick,'ticket','restored');await settle();assert.equal(reads,2) +}) diff --git a/patches/ds-bot/files/test/history-hit-view.test.js b/patches/ds-bot/files/test/history-hit-view.test.js new file mode 100644 index 000000000..3c635cad6 --- /dev/null +++ b/patches/ds-bot/files/test/history-hit-view.test.js @@ -0,0 +1,42 @@ +// Actual viewer component; effects are covered by history-hit-state separately. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { build } from 'esbuild' +import { runInNewContext } from 'node:vm' +import { fileURLToPath } from 'node:url' +const bundle=await build({entryPoints:[fileURLToPath(new URL('../src/client/history-hit.js',import.meta.url))],bundle:true,platform:'browser',format:'cjs',write:false,external:['react']}) +const h=(type,props,...children)=>({type,props:{...props,children:children.flat(Infinity)}}) +const text=node=>typeof node==='string'||typeof node==='number'?String(node):Array.isArray(node)?node.map(text).join(''):node?text(node.props?.children):'' +const nodes=(node,out=[])=>{if(Array.isArray(node)){for(const child of node)nodes(child,out)}else if(node&&typeof node==='object'){out.push(node);nodes(node.props?.children,out)}return out} +function draw(status='ready',{deleted=false}={}){ + const bot={id:'bot',ownerId:'alice',sessionId:'live',parts:['old','live']} + const roster={byId:deleted?{}:{bot},self:{memberId:'alice'}} + const access=JSON.stringify([true,'alice','live',['old','live'],'alice']) + const value={scope:'read-only-history',sessionId:'old',part:1,partCount:2,entries:[{seq:1,turn:0,role:'user',hit:true,text:'原始 ABC 历史',truncated:true,omittedBefore:true},{seq:2,turn:0,role:'assistant',hit:false,text:'相邻文本'}]} + const react={createElement:h,useRef:initial=>({current:initial}),useEffect(){},useState:initial=>[initial&&typeof initial==='object'&&'key'in initial?{key:`token:${access}:0`,status,value}:initial,()=>{}]} + const module={exports:{}} + runInNewContext(bundle.outputFiles[0].text,{module,exports:module.exports,require:()=>react}) + let back=0 + const result=module.exports.HistoryHitDialog({hit:{botId:'bot',sessionId:'old',hitToken:'token',snippet:'NEVER USE SEARCH SNIPPET'},roster,actions:{openSession(){throw Error('must not navigate')},readHistoryHit:async()=>value},onBack:()=>back++}) + return {all:nodes(result),back:()=>back} +} +test('read-only viewer identifies its real segment and displays original escaped text, hit marker and truncation notice',()=>{ + const {all,back}=draw() + assert.ok(all.some(node=>node.props?.role==='dialog'&&node.props['aria-label']==='Read-only history match')) + assert.ok(all.some(node=>text(node)==='Segment 1 of 2')) + assert.ok(all.some(node=>node.type==='code'&&text(node)==='old')) + assert.ok(all.some(node=>node.type==='pre'&&text(node)==='原始 ABC 历史'&&node.props.dangerouslySetInnerHTML===undefined)) + assert.ok(all.some(node=>node.props?.['data-hit']===true)) + assert.ok(all.some(node=>text(node)==='Text truncated by the byte limit; this is not complete history.')) + assert.equal(all.some(node=>node.type==='input'||node.type==='textarea'),false) + const buttons=all.filter(node=>node.type==='button') + assert.ok(buttons.every(node=>['Back to search','Reload history context'].includes(text(node))||node.props['aria-label']==='Back to search')) + buttons.find(node=>text(node)==='Back to search').props.onClick();assert.equal(back(),1) +}) +test('loading/error/deleted-roster states never render cached context or the search snippet',()=>{ + for(const [status,deleted] of [['loading',false],['error',false],['ready',true]]){ + const {all}=draw(status,{deleted}) + assert.equal(all.some(node=>node.type==='pre'),false) + assert.equal(all.some(node=>text(node).includes('NEVER USE SEARCH SNIPPET')),false) + } +}) diff --git a/patches/ds-bot/files/test/history-hook-harness.js b/patches/ds-bot/files/test/history-hook-harness.js new file mode 100644 index 000000000..02c8c3bb1 --- /dev/null +++ b/patches/ds-bot/files/test/history-hook-harness.js @@ -0,0 +1,22 @@ +// Shared deterministic effect/timer harness for the two history query hooks. +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' +import { fileURLToPath } from 'node:url' +export async function historyHookHarness(entry, exported) { + const bundled = await build({entryPoints:[fileURLToPath(new URL(entry,import.meta.url))],bundle:true,format:'cjs',platform:'browser',write:false,external:['react']}) + return function mount() { + const slots=[], effects=[], timers=new Map(); let index=0, sequence=0 + const react={ + useState(initial){const at=index++;if(!(at in slots))slots[at]=initial;return [slots[at],next=>{slots[at]=typeof next==='function'?next(slots[at]):next}]}, + useRef(initial){const at=index++;if(!(at in slots))slots[at]={current:initial};return slots[at]}, + useEffect(run,deps){const at=index++;const old=slots[at];if(!old||deps.some((value,i)=>value!==old.deps[i])){effects.push(()=>{old?.off?.();slots[at]={deps,off:run()}})}}, + } + const module={exports:{}} + runInNewContext(bundled.outputFiles[0].text,{module,exports:module.exports,require:()=>react,AbortController,setTimeout:fn=>{const id=++sequence;timers.set(id,fn);return id},clearTimeout:id=>timers.delete(id)}) + return { + draw(...args){index=0;const result=module.exports[exported](...args);while(effects.length)effects.shift()();return result}, + tick(){for(const [id,run] of timers){timers.delete(id);run()}}, + unmount(){for(const value of slots)value?.off?.()}, + } + } +} diff --git a/patches/ds-bot/files/test/history-search-state.test.js b/patches/ds-bot/files/test/history-search-state.test.js new file mode 100644 index 000000000..475136098 --- /dev/null +++ b/patches/ds-bot/files/test/history-search-state.test.js @@ -0,0 +1,39 @@ +// Effect-capable VM hooks, following palette-ui/message-tools harness conventions. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { historyHookHarness } from './history-hook-harness.js' +const mount=await historyHookHarness('../src/client/history-search.js','useHistorySearch') +const reply=(items=[],cursor=null,extra={})=>({scope:'local-bot-chats',items,cursor,...extra}) +const settle=async()=>{await Promise.resolve();await Promise.resolve();await Promise.resolve()} +test('debounces Chinese query; history is async and continuation uses opaque cursor',async()=>{ + const env=mount(),calls=[] + const search=async body=>{calls.push(body);return body.cursor?reply([{seq:2}]):reply([{seq:1}],'opaque')} + env.draw(search,'中');env.draw(search,'中文');env.tick();await settle() + let state=env.draw(search,'中文');assert.equal(calls.length,1);assert.equal(calls[0].query,'中文');assert.equal(state.status,'ready');assert.equal(state.items.length,1) + state.more();await settle();state=env.draw(search,'中文') + assert.equal(calls[1].cursor,'opaque');assert.equal(state.items.length,2) +}) +test('stale responses cannot replace the new query, and unmount ignores delayed results',async()=>{ + const env=mount(),pending=[] + const search=()=>new Promise(resolve=>pending.push(resolve)) + env.draw(search,'old');env.tick();env.draw(search,'new');env.tick() + pending[1](reply([{seq:2}]));await settle();pending[0](reply([{seq:1}]));await settle() + assert.equal(env.draw(search,'new').items[0].seq,2) + env.draw(search,'third');env.tick();env.unmount();pending[2](reply([{seq:3}]));await settle() + assert.equal(env.draw(search,'third').items.length,0) +}) +test('empty/long/unsupported/filter-disabled queries never call the host; backend failure degrades explicitly',async()=>{ + const env=mount();let count=0 + const search=async()=>{count++;throw Error('backend path/config must not appear')} + for(const query of ['', 'x'.repeat(257)]){env.draw(search,query);env.tick();await settle()} + env.draw(undefined,'query');env.tick();assert.equal(count,0) + env.draw(search,'needle');env.tick();await settle();const result=env.draw(search,'needle') + assert.equal(result.status,'error');assert.equal(result.items.length,0);assert.equal(JSON.stringify(result).includes('config'),false) +}) +test('display cap stops pagination and marks incomplete/limited results honestly',async()=>{ + const env=mount();let batch=0 + const search=async()=>reply(Array.from({length:20},(_,seq)=>({seq:++batch*20+seq})),'more',{incomplete:true}) + env.draw(search,'query');env.tick();await settle() + for(let n=0;n<4;n++){env.draw(search,'query').more();await settle()} + const result=env.draw(search,'query');assert.equal(result.items.length,100);assert.equal(result.cursor,null);assert.equal(result.limited,true);assert.equal(result.incomplete,true) +}) diff --git a/patches/ds-bot/files/test/memory-catalog.test.js b/patches/ds-bot/files/test/memory-catalog.test.js new file mode 100644 index 000000000..a2b460dcb --- /dev/null +++ b/patches/ds-bot/files/test/memory-catalog.test.js @@ -0,0 +1,47 @@ +// Directory grouping and search over already-loaded memory entries. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { filterMemoryEntries, memoryStats, memoryTopics, sameTopic, topicKey } from '../src/shared/memory-catalog.js' + +const entries = [ + { text: 'Prefers the window seat on flights', scope: 'own', topic: 'travel', by: null }, + { text: 'Allergic to peanuts', scope: 'own', topic: null, by: null }, + { text: 'Standup is at 10:00', scope: 'team', topic: 'rituals', by: 'Chief' }, + { text: 'The travel budget is tight this quarter', scope: 'team', topic: 'travel', by: 'Writer' }, +] + +test('topics are grouped by scope, untagged first, then by name', () => { + assert.deepEqual(memoryTopics(entries), [ + { scope: 'own', topic: null, count: 1 }, + { scope: 'own', topic: 'travel', count: 1 }, + { scope: 'team', topic: 'rituals', count: 1 }, + { scope: 'team', topic: 'travel', count: 1 }, + ]) + assert.deepEqual(memoryTopics([]), []) + assert.deepEqual(memoryTopics(undefined), []) +}) + +test('stats count entries and named topics, not the untagged main file', () => { + assert.deepEqual(memoryStats(entries), { entries: 4, topics: 3 }) + assert.deepEqual(memoryStats([]), { entries: 0, topics: 0 }) + // own travel and team travel are two topics + assert.equal(memoryStats([{ topic: 'travel', scope: 'own' }, { topic: 'travel', scope: 'team' }]).topics, 2) +}) + +test('search keeps entries that contain every term in the text, topic, or author', () => { + assert.equal(filterMemoryEntries(entries, '').length, 4) + assert.deepEqual(filterMemoryEntries(entries, ' ').map(item => item.text), entries.map(item => item.text)) + assert.deepEqual(filterMemoryEntries(entries, 'window seat').map(item => item.text), ['Prefers the window seat on flights']) + assert.deepEqual(filterMemoryEntries(entries, 'TRAVEL').map(item => item.text), [ + 'Prefers the window seat on flights', + 'The travel budget is tight this quarter', + ]) + assert.deepEqual(filterMemoryEntries(entries, 'chief').map(item => item.text), ['Standup is at 10:00']) + assert.deepEqual(filterMemoryEntries(entries, 'window budget'), []) +}) + +test('a topic key treats missing and empty names as the untagged main file', () => { + assert.equal(topicKey({ scope: 'own' }), 'own:') + assert.equal(sameTopic({ scope: 'team', topic: 'travel' }, { scope: 'team', topic: 'travel' }), true) + assert.equal(sameTopic({ scope: 'own', topic: 'travel' }, { scope: 'team', topic: 'travel' }), false) +}) diff --git a/patches/ds-bot/files/test/memory-panel-readonly.test.js b/patches/ds-bot/files/test/memory-panel-readonly.test.js index be03b7f06..2d188a9ef 100644 --- a/patches/ds-bot/files/test/memory-panel-readonly.test.js +++ b/patches/ds-bot/files/test/memory-panel-readonly.test.js @@ -172,3 +172,26 @@ test('P-475: the dialog is handed the roster, or the panel cannot know the windo const overlays = readFileSync(new URL('../src/client/overlays.js', import.meta.url), 'utf8') assert.match(overlays, /h\(MemoryDialog, \{ key: memory, bot: roster\.byId\[memory\], roster, actions, leaving: memoryLeaving \}\)/) }) + +test('the memory panel draws a directory and filters entries by search', async () => { + reset() + const props = { bot: { id: 'bot1', name: 'Scout' }, actions: actions(), roster: {} } + let tree = render(props) + await flush() + tree = render(props) + assert.match(textOf(tree), /Overview/) + assert.match(textOf(tree), /All entries/) + assert.ok(all(tree).some(node => node.props?.['aria-label'] === 'Memory directory'), 'the directory is named') + const search = all(tree).find(node => node.type === 'input' && node.props?.['aria-label'] === 'Search memory') + assert.ok(search, 'a search field is in the directory') + search.props.onChange({ target: { value: 'second' } }) + tree = render(props) + assert.match(textOf(tree), /A second fact/) + assert.doesNotMatch(textOf(tree), /A saved fact/) + const hide = all(tree).find(node => node.props?.['aria-label'] === 'Hide directory') + assert.ok(hide, 'the directory can be hidden') + hide.props.onClick() + tree = render(props) + assert.equal(all(tree).filter(node => node.props?.['aria-label'] === 'Memory directory').length, 0) + assert.ok(all(tree).some(node => node.props?.['aria-label'] === 'Show directory')) +}) diff --git a/patches/ds-bot/files/test/mention-look.test.js b/patches/ds-bot/files/test/mention-look.test.js index b5ea361da..c18829454 100644 --- a/patches/ds-bot/files/test/mention-look.test.js +++ b/patches/ds-bot/files/test/mention-look.test.js @@ -88,7 +88,7 @@ function chipBot(roster, text) { useRoster: select => select(roster), actions: { openSession() {} }, }) - const marks = find(expand(cell, ['UserText']), node => node.type?.name === 'BotMark') + const marks = find(expand(cell, ['UserText', 'FoldedContent', 'MessageTools']), node => node.type?.name === 'BotMark') assert.equal(marks.length, 1) return marks[0].props.bot } @@ -121,7 +121,7 @@ test('a face-room @ row and mention chip draw the stored friend look, not the ha sessionId: 'room', useRoster: select => select(roster), actions: { openSession() {} }, - }), ['UserText']) + }), ['UserText', 'FoldedContent', 'MessageTools']) const button = find(cell, node => node.props?.className === 'bt-umention')[0] assert.match(JSON.stringify(button.children), /Chief \(SelfA1025\)/) }) diff --git a/patches/ds-bot/files/test/message-actions.test.js b/patches/ds-bot/files/test/message-actions.test.js new file mode 100644 index 000000000..a20f2ce4a --- /dev/null +++ b/patches/ds-bot/files/test/message-actions.test.js @@ -0,0 +1,50 @@ +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { MESSAGE_REACTIONS, hasMessageText, isLockedRoster, userMessageReactKey, messageActionIds, hasMessageActions } from '../src/shared/message-actions.js' +import { canPinSession, sessionPinned, sessionPinTarget } from '../src/shared/session-pin.js' + +test('message actions only include reaction, reply, copy, and download when those can run', () => { + assert.deepEqual(MESSAGE_REACTIONS, ['👍', '❤️', '😂', '😮', '😢', '🙏']) + assert.deepEqual( + messageActionIds({ text: 'Hello', sessionId: 'chief', canReact: true, canReply: true }), + ['react', 'reply', 'copy', 'download'], + ) + assert.ok(!messageActionIds({ text: 'Hello', sessionId: 'chief', canReact: true, canReply: true }).includes('artifacts')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('translate')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('forward')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('report')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('edit')) + assert.ok(!messageActionIds({ text: 'Hello' }).includes('pin')) +}) + +test('copy and download need readable text; reply needs a session and a writable window', () => { + assert.equal(hasMessageText(' \n'), false) + assert.deepEqual(messageActionIds({ text: ' ', canReact: true }), ['react']) + assert.deepEqual(messageActionIds({ text: 'Hi', canReply: true }), ['copy', 'download']) + assert.deepEqual(messageActionIds({ text: 'Hi', sessionId: 'chief', canReply: true, locked: true }), ['copy', 'download']) + assert.equal(hasMessageActions({ text: '', canReact: false, canReply: true, sessionId: 'chief' }), false) + assert.equal(hasMessageActions({ text: '', canReact: false, canReply: true }), false) +}) + +test('a user bubble gets a reaction key only from a stable turn identity', () => { + assert.equal(userMessageReactKey('chief', { location: { kind: 'turn', turn: 4 } }), 'chief:4:user') + assert.equal(userMessageReactKey('chief', { data: { turn: 9 } }), 'chief:9:user') + assert.equal(userMessageReactKey('chief', { key: 'unstable', data: { content: [] } }), undefined) + assert.equal(userMessageReactKey('', { data: { turn: 1 } }), undefined) +}) + +test('session pin follows the host flag and skips remote Bots, the main tile, and a locked window', () => { + const chief = { id: 'chief', name: 'Chief', pinned: true } + const writer = { id: 'writer', name: 'Writer', remote: { handle: '@x' } } + const room = { id: 'room', name: 'Review', pinned: false } + const roster = { byId: { chief, writer }, roomsById: { room }, mainBotId: 'chief' } + assert.equal(sessionPinTarget(roster, 'room'), room) + assert.equal(canPinSession(roster, 'chief'), false) + assert.equal(canPinSession(roster, 'writer'), false) + assert.equal(canPinSession(roster, 'room'), true) + assert.equal(sessionPinned(roster, 'chief'), true) + assert.equal(sessionPinned(roster, 'room'), false) + assert.equal(canPinSession({ ...roster, readOnly: 'This window is read-only' }, 'room'), false) + assert.equal(isLockedRoster({ readOnly: ' ' }), false) + assert.equal(canPinSession(roster, 'missing'), false) +}) diff --git a/patches/ds-bot/files/test/message-fold.test.js b/patches/ds-bot/files/test/message-fold.test.js new file mode 100644 index 000000000..9cfa7cd70 --- /dev/null +++ b/patches/ds-bot/files/test/message-fold.test.js @@ -0,0 +1,110 @@ +// Message folding thresholds, previews, document-card detection, and prefs. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { + FOLD_THRESHOLDS, documentHeadings, documentTitle, exceedsThreshold, + foldingOf, isLongDocument, previewOf, shouldFold, showsDocumentCard, +} from '../src/shared/message-fold.js' +import { readFolding } from '../src/shared/message-fold-prefs.js' + +const line = 'A short line of ordinary prose.' +const compactOverChars = 'word '.repeat(60).trim() // 299 chars +const standardOverChars = 'word '.repeat(170).trim() // 849 chars +const manyLines = (n, width = 'This is a line of a longer reply.') => Array.from({ length: n }, () => width).join('\n') +const article = [ + '# Weekly note', + '', + 'An introduction long enough that this document clears the standard threshold, with several short paragraphs so the character count is honest.', + '', + '## Progress', + '', + 'The team shipped the chat shell, the appearance modes, and the send-key preference. The next pass is message folding in the bubble itself, not a setting that does nothing.', + '', + '## Risks', + '', + 'A fake entry would look like a completed feature. The bubble has to fold first, then the setting has to write through set-prefs and change what the bubble shows.', + '', + '## Next', + '', + 'After the setting is stored on the host, opening the same conversation again still folds at the same caps, and a long document still opens as a card beside the thread.', +].join('\n') + +test('fresh prefs are standard with document cards on', () => { + assert.deepEqual(foldingOf(undefined), { mode: 'standard', documentCards: true }) + assert.deepEqual(foldingOf({}), { mode: 'standard', documentCards: true }) + assert.equal(foldingOf({ folding: { mode: 'compact', documentCards: false } }).mode, 'compact') + assert.equal(foldingOf({ folding: { mode: 'compact', documentCards: false } }).documentCards, false) + assert.equal(foldingOf({ folding: { mode: 'wild' } }).mode, 'standard') +}) + +test('a message at the cap stays open; one character or line over folds', () => { + const { compact, standard } = FOLD_THRESHOLDS + assert.equal(compact.lines, 4) + assert.equal(compact.chars, 240) + assert.equal(standard.lines, 12) + assert.equal(standard.chars, 800) + assert.equal(shouldFold('x'.repeat(compact.chars), 'compact'), false) + assert.equal(shouldFold('x'.repeat(compact.chars + 1), 'compact'), true) + assert.equal(shouldFold(manyLines(compact.lines), 'compact'), false) + assert.equal(shouldFold(manyLines(compact.lines + 1), 'compact'), true) + assert.equal(shouldFold('x'.repeat(standard.chars), 'standard'), false) + assert.equal(shouldFold('x'.repeat(standard.chars + 1), 'standard'), true) + assert.equal(shouldFold(manyLines(standard.lines), 'standard'), false) + assert.equal(shouldFold(manyLines(standard.lines + 1), 'standard'), true) + assert.equal(shouldFold(standardOverChars, 'none'), false) + assert.equal(shouldFold(article, 'none'), false) +}) + +test('the preview is capped by lines or characters and does not equal the full text', () => { + const preview = previewOf(manyLines(8), 'compact') + assert.equal(preview.split('\n').length, 4) + assert.notEqual(preview, manyLines(8)) + const clipped = previewOf(compactOverChars, 'compact') + assert.ok(clipped.length <= 240, `compact char preview is ${clipped.length}`) + assert.notEqual(clipped, compactOverChars) + const mid = previewOf(standardOverChars, 'standard') + assert.ok(mid.length <= 800, `standard char preview is ${mid.length}`) + const short = previewOf(line, 'standard') + assert.equal(short, line) + assert.equal(exceedsThreshold(line, FOLD_THRESHOLDS.standard), false) +}) + +test('a preview does not leave a markdown fence open', () => { + const body = 'Intro\n\n```js\n' + 'const n = 1;\n'.repeat(40) + '```\n' + assert.equal(shouldFold(body, 'compact'), true) + const preview = previewOf(body, 'compact') + const ticks = preview.match(/```/g) ?? [] + assert.equal(ticks.length % 2, 0, 'fences come in pairs') +}) + +test('a long document is a multi-heading message that already exceeds standard', () => { + assert.equal(isLongDocument(article), true) + assert.ok(documentHeadings(article).length >= 2) + assert.equal(documentTitle(article), 'Weekly note') + assert.equal(showsDocumentCard(article, { mode: 'standard', documentCards: true }), true) + assert.equal(showsDocumentCard(article, { mode: 'none', documentCards: true }), false) + assert.equal(showsDocumentCard(article, { mode: 'standard', documentCards: false }), false) + assert.equal(showsDocumentCard(article, { mode: 'standard', documentCards: true }, { streaming: true }), false) + const shortDoc = '# One\n\nHello\n\n## Two\n\nWorld' + assert.equal(isLongDocument(shortDoc), false) + const broken = ['Part one is long enough on its own: ' + 'word '.repeat(80), '---', 'Part two keeps going: ' + 'word '.repeat(80), '---', 'Part three finishes: ' + 'word '.repeat(80)].join('\n') + assert.equal(isLongDocument(broken), true) +}) + +test('host set-prefs accepts a folding record and refuses a bad one', () => { + assert.deepEqual(readFolding(null), undefined) + assert.deepEqual(readFolding({ mode: 'compact' }), { mode: 'compact', documentCards: true }) + assert.deepEqual(readFolding({ documentCards: false }, { mode: 'standard', documentCards: true }), { mode: 'standard', documentCards: false }) + assert.equal(readFolding({ mode: 'loose' }), false) + assert.equal(readFolding({ mode: 'standard', documentCards: 'yes' }), false) + assert.equal(readFolding('standard'), false) +}) + + +test('fenced examples are not document headings or section breaks; tilde and longer fences close safely', () => { + for (const fence of ['~~~', '````']) { + const code = `${fence}md\n# Example\n## Not a heading\n---\n---\n${'x'.repeat(900)}\n${fence}` + assert.equal(isLongDocument(code), false) + assert.equal(previewOf(code, 'compact').endsWith(fence), true) + } +}) diff --git a/patches/ds-bot/files/test/message-history-search.test.js b/patches/ds-bot/files/test/message-history-search.test.js new file mode 100644 index 000000000..b5d075acb --- /dev/null +++ b/patches/ds-bot/files/test/message-history-search.test.js @@ -0,0 +1,320 @@ +// All data is isolated in memory. No persistence directory, running instance or user data. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { install, SEARCH_LIMITS } from '../src/host/message-search.js' +import { install as installChannel } from '../src/host/channel.js' +import { install as installAuthz } from '../src/host/authz.js' +const alice = { memberId: 'alice' }, bob = { memberId: 'bob' } +const message = (seq, text, kind = 'user', extra = {}) => ({ seq, time: seq, type: kind === 'assistant' ? 'assistant/message' : 'user/message', surfaceOp: 'append', + data: kind === 'assistant' ? { turn: 0, message: { role: 'assistant', content: [{ type: 'text', text }] } } : { source: { kind: 'user' }, content: [{ type: 'text', text }], turn: 0 }, ...extra }) +function fixture({ logs = {}, bots, observe, dispose } = {}) { + const state = { bots: bots ?? { a: { id: 'a', ownerId: 'alice', sessionId: 'a-live', segments: [{ sessionId: 'a-old' }] }, b: { id: 'b', ownerId: 'bob', sessionId: 'b-live' }, remote: { id: 'remote', ownerId: 'alice', remote: {}, sessionId: 'remote-live' } }, rooms: { room: { id: 'room', sessions: { a: 'internal-group' } } }, authSessions: { t: {} }, members: { alice: {}, bob: {} }, exchangeTurns: {} } + const reads = [], disposed = [] + const provider = { async observeSession(id, opts) { + assert.equal(opts.projectionMode, 'none') + assert.ok(opts.signal instanceof AbortSignal) + reads.push(id) + if (observe) await observe(id) + const events = logs[id] ?? [] + return { header: { id }, events, cursor: events.at(-1)?.seq ?? -1, [Symbol.dispose]: () => { disposed.push(id); dispose?.(id) } } + }, searchEvents() { throw Error('must not build/write the native index') }, listSessions() { throw Error('must not enumerate another instance') } } + const forbidden = () => { throw Error('must never activate, write, save, flush or list') } + const rt = { state, ctx: { get: key => { assert.equal(key, 'sessionQuery'); return provider }, sessionController: { list: forbidden, resolveAgent: forbidden, page: forbidden } }, + save: forbidden, load: forbidden, resolveAgent: forbidden, + partsOf: id => [...(state.bots[id]?.segments ?? []), ...(state.bots[id] ? [{ sessionId: state.bots[id].sessionId ?? id }] : [])], + chatOf: id => state.bots[id]?.sessionId ?? id, + botOf: id => Object.values(state.bots).find(bot => bot.id === id || bot.sessionId === id || bot.segments?.some(part => part.sessionId === id)), + } + installAuthz(rt); install(rt) + return { rt, state, reads, disposed, provider, search: (body, actor = alice) => rt.searchMessages(body, actor) } +} + +test('finds Chinese history in unloaded current and archived parts, without touching foreign sessions or writing', async () => { + const f = fixture({ logs: { 'a-live': [message(1, '现在的中文计划')], 'a-old': [message(1, '从未加载的中文历史', 'assistant')], 'b-live': [message(1, '别人的中文')] } }) + const before = JSON.stringify(f.state) + const result = await f.search({ query: '中文' }) + assert.equal(result.items.length, 2) + assert.deepEqual(result.items.map(hit => hit.sessionId), ['a-live', 'a-old']) + assert.equal(result.items[1].earlier, true) + assert.equal(result.scope, 'local-bot-chats') + assert.equal(result.cursor, null) + assert.equal(JSON.stringify(f.state), before) + assert.deepEqual(f.reads, f.disposed) +}) + +test('one-character Chinese, Unicode width/case, and FTS/regex metacharacters are literal', async () => { + const f = fixture({ logs: { 'a-live': [message(1, '甲 ABC %_*[x]')] } }) + for (const query of ['甲', 'abc', '%_*[x]']) assert.equal((await f.search({ query })).items.length, 1) + assert.equal((await f.search({ query: '" OR *' })).items.length, 0) +}) + +test('empty, invalid and oversized queries never read logs; caller selectors/actor ids grant nothing', async () => { + const f = fixture() + assert.deepEqual((await f.search({ query: ' \n\t' })).items, []) + for (const body of [{query:1},{query:'x'.repeat(257)},{query:'x\0'}, {query:'x',limit:0},{query:'x',limit:51},{query:'x',limit:1.5},{query:'x',sessionId:'b-live'},{query:'x',home:'/other'},{query:'x',actorId:'bob'}]) { + await assert.rejects(f.search(body), {code:'bot/invalid'}) + } + assert.deepEqual(f.reads, []) +}) + +test('only append-origin human/assistant text is searched, including pre-compaction transcript; never tools or model replacement copies', async () => { + const f = fixture({logs:{'a-live':[ + message(1,'needle old human transcript'), + message(2,'needle replacement','user',{surfaceOp:{from:1,to:1}}), + message(3,'needle plugin user','user',{data:{source:{kind:'ds-bot'},content:[{type:'text',text:'needle plugin user'}]}}), + {seq:4,type:'tool/result',surfaceOp:'append',data:{message:{content:[{type:'text',text:'needle tool result'}]}}}, + message(5,'needle log-only','user',{surfaceOp:undefined}), + ]}}) + const result=await f.search({query:'needle'}) + assert.deepEqual(result.items.map(hit=>hit.seq),[1]) +}) + +test('exchange-hidden turns and unknown-turn messages in a hidden session fail closed', async () => { + const hidden=message(1,'needle');const unknown=message(2,'needle');delete unknown.data.turn + const f=fixture({logs:{'a-live':[hidden,unknown,message(3,'needle visible','assistant',{data:{turn:3,message:{content:[{type:'text',text:'needle visible'}]}}})]}}) + f.state.exchangeTurns['a-live']=[0] + assert.deepEqual((await f.search({query:'needle'})).items.map(hit=>hit.seq),[3]) +}) + +test('pagination is bounded, no duplicates, and opaque cursors are query/actor/instance bound', async () => { + const f=fixture({logs:{'a-live':Array.from({length:5},(_,i)=>message(i,'needle '+i))}}) + const first=await f.search({query:'needle',limit:2}) + assert.ok(first.cursor) + for (const [query,actor] of [['different',alice],['needle',bob]]) await assert.rejects(f.search({query,cursor:first.cursor},actor),{code:'bot/invalid'}) + await assert.rejects(fixture().search({query:'needle',cursor:first.cursor}),{code:'bot/invalid'}) + await assert.rejects(f.search({query:'needle',cursor:'../../secret'}),{code:'bot/invalid'}) + const next=await f.search({query:'needle',limit:2,cursor:first.cursor}) + const last=await f.search({query:'needle',limit:2,cursor:next.cursor}) + assert.deepEqual([...first.items,...next.items,...last.items].map(hit=>hit.seq),[4,3,2,1,0]) + assert.equal(last.cursor,null) +}) + +test('authorization denies anonymous in member mode, narrows owners, excludes group/internal/remote sessions', async () => { + const f=fixture({logs:{'b-live':[message(1,'needle')]}}) + assert.equal(f.rt.authorize(null,'search-messages',{}).code,'bot/unauthorized') + await assert.rejects(f.search({query:'needle'},null),{code:'bot/unauthorized'}) + assert.equal(f.rt.authorize(alice,'search-messages',{}).ok,true) + await f.search({query:'needle'}) + assert.deepEqual(f.reads,['a-live','a-old']) + f.reads.length=0 + assert.equal((await f.search({query:'needle'},bob)).items.length,1) + assert.deepEqual(f.reads,['b-live']) +}) + +test('revocation during awaits prevents delivery and subsequent pages recheck ownership', async () => { + let f + f=fixture({logs:{'a-live':[message(1,'needle')]},observe:async id=>{if(id==='a-live') f.state.bots.a.ownerId='bob'}}) + assert.deepEqual((await f.search({query:'needle'})).items,[]) + assert.deepEqual(f.reads,['a-live']) +}) + +test('backend failures are sanitized and explicitly incomplete, never a false exhaustive empty', async () => { + const f=fixture({observe:async()=>{throw Error('/other-instance/config API_KEY=NEVER_RETURN')}}) + const result=await f.search({query:'needle'}) + assert.equal(result.incomplete,true) + assert.equal(JSON.stringify(result).includes('API_KEY'),false) + f.rt.ctx.get=()=>undefined + await assert.rejects(f.search({query:'needle'}),{code:'bot/search-unavailable'}) +}) + +test('continuation detects changed history and expired cursors', async () => { + const logs={'a-live':[message(0,'needle'),message(1,'needle')]} + const f=fixture({logs}) + const first=await f.search({query:'needle',limit:1}) + logs['a-live'].push(message(2,'needle')) + await assert.rejects(f.search({query:'needle',cursor:first.cursor}),{code:'bot/invalid'}) + const now=Date.now + Date.now=()=>now()+SEARCH_LIMITS.ttl+1 + try {await assert.rejects(f.search({query:'needle',cursor:first.cursor}),{code:'bot/invalid'})} finally {Date.now=now} +}) + +test('per-request source reads are capped even when all histories fail; oversized source is explicitly limited', async () => { + const bots=Object.fromEntries(Array.from({length:20},(_,i)=>['a'+i,{id:'a'+i,ownerId:'alice'}])) + const f=fixture({bots,observe:async()=>{throw Error('bad history')}}) + const result=await f.search({query:'needle'}) + assert.equal(f.reads.length,SEARCH_LIMITS.pagesPerRequest) + assert.ok(result.cursor) + assert.equal(result.incomplete,true) + const big=fixture({logs:{'a-live':Array.from({length:SEARCH_LIMITS.sourceEvents+1},()=>message(0,'needle'))}}) + assert.equal((await big.search({query:'needle'})).limited,true) +}) + +test('legacy single-human mode stays instance-local and query never mutates a read-only runtime', async () => { + const f=fixture({logs:{'a-old':[message(0,'needle')]}}) + f.state.authSessions={}; f.rt.readOnly=()=> 'read-only host' + assert.equal((await f.search({query:'needle'},null)).items.length,1) + assert.equal(f.reads.some(id=>id==='remote-live'||id==='internal-group'),false) +}) + + +test('real /api/bot channel allows read-only search, authenticates from the header, and rejects forged payload authority', async () => { + const f=fixture({logs:{'a-old':[message(0,'历史 needle')]}}) + let route + f.rt.ctx.effect=run=>run() + f.rt.ctx.connection={fetch:{register:value=>{route=value;return ()=>{}}}} + f.rt.refresh=async()=>{} + f.rt.load=async()=>{} // installation only; search itself never calls the loader + f.rt.readOnly=()=> 'another window owns the writer' + f.rt.authenticate=async token=>token==='alice-token'?alice:token==='bob-token'?bob:null + f.rt.noteFailure=()=>{throw Error('unexpected internal failure')} + installChannel(f.rt) + const call=async(token,payload,endpoint='search-messages')=> (await route.fetch(new Request('http://fixture.invalid/api/bot',{method:'POST',headers:token?{'x-flybot-member-session':token}:{},body:JSON.stringify({endpoint,payload})}))).json() + const result=await call('alice-token',{query:'历史'}) + assert.equal(result.ok,true) + assert.equal(result.value.items[0].sessionId,'a-old') + const context=await call('alice-token',{hitToken:result.value.items[0].hitToken},'history-hit') + assert.equal(context.ok,true) + assert.equal(context.value.sessionId,'a-old') + assert.equal((await call('bob-token',{hitToken:result.value.items[0].hitToken},'history-hit')).error.code,'bot/history-unavailable') + assert.equal((await call(null,{hitToken:result.value.items[0].hitToken},'history-hit')).error.code,'bot/unauthorized') + assert.equal((await call(null,{query:'历史'})).error.code,'bot/unauthorized') + assert.equal((await call('bob-token',{query:'历史'})).value.items.length,0) + assert.equal((await call('alice-token',{query:'历史',actorId:'bob'})).error.code,'bot/invalid') +}) + +test('per-owner concurrent work is refused and released, without blocking another owner', async () => { + let release + const held=new Promise(resolve=>{release=resolve}) + const f=fixture({observe:async id=>{if(id==='a-live')await held}}) + const pending=f.search({query:'needle'}) + await assert.rejects(f.search({query:'needle'}),{code:'bot/search-unavailable'}) + await f.search({query:'needle'},bob) + release();await pending + await f.search({query:'needle'}) +}) + +test('read-only hit returns its exact earlier segment and original bounded context, never opens an Agent', async () => { + const f=fixture({logs:{'a-old':[message(0,'before'),message(1,'原始 ABC 命中'),message(2,'after','assistant')]}}) + const hit=(await f.search({query:'abc'})).items[0] + const view=await f.rt.readHistoryHit({hitToken:hit.hitToken},alice) + assert.equal(view.scope,'read-only-history');assert.equal(view.sessionId,'a-old');assert.equal(view.part,1);assert.equal(view.partCount,2) + assert.deepEqual(view.entries.map(entry=>entry.text),['before','原始 ABC 命中','after']) + assert.equal(view.entries[1].hit,true) + assert.deepEqual(f.reads,['a-live','a-old','a-old']) + assert.deepEqual(f.reads,f.disposed) +}) + +test('context tickets reject foreign actor, other instance, selectors and expiration before reading', async () => { + const f=fixture({logs:{'a-live':[message(0,'needle')]}}) + const hit=(await f.search({query:'needle'})).items[0], body={hitToken:hit.hitToken} + f.reads.length=0 + for(const [payload,actor] of [[body,bob],[{...body,sessionId:'b-live'},alice],[{hitToken:'../config'},alice]]) { + await assert.rejects(f.rt.readHistoryHit(payload,actor),{code:'bot/history-unavailable'}) + } + await assert.rejects(fixture().rt.readHistoryHit(body,alice),{code:'bot/history-unavailable'}) + assert.deepEqual(f.reads,[]) + const now=Date.now;Date.now=()=>now()+SEARCH_LIMITS.ttl+1 + try {await assert.rejects(f.rt.readHistoryHit(body,alice),{code:'bot/history-unavailable'})} finally {Date.now=now} +}) + +test('stale hits reject appended or modified history, deleted Bot/session, removed segment and newly hidden turns',async()=>{ + for(const change of ['append','modify','bot-delete','session-delete','segment-remove','hidden']){ + const logs={'a-old':[message(0,'needle')]};const f=fixture({logs}) + const hit=(await f.search({query:'needle'})).items[0] + if(change==='append')logs['a-old'].push(message(1,'new')) + if(change==='modify')logs['a-old'][0].data.content[0].text='replaced same seq' + if(change==='bot-delete')delete f.state.bots.a + if(change==='session-delete')delete logs['a-old'] + if(change==='segment-remove')f.state.bots.a.segments=[] + if(change==='hidden')f.state.exchangeTurns['a-old']=[0] + await assert.rejects(f.rt.readHistoryHit({hitToken:hit.hitToken},alice),{code:'bot/history-unavailable'},change) + } +}) + +test('revocation or deletion during the context await, and revocation during dispose, prevent all delivery',async()=>{ + for(const change of ['owner','delete','dispose']){ + let checking=false,f + f=fixture({logs:{'a-old':[message(0,'needle')]},observe:async()=>{ + if(checking&&change==='owner')f.state.bots.a.ownerId='bob' + if(checking&&change==='delete')delete f.state.bots.a + },dispose:()=>{if(checking&&change==='dispose')f.state.bots.a.ownerId='bob'}}) + const hit=(await f.search({query:'needle'})).items[0];checking=true + await assert.rejects(f.rt.readHistoryHit({hitToken:hit.hitToken},alice),{code:'bot/history-unavailable'}) + } +}) + +test('pagination after ownership change skips revoked segments and old tickets cannot acquire context',async()=>{ + const f=fixture({bots:{a:{id:'a',ownerId:'alice',sessionId:'a-live',segments:[{sessionId:'a-old'}]},c:{id:'c',ownerId:'alice',sessionId:'c-live'}},logs:{'a-live':[message(0,'needle'),message(1,'needle')],'a-old':[message(0,'needle')],'c-live':[message(0,'needle c')]}}) + const first=await f.search({query:'needle',limit:1});assert.ok(first.cursor) + f.state.bots.a.ownerId='bob';f.reads.length=0 + const next=await f.search({query:'needle',cursor:first.cursor}) + assert.deepEqual(next.items.map(hit=>hit.botId),['c']) + assert.deepEqual(f.reads,['c-live']) + await assert.rejects(f.rt.readHistoryHit({hitToken:first.items[0].hitToken},alice),{code:'bot/history-unavailable'}) +}) + +test('result UTF-8 bytes are capped and pagination loses no hit at a byte boundary',async()=>{ + const id='分'.repeat(200), query='中'.repeat(256) + const f=fixture({bots:{[id]:{id,ownerId:'alice',sessionId:id}},logs:{[id]:Array.from({length:50},(_,i)=>message(i,'前'.repeat(50)+query+'后'.repeat(100)))}}) + const first=await f.search({query,limit:50}) + assert.ok(Buffer.byteLength(JSON.stringify(first))<=SEARCH_LIMITS.resultBytes) + assert.ok(first.cursor);assert.equal(first.limited,true) + const next=await f.search({query,limit:50,cursor:first.cursor}) + assert.ok(Buffer.byteLength(JSON.stringify(next))<=SEARCH_LIMITS.resultBytes) + assert.equal(new Set([...first.items,...next.items].map(hit=>hit.seq)).size,50) + assert.equal(next.cursor,null) +}) + +test('scan/message bytes are executable limits, distinct from the unbounded native cold materialization',async()=>{ + const f=fixture({logs:{'a-live':Array.from({length:20},(_,i)=>message(i,'x'.repeat(150_000)+' needle'))}}) + const first=await f.search({query:'needle',limit:50}) + assert.ok(first.cursor);assert.equal(first.limited,true);assert.ok(first.items.length<20) + const next=await f.search({query:'needle',limit:50,cursor:first.cursor}) + assert.equal(first.items.length+next.items.length,20) + const large=fixture({logs:{'a-live':[message(0,'needle '+'x'.repeat(SEARCH_LIMITS.messageBytes))]}}) + const skipped=await large.search({query:'needle'}) + assert.equal(skipped.items.length,0);assert.equal(skipped.limited,true) +}) + +test('context enforces UTF-8 output cap, preserves original Unicode and excludes hidden/tool/plugin neighbors',async()=>{ + const logs={'a-old':[message(0,'😄'.repeat(10_000)),message(1,'😄'.repeat(10_000)+' needle 原文'),message(2,'😄'.repeat(10_000),'assistant'),message(3,'hidden','user',{data:{turn:3,source:{kind:'user'},content:[{type:'text',text:'NEVER-HIDDEN'}]}}),{seq:4,type:'tool/result',surfaceOp:'append',data:{content:[{type:'text',text:'NEVER-TOOL'}]}}]} + const f=fixture({logs});f.state.exchangeTurns['a-old']=[3] + const hit=(await f.search({query:'needle'})).items[0] + const view=await f.rt.readHistoryHit({hitToken:hit.hitToken},alice) + assert.ok(Buffer.byteLength(JSON.stringify(view))<=SEARCH_LIMITS.contextBytes) + assert.ok(view.entries.some(entry=>entry.hit&&entry.text.includes('needle 原文')&&entry.truncated)) + assert.ok(view.entries.every(entry=>!entry.text.includes('\uFFFD') && entry.text.isWellFormed())) + assert.equal(JSON.stringify(view).includes('NEVER'),false) +}) + +test('context cancellation propagates to the provider and shares search concurrency budget',async()=>{ + let checking=false,signalSeen,release,entered + const started=new Promise(resolve=>{entered=resolve}) + const held=new Promise(resolve=>{release=resolve}) + const f=fixture({logs:{'a-live':[message(0,'needle')]}}) + const hit=(await f.search({query:'needle'})).items[0] + const observe=f.provider.observeSession + f.provider.observeSession=async(id,opts)=>{if(checking){signalSeen=opts.signal;entered();await held}return observe(id,opts)} + checking=true + const abort=new AbortController() + const pending=f.rt.readHistoryHit({hitToken:hit.hitToken},alice,abort.signal) + await started + await assert.rejects(f.search({query:'needle'}),{code:'bot/search-unavailable'}) + abort.abort();release() + await assert.rejects(pending,{code:'bot/history-unavailable'}) + assert.equal(signalSeen.aborted,true) +}) + +test('global concurrency and segment-count caps execute before unbounded corpus work',async()=>{ + let release,entered,count=0 + const held=new Promise(resolve=>{release=resolve}), started=new Promise(resolve=>{entered=resolve}) + const bots=Object.fromEntries(Array.from({length:5},(_,i)=>['a'+i,{id:'a'+i,ownerId:'owner'+i}])) + const f=fixture({bots,observe:async()=>{if(++count===4)entered();await held}}) + const pending=Array.from({length:4},(_,i)=>f.search({query:'needle'},{memberId:'owner'+i})) + await started + await assert.rejects(f.search({query:'needle'},{memberId:'owner4'}),{code:'bot/search-unavailable'}) + release();await Promise.all(pending) + const many=fixture({bots:Object.fromEntries(Array.from({length:SEARCH_LIMITS.sessions+1},(_,i)=>['b'+i,{id:'b'+i,ownerId:'alice'}]))}) + const result=await many.search({query:'needle'}) + assert.equal(result.limited,true);assert.equal(many.reads.length,SEARCH_LIMITS.pagesPerRequest) +}) + + +test('JSON escaping is included in the context byte budget, not mistaken for raw UTF-8 length',async()=>{ + const text='\n\t\\"'.repeat(6000) + const f=fixture({logs:{'a-live':[message(0,text),message(1,text+'needle'+text),message(2,text,'assistant')]}}) + const hit=(await f.search({query:'needle'})).items[0] + const view=await f.rt.readHistoryHit({hitToken:hit.hitToken},alice) + assert.ok(view.entries.some(entry=>entry.hit&&entry.text.includes('needle')&&entry.truncated)) + assert.ok(Buffer.byteLength(JSON.stringify(view))<=SEARCH_LIMITS.contextBytes) +}) diff --git a/patches/ds-bot/files/test/message-tools.test.js b/patches/ds-bot/files/test/message-tools.test.js new file mode 100644 index 000000000..a64ce514b --- /dev/null +++ b/patches/ds-bot/files/test/message-tools.test.js @@ -0,0 +1,325 @@ +// Message hover toolbar, overflow, and right-click only offer actions FlyBot can run: +// reaction, reply/quote, copy, and download. Locked windows hide Reply. User bubbles +// share the same menu. Unimplemented items (Artifacts, translate, forward, report) are absent. +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' + +const runtime = { instances: new Map(), key: 'root', index: 0, dirty: false } +function instance(key) { + let inst = runtime.instances.get(key) + if (!inst) { + inst = { slots: [], refs: [], pending: [], deps: new Map(), cleanups: new Map() } + runtime.instances.set(key, inst) + } + return inst +} +function withInstance(key, run) { + const previousKey = runtime.key + const previousIndex = runtime.index + runtime.key = key + runtime.index = 0 + try { return run() } finally { runtime.key = previousKey; runtime.index = previousIndex } +} +function recordEffect(run, deps) { + instance(runtime.key).pending.push({ index: runtime.index++, run, deps }) +} +function commitEffects() { + for (const inst of runtime.instances.values()) { + const pending = inst.pending + inst.pending = [] + for (const { index, run, deps } of pending) { + const previous = inst.deps.get(index) + const changed = !deps || !previous || deps.length !== previous.length || deps.some((dep, at) => !Object.is(dep, previous[at])) + if (!changed) continue + const cleanup = inst.cleanups.get(index) + if (typeof cleanup === 'function') cleanup() + inst.cleanups.delete(index) + inst.deps.set(index, deps ? [...deps] : null) + const next = run() + if (typeof next === 'function') inst.cleanups.set(index, next) + } + } +} +const react = { + createElement: (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }), + Fragment: Symbol('F'), + useEffect: (run, deps) => recordEffect(run, deps), + useLayoutEffect: (run, deps) => recordEffect(run, deps), + useMemo: (make) => make(), + useCallback: (fn) => fn(), + useRef: (current) => { + const inst = instance(runtime.key) + const index = runtime.index++ + if (!(index in inst.refs)) inst.refs[index] = { current } + return inst.refs[index] + }, + useSyncExternalStore: (_subscribe, get) => get(), + useState: (initial) => { + const inst = instance(runtime.key) + const index = runtime.index++ + if (!(index in inst.slots)) inst.slots[index] = typeof initial === 'function' ? initial() : initial + const set = (next) => { + const value = typeof next === 'function' ? next(inst.slots[index]) : next + if (Object.is(value, inst.slots[index])) return + inst.slots[index] = value + runtime.dirty = true + } + return [inst.slots[index], set] + }, +} + +const io = { clipboard: 'ok', download: 'ok', writes: [], downloads: [], keys: null } +class TestElement { closest(selector) { return selector === '[data-composer-card]' ? this.card : this } } +async function load(entry) { + const bundle = await build({ + entryPoints: [fileURLToPath(new URL(`../src/client/${entry}`, import.meta.url))], + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], + }) + const env = { + module: { exports: {} }, Element: TestElement, Event: class Event { constructor(type) { this.type = type } }, + document: { body: {}, hidden: false, addEventListener() {}, removeEventListener() {}, createElement: () => ({ click() { if (io.download === 'fail') throw new Error('download failed'); io.downloads.push(true) } }) }, + Blob: class Blob {}, URL: { createObjectURL: () => 'blob:test', revokeObjectURL() {} }, + navigator: { language: 'en', clipboard: { writeText: async text => { if (io.clipboard === 'fail') throw new Error('denied'); io.writes.push(text) } } }, + window: { innerHeight: 800, innerWidth: 1400, addEventListener(name, handler) { if (name === 'keydown') io.keys = handler }, removeEventListener() {} }, + setTimeout, clearTimeout, + } + env.require = (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return { MarkdownText: props => ({ type: 'span', props: { className: 'bt-md', text: props.text, children: [] } }), projectUserText: text => text } + throw new Error(`Unexpected platform module ${name}`) + } + runInNewContext(bundle.outputFiles[0].text, env) + return env.module.exports +} + +const cells = await load('cells.js') +const userMod = await load('user-message.js') +const composerMod = await load('composer.js') + +const expand = (node, path = 'r') => { + if (node === null || node === undefined || typeof node === 'boolean') return null + if (Array.isArray(node)) return node.map((child, at) => expand(child, `${path}.${at}`)) + if (typeof node !== 'object') return node + if (typeof node.type === 'function') return withInstance(path, () => expand(node.type(node.props), path)) + return { ...node, props: { ...node.props, children: expand(node.props.children, path) } } +} +function render(node) { + runtime.dirty = false + for (const inst of runtime.instances.values()) inst.pending = [] + const tree = expand(node) + commitEffects() + return tree +} +function flush(draw) { + let tree = render(draw()) + for (let i = 0; i < 8 && runtime.dirty; i++) tree = render(draw()) + return tree +} +const find = (node, match, out = []) => { + if (node === null || node === undefined) return out + if (Array.isArray(node)) { + for (const child of node) find(child, match, out) + return out + } + if (typeof node !== 'object') return out + if (match(node)) out.push(node) + find(node.props?.children, match, out) + return out +} +const labelled = (node, label) => node.type === 'button' && (node.props?.['aria-label'] === label || (node.props?.children ?? []).includes(label)) +const button = (root, label) => find(root, node => labelled(node, label))[0] +const press = (node) => node.props.onClick({ currentTarget: { getBoundingClientRect: () => ({ left: 10, top: 10, width: 40, height: 20, bottom: 30, right: 50 }) } }) +const labels = (root) => find(root, node => node.type === 'button').map(node => node.props?.['aria-label'] ?? (Array.isArray(node.props?.children) ? node.props.children.find(child => typeof child === 'string') : null)).filter(Boolean) +const forbidden = (root) => labels(root).filter(label => /artifact|translate|forward|report|studio|template|select multiple|ask ai/i.test(String(label))) + +const chief = { id: 'chief', name: 'Chief', color: 'green' } +const roster = { bots: [chief], byId: { chief }, rooms: [], roomsById: {}, exchangeTurns: {}, questions: {}, secretRequests: {}, secrets: [] } + +function mountBubbles({ text = 'weekly note', locked = false, quotes = [], reactions = [], prefs, streaming = false } = {}) { + runtime.instances.clear() + const actions = { + quote: (sessionId, value) => { quotes.push([sessionId, value]) }, + toggleReaction: (key, index, emoji) => { reactions.push([key, index, emoji]) }, + openSession() {}, + } + const team = { ...roster, prefs, ...(locked ? { readOnly: 'This window is read-only.' } : {}) } + const draw = () => react.createElement(cells.Bubbles, { + texts: [text], roster: team, streaming, selfId: chief.id, actions, sessionId: 'chief', msgKey: 'chief:1:2', + useUi: () => null, + }) + return { draw, actions, quotes, reactions, tree: flush(draw) } +} + +test('a reply bubble offers reaction, reply, and more; the overflow has copy and download only from real actions', () => { + const { draw, quotes, reactions, tree: first } = mountBubbles() + assert.ok(button(first, 'Add reaction')) + assert.ok(button(first, 'Reply')) + assert.ok(button(first, 'More message actions')) + press(button(first, 'More message actions')) + const tree = flush(draw) + const menu = find(tree, node => node.props?.['aria-label'] === 'Message actions')[0] + assert.ok(menu, 'the overflow menu opens') + const shown = labels(menu) + assert.ok(shown.includes('Reply')) + assert.ok(shown.includes('Copy')) + assert.ok(shown.includes('Download')) + assert.ok(shown.includes('👍')) + assert.deepEqual(forbidden(menu), [], 'unimplemented items stay off the menu') + press(button(menu, 'Reply')) + assert.deepEqual(quotes, [['chief', 'weekly note']]) + runtime.instances.clear() + const again = mountBubbles({ reactions }) + press(button(again.tree, 'Add reaction')) + const strip = find(flush(again.draw), node => node.props?.['aria-label'] === 'Reactions')[0] + press(button(strip, '👍')) + assert.deepEqual(reactions, [['chief:1:2', 0, '👍']]) +}) + +test('right-clicking a bubble opens the same message menu at the cursor', () => { + const { draw, tree: first } = mountBubbles() + const row = find(first, node => String(node.props?.className ?? '').split(/\s+/).includes('bt-msg'))[0] + assert.ok(row.props.onContextMenu) + row.props.onContextMenu({ + preventDefault() {}, stopPropagation() {}, clientX: 120, clientY: 80, target: { closest: () => null }, + }) + const menu = find(flush(draw), node => node.props?.['aria-label'] === 'Message actions')[0] + assert.ok(menu) + const shown = labels(menu) + assert.ok(shown.includes('Copy') && shown.includes('Download') && shown.includes('Reply')) + assert.deepEqual(forbidden(menu), []) +}) + +test('a locked window keeps copy and download, and hides reply', () => { + const { tree } = mountBubbles({ locked: true }) + assert.equal(button(tree, 'Reply'), undefined) + assert.ok(button(tree, 'Add reaction')) + assert.ok(button(tree, 'More message actions')) + press(button(tree, 'More message actions')) + // Remount after press needs the same runtime instances — press already set state on this tree's + // instance. Re-flush the same draw. +}) + +test('a locked window overflow lists copy and download, not reply', () => { + const { draw, tree: first } = mountBubbles({ locked: true }) + press(button(first, 'More message actions')) + const menu = find(flush(draw), node => node.props?.['aria-label'] === 'Message actions')[0] + const shown = labels(menu) + assert.ok(!shown.includes('Reply')) + assert.ok(shown.includes('Copy')) + assert.ok(shown.includes('Download')) +}) + +function mountUser({ locked = false, quotes = [], withTurn = true } = {}) { + runtime.instances.clear() + const actions = { quote: (sessionId, value) => { quotes.push([sessionId, value]) }, toggleReaction() {}, openSession() {} } + const team = locked ? { ...roster, readOnly: 'This window is read-only.' } : roster + const node = { + kind: 'user', + location: withTurn ? { kind: 'turn', turn: 3 } : undefined, + data: { content: [{ type: 'text', text: 'Draft the weekly note' }] }, + } + const draw = () => react.createElement(userMod.UserMessageCell, { + node, sessionId: 'chief', useRoster: select => select(team), useUi: () => ({ reactions: {} }), actions, + }) + return { draw, quotes, tree: flush(draw) } +} + +test('a user bubble offers reply, copy, and download, and has no unimplemented items', () => { + const { draw, quotes, tree: first } = mountUser() + assert.ok(button(first, 'Reply')) + assert.ok(button(first, 'More message actions')) + assert.ok(button(first, 'Add reaction'), 'a stable turn identity lets the user bubble react') + press(button(first, 'More message actions')) + const menu = find(flush(draw), node => node.props?.['aria-label'] === 'Message actions')[0] + const shown = labels(menu) + assert.ok(shown.includes('Reply') && shown.includes('Copy') && shown.includes('Download')) + assert.deepEqual(forbidden(menu), []) + press(button(first, 'Reply')) + assert.deepEqual(quotes, [['chief', 'Draft the weekly note']]) +}) + +test('a user bubble without a turn identity has no reaction control, and a locked one has no reply', () => { + const plain = mountUser({ withTurn: false }) + assert.equal(button(plain.tree, 'Add reaction'), undefined) + assert.ok(button(plain.tree, 'Reply')) + const locked = mountUser({ locked: true }) + assert.equal(button(locked.tree, 'Reply'), undefined) + assert.ok(button(locked.tree, 'More message actions')) +}) + + +test('clipboard and download failures are handled with visible status; right-click menu closes and can reopen', async () => { + const { draw, tree: first } = mountBubbles() + press(button(first, 'More message actions')) + io.clipboard = 'fail' + press(button(flush(draw), 'Copy')) + await new Promise(resolve => setTimeout(resolve, 0)) + assert.ok(find(flush(draw), n => n.props?.role === 'status').length) + io.clipboard = 'ok' + press(button(flush(draw), 'Copy')) + await new Promise(resolve => setTimeout(resolve, 0)) + assert.ok(io.writes.includes('weekly note')) + io.download = 'fail' + press(button(flush(draw), 'Download')) + assert.ok(find(flush(draw), n => n.props?.role === 'status').length) + io.download = 'ok' + press(button(flush(draw), 'Download')) + assert.ok(io.downloads.length > 0) + assert.equal(find(flush(draw), n => n.props?.['aria-label'] === 'Message actions').length, 0) + let tree = flush(draw) + const rightClick = () => find(tree, n => n.props?.className === 'bt-msg')[0].props.onContextMenu({ + clientX: 80, clientY: 80, target: { closest: () => null }, preventDefault() {}, stopPropagation() {}, + }) + rightClick(); tree = flush(draw) + press(button(find(tree, n => n.props?.['aria-label'] === 'Message actions')[0], 'Reply')) + tree = flush(draw) + assert.equal(find(tree, n => n.props?.['aria-label'] === 'Message actions').length, 0, 'context menu closes after reply') + rightClick(); tree = flush(draw) + assert.equal(find(tree, n => n.props?.['aria-label'] === 'Message actions').length, 1, 'can reopen immediately') +}) + + +test('folding, document cards, quoting, no-fold and streaming compose without hiding access to text', () => { + const text = '# Full report\n' + 'A long paragraph. '.repeat(60) + '\n## Next steps\nFinish review.' + let mounted = mountBubbles({ text, prefs: { folding: { mode: 'standard', documentCards: true } } }) + assert.ok(button(mounted.tree, 'Show message text'), 'a document card keeps an inline full-text control') + press(button(mounted.tree, 'Show message text')) + let tree = flush(mounted.draw) + assert.ok(find(tree, n => n.props?.text === text).length, 'inline expansion renders the complete text') + press(button(tree, 'More message actions')) + tree = flush(mounted.draw) + press(button(find(tree, n => n.props?.['aria-label'] === 'Message actions')[0], 'Reply')) + assert.deepEqual(mounted.quotes, [['chief', text]], 'reply quotes full raw text, not the preview') + mounted = mountBubbles({ text, prefs: { folding: { mode: 'none', documentCards: true } } }) + assert.equal(button(mounted.tree, 'Show message text'), undefined, 'no-fold also bypasses card conversion') + assert.ok(find(mounted.tree, n => n.props?.text === text).length) + mounted = mountBubbles({ text, streaming: true, prefs: { folding: { mode: 'compact', documentCards: true } } }) + assert.equal(button(mounted.tree, 'More message actions'), undefined) + assert.equal(button(mounted.tree, 'Show message text'), undefined) + assert.ok(find(mounted.tree, n => n.props?.text === text).length, 'streaming renders full text without premature folding') +}) + +test('installed Shift+Enter shortcut respects IME, multiline, disabled send and read-only roster', () => { + const field = new TestElement() + let clicks = 0; let inputEvents = 0 + const sendButton = { disabled: false, getAttribute() { return null }, click() { clicks++ } } + field.card = { querySelector() { return sendButton } } + field.value = 'abc'; field.selectionStart = 1; field.selectionEnd = 1 + field.dispatchEvent = () => inputEvents++ + const snapshot = { prefs: { sendKey: 'shift-enter' } } + composerMod.installSendShortcut({ getSnapshot: () => snapshot }) + const key = io.keys + const event = (more = {}) => ({ key: 'Enter', target: field, preventDefault() {}, stopPropagation() {}, ...more }) + key(event({ keyCode: 229, shiftKey: true })); assert.equal(clicks, 0) + key(event()); assert.equal(field.value, 'a\nbc'); assert.equal(inputEvents, 1) + key(event({ shiftKey: true })); assert.equal(clicks, 1) + sendButton.disabled = true + key(event({ shiftKey: true })); assert.equal(clicks, 1) + snapshot.readOnly = 'This window is read-only.' + key(event()); assert.equal(inputEvents, 1) +}) diff --git a/patches/ds-bot/files/test/mobile-layout.test.js b/patches/ds-bot/files/test/mobile-layout.test.js index 9fdcce65b..13534f92b 100644 --- a/patches/ds-bot/files/test/mobile-layout.test.js +++ b/patches/ds-bot/files/test/mobile-layout.test.js @@ -54,7 +54,7 @@ test('the client installs the phone styles after the shell styles they override' const index = readFileSync(new URL('../src/client/index.js', import.meta.url), 'utf8') const at = name => index.indexOf(`installCompiledStyles(${name}`) assert.ok(at('MOBILE_CSS') > 0, 'MOBILE_CSS is installed') - for (const earlier of ['SHELL_CSS', 'INBOX_CSS', 'FLYBOT_CSS']) assert.ok(at(earlier) >= 0 && at(earlier) < at('MOBILE_CSS'), `${earlier} comes first`) + for (const earlier of ['SHELL_CSS', 'INBOX_CSS', 'FLYBOT_CSS', 'PARITY_SHELL_CSS']) assert.ok(at(earlier) >= 0 && at(earlier) < at('MOBILE_CSS'), `${earlier} comes first`) const bundle = readFileSync(new URL('../client.js', import.meta.url), 'utf8') assert.ok(bundle.includes('.bt-inbox-actions :is(.bt-soft,.bt-send){height:36px'), 'client.js carries the phone styles') }) diff --git a/patches/ds-bot/files/test/new-chat.test.js b/patches/ds-bot/files/test/new-chat.test.js index 8b9b1797f..82cc4a7a5 100644 --- a/patches/ds-bot/files/test/new-chat.test.js +++ b/patches/ds-bot/files/test/new-chat.test.js @@ -66,7 +66,7 @@ test('the sidebar + menu wires plugin actions in after New group chat', () => { assert.match(sidebar, /const inTree = entry => entry\.kind === 'bot' && !entry\.item\.remote/) assert.match(sidebar, /structure\?\.include\?\.\(entry\.item\.id\) !== false/) assert.match(sidebar, /botTree\(\[main, \.\.\.order\.filter\(listed\)/) - assert.match(sidebar, /order\.filter\(entry => !\(tree && inTree\(entry\)\) && !\(inTree\(entry\) && structure\?\.include/) + assert.match(sidebar, /!\(tree && inTree\(entry\)\) &&\n\s*!\(inTree\(entry\) && structure\?\.include\?\.\(entry\.item\.id\) === false\) &&\n\s*matchesSessionFilter/) assert.equal(DICTIONARY.zh['Copy my handle'], '复制我的 handle') assert.equal(DICTIONARY.zh['Face-to-face'], '面对面') assert.equal(DICTIONARY.zh['Face-to-face room'], '面对面房间') diff --git a/patches/ds-bot/files/test/palette-history-ui.test.js b/patches/ds-bot/files/test/palette-history-ui.test.js new file mode 100644 index 000000000..d76ed694a --- /dev/null +++ b/patches/ds-bot/files/test/palette-history-ui.test.js @@ -0,0 +1,129 @@ +// Empty state, no-match state, and type filters for the command palette. +// View-only seam for history state; real asynchronous hook is covered separately. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' + +const { outputFiles } = await build({ + stdin: { contents: "export { CommandPalette } from './src/client/palette.js'", resolveDir: fileURLToPath(new URL('..', import.meta.url)) }, + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], + plugins: [{name:'history-view-state',setup(b){b.onLoad({filter:/history-search\.js$/},()=>({contents:"export const useHistorySearch = search => { globalThis.__capture(typeof search === 'function'); return globalThis.__history() }",loader:'js'}))}}], +}) + +const h = (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }) +let historyState = {items:[],status:'ready',cursor:null} +let historyEnabled, opened +let slots = [] +let index = 0 +const react = { + createElement: h, Fragment: Symbol('F'), + useMemo: (fn) => { const at = index++; if (!(at in slots)) slots[at] = fn(); return slots[at] }, + useState: (initial) => { + const at = index++ + if (!(at in slots)) slots[at] = typeof initial === 'function' ? initial() : initial + return [slots[at], (value) => { slots[at] = typeof value === 'function' ? value(slots[at]) : value }] + }, + useCallback: (fn) => fn, + useRef: (value) => { const at = index++; if (!(at in slots)) slots[at] = { current: value }; return slots[at] }, + useEffect() {}, + useLayoutEffect() {}, +} +const module = { exports: {} } +runInNewContext(outputFiles[0].text, { + module, exports: module.exports, console, setTimeout, clearTimeout, + __history:()=>historyState, __capture:value=>{historyEnabled=value}, + document: { hidden: false, querySelector: () => null }, + window: { addEventListener() {}, removeEventListener() {} }, + navigator: { language: 'en' }, + localStorage: { getItem: () => null, setItem() {} }, + requestAnimationFrame: () => 0, cancelAnimationFrame() {}, + require: (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return { FishLogo: () => null, MarkdownText: ({ text }) => text } + throw new Error(`Unexpected platform module ${name}`) + }, +}) +const { CommandPalette } = module.exports + +const chief = { id: 'chief', name: 'Chief', role: 'Coordinator', sessionId: 'chief' } +const roster = { bots: [chief], byId: { chief }, rooms: [], roomsById: {}, agents: [], exchangeTurns: {} } +const sessions = { + projectionsBySession: { chief: { values: { turnOutline: [{ turn: 1, prompt: 'Weekly note for Chief', response: 'Here is the draft.' }] } } }, + byId: {}, +} +const expand = (node) => { + if (node == null) return node + if (Array.isArray(node)) return node.map(expand) + if (typeof node !== 'object') return node + if (typeof node.type === 'function') return expand(node.type(node.props ?? {})) + return { ...node, props: { ...node.props, children: expand(node.props?.children) } } +} +const all = (node, out = []) => { + if (node == null) return out + if (Array.isArray(node)) { for (const item of node) all(item, out); return out } + if (typeof node !== 'object') return out + out.push(node) + all(node.props?.children, out) + return out +} +const ownText = (node) => { + const walk = (value) => { + if (Array.isArray(value)) return value.map(walk).join('') + if (typeof value === 'string' || typeof value === 'number') return String(value) + if (value && typeof value === 'object') return walk(value.props?.children) + return '' + } + return walk(node?.props?.children) +} +const hasClass = (node, name) => String(node.props?.className ?? '').split(/\s+/).includes(name) + +const mount = (start = '') => { + slots = [] + const draw = () => { + index = 0 + return all(expand(CommandPalette({ + start, token: 't', roster, + actions: { closePalette() {}, searchMessages: async()=>{}, openSession(id) {opened=id}, openNewChat() {}, openSettings() {}, setFlags: async () => {}, openAgent() {} }, + useSessions: select => select(sessions), + }))) + } + return draw +} + +test('history results open a read-only context view instead of navigating the current chat; four tags still gate history',()=>{ + historyState={items:[{botId:'chief',sessionId:'chief-old',seq:7,snippet:'未加载的中文历史',earlier:true,hitToken:'opaque-hit'}],status:'ready',cursor:null} + const draw=mount('中文');let nodes=draw() + assert.ok(nodes.some(node=>ownText(node)==='Local Bot chat history')) + assert.ok(nodes.some(node=>ownText(node)==='Earlier part; view read-only history')) + for(const label of ['Chats','Commands','Messages','All']){ + nodes.find(node=>hasClass(node,'bt-palette-filter')&&ownText(node)===label).props.onClick();nodes=draw() + assert.equal(historyEnabled,['Messages','All'].includes(label)) + assert.equal(nodes.some(node=>node.props?.role==='option'&&ownText(node).includes('未加载的中文历史')),['Messages','All'].includes(label)) + } + nodes.find(node=>node.props?.role==='option'&&ownText(node).includes('未加载的中文历史')).props.onClick() + nodes=draw() + assert.equal(opened,undefined) + assert.ok(nodes.some(node=>node.props?.role==='dialog'&&node.props['aria-label']==='Read-only history match')) + assert.ok(nodes.some(node=>ownText(node)==='This is segment history, not the current chat. No Bot is activated.')) + assert.equal(nodes.some(node=>node.type==='pre'&&ownText(node).includes('未加载的中文历史')),false,'search snippets cannot masquerade as authorized context') +}) +test('loading, continuation and incomplete states never claim an exhaustive no-results search',()=>{ + for(const state of [{status:'loading'}, {status:'ready',cursor:'opaque'}, {status:'ready',incomplete:true}, {status:'ready',limited:true}]){ + historyState={items:[],cursor:null,...state};const nodes=mount('zzzz')() + assert.equal(nodes.some(node=>hasClass(node,'bt-palette-empty-label')&&ownText(node)==='No results'),false) + } + let more=0;historyState={items:[],status:'ready',cursor:'opaque',more:()=>more++} + const nodes=mount('zzzz')();nodes.find(node=>ownText(node)==='Search more history').props.onClick();assert.equal(more,1) +}) +test('backend error explicitly falls back to loaded outlines; no global/files tag or all-history claim',()=>{ + historyState={items:[],status:'error',cursor:null} + const nodes=mount('Chief')() + assert.ok(nodes.some(node=>ownText(node)==='History query failed; showing loaded messages only.')) + assert.ok(nodes.some(node=>node.props?.role==='option'&&ownText(node).includes('Weekly note'))) + assert.deepEqual(nodes.filter(node=>hasClass(node,'bt-palette-filter')).map(ownText),['All','Chats','Messages','Commands']) + assert.equal(nodes.some(node=>ownText(node)==='Search all chats'),false) +}) diff --git a/patches/ds-bot/files/test/palette-search.test.js b/patches/ds-bot/files/test/palette-search.test.js new file mode 100644 index 000000000..dfe9686a6 --- /dev/null +++ b/patches/ds-bot/files/test/palette-search.test.js @@ -0,0 +1,27 @@ +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { PALETTE_FILTERS, PALETTE_MESSAGE_MIN, paletteEmptyKind, paletteFilterAllows } from '../src/shared/palette-search.js' + +test('the public palette filters are all, chats, messages, and commands', () => { + assert.deepEqual(PALETTE_FILTERS, ['all', 'chats', 'messages', 'commands']) + assert.equal(PALETTE_MESSAGE_MIN, 2) + assert.equal(PALETTE_FILTERS.includes('artifacts'), false) + assert.equal(PALETTE_FILTERS.includes('files'), false) +}) + +test('each filter keeps only kinds the palette can actually search', () => { + assert.equal(paletteFilterAllows('all', 'chats'), true) + assert.equal(paletteFilterAllows('all', 'messages'), true) + assert.equal(paletteFilterAllows('chats', 'chats'), true) + assert.equal(paletteFilterAllows('chats', 'messages'), false) + assert.equal(paletteFilterAllows('messages', 'commands'), false) + assert.equal(paletteFilterAllows('commands', 'commands'), true) +}) + +test('empty kind distinguishes a blank query, a short message query, and no matches', () => { + assert.equal(paletteEmptyKind('', 'all'), 'empty') + assert.equal(paletteEmptyKind(' ', 'chats'), 'empty') + assert.equal(paletteEmptyKind('h', 'messages'), 'short') + assert.equal(paletteEmptyKind('hi', 'messages'), 'none') + assert.equal(paletteEmptyKind('h', 'all'), 'none') +}) diff --git a/patches/ds-bot/files/test/palette-ui.test.js b/patches/ds-bot/files/test/palette-ui.test.js new file mode 100644 index 000000000..9d38cd39d --- /dev/null +++ b/patches/ds-bot/files/test/palette-ui.test.js @@ -0,0 +1,130 @@ +// Empty state, no-match state, and type filters for the command palette. +// Message search only reads turn outlines already loaded in the session list. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' + +const { outputFiles } = await build({ + stdin: { contents: "export { CommandPalette } from './src/client/palette.js'", resolveDir: fileURLToPath(new URL('..', import.meta.url)) }, + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], +}) + +const h = (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }) +let slots = [] +let index = 0 +const react = { + createElement: h, Fragment: Symbol('F'), + useMemo: (fn) => { const at = index++; if (!(at in slots)) slots[at] = fn(); return slots[at] }, + useState: (initial) => { + const at = index++ + if (!(at in slots)) slots[at] = typeof initial === 'function' ? initial() : initial + return [slots[at], (value) => { slots[at] = typeof value === 'function' ? value(slots[at]) : value }] + }, + useCallback: (fn) => fn, + useRef: (value) => { const at = index++; if (!(at in slots)) slots[at] = { current: value }; return slots[at] }, + useEffect() {}, + useLayoutEffect() {}, +} +const module = { exports: {} } +runInNewContext(outputFiles[0].text, { + module, exports: module.exports, console, setTimeout, clearTimeout, + document: { hidden: false, querySelector: () => null }, + window: { addEventListener() {}, removeEventListener() {} }, + navigator: { language: 'en' }, + localStorage: { getItem: () => null, setItem() {} }, + requestAnimationFrame: () => 0, cancelAnimationFrame() {}, + require: (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return { FishLogo: () => null, MarkdownText: ({ text }) => text } + throw new Error(`Unexpected platform module ${name}`) + }, +}) +const { CommandPalette } = module.exports + +const chief = { id: 'chief', name: 'Chief', role: 'Coordinator', sessionId: 'chief' } +const roster = { bots: [chief], byId: { chief }, rooms: [], roomsById: {}, agents: [], exchangeTurns: {} } +const sessions = { + projectionsBySession: { chief: { values: { turnOutline: [{ turn: 1, prompt: 'Weekly note for Chief', response: 'Here is the draft.' }] } } }, + byId: {}, +} +const expand = (node) => { + if (node == null) return node + if (Array.isArray(node)) return node.map(expand) + if (typeof node !== 'object') return node + if (typeof node.type === 'function') return expand(node.type(node.props ?? {})) + return { ...node, props: { ...(node.props ?? {}), children: expand(node.props?.children) } } +} +const all = (node, out = []) => { + if (node == null) return out + if (Array.isArray(node)) { for (const item of node) all(item, out); return out } + if (typeof node !== 'object') return out + out.push(node) + all(node.props?.children, out) + return out +} +const ownText = (node) => { + const walk = (value) => { + if (Array.isArray(value)) return value.map(walk).join('') + if (typeof value === 'string' || typeof value === 'number') return String(value) + if (value && typeof value === 'object') return walk(value.props?.children) + return '' + } + return walk(node?.props?.children) +} +const hasClass = (node, name) => String(node.props?.className ?? '').split(/\s+/).includes(name) + +const mount = (start = '') => { + slots = [] + const draw = () => { + index = 0 + return all(expand(CommandPalette({ + start, token: 't', roster, + actions: { closePalette() {}, openSession() {}, openNewChat() {}, openSettings() {}, setFlags: async () => {}, openAgent() {} }, + useSessions: select => select(sessions), + }))) + } + return draw +} + +test('an empty query shows the empty state, type filters, and a close control; it does not prefill chats or messages', () => { + const nodes = mount('')() + assert.ok(nodes.some(node => hasClass(node, 'bt-palette-empty'))) + assert.ok(nodes.some(node => ownText(node) === 'Search chats and messages')) + assert.ok(nodes.some(node => String(ownText(node)).includes('loaded message'))) + assert.equal(nodes.some(node => ownText(node) === 'Search all chats' || String(ownText(node)).includes('all content')), false) + const tabs = nodes.filter(node => hasClass(node, 'bt-palette-filter')) + assert.deepEqual(tabs.map(ownText), ['All', 'Chats', 'Messages', 'Commands']) + assert.equal(tabs.some(node => ownText(node) === 'Artifacts' || ownText(node) === 'Files'), false) + assert.ok(nodes.some(node => node.props?.['aria-label'] === 'Close')) + assert.equal(nodes.filter(node => node.props?.role === 'option').length, 0) +}) + +test('a query with no matches shows the no-results state', () => { + const nodes = mount('zzzz-no-such')() + assert.ok(nodes.some(node => ownText(node) === 'No results')) + assert.ok(nodes.some(node => String(ownText(node)).includes('loaded message'))) +}) + +test('the Messages filter finds loaded outlines, and the Chats filter hides those hits', () => { + const draw = mount('Chief') + let nodes = draw() + const titles = () => nodes.filter(node => hasClass(node, 'bt-palette-title')).map(ownText) + assert.ok(titles().includes('Chief')) + assert.ok(nodes.some(node => String(ownText(node)).includes('Weekly note') || String(ownText(node)).includes('draft'))) + const press = (label) => { + const tab = nodes.find(node => hasClass(node, 'bt-palette-filter') && ownText(node) === label) + assert.ok(tab, label) + tab.props.onClick() + nodes = draw() + } + press('Messages') + assert.equal(titles().includes('Chief') && nodes.some(node => hasClass(node, 'bt-palette-section') && ownText(node) === 'Bots'), false) + assert.ok(nodes.some(node => hasClass(node, 'bt-palette-section') && ownText(node) === 'Messages') || nodes.some(node => String(ownText(node)).includes('draft'))) + press('Chats') + assert.ok(titles().includes('Chief')) + assert.equal(nodes.some(node => hasClass(node, 'bt-palette-section') && ownText(node) === 'Messages'), false) +}) diff --git a/patches/ds-bot/files/test/parity-shell.test.js b/patches/ds-bot/files/test/parity-shell.test.js new file mode 100644 index 000000000..fc52ef16d --- /dev/null +++ b/patches/ds-bot/files/test/parity-shell.test.js @@ -0,0 +1,106 @@ +// First-batch chat-shell layout: icon rail, denser list, pill composer, Grove theme. +// Brand must stay FlyBot. Existing sidebar entries must remain. Phone rules stay in MOBILE_CSS. +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { test } from 'node:test' +import { allThemes, themeCss } from '../src/client/themes.js' +import { ICON_RAIL_WIDTH, CHAT_LIST_WIDTH, SHELL_LEFT_WIDTH, COMPOSER_HEIGHT, HEADER_HEIGHT, PARITY_SHELL_CSS } from '../src/client/parity-shell.js' + +const src = name => readFileSync(new URL(`../src/client/${name}`, import.meta.url), 'utf8') +const index = readFileSync(new URL('../src/client/index.js', import.meta.url), 'utf8') + +test('Grove is a selectable theme and is not named after another product', () => { + const grove = allThemes().grove + assert.equal(grove.label, 'Grove') + assert.equal(grove.dark.bg, '#171c19') + assert.equal(grove.dark.card, '#272e2b') + assert.equal(grove.dark.bubble, '#2a332d') + assert.equal(grove.dark.accent, '#3d9a6e') + assert.equal(grove.light.text, '#171c19') + const css = themeCss(grove) + assert.match(css, /--bt-main:#171c19/) + assert.doesNotMatch(src('themes.js'), /Teamily|teamily/i) + assert.doesNotMatch(src('parity-shell.js'), /Teamily|teamily/i) +}) + +test('the default themes and DeepSeek option remain available', () => { + const themes = allThemes() + assert.ok(themes.deepseek) + assert.ok(themes.mono) + assert.ok(themes.paper) + assert.ok(themes.moonlight) + assert.equal(themes.deepseek.dark.bg, '#141414') +}) + +test('wide sidebar keeps the FlyBot name and mark, and adds a 72px icon rail', () => { + const sidebar = src('sidebar.js') + assert.match(sidebar, /function BrandName\(\) \{\n return h\('span', \{ style: \{ fontWeight: 600, fontSize: 14 \} \}, t\('FlyBot'\)\)\n\}/) + assert.match(sidebar, /function BrandMark\(\{ size = 24 \}\) \{\n return h\('span', \{ className: 'bt-brand-mark' \}, h\(FlyBotMark, \{ size \}\)\)\n\}/) + assert.match(sidebar, /className: 'bt-icon-rail', 'aria-label': t\('FlyBot'\)/) + assert.match(sidebar, /className: wide \? 'bt-side bt-side-split' : 'bt-side bt-rail'/) + assert.equal(ICON_RAIL_WIDTH, 72) + assert.match(PARITY_SHELL_CSS, /\.bt-icon-rail\{[^}]*width:72px/) +}) + +test('Search, New, Inbox, Kanban and Projects stay in the sidebar', () => { + const sidebar = src('sidebar.js') + assert.match(sidebar, /'aria-label': t\('Search'\)/) + assert.match(sidebar, /'aria-label': t\('New…'\)/) + assert.equal(sidebar.match(/h\(InboxRow,/g)?.length, 1) + assert.ok(sidebar.indexOf('h(InboxRow,') < sidebar.indexOf("className: 'bt-list'")) + assert.equal(sidebar.match(/h\(KanbanRow,/g)?.length, 1) + assert.equal(sidebar.match(/h\(ProjectsNav,/g)?.length, 1) + assert.ok(sidebar.includes("h(FlyBotSections,")) +}) + +test('desktop composer is a taller rounded pill; phone rules are not moved here', () => { + assert.match(PARITY_SHELL_CSS, /@media \(min-width:641px\)/) + const desktop = PARITY_SHELL_CSS.split('@media (min-width:641px)')[1] + assert.match(desktop, /\[data-composer-card\]\{[^}]*min-height:86px/) + assert.match(desktop, /\[data-composer-card\]\{[^}]*border-radius:20px/) + assert.match(desktop, /\[data-composer-card\] \[class\*=\"_tools\"\]\{order:1/) + assert.match(desktop, /\[data-composer-card\]>\[data-input-scroll\]\{order:2/) + assert.match(desktop, /\[data-composer-card\] \[class\*=\"_trailing\"\]\{order:3/) + assert.match(desktop, /:focus-visible\{outline:2px solid var\(--bt-accent\)/) + assert.doesNotMatch(PARITY_SHELL_CSS, /@media \(max-width:640px\)/) + assert.doesNotMatch(PARITY_SHELL_CSS, /\.bt-flybot-approvals\{left:/) +}) + +test('parity shell styles install after conversation and flybot styles, before phone styles', () => { + const at = name => index.indexOf(`installCompiledStyles(${name}`) + assert.ok(at('PARITY_SHELL_CSS') > 0, 'PARITY_SHELL_CSS is installed in the shell group') + assert.ok(at('FLYBOT_CSS') < at('PARITY_SHELL_CSS')) + assert.ok(at('PARITY_SHELL_CSS') < at('MOBILE_CSS')) + const conv = index.indexOf("installCompiledStyles(CONVERSATION_CSS, 'conversation')") + const again = index.indexOf("installCompiledStyles(PARITY_SHELL_CSS, 'parity-shell-conversation')") + assert.ok(conv >= 0 && again > conv, 'composer overrides follow CONVERSATION_CSS') +}) + + +test('shell metrics follow the 1920×1072 screenshot measurements', () => { + assert.equal(ICON_RAIL_WIDTH, 72) + assert.equal(CHAT_LIST_WIDTH, 360) + assert.equal(SHELL_LEFT_WIDTH, 432) + assert.equal(COMPOSER_HEIGHT, 86) + assert.equal(HEADER_HEIGHT, 56) + assert.match(PARITY_SHELL_CSS, /\.bt-icon-rail\{[^}]*width:72px/) + assert.match(PARITY_SHELL_CSS, /\.bt-icon-rail\{[^}]*gap:6px/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn\{[^}]*width:40px;height:40px/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn\{[^}]*border-radius:12px/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn svg\{width:20px;height:20px\}/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-row-name\{font-size:14px;line-height:20px;font-weight:500/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-row-preview\{font-size:12px;line-height:16px;font-weight:400/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-row-title\{[^}]*text-overflow:ellipsis;white-space:nowrap/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-list\{[^}]*overflow-y:auto/) + assert.match(PARITY_SHELL_CSS, /\.bt-side\.bt-side-split \.bt-hint\{[^}]*text-align:center/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn:disabled\{opacity:\.4;cursor:not-allowed\}/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn:hover\{background:var\(--bt-hover\)/) + assert.match(PARITY_SHELL_CSS, /\.bt-rail-btn\[aria-current=page\][^}]*--bt-selected/) + const desktop = PARITY_SHELL_CSS.split('@media (min-width:641px)')[1] + assert.match(desktop, /min-height:56px/) + assert.match(desktop, /min-height:86px/) + assert.match(desktop, /border-radius:20px/) + assert.match(desktop, /border:1px solid/) + assert.match(PARITY_SHELL_CSS, /@media \(min-width:1025px\)/) + assert.match(PARITY_SHELL_CSS, /width:432px;min-width:432px/) +}) diff --git a/patches/ds-bot/files/test/schedules-client.test.js b/patches/ds-bot/files/test/schedules-client.test.js index 8498e8bd3..ad79bc0f6 100644 --- a/patches/ds-bot/files/test/schedules-client.test.js +++ b/patches/ds-bot/files/test/schedules-client.test.js @@ -36,7 +36,7 @@ runInNewContext(outputFiles[0].text, { throw new Error(`Unexpected platform module ${name}`) }, }) -const { SchedulesPage, BotSchedules, ScheduleSummary, RoomSchedules, CopyRow, openPlugins, formStart, timingText, schedulesReadFailure, reachText } = module.exports +const { SchedulesPage, BotSchedules, ScheduleSummary, RoomSchedules, CopyRow, openPlugins, formStart, timingText, schedulesReadFailure, reachText, whenFromForm, wallClockInput, instantFromWallClock, timeZoneOptions } = module.exports // Every node and string under a tree; an array (what a page returns) is walked too. const all = (node, out = []) => { if (Array.isArray(node)) { for (const item of node) all(item, out); return out } @@ -127,6 +127,9 @@ test('Edit opens the task form filled in, and saving updates that task (#354)', assert.ok(all(form).some(node => node.type === 'textarea' && node.props.value === 'Sum up')) assert.ok(text(form).includes('Save changes')) assert.equal(all(card).filter(node => node.type === 'form').length, 1) + const zone = all(form).find(node => node.props?.['data-flybot'] === 'task-timezone') + assert.equal(zone?.props.value, 'Asia/Shanghai') + assert.ok(all(zone).some(node => node.props?.value === 'UTC' || node === 'UTC'), 'the picker lists UTC') form.props.onSubmit({ preventDefault() {} }) await new Promise(resolve => setImmediate(resolve)) assert.deepEqual(JSON.parse(JSON.stringify(sent)), [{ sessionId: 'chat-b1', id: 's1', target: 'b1', title: 'Briefing', prompt: 'Sum up', when: { kind: 'daily', time: '09:00', timeZone: 'Asia/Shanghai' } }]) @@ -139,6 +142,44 @@ test('the form starts from the edited task: repeat interval, one time, cron kept assert.deepEqual([once.kind, once.at], ['at', '2030-01-02T07:05']) assert.equal(formStart({ kind: 'cron', expression: '0 9 * * 1', timeZone: 'UTC' }).kind, 'cron') assert.deepEqual([formStart(undefined).kind, formStart(undefined).title, formStart(undefined).time], ['daily', '', '09:00']) + const shanghaiOnce = formStart({ kind: 'at', scheduledAt: '2030-01-02T07:05:00.000Z', timeZone: 'Asia/Shanghai' }) + assert.equal(shanghaiOnce.at, '2030-01-02T15:05') + assert.equal(shanghaiOnce.timeZone, 'Asia/Shanghai') +}) + +test('#3110: wall clocks convert through the chosen zone, and daily/weekly send that zone to the host', () => { + assert.equal(instantFromWallClock('2030-01-02T15:05', 'Asia/Shanghai'), '2030-01-02T07:05:00.000Z') + assert.equal(instantFromWallClock('2030-01-02T07:05', 'UTC'), '2030-01-02T07:05:00.000Z') + assert.equal(instantFromWallClock('2030-07-02T09:00', 'America/New_York'), '2030-07-02T13:00:00.000Z') + assert.equal(instantFromWallClock('2030-01-02T09:00', 'America/New_York'), '2030-01-02T14:00:00.000Z') + assert.equal(wallClockInput(Date.parse('2030-01-02T07:05:00.000Z'), 'Asia/Shanghai'), '2030-01-02T15:05') + const asJson = value => JSON.parse(JSON.stringify(value)) + assert.deepEqual(asJson(whenFromForm({ kind: 'daily', time: '09:00', timeZone: 'America/Los_Angeles' })), { + kind: 'daily', time: '09:00', timeZone: 'America/Los_Angeles', + }) + assert.deepEqual(asJson(whenFromForm({ kind: 'weekly', time: '18:30', weekdays: [1, 5], timeZone: 'UTC' })), { + kind: 'weekly', time: '18:30', timeZone: 'UTC', weekdays: [1, 5], + }) + const once = asJson(whenFromForm({ kind: 'at', at: '2030-01-02T15:05', timeZone: 'Asia/Shanghai' })) + assert.deepEqual(once, { kind: 'at', at: '2030-01-02T07:05:00.000Z', timeZone: 'Asia/Shanghai' }) + const every = asJson(whenFromForm({ kind: 'every', count: 2, unit: 'hours', timeZone: 'Asia/Shanghai' })) + assert.deepEqual(every, { kind: 'every', seconds: 7200 }) + assert.equal('timeZone' in every, false, 'an interval has no time_zone in the engine') + assert.ok(timeZoneOptions('Asia/Shanghai').includes('Asia/Shanghai')) + assert.ok(timeZoneOptions('Asia/Shanghai').includes('UTC')) + assert.ok(timeZoneOptions('Not/AZone').includes('Not/AZone'), 'a stored zone stays selectable') +}) + +test('#3110: the timezone picker is on once/daily/weekly forms and not on a repeat-every form', () => { + seeded.push({ available: true, tasks: [ACTIVE] }, ACTIVE) + const daily = render(BotSchedules({ bot: { id: 'b1' }, roster: ROSTER, actions: spy() })) + const dailyZone = all(daily).find(node => node.props?.['data-flybot'] === 'task-timezone') + assert.ok(dailyZone, 'the daily form shows a timezone control') + assert.equal(dailyZone.props.value, 'Asia/Shanghai') + const everyTask = { id: 'e1', sessionId: 'chat-b1', botId: 'b1', title: 'Ping', prompt: 'Ping', kind: 'every', everySeconds: 3600, scheduledAt: '2030-01-01T01:00:00.000Z', status: 'active' } + seeded.push({ available: true, tasks: [everyTask] }, everyTask) + const every = render(BotSchedules({ bot: { id: 'b1' }, roster: ROSTER, actions: spy() })) + assert.equal(all(every).some(node => node.props?.['data-flybot'] === 'task-timezone'), false, 'repeat-every has no zone in the engine, so no control') }) // #1651 (P-132): an interval that is not a whole number of minutes was shown rounded and @@ -260,19 +301,21 @@ test('turning quiet hours on saves the default window as the settings write (#11 assert.deepEqual(JSON.parse(JSON.stringify(sent)), [{ quietHours: { on: true, from: '22:00', to: '07:00' } }]) }) -test('a once task sends its zone, so the host reads its wall clock (#1166)', async () => { +test('a once task sends its zone, so the host reads its wall clock (#1166, #3110)', async () => { const sent = [] const actions = { ...spy(), scheduleUpdate: async (task) => { sent.push(task); return OFF } } const once = { ...ACTIVE, kind: 'at', scheduledAt: '2030-01-02T07:05:00.000Z' } seeded.push({ available: true, tasks: [once], quietHours: QUIET }, once) const card = render(BotSchedules({ bot: { id: 'b1' }, roster: ROSTER, actions })) const form = all(card).find(node => node.type === 'form') + const zone = all(form).find(node => node.props?.['data-flybot'] === 'task-timezone') + assert.equal(zone?.props.value, 'Asia/Shanghai') form.props.onSubmit({ preventDefault() {} }) await new Promise(resolve => setImmediate(resolve)) const [when] = JSON.parse(JSON.stringify(sent)).map(task => task.when) assert.equal(when.kind, 'at') - assert.equal(typeof when.timeZone, 'string') - assert.notEqual(when.timeZone, '') + assert.equal(when.timeZone, 'Asia/Shanghai') + assert.equal(when.at, '2030-01-02T07:05:00.000Z', 'the wall clock is read in the chosen zone, not only attached') }) test('the repeat-task warning is the view flag, not the page scanning its tasks (#1199)', () => { @@ -791,7 +834,7 @@ test('#2232: Quiet hours and the form announce a refusal, not only print it', as const start = formStart(ACTIVE) seeded.push( { available: true, tasks: [] }, true, null, false, '', '22:00', '07:00', - 'b1', start.title, start.prompt, start.kind, start.at, start.time, start.weekdays, start.count, start.unit, false, sentence, + 'b1', start.title, start.prompt, start.kind, start.at, start.time, start.weekdays, start.count, start.unit, start.timeZone, false, sentence, ) const formShown = render(SchedulesPage({ roster: ROSTER, actions: formActions, start: 'b1' })) const formAlerts = alertsOf(formShown) diff --git a/patches/ds-bot/files/test/session-list-filter.test.js b/patches/ds-bot/files/test/session-list-filter.test.js new file mode 100644 index 000000000..6a02a7675 --- /dev/null +++ b/patches/ds-bot/files/test/session-list-filter.test.js @@ -0,0 +1,50 @@ +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { matchesSessionFilter, sessionIsUnread, sessionStatusOf, SESSION_FILTERS } from '../src/shared/session-list-filter.js' + +const chief = { kind: 'bot', item: { id: 'chief', name: 'Chief' } } +const writer = { kind: 'bot', item: { id: 'writer', name: 'Writer', sessionId: 'writer-s' } } +const room = { kind: 'room', item: { id: 'room-1', name: 'Review room' } } +const agent = { kind: 'agent', item: { id: 'dsh', sessions: ['a1', 'a2'] } } + +test('the public filters are all, group, direct, and unread', () => { + assert.deepEqual(SESSION_FILTERS, ['all', 'group', 'direct', 'unread']) +}) + +test('all keeps every row; group is rooms; direct is Bots and the coding agent', () => { + assert.equal(matchesSessionFilter(chief, 'all'), true) + assert.equal(matchesSessionFilter(room, 'all'), true) + assert.equal(matchesSessionFilter(agent, 'all'), true) + assert.equal(matchesSessionFilter(room, 'group'), true) + assert.equal(matchesSessionFilter(chief, 'group'), false) + assert.equal(matchesSessionFilter(agent, 'group'), false) + assert.equal(matchesSessionFilter(chief, 'direct'), true) + assert.equal(matchesSessionFilter(agent, 'direct'), true) + assert.equal(matchesSessionFilter(room, 'direct'), false) +}) + +test('unread keeps only rows already marked unread, and never invents a read chip', () => { + assert.equal(matchesSessionFilter(chief, 'unread', false), false) + assert.equal(matchesSessionFilter(chief, 'unread', true), true) + assert.equal(matchesSessionFilter(room, 'unread', true), true) + assert.equal(SESSION_FILTERS.includes('read'), false) +}) + +test('unread follows completion, a pending bot interaction, or a manual mark', () => { + const map = new Map([ + ['chief', { completionUnread: true }], + ['writer-s', { pendingInteraction: { id: 'q1' } }], + ['room-1', { completionUnread: true }], + ['a2', { completionUnread: true }], + ]) + assert.equal(sessionIsUnread(chief, map, {}), true) + assert.equal(sessionIsUnread(writer, map, {}), true) + assert.equal(sessionIsUnread(room, map, {}), true) + assert.equal(sessionIsUnread(agent, map, {}), true) + assert.equal(sessionIsUnread(chief, new Map(), { chief: true }), true) + assert.equal(sessionIsUnread(writer, new Map(), {}), false) + assert.equal(sessionIsUnread(room, new Map(), {}), false) + assert.equal(sessionIsUnread(agent, new Map(), {}), false) + assert.equal(sessionStatusOf({ chief: { completionUnread: true } }, 'chief')?.completionUnread, true) + assert.equal(sessionStatusOf(null, 'chief'), undefined) +}) diff --git a/patches/ds-bot/files/test/session-unread.test.js b/patches/ds-bot/files/test/session-unread.test.js new file mode 100644 index 000000000..b53a2308f --- /dev/null +++ b/patches/ds-bot/files/test/session-unread.test.js @@ -0,0 +1,39 @@ +import { sessionIsUnread, matchesSessionFilter } from '../src/shared/session-list-filter.js' +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { isManuallyUnread, shouldClearManualUnread, unreadEntryId } from '../src/shared/session-unread.js' + +test('manual unread clears only when a chat becomes active, not while it stays open', () => { + assert.equal(shouldClearManualUnread({ active: true, wasActive: false, marked: true }), true) + assert.equal(shouldClearManualUnread({ active: true, wasActive: true, marked: true }), false) + assert.equal(shouldClearManualUnread({ active: false, wasActive: true, marked: true }), false) + assert.equal(shouldClearManualUnread({ active: true, wasActive: false, marked: false }), false) +}) + +test('unreadEntryId uses the Bot, room, or agent id the sidebar stores', () => { + const writer = { id: 'writer', sessionId: 'sess-w' } + const roster = { + bots: [{ id: 'chief', sessionId: 'chief' }, writer], + byId: { chief: { id: 'chief' }, writer }, + rooms: [{ id: 'room-1' }], + roomsById: { 'room-1': { id: 'room-1' } }, + agents: [{ id: 'dsh', sessions: ['a1'] }], + } + assert.equal(unreadEntryId(roster, 'writer'), 'writer') + assert.equal(unreadEntryId(roster, 'sess-w'), 'writer') + assert.equal(unreadEntryId(roster, 'room-1'), 'room-1') + assert.equal(unreadEntryId(roster, 'a1'), 'dsh') + assert.equal(unreadEntryId(roster, 'missing'), 'missing') + assert.equal(isManuallyUnread({ writer: true }, 'writer'), true) + assert.equal(isManuallyUnread({}, 'writer'), false) +}) + + +test('clearing the manual mark does not acknowledge system unread or remove it from unread filter', () => { + const entry = { kind: 'bot', item: { id: 'chief' } } + const system = { chief: { completionUnread: true } } + assert.equal(sessionIsUnread(entry, system, { chief: true }), true) + assert.equal(matchesSessionFilter(entry, 'unread', sessionIsUnread(entry, system, {})), true) + assert.equal(sessionIsUnread(entry, { chief: { pendingInteraction: { kind: 'question' } } }, {}), true) + assert.equal(sessionIsUnread(entry, {}, {}), false) +}) diff --git a/patches/ds-bot/files/test/settings-page-keys.test.js b/patches/ds-bot/files/test/settings-page-keys.test.js index d85463ac1..c7f7c441f 100644 --- a/patches/ds-bot/files/test/settings-page-keys.test.js +++ b/patches/ds-bot/files/test/settings-page-keys.test.js @@ -28,7 +28,7 @@ function clientSources(dir, out = []) { test('every openSettings() page key exists in SETTINGS_PAGES', () => { const keys = new Set(settingsPageKeys()) - assert.equal(keys.size, 13, 'the settings dialog lists thirteen pages') + assert.equal(keys.size, 14, 'the settings dialog lists fourteen pages') const unknown = [] let seen = 0 diff --git a/patches/ds-bot/files/test/settings-page-slot.test.js b/patches/ds-bot/files/test/settings-page-slot.test.js index f37182949..e299ec27b 100644 --- a/patches/ds-bot/files/test/settings-page-slot.test.js +++ b/patches/ds-bot/files/test/settings-page-slot.test.js @@ -39,7 +39,7 @@ test('a flybot.settings.page entry is listed after Connectors and drawn with the const tree = SettingsDialog({ page: 'plugin:social', id: null, roster, actions, useUpdate: () => ({}) }) const nodes = all(tree) const items = nodes.filter(node => node.type === 'button' && node.props.className === 'bt-settings-item').map(text) - assert.deepEqual(items.slice(4, 7), ['Connectors', 'Bot Social', 'Capabilities']) + assert.deepEqual(items.slice(4, 8), ['Connectors', 'Channels', 'Bot Social', 'Capabilities']) assert.equal(text(nodes.find(node => node.type === 'h2')), 'Bot Social') const slot = nodes.find(node => node.props?.entry?.id === 'social') assert.ok(slot) @@ -56,6 +56,6 @@ test('a page whose plugin is gone falls back to General, and without plugins the const nodes = all(tree) assert.equal(text(nodes.find(node => node.type === 'h2')), 'General') const items = nodes.filter(node => node.type === 'button' && node.props.className === 'bt-settings-item').map(text) - assert.deepEqual(items.slice(0, 7), ['General', 'Bots', 'Group chats', 'Projects', 'Connectors', 'Capabilities', 'Plugins']) + assert.deepEqual(items.slice(0, 8), ['General', 'Bots', 'Group chats', 'Projects', 'Connectors', 'Channels', 'Capabilities', 'Plugins']) assert.equal(nodes.some(node => node.props?.entry !== undefined), false) }) diff --git a/patches/ds-bot/files/test/settings-readonly-pages.test.js b/patches/ds-bot/files/test/settings-readonly-pages.test.js index bedad0b72..b4bba68d4 100644 --- a/patches/ds-bot/files/test/settings-readonly-pages.test.js +++ b/patches/ds-bot/files/test/settings-readonly-pages.test.js @@ -1,7 +1,7 @@ // #2474: in a window that holds the team read-only the host refuses every write with -// `bot/read-only`, but seven Settings pages still drew their controls: General's theme +// `bot/read-only`, but eight Settings pages still drew their controls: General's theme // select and switches, the Bots page's Main Bot and animation controls, and the live forms -// of a Bot, a group chat, Connectors, Capabilities and Secrets. Each page now reads the +// of a Bot, a group chat, Connectors, Channels, Capabilities and Secrets. Each page now reads the // roster's own read-only sentence through `lockedWindow` and draws a plain-text view // instead: no control anywhere, and the facts of the page kept as text. A writable window // is untouched, and the standing sentence stays in the dialog header — once per page. @@ -79,6 +79,7 @@ const writer = { id: 'writer', name: 'Writer', role: 'Editor', model: 'mock/m1', const editor = { id: 'editor', name: 'Editor', role: '', model: 'mock/m1', workDir: null, instructions: '' } const room = { id: 'r1', name: 'Ops', admin: 'chief', members: ['chief', 'writer'], mode: 'admin', notice: 'Read this first.', named: true, workDir: '/work/ops', participants: [{ kind: 'human', id: 'owner-1', displayName: 'Alice', role: 'admin' }] } const github = { id: 'github', name: 'GitHub', kind: 'tool', state: 'ready', account: 'xuke' } +const feishu = { id: 'feishu', name: 'Feishu', kind: 'channel', state: 'off' } const browser = { name: 'browser', kind: 'mcp', transport: 'stdio', description: 'Open pages' } const token = { name: 'GITHUB_TOKEN', purpose: 'Push branches', scope: 'all', createdAt: 0 } const baseRoster = { @@ -90,7 +91,7 @@ const baseRoster = { mainBotId: 'chief', prefs: { theme: 'deepseek', motion: 'quiet', notifications: true }, models: [{ id: 'm1', name: 'Mock One', served: true }], - connectors: [github], + connectors: [github, feishu], capabilities: [browser], secrets: [token], humans: [], @@ -198,11 +199,12 @@ const INTERACTIVE = new Set(['button', 'a', 'input', 'select', 'textarea']) const isInteractive = (node) => INTERACTIVE.has(nameOf(node)) || typeof node.props?.onClick === 'function' const PAGES = [ - { key: 'general', id: null, name: 'GeneralPage', facts: ['DeepSeek', 'On'] }, + { key: 'general', id: null, name: 'GeneralPage', facts: ['DeepSeek', 'On', 'Standard'] }, { key: 'bots', id: null, name: 'BotsPage', facts: ['Main Bot', 'Chief', 'Writer', 'Bot animation', 'Quiet'] }, { key: 'bots', id: 'chief', name: 'BotSettingsForm', facts: ['Chief', 'Researcher', 'Run the team.'] }, { key: 'groups', id: 'r1', name: 'GroupSettingsForm', facts: ['Ops', 'Chief', 'Writer', 'Alice', 'Read this first.'] }, { key: 'connectors', id: null, name: 'ConnectorsPage', facts: ['GitHub', 'xuke'] }, + { key: 'channels', id: null, name: 'ChannelsPage', facts: ['Feishu'] }, { key: 'capabilities', id: null, name: 'CapabilitiesPage', facts: ['browser', 'Open pages'] }, { key: 'secrets', id: null, name: 'SecretsPage', facts: ['GITHUB_TOKEN', 'Push branches'] }, ] @@ -210,7 +212,7 @@ const PAGES = [ // Pressing what a locked page draws may navigate; it may not write. const pressure = (nodes) => nodes.filter(node => nameOf(node) === 'button') -test('a read-only window draws no write control on any of the seven Settings pages (#2474)', () => { +test('a read-only window draws no write control on any of the eight Settings pages (#2474)', () => { const controls = [] const writes = [] const missing = [] @@ -253,7 +255,9 @@ test('a writable window keeps every page as it is today (#2474)', () => { const general = mount(baseRoster, 'general', null, 'GeneralPage').nodes assert.equal(general.filter(node => node.type === 'select').length, 1, 'General keeps its theme select') assert.equal(general.filter(node => node.type === 'input').length, 1, 'General keeps its colour field') - assert.equal(counts(general), 6, 'General keeps its four switches beside them') + // Theme select, accent field, four notification switches, appearance and send-shortcut + // segmenteds, plus the document-card switch (folding modes are radio buttons, not widgets). + assert.equal(counts(general), 9, 'General keeps its theme, accent, appearance, shortcut, folding and notification controls') const bots = mount(baseRoster, 'bots', null, 'BotsPage').nodes assert.equal(bots.filter(node => node.type === 'select').length, 2, 'Bots keeps both of its Main Bot selects') @@ -262,6 +266,7 @@ test('a writable window keeps every page as it is today (#2474)', () => { assert.ok(counts(mount(baseRoster, 'bots', 'chief', 'BotSettingsForm').nodes) >= 3, 'a Bot keeps its live form') assert.ok(counts(mount(baseRoster, 'groups', 'r1', 'GroupSettingsForm').nodes) >= 3, 'a group keeps its live form') assert.ok(mount(baseRoster, 'connectors', null, 'ConnectorsPage').nodes.some(node => nameOf(node) === 'ConnectorRow'), 'Connectors keeps its live rows') + assert.ok(mount(baseRoster, 'channels', null, 'ChannelsPage').nodes.some(node => nameOf(node) === 'ConnectorRow'), 'Channels keeps the Feishu row') assert.ok(mount(baseRoster, 'capabilities', null, 'CapabilitiesPage').nodes.some(node => nameOf(node) === 'CapabilityRow'), 'Capabilities keeps its rows') assert.ok(mount(baseRoster, 'secrets', null, 'SecretsPage').nodes.some(node => nameOf(node) === 'SecretRow'), 'Secrets keeps its rows') }) diff --git a/patches/ds-bot/files/test/sidebar-parity-events.test.js b/patches/ds-bot/files/test/sidebar-parity-events.test.js new file mode 100644 index 000000000..0c0f3645a --- /dev/null +++ b/patches/ds-bot/files/test/sidebar-parity-events.test.js @@ -0,0 +1,186 @@ +// First-batch shell: the icon rail and header entries actually fire navigation, typing +// focuses search, and the collapsed rail keeps its existing shape. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' +import { MOBILE_CSS } from '../src/client/mobile.js' +import { PARITY_SHELL_CSS } from '../src/client/parity-shell.js' + +const { outputFiles } = await build({ + stdin: { + contents: "export { TeamSidebar } from './src/client/sidebar.js'", + resolveDir: fileURLToPath(new URL('..', import.meta.url)), + }, + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], +}) + +const h = (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }) +class Component { + constructor(props) { this.props = props } + setState() {} +} +const react = { + createElement: h, + Fragment: Symbol('Fragment'), + Component, + PureComponent: Component, + createRef: () => ({ current: null }), + useState: initial => [typeof initial === 'function' ? initial() : initial, () => {}], + useEffect() {}, + useLayoutEffect() {}, + useRef: value => ({ current: value }), + useCallback: fn => fn, + useMemo: fn => fn(), +} +const slots = { entries: () => [], subscribe: () => () => {}, version: () => 0 } +const module = { exports: {} } +class Element {} +runInNewContext(outputFiles[0].text, { + module, exports: module.exports, console, Date, JSON, Promise, Symbol, Element, + __flybot__: { slots, call: () => {} }, + require: (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return {} + throw new Error(`Unexpected platform module ${name}`) + }, +}) +const { TeamSidebar } = module.exports + +const walk = (node, out = []) => { + if (Array.isArray(node)) { + for (const child of node) walk(child, out) + return out + } + if (!node || typeof node !== 'object') return out + out.push(node) + walk(node.props?.children, out) + return out +} +const all = tree => walk(tree) +const byClass = (tree, name) => all(tree).filter(node => { + const value = node.props?.className + return typeof value === 'string' && value.split(' ').includes(name) +}) +const buttonsNamed = (tree, label) => all(tree).filter(node => node.type === 'button' && node.props?.['aria-label'] === label) + +function renderSidebar({ wide, actions }) { + const roster = { ready: true, bots: [], rooms: [], agents: [], byId: {}, roomsById: {}, mainBotId: undefined } + const defaults = { + openInbox() {}, openBoard() {}, openPalette() {}, openNewChat() {}, + landOnMainBot() {}, clearUnread() {}, isAgentSession: () => false, + } + return TeamSidebar({ + wide, + useRoster: select => select(roster), + useUi: select => select({}), + useSessions: select => select({ ids: [], byId: {} }), + useRegistry: () => {}, + useUpdate: select => select({}), + useWork: select => select({}), + useSessionStatus: select => select({}), + useSessionRetainInfo: select => select({}), + useActivity: select => select({}), + actions: { ...defaults, ...actions }, + }) +} + +test('wide sidebar Search and New in the rail and the header open the same actions', () => { + const palette = [] + const created = [] + const tree = renderSidebar({ + wide: true, + actions: { + openPalette: (query) => palette.push(query ?? 'open'), + openNewChat: (kind) => created.push(kind), + }, + }) + assert.equal(byClass(tree, 'bt-side-split').length, 1) + assert.equal(byClass(tree, 'bt-rail').length, 0) + const rail = byClass(tree, 'bt-icon-rail') + assert.equal(rail.length, 1) + assert.equal(rail[0].type, 'nav') + assert.equal(rail[0].props['aria-label'], 'FlyBot') + + const search = buttonsNamed(tree, 'Search') + const createdBtns = buttonsNamed(tree, 'New…') + assert.equal(search.length, 2, 'Search stays in the header and is also on the rail') + assert.equal(createdBtns.length, 2, 'New stays in the header and is also on the rail') + for (const button of [...search, ...createdBtns]) { + assert.equal(button.props.type, 'button') + assert.equal(typeof button.props.onClick, 'function') + assert.ok(button.props.title) + } + + search[0].props.onClick() + search[1].props.onClick() + assert.deepEqual(palette, ['open', 'open']) + createdBtns[0].props.onClick() + createdBtns[1].props.onClick() + assert.deepEqual(created, ['new', 'new']) +}) + +test('typing a character in the wide sidebar opens search with that character', () => { + const palette = [] + const tree = renderSidebar({ wide: true, actions: { openPalette: (query) => palette.push(query) } }) + const event = { + key: 'c', + defaultPrevented: false, + metaKey: false, + ctrlKey: false, + altKey: false, + nativeEvent: { isComposing: false }, + target: {}, + preventDefault() { this.defaultPrevented = true }, + } + tree.props.onKeyDown(event) + assert.equal(event.defaultPrevented, true) + assert.deepEqual(palette, ['c']) +}) + +test('modifier keys and Space do not steal focus for search', () => { + const palette = [] + const tree = renderSidebar({ wide: true, actions: { openPalette: (query) => palette.push(query) } }) + const fire = (extra) => { + const event = { + key: 'c', defaultPrevented: false, metaKey: false, ctrlKey: false, altKey: false, + nativeEvent: { isComposing: false }, target: {}, preventDefault() { this.defaultPrevented = true }, + ...extra, + } + tree.props.onKeyDown(event) + return event + } + fire({ metaKey: true }) + fire({ ctrlKey: true }) + fire({ altKey: true }) + fire({ key: ' ' }) + fire({ key: 'Enter' }) + fire({ key: 'c', nativeEvent: { isComposing: true } }) + assert.deepEqual(palette, []) +}) + +test('the collapsed rail keeps New, and does not draw the wide icon rail', () => { + const created = [] + const tree = renderSidebar({ wide: false, actions: { openNewChat: (kind) => created.push(kind) } }) + assert.equal(byClass(tree, 'bt-rail').length, 1) + assert.equal(byClass(tree, 'bt-icon-rail').length, 0) + assert.equal(byClass(tree, 'bt-side-split').length, 0) + const createdBtns = buttonsNamed(tree, 'New…') + assert.equal(createdBtns.length, 1) + createdBtns[0].props.onClick() + assert.deepEqual(created, ['new']) +}) + +test('desktop composer and header restyles stay above the phone breakpoint, and phone approval offsets stay put', () => { + assert.match(PARITY_SHELL_CSS, /@media \(min-width:641px\)/) + const desktop = PARITY_SHELL_CSS.split('@media (min-width:641px)')[1] + assert.match(desktop, /min-height:86px/) + assert.match(desktop, /border-radius:20px/) + assert.doesNotMatch(PARITY_SHELL_CSS.split('@media (min-width:641px)')[0], /min-height:86px/) + assert.match(MOBILE_CSS, /@media \(max-width:640px\)/) + assert.match(MOBILE_CSS, /\.bt-flybot-approvals\{left:64px/) + assert.match(MOBILE_CSS, /\.bt-flybot-pointers\{[^}]*max-width:calc\(100vw - 72px\)/) +}) diff --git a/patches/ds-bot/files/test/sidebar-session-filter.test.js b/patches/ds-bot/files/test/sidebar-session-filter.test.js new file mode 100644 index 000000000..2309e4d3d --- /dev/null +++ b/patches/ds-bot/files/test/sidebar-session-filter.test.js @@ -0,0 +1,175 @@ +// The sidebar session filter only offers kinds the list already has: all, group +// chats, direct chats, and unread (from the same marks the rows already draw). +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { fileURLToPath } from 'node:url' +import { runInNewContext } from 'node:vm' +import { build } from 'esbuild' + +const { outputFiles } = await build({ + stdin: { + contents: "export { TeamSidebar } from './src/client/sidebar.js'", + resolveDir: fileURLToPath(new URL('..', import.meta.url)), + }, + bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent', + external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'], +}) + +const h = (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }) +let slots = [] +let index = 0 +const react = { + createElement: h, Component: class {}, Fragment: Symbol('F'), + useMemo: (fn) => { const at = index++; if (!(at in slots)) slots[at] = fn(); return slots[at] }, + useState: (initial) => { + const at = index++ + if (!(at in slots)) slots[at] = typeof initial === 'function' ? initial() : initial + return [slots[at], (value) => { slots[at] = typeof value === 'function' ? value(slots[at]) : value }] + }, + useCallback: (fn) => fn, + useRef: (value) => { const at = index++; if (!(at in slots)) slots[at] = { current: value }; return slots[at] }, + useEffect() {}, + useLayoutEffect() {}, + useSyncExternalStore: (_subscribe, get) => get(), +} +const win = { location: { hash: '' }, innerHeight: 800, addEventListener() {}, removeEventListener() {}, matchMedia: () => ({ matches: false, addEventListener() {}, removeEventListener() {} }) } +const module = { exports: {} } +runInNewContext(outputFiles[0].text, { + module, exports: module.exports, console, setTimeout, clearTimeout, setImmediate, queueMicrotask, + requestAnimationFrame: () => 0, cancelAnimationFrame() {}, + Date, JSON, Promise, Symbol, Map, Set, + document: { hidden: false, addEventListener() {}, removeEventListener() {}, body: {}, querySelector: () => null }, + navigator: { language: 'en' }, + localStorage: { getItem: () => null, setItem() {} }, + window: win, + __flybot__: { slots: { entries: () => [], subscribe: () => () => {}, version: () => 0 }, call: () => {} }, + require: (name) => { + if (name === 'react') return react + if (name === 'react-dom') return { createPortal: node => node } + if (name === '@deepseek-ai/dsh-client-ui-primitives') return {} + throw new Error(`Unexpected platform module ${name}`) + }, +}) +const { TeamSidebar } = module.exports + +const chief = { id: 'chief', name: 'Chief' } +const writer = { id: 'writer', name: 'Writer' } +const room = { id: 'room-1', name: 'Review room', origin: 'group' } +const statuses = new Map([ + ['writer', { completionUnread: true }], +]) +const roster = { + ready: true, bots: [chief, writer], rooms: [room], agents: [], + byId: { chief, writer }, roomsById: { 'room-1': room }, mainBotId: 'chief', +} +const OPAQUE = new Set(['BotRow', 'RoomRow', 'AgentRow', 'InboxRow', 'KanbanRow', 'ProjectsNav', 'FlyBotSections', 'TreeNode', 'UpdateButton', 'BrandMark', 'BrandName']) +const expand = (node) => { + if (Array.isArray(node)) return node.map(expand) + if (!node || typeof node !== 'object') return node + if (typeof node.type === 'function' && !OPAQUE.has(node.type.name)) return expand(node.type(node.props ?? {})) + const props = node.props ?? {} + return { ...node, props: { ...props, children: expand(props.children) } } +} +const all = (node, out = []) => { + if (node == null) return out + if (Array.isArray(node)) { for (const item of node) all(item, out); return out } + if (typeof node !== 'object') return out + out.push(node) + all(node.props?.children, out) + return out +} +const ownText = (node) => { + const walk = (value) => { + if (Array.isArray(value)) return value.map(walk).join('') + if (typeof value === 'string' || typeof value === 'number') return String(value) + if (value && typeof value === 'object') return walk(value.props?.children) + return '' + } + return walk(node?.props?.children) +} +const hasClass = (node, name) => String(node.props?.className ?? '').split(/\s+/).includes(name) + +const mount = () => { + slots = [] + const draw = () => { + index = 0 + return all(expand(TeamSidebar({ + wide: true, + useRoster: select => select(roster), + useUi: select => select({ unread: {} }), + useSessions: select => select({ ids: ['chief', 'writer', 'room-1'], byId: { chief: { updatedAt: 3 }, writer: { updatedAt: 2 }, 'room-1': { updatedAt: 1 } } }), + useRegistry: () => {}, + useUpdate: select => select({}), + useWork: select => select({}), + useSessionStatus: select => select(statuses), + useSessionRetainInfo: select => select({}), + useActivity: select => select({}), + actions: { + openInbox() {}, openBoard() {}, openPalette() {}, openNewChat() {}, + landOnMainBot() {}, clearUnread() {}, isAgentSession: () => false, + }, + }))) + } + return draw +} + +test('the wide sidebar offers All, Group chats, Direct chats, and Unread, and no Read chip', () => { + const nodes = mount()() + const bar = nodes.find(node => hasClass(node, 'bt-session-filter')) + assert.ok(bar, 'the session filter is drawn above the list') + const chips = nodes.filter(node => hasClass(node, 'bt-session-filter-btn')) + assert.deepEqual(chips.map(ownText), ['All', 'Group chats', 'Direct chats', 'Unread']) + assert.equal(chips.find(node => ownText(node) === 'All').props['aria-checked'], true) + assert.equal(nodes.some(node => ownText(node) === 'Read' && hasClass(node, 'bt-session-filter-btn')), false) + const kinds = nodes.filter(node => typeof node.type === 'function').map(node => node.type.name) + assert.ok(kinds.includes('BotRow')) + assert.ok(kinds.includes('RoomRow')) +}) + +test('Group chats keeps rooms, Direct chats keeps Bots, Unread keeps only marked rows', () => { + const draw = mount() + let nodes = draw() + const press = label => { + const chip = nodes.find(node => hasClass(node, 'bt-session-filter-btn') && ownText(node) === label) + assert.ok(chip, label) + chip.props.onClick() + nodes = draw() + } + const names = (kind) => nodes.filter(node => node.type?.name === kind).map(node => (node.props.bot ?? node.props.room)?.name) + press('Group chats') + assert.deepEqual(names('RoomRow'), ['Review room']) + assert.deepEqual(names('BotRow'), []) + press('Direct chats') + assert.deepEqual(names('RoomRow'), []) + assert.ok(names('BotRow').includes('Chief')) + assert.ok(names('BotRow').includes('Writer')) + press('Unread') + assert.deepEqual(names('BotRow'), ['Writer']) + assert.deepEqual(names('RoomRow'), []) + press('All') + assert.ok(names('BotRow').includes('Chief')) + assert.ok(names('RoomRow').includes('Review room')) +}) + +test('the narrow rail does not draw session filter chips', () => { + slots = [] + index = 0 + const tree = TeamSidebar({ + wide: false, + useRoster: select => select(roster), + useUi: select => select({ unread: {} }), + useSessions: select => select({ ids: [], byId: {} }), + useRegistry: () => {}, + useUpdate: select => select({}), + useWork: select => select({}), + useSessionStatus: select => select(statuses), + useSessionRetainInfo: select => select({}), + useActivity: select => select({}), + actions: { + openInbox() {}, openBoard() {}, openPalette() {}, openNewChat() {}, + landOnMainBot() {}, clearUnread() {}, isAgentSession: () => false, + }, + }) + const nodes = all(expand(tree)) + assert.equal(nodes.some(node => hasClass(node, 'bt-session-filter')), false) +}) diff --git a/patches/ds-bot/files/test/theme-prefs.test.js b/patches/ds-bot/files/test/theme-prefs.test.js new file mode 100644 index 000000000..e067e240d --- /dev/null +++ b/patches/ds-bot/files/test/theme-prefs.test.js @@ -0,0 +1,83 @@ +// Theme choice in a real FlyBot: Grove is the unsaved default, existing themes stay selectable, +// and the same record installTheme writes to localStorage can be read back. +import assert from 'node:assert/strict' +import { test } from 'node:test' +import { DICTIONARY, installLocale, t } from '../src/client/i18n.js' +import { + DEFAULT_THEME, allThemes, resolveThemeId, themeCss, themePrefsRecord, +} from '../src/client/themes.js' + +test('a profile with no saved theme presents Grove, and a saved id is kept', () => { + assert.equal(DEFAULT_THEME, 'grove') + assert.equal(resolveThemeId(undefined), 'grove') + assert.equal(resolveThemeId({}), 'grove') + assert.equal(resolveThemeId({ theme: 'unknown-theme' }), 'grove') + assert.equal(resolveThemeId({ theme: 'deepseek' }), 'deepseek') + assert.equal(resolveThemeId({ theme: 'mono' }), 'mono') + assert.equal(resolveThemeId({ theme: 'paper' }), 'paper') + assert.equal(resolveThemeId({ theme: 'moonlight' }), 'moonlight') + assert.equal(resolveThemeId({ theme: 'grove' }), 'grove') +}) + +test('every shipped theme stays in the picker, including Grove and DeepSeek', () => { + const themes = allThemes() + assert.deepEqual(Object.keys(themes).sort(), ['deepseek', 'grove', 'mono', 'moonlight', 'paper'].sort()) + assert.equal(themes.grove.label, 'Grove') + assert.equal(themes.deepseek.label, 'DeepSeek') +}) + +test('Grove tokens are the forest shell; DeepSeek tokens stay the original greys', () => { + const grove = themeCss(allThemes().grove) + assert.match(grove, /html body\{[^}]*--bt-main:#f4f7f5/) + assert.match(grove, /html body\[data-ds-dark-theme\]\{[^}]*--bt-main:#171c19/) + assert.match(grove, /--bt-card:#272e2b/) + assert.match(grove, /--bt-accent:#3d9a6e/) + assert.match(grove, /--bt-selected:#235039/) + const deepseek = themeCss(allThemes().deepseek) + assert.match(deepseek, /html body\[data-ds-dark-theme\]\{[^}]*--bt-main:#141414/) + assert.match(deepseek, /--bt-accent:#5b7bff/) + assert.doesNotMatch(grove, /Teamily|teamily/) +}) + +test('the localStorage record installTheme writes can be resolved on the next load', () => { + const store = new Map() + const storage = { + setItem(key, value) { store.set(key, value) }, + getItem(key) { return store.get(key) ?? null }, + } + const key = 'ds-bot:prefs' + storage.setItem(key, JSON.stringify(themePrefsRecord({ theme: 'grove', accent: '#1f7a54', motion: 'normal' }))) + const saved = JSON.parse(storage.getItem(key)) + assert.equal(saved.theme, 'grove') + assert.equal(resolveThemeId(saved), 'grove') + + storage.setItem(key, JSON.stringify(themePrefsRecord({ theme: 'deepseek', motion: 'quiet' }))) + const kept = JSON.parse(storage.getItem(key)) + assert.equal(kept.theme, 'deepseek') + assert.equal(resolveThemeId(kept), 'deepseek') + + storage.setItem(key, JSON.stringify(themePrefsRecord({}))) + const blank = JSON.parse(storage.getItem(key)) + assert.equal(blank.theme, undefined) + assert.equal(resolveThemeId(blank), 'grove') +}) + +test('Grove has a Chinese label, like the other theme names', () => { + assert.equal(DICTIONARY.zh.Grove, '林间') + const dicts = new Map() + const off = installLocale({ + register: (ns, locale, dict) => { dicts.set(`${ns}:${locale}`, dict); return () => dicts.delete(`${ns}:${locale}`) }, + bind: ns => (key) => dicts.get(`${ns}:zh`)?.[key] ?? key, + getLocale: () => ({ active: 'zh' }), + }) + try { + for (const theme of Object.values(allThemes())) { + assert.equal(typeof t(theme.label), 'string') + assert.notEqual(t(theme.label), '') + } + assert.equal(t('Grove'), '林间') + assert.equal(t('DeepSeek'), 'DeepSeek') + } finally { + off() + } +}) diff --git a/patches/ds-bot/topics.json b/patches/ds-bot/topics.json index 1fe42273a..5c43338b8 100644 --- a/patches/ds-bot/topics.json +++ b/patches/ds-bot/topics.json @@ -77,6 +77,7 @@ "test/questions.test.js" ], "0003-flybot-api-client": [ + "src/client/themes.js", "src/client/index.js", "src/client/sidebar.js", "src/client/cells.js", diff --git a/plugins/project/src/project-assistant.js b/plugins/project/src/project-assistant.js index 628ab1558..4698904b2 100644 --- a/plugins/project/src/project-assistant.js +++ b/plugins/project/src/project-assistant.js @@ -233,6 +233,13 @@ export function install(rt) { const owner = rt.botOf?.(botId)?.ownerId const actor = owner === undefined ? undefined : { memberId: owner } try { + // A digest already on this Session (a hand-created 09:00 task, or a previous write + // whose scheduleId was never stored) is adopted, not created again (#1751, #3110). + const listed = await rt.scheduleEndpoint('schedules', {}, actor) + const existing = (listed?.tasks ?? []).find(task => + task.sessionId === sessionId && task.title === DIGEST_TITLE && task.status !== 'finished') + if (typeof existing?.id === 'string') return { scheduleId: existing.id } + const view = await rt.scheduleEndpoint('schedule-create', { target: botId, title: DIGEST_TITLE, diff --git a/plugins/project/test/project-assistant.test.js b/plugins/project/test/project-assistant.test.js index 364e92754..bf6abc20c 100644 --- a/plugins/project/test/project-assistant.test.js +++ b/plugins/project/test/project-assistant.test.js @@ -350,6 +350,31 @@ test('project-create retries the digest for an assistant it did not create (#175 } }) +test('reconcile adopts a 09:00 digest already on the Session and does not create a second (#1751)', async () => { + const { rt, service, attachSchedule, stop } = await start({ schedule: false }) + try { + const project = await created(rt, { name: 'Hand', ownerUserId: 'owner-1' }) + assert.equal(project.assistant.scheduleId, undefined) + const sessionId = project.assistant.sessionId + const record = await service.create(sessionId, { + title: '09:00 Project digest', + prompt: "Build today's Project digest: call project_digest once. It answers whether today already has one.", + daily: { time: '09:00:00', time_zone: 'Asia/Shanghai' }, + }) + assert.equal(service.created.length, 1) + + attachSchedule() + await rt.projectAssistant.reconcile() + assert.equal(service.created.length, 1, 'an existing digest is not written again') + assert.equal(service.tasks.size, 1) + const saved = rt.readProject(project.id).assistant + assert.equal(saved.scheduleId, record.id) + assert.equal(saved.error, undefined) + } finally { + await stop() + } +}) + test('buildDigest is pure: the same rows answer the same four sections', () => { const project = { id: 'project-1', name: 'Pure' } const rows = [ diff --git a/plugins/social/client.js b/plugins/social/client.js index df78f7171..038dceb07 100644 --- a/plugins/social/client.js +++ b/plugins/social/client.js @@ -630,12 +630,12 @@ window.__ModuleLoader__.load({ const row = h('button', { key: item.id, type: 'button', className: 'fs-pending-item', 'data-flybot': 'pending-item', ...(failed ? { 'data-state': 'failed' } : {}), - title: oneLine(item.text || item.summary || pendingTitle(item)), + title: oneLine(item.autoApproveError || item.text || item.summary || pendingTitle(item)), onClick: () => onOpen?.(item), }, h('span', { className: 'fs-text' }, h('span', { className: 'fs-name' }, pendingTitle(item)), - h('span', { className: 'fs-pending-one' }, failed ? oneLine(item.error || tr('Not sent')) : oneLine(item.text || item.summary || '')))) + h('span', { className: 'fs-pending-one' }, failed ? oneLine(item.error || tr('Not sent')) : oneLine(item.autoApproveError || item.text || item.summary || '')))) if (!retry) return row return h('div', { key: item.id, className: 'fs-pending-row', 'data-flybot': 'pending-row' }, row, @@ -2188,6 +2188,9 @@ window.__ModuleLoader__.load({ ? h('div', { className: 'fs-sub' }, `${from} → ${to}`) : null, reasonLine ? h('div', { className: 'fs-sub', 'data-flybot': 'hold-reason' }, reasonLine) : null, + item.autoApproveError + ? h('div', { className: 'fs-sub fs-chat-error', role: 'status', 'data-flybot': 'auto-approve-error' }, tr(item.autoApproveError)) + : null, text ? h('div', { className: 'fs-draft', 'data-clamp': !open && long ? true : undefined }, text) : null, long ? h('button', { type: 'button', className: 'fs-hold-more', 'data-flybot': 'hold-expand', @@ -2209,6 +2212,7 @@ window.__ModuleLoader__.load({ const handles = new Set((room?.participants ?? []).map(p => p.handle).filter(Boolean)) if (handle) handles.add(handle) return list.filter(item => { + if (item.kind === 'grant_request') return false if (item.kind === 'face_room_message') { // A room line belongs to the one room it was held in (#188); no room means no card. if (faceId && item.roomId === faceId) return true @@ -3230,11 +3234,14 @@ window.__ModuleLoader__.load({ const [faceOpen, setFaceOpen] = useState(false) const [faceMode, setFaceMode] = useState('join') const [shareRequests, setShareRequests] = useState([]) + const [grantRequests, setGrantRequests] = useState([]) + const [grantBusy, setGrantBusy] = useState('') const [acceptNotices, setAcceptNotices] = useState([]) // null until the first status answer: a reload must not toast notices that were already there (#1054). const seenAccept = useRef(null) const applyStatus = (value) => { setShareRequests(Array.isArray(value?.shareRequests) ? value.shareRequests : []) + setGrantRequests(Array.isArray(value?.grantRequests) ? value.grantRequests : []) const next = Array.isArray(value?.acceptNotices) ? value.acceptNotices : [] setAcceptNotices(next) if (seenAccept.current === null) { @@ -3253,6 +3260,17 @@ window.__ModuleLoader__.load({ }, e => setError(errorText(e))) const dismissShareRequest = item => call('social/share-request-dismiss', { id: item.id }).then(applyStatus, e => setError(errorText(e))) const dismissAccept = item => call('social/accept-notice-dismiss', { id: item.id }).then(applyStatus, e => setError(errorText(e))) + const decideGrant = (item, decision) => { + if (grantBusy || locked) return + setGrantBusy(item.id) + return call('social/decide-approval', { approvalId: item.id, decision }).then((result) => { + setGrantBusy('') + return loadApprovals().then(() => result) + }, e => { + setGrantBusy('') + setError(errorText(e)) + }) + } const askShareBack = item => call('social/ask-share-back', { botId: item.botId, to: item.from, noticeId: item.id }).then(applyStatus, e => setError(errorText(e))) useEffect(() => { loadApprovals() @@ -3275,6 +3293,7 @@ window.__ModuleLoader__.load({ return h('section', { className: 'fs bt-social', 'aria-label': 'Social' }, error ? h('div', { className: 'fs-status', 'data-tone': 'error', style: { padding: '4px 10px' } }, error) : null, h(AcceptNotices, { items: acceptNotices, onAsk: askShareBack, onDismiss: dismissAccept, locked }), + h(GrantRequests, { items: grantRequests, onDecide: decideGrant, busyId: grantBusy, locked }), h(ShareRequests, { items: shareRequests, actions, onDismiss: dismissShareRequest, locked }), h(FaceRooms, { actions, enabled: true, roster, remoteChats }), adding ? h(AddFriend, { actions, remoteChats, onChange: loadApprovals, onDone: () => setAdding(false) }) : null, @@ -3331,6 +3350,43 @@ window.__ModuleLoader__.load({ })) } + // A Bot Social grant_request waits for this owner. Approve / Reject call the same + // decide-approval path as a held message; the card lives in the Social section because it + // is not an outbound draft and has no chat to open. + function grantRequestSentence(item) { + const rawWho = String(item?.from || '').trim() + const who = rawWho || tr('A friend') + const cap = String(item?.capability || '').trim() + const text = String(item?.text || item?.summary || '').trim() + // The host may already have written the English fallback into `text`. Treat that + // as the generic sentence so a zh UI can translate it; a custom summary is kept. + // Named keys (not English templates) keep this comparison out of the copy scan (#3110). + const fill = (key, params) => key.replace(/\{(\w+)\}/g, (_, name) => String(params?.[name] ?? '')) + const genericEnglish = (name) => cap + ? fill('{name} requests {capability}', { name, capability: cap }) + : fill('{name} requests a share', { name }) + const isGeneric = text && [rawWho, 'A friend', who].some(name => name && text === genericEnglish(name)) + if (text && !isGeneric) return text + return cap + ? tr('{name} requests {capability}', { name: who, capability: cap }) + : tr('{name} requests a share', { name: who }) + } + function GrantRequests({ items, onDecide, busyId, error, locked = false } = {}) { + if (!Array.isArray(items) || items.length === 0) return null + return h('div', { className: 'fs-share-requests', 'data-flybot': 'grant-requests' }, + items.map((item) => h('div', { key: item.id, className: 'fs-card fs-share-request', role: 'status', 'data-flybot': 'grant-request' }, + h('div', { className: 'fs-hint', 'data-flybot': 'grant-request-text' }, grantRequestSentence(item)), + locked ? null : h('div', { className: 'fs-line' }, + h('button', { + type: 'button', className: 'fs-btn fs-btn-sm', 'data-flybot': 'grant-request-reject', + disabled: !!busyId, onClick: () => onDecide?.(item, 'reject'), + }, tr('Reject')), + h('button', { + type: 'button', className: 'fs-btn fs-btn-sm fs-btn-primary', 'data-flybot': 'grant-request-approve', + disabled: !!busyId, onClick: () => onDecide?.(item, 'approve'), + }, tr('Approve')))))) + } + // One invite control for Add friend and a Bot's Sharing (#499): one button makes the link and copies // it; then the link shows with the same Copy link / Copy with instructions / New link, and every copy // note names the Bot. A plain render helper without hooks: each caller keeps its own state. @@ -4262,6 +4318,7 @@ window.__ModuleLoader__.load({ AddFriend, AcceptNotices, FriendsBots, + GrantRequests, ShareRequests, PendingApprovals, ChatApproval, diff --git a/plugins/social/src/face-rooms.js b/plugins/social/src/face-rooms.js index dda0829d2..4ce046759 100644 --- a/plugins/social/src/face-rooms.js +++ b/plugins/social/src/face-rooms.js @@ -163,6 +163,7 @@ const FRIENDLY = { unauthorized: 'Bot Social signed you out. Reconnect in Friends\' Bots, or restart FlyBot.', forbidden: 'This Bot cannot join that room.', bot_revoked: 'This Bot is no longer available on Bot Social.', + bot_frozen: 'This Bot is stopped on Bot Social. Resume it, then try again.', bot_not_found: 'That Bot is not one of yours on Bot Social.', face_room_not_found: 'That room is not available.', room_full: 'This room already has 8 Bots. Nobody else can join with this number.', diff --git a/plugins/social/src/social.js b/plugins/social/src/social.js index f4a65ee61..07a85861d 100644 --- a/plugins/social/src/social.js +++ b/plugins/social/src/social.js @@ -117,7 +117,28 @@ export function approvalDraftText(value) { const body = human ? draftText(human.text) : raw return body.replace(/^(to (the )?face[ -]?room|to the room)\s*:\s*/i, '').trim() } -// Bot Social list_approvals card → the Friends' Bots queue (outbound drafts only). +// Capability / share requests from Bot Social (`grant_request`). The owner decides these +// in the Social section, not on an outbound-message dock card. +export function grantRequestOf(item) { + const grant = item?.grant_request + return grant && typeof grant === 'object' ? grant : undefined +} +export function grantRequestSentence(item) { + if (!item || (item.kind && item.kind !== 'grant_request')) return '' + const grant = grantRequestOf(item) + const from = grant?.from + const who = cleanText( + (from && (from.display_name || from.handle)) + || (typeof item.from === 'string' ? item.from : item.from?.display_name) + || item.sender_name + || '', + ) || 'A friend' + const cap = cleanText(grant?.capability || item.capability || '') + const summary = approvalDraftText(item.summary || item.text || '') + if (summary) return summary + return cap ? `${who} requests ${cap}` : `${who} requests a share` +} +// Bot Social list_approvals card → the Friends' Bots queue (outbound drafts) and, for grant_request, the Social section. const looksLikeBotId = (value) => /^bot_[a-z0-9]+$/i.test(String(value ?? '').trim()) // Why Bot Social held a send, as the DLP categories it named (`dlp.commitment` → `commitment`). The plain // "all outbound needs approval" reason is not a finding and is left out. Only known-shaped names pass: the card @@ -210,13 +231,18 @@ export function approvalView(item, { localName } = {}) { || item.sender_kind === 'human' || item.from_kind === 'human' const named = typeof localName === 'function' ? localName(item.bot_id) : '' + const grant = kind === 'grant_request' ? grantRequestOf(item) : undefined + const grantFrom = grant?.from const fromRaw = viaComposer ? 'You' : named + || (grantFrom && (grantFrom.display_name || grantFrom.handle)) || (typeof item.from === 'string' ? item.from : item.from?.display_name) || item.sender_name || item.bot?.display_name const from = viaComposer ? 'You' : (cleanText(fromRaw) || (looksLikeBotId(item.bot_id) ? 'Bot' : cleanText(item.bot_id))) + const capability = cleanText(grant?.capability || item.capability || '') + const grantText = kind === 'grant_request' ? grantRequestSentence(item) : '' return { id, kind, @@ -224,6 +250,7 @@ export function approvalView(item, { localName } = {}) { from, to: to?.handle ? norm(to.handle) : undefined, toName: cleanText(to?.display_name) || (kind === 'face_room_message' ? 'the room' : undefined), + ...(capability ? { capability } : {}), roomId: item.room_id || item.face_room_id || item.message?.room_id, // The Bot Social identity that wrote it (a local Bot is found by it), and why Bot Social held it (#371). ...(typeof item.bot_id === 'string' && item.bot_id ? { botId: item.bot_id } : {}), @@ -235,7 +262,7 @@ export function approvalView(item, { localName } = {}) { // `autoSendHold` beside it, which adds its own switch (#457); the outbound paths never do. blanketHold: holdIsBlanket(item), autoSendHold: holdAllowsFaceAutoSend(item), - text, + text: grantText || text, summary: cleanText(item.summary), createdAt: item.created_at, attachments: (item.message?.attachments ?? []).filter(file => file?.name).map(file => ({ name: safeName(file.name), size: Number(file.size) || 0 })), @@ -394,6 +421,41 @@ export function parseInviteInput(input) { // Neutral, not an error: re-accepting an invite for a Bot this home already has (#496). export const ALREADY_HAVE = "You already have this friend's Bot." +// Bot Social #776: a stopped Bot is bot_frozen (resumable); a removed one is bot_revoked. +// FlyBot API codes use the bot/ prefix so /api/bot keeps them (see channel.js). +export function mapStoppedOrRemovedBot(error, { frozen, revoked } = {}) { + const raw = String(error?.message ?? error ?? '').replace(/\s+/g, ' ').trim() + const blob = `${raw} ${error?.code ?? ''}` + if (/bot_frozen|bot is frozen/i.test(blob)) { + return Object.assign(new Error(frozen), { code: 'bot/frozen' }) + } + if (/bot_revoked|bot identity was revoked|bot in this relationship was revoked/i.test(blob)) { + return Object.assign(new Error(revoked), { code: 'bot/revoked' }) + } + return undefined +} + +// Auto-send / auto-approve (#3110): when the silent decide_approval path fails, the dock +// shows these sentences on the waiting card. Transient errors are left off so a later poll +// can retry an owner-typed line without flashing a card (#227). +export const AUTO_APPROVE_FROZEN = 'Auto-send could not finish: one of the Bots on this line is stopped on Bot Social. Resume it, then approve again.' +export const AUTO_APPROVE_REVOKED = 'Auto-send could not finish: one of the Bots on this line was removed from Bot Social, so it cannot be approved.' +export const AUTO_APPROVE_CANCELLED = 'This approval was cancelled, so Auto-send could not send the line.' +export const AUTO_APPROVE_FAILED = 'Auto-send could not send this line. It is waiting for your approval.' + +export function mapAutoApproveError(error, { allowGeneric = false } = {}) { + const mapped = mapStoppedOrRemovedBot(error, { frozen: AUTO_APPROVE_FROZEN, revoked: AUTO_APPROVE_REVOKED }) + if (mapped) return mapped + const blob = `${String(error?.message ?? error ?? '')} ${error?.code ?? ''}` + if (/invalid_state|approval is cancelled|\bcancelled\b/i.test(blob)) { + return Object.assign(new Error(AUTO_APPROVE_CANCELLED), { code: 'invalid_state' }) + } + if (!allowGeneric) return undefined + const raw = String(error?.message ?? error ?? '').replace(/\s+/g, ' ').trim() + if (!raw) return undefined + return Object.assign(new Error(AUTO_APPROVE_FAILED), { code: 'bot/auto-approve-failed' }) +} + export function mapJoinInviteError(error, { foreignHost } = {}) { const msg = String(error?.message ?? error ?? '') const code = String(error?.code ?? '') @@ -434,9 +496,55 @@ export function mapJoinInviteError(error, { foreignHost } = {}) { if (/rate_limited/i.test(blob)) { return Object.assign(new Error('Too many tries. Wait a moment and try again.'), { code: 'rate_limited' }) } + const availability = mapStoppedOrRemovedBot(error, { + frozen: 'The Bot this invite names is stopped. Ask its owner to resume it; the same link will work again then.', + revoked: 'The Bot this invite names was removed. Ask its owner for a new invite to one of their Bots.', + }) + if (availability) return availability return error } +// Share-with-friend refusals from Bot Social, as plain next-step sentences. +// A stopped Bot (#776 on Birfy/bot-social) is bot_frozen and can be resumed; a removed +// one is bot_revoked. Neither should fall through to "Try again". +export function mapShareFriendError(error) { + const raw = String(error?.message ?? error ?? '').replace(/\s+/g, ' ').trim() + const blob = `${raw} ${error?.code ?? ''}` + if (error?.unavailable || /unavailable/i.test(blob)) { + return Object.assign(new Error('Bot Social needs an update to share with a friend. Invite links still work.'), { code: 'unavailable' }) + } + const availability = mapStoppedOrRemovedBot(error, { + frozen: 'One of the Bots in this share is stopped on Bot Social. Resume it, then share again.', + revoked: 'One of the Bots in this share was removed from Bot Social, so it cannot be shared.', + }) + if (availability) return availability + if (/not_friends|no_relationship|no active relationship|not friends/i.test(blob)) { + return new Error('You are not friends with them yet. Add them from + Add friend.') + } + if (/already_granted|idempotent|unchanged/i.test(blob)) { + return null + } + if (/bot_not_found|not your bot/i.test(blob)) { + return new Error('Choose one of your Bots to share.') + } + if (/friend_not_found|no such friend|unknown friend/i.test(blob)) { + return new Error('That friend is not on this server.') + } + if (/not connected|no token|no server URL/i.test(blob)) { + return new Error('Bot Social is disconnected. Reconnect under Settings → Bot Social.') + } + // The server has the tool but refused our arguments (an older or newer contract, #592): a plain + // line, never the raw JSON-RPC validation text. + if (/(invalid input|invalid arguments|expected string|received undefined|-32602)/i.test(blob) && !/not found|no such tool|unknown tool/i.test(blob)) { + return new Error('Bot Social did not accept that share request. Its server may need an update; invite links still work.') + } + const body = raw.replace(/^Bot Social\s+\S+:\s*/i, '').trim() + if (/^(MCP error|JSON-RPC|error:)/i.test(body) || /^-?\d+ /.test(body)) { + return new Error('Could not share with that friend. Try again, or use an invite link.') + } + return new Error(body || 'Could not share with that friend. Try again.') +} + export const startFailureReason = (error) => String(error?.message ?? error ?? 'the plugin did not start').replace(/\s+/g, ' ').trim() || 'the plugin did not start' export function unavailableMessage(reason) { @@ -2075,7 +2183,10 @@ export function createSocial(service, config = {}, { client: given, api: givenAp rememberOwnLine(approvalId) pendingCache.at = 0 await confirmedCall('decide_approval', { approval_id: approvalId, decision: 'approved' }) - .catch(error => warn('direct-chat owner line not approved yet; the next poll retries', error)) + .catch(error => { + noteAutoApproveFailure(approvalId, error, { releaseOwn: true }) + warn('direct-chat owner line not approved yet; the next poll retries', error) + }) } // The room's own envelope clears Bot Social's blanket hold by itself (#847): the click on "Add @@ -2103,6 +2214,7 @@ export function createSocial(service, config = {}, { client: given, api: givenAp await confirmedCall('decide_approval', { approval_id: approvalId, decision: 'approved' }) return true } catch (error) { + noteAutoApproveFailure(approvalId, error, { allowGeneric: true }) warn('room envelope hold not cleared; it waits on its card', error) return false } @@ -2133,6 +2245,7 @@ export function createSocial(service, config = {}, { client: given, api: givenAp // cache to begin with (#766). return true } catch (error) { + noteAutoApproveFailure(approvalId, error, { allowGeneric: true }) warn('Auto-send did not approve the Bot Social hold; the line waits on its card', error) return false } @@ -2830,7 +2943,8 @@ export function createSocial(service, config = {}, { client: given, api: givenAp handle: activeMember(bot.id)?.handle ? norm(activeMember(bot.id).handle) : undefined, })) : [], pendingApprovals: approvals.length, - approvals, + approvals: approvals.filter(item => item.kind !== 'grant_request'), + grantRequests: approvals.filter(item => item.kind === 'grant_request'), autoApproveFaceRooms, // Each Bot's face-room Auto-send (#457). faceAutoSend: Object.fromEntries(flybot.bot.list().map(bot => [bot.id, autoApproveFaceRooms || faceAutoOf(bot.id)])), @@ -3011,8 +3125,15 @@ export function createSocial(service, config = {}, { client: given, api: givenAp // reaching this point again (Codex P2 on #387). let status = joined.status if (joined.awaiting === 'your_owner_approval' && joined.approval_id) { - await confirmedCall('decide_approval', { approval_id: joined.approval_id, decision: 'approved' }) - status = 'pending_target' + try { + await confirmedCall('decide_approval', { approval_id: joined.approval_id, decision: 'approved' }) + status = 'pending_target' + } catch (error) { + throw mapStoppedOrRemovedBot(error, { + frozen: 'One of the Bots on this invite is stopped on Bot Social. Resume it, then try the invite again.', + revoked: 'One of the Bots on this invite was removed from Bot Social, so the invite cannot be completed.', + }) ?? error + } } if (offeredHandle) unhideDeclined([offeredHandle]) const unhide = revealHiddenIfPresent(settings, offeredHandle ? [offeredHandle] : []) @@ -3059,7 +3180,15 @@ export function createSocial(service, config = {}, { client: given, api: givenAp warn('could not load pending request for respond', error) } } - const result = await confirmedCall('respond_friend_request', { relationship_id: rid, decision, ...(decision === 'accept' ? { grant_capabilities: ['chat.public'] } : {}) }) + let result + try { + result = await confirmedCall('respond_friend_request', { relationship_id: rid, decision, ...(decision === 'accept' ? { grant_capabilities: ['chat.public'] } : {}) }) + } catch (error) { + throw mapStoppedOrRemovedBot(error, { + frozen: 'One of the Bots in this request is stopped on Bot Social. Resume it, then accept again.', + revoked: 'One of the Bots in this request was removed from Bot Social, so it cannot be accepted.', + }) ?? error + } if (decision === 'accept') { const before = new Set(listedRemoteBots().map(bot => bot.handle)) const roster = await remoteBots({ fresh: true }).catch(() => remote) @@ -3315,39 +3444,6 @@ export function createSocial(service, config = {}, { client: given, api: givenAp } disposers.push(flybot.api.handle('social/share-friends', async ({ botId } = {}) => shareFriendsForBot(botId), { read: true })) - function mapShareFriendError(error) { - const raw = String(error?.message ?? error ?? '').replace(/\s+/g, ' ').trim() - const blob = `${raw} ${error?.code ?? ''}` - if (error?.unavailable || /unavailable/i.test(blob)) { - return Object.assign(new Error('Bot Social needs an update to share with a friend. Invite links still work.'), { code: 'unavailable' }) - } - if (/not_friends|no_relationship|no active relationship|not friends/i.test(blob)) { - return new Error('You are not friends with them yet. Add them from + Add friend.') - } - if (/already_granted|idempotent|unchanged/i.test(blob)) { - return null - } - if (/bot_not_found|not your bot/i.test(blob)) { - return new Error('Choose one of your Bots to share.') - } - if (/friend_not_found|no such friend|unknown friend/i.test(blob)) { - return new Error('That friend is not on this server.') - } - if (/not connected|no token|no server URL/i.test(blob)) { - return new Error('Bot Social is disconnected. Reconnect under Settings → Bot Social.') - } - // The server has the tool but refused our arguments (an older or newer contract, #592): a plain - // line, never the raw JSON-RPC validation text. - if (/(invalid input|invalid arguments|expected string|received undefined|-32602)/i.test(blob) && !/not found|no such tool|unknown tool/i.test(blob)) { - return new Error('Bot Social did not accept that share request. Its server may need an update; invite links still work.') - } - const body = raw.replace(/^Bot Social\s+\S+:\s*/i, '').trim() - if (/^(MCP error|JSON-RPC|error:)/i.test(body) || /^-?\d+ /.test(body)) { - return new Error('Could not share with that friend. Try again, or use an invite link.') - } - return new Error(body || 'Could not share with that friend. Try again.') - } - // #500: grant this Bot to an existing friend (Bot Social grant_bot_to_friend). Does not // replace invite links. After a successful share, People with access re-syncs this Bot. disposers.push(flybot.api.handle('social/share-with-friend', async ({ botId, home: friendHome, ownerId, friendOwnerId, friendBotId, peerBotId, friendName, friendHandle } = {}) => { @@ -3550,6 +3646,8 @@ export function createSocial(service, config = {}, { client: given, api: givenAp if (settings.approvalNotices[item.id]) continue // The owner of a held room line sees its Approve card, never "waiting for the owner" (#179). if (item.kind === 'face_room_message') { settings.approvalNotices[item.id] = { at: now(), kind: 'waiting' }; changed = true; continue } + // grant_request is decided in the Social section; it has no 1:1 chat to post into. + if (item.kind === 'grant_request') { settings.approvalNotices[item.id] = { at: now(), kind: 'waiting' }; changed = true; continue } // Owner 1:1 chats use the Approve / Reject dock. Do not post a waiting bubble there (#140). await postChatNote(item, WAITING_OTHERS, { chats: false }) settings.approvalNotices[item.id] = { at: now(), kind: 'waiting' } @@ -3560,7 +3658,7 @@ export function createSocial(service, config = {}, { client: given, api: givenAp async function postRejectNote(approvalId) { const item = pendingCache.items.find(entry => entry.id === approvalId) // A rejected room line already reads "Not sent" where it would have stood (#456): no second note. - if (!item || item.kind === 'face_room_message') return + if (!item || item.kind === 'face_room_message' || item.kind === 'grant_request') return await postChatNote(item, REJECT_NOTE) settings.approvalNotices ??= {} settings.approvalNotices[approvalId] = { at: now(), kind: 'rejected' } @@ -3594,6 +3692,45 @@ export function createSocial(service, config = {}, { client: given, api: givenAp if (keys.length > 200) for (const key of keys.sort((a, b) => map[a] - map[b]).slice(0, keys.length - 200)) delete map[key] saveSettings() } + const autoApproveNotices = () => (settings.autoApproveNotices ??= {}) + function attachAutoApproveNotice(item) { + const note = autoApproveNotices()[item?.id] + return note?.message ? { ...item, autoApproveError: note.message, autoApproveCode: note.code } : item + } + function pruneAutoApproveNotices(ids) { + const map = settings.autoApproveNotices + if (!map) return + const live = new Set((ids ?? []).map(String)) + let changed = false + for (const id of Object.keys(map)) { + if (live.has(id)) continue + delete map[id] + changed = true + } + if (changed) saveSettings() + } + // #3110: put a human sentence on the waiting card when Auto-send or a silent approve fails. + // Releasing an owner-typed line (frozen / revoked) lets the dock show it instead of retrying forever. + function noteAutoApproveFailure(approvalId, error, { releaseOwn = false, allowGeneric = false } = {}) { + const mapped = mapAutoApproveError(error, { allowGeneric }) + if (!approvalId || !mapped) return mapped + const id = String(approvalId) + const map = autoApproveNotices() + map[id] = { at: now(), message: mapped.message, code: mapped.code } + const keys = Object.keys(map) + if (keys.length > 50) { + for (const key of keys.sort((a, b) => map[a].at - map[b].at).slice(0, keys.length - 50)) delete map[key] + } + if (releaseOwn && (mapped.code === 'bot/frozen' || mapped.code === 'bot/revoked')) { + const own = ownLineIds() + if (own[id]) delete own[id] + } + saveSettings() + if (pendingCache.items.some(item => item.id === id)) { + setPending(pendingCache.items.map(item => (item.id === id ? attachAutoApproveNotice(item) : item))) + } + return mapped + } // The room a held room line belongs to (#188). Bot Social's approval card may not name it, so // the send path records it; a hold with no known room is legacy and stays out of every room. const holdRooms = () => (settings.holdRooms ??= {}) @@ -3642,6 +3779,7 @@ export function createSocial(service, config = {}, { client: given, api: givenAp try { await confirmedCall('decide_approval', { approval_id: item.id, decision: 'approved' }) } catch (error) { + noteAutoApproveFailure(item.id, error, { releaseOwn: true }) warn('face-room owner line not approved', error) } finally { setTimeout(() => ownLineApproving.delete(item.id), 30_000).unref?.() @@ -3678,6 +3816,7 @@ export function createSocial(service, config = {}, { client: given, api: givenAp await confirmedCall('decide_approval', { approval_id: id, decision: 'approved' }) cleared.add(id) } catch (error) { + noteAutoApproveFailure(id, error, { allowGeneric: true }) warn('room line held as policy not cleared; it waits on its card', error) } finally { roomPolicyClearing.delete(id) @@ -3695,7 +3834,7 @@ export function createSocial(service, config = {}, { client: given, api: givenAp const items = raw .filter(item => !cleared.has(String(item?.approval_id ?? item?.id ?? ''))) .map(item => approvalView(item, { localName: localNameOf })) - .filter(item => item && (item.kind === 'outbound_message' || item.kind === 'face_room_message') && (item.status === 'pending' || item.status === 'pending_approval')) + .filter(item => item && (item.kind === 'outbound_message' || item.kind === 'face_room_message' || item.kind === 'grant_request') && (item.status === 'pending' || item.status === 'pending_approval')) // A local Bot's own send shows in its chat when the friend's chat is hidden or gone, so a hold is never // without a place (#371). The Bot is found by its Bot Social identity, never by a name. .map(item => { @@ -3709,8 +3848,9 @@ export function createSocial(service, config = {}, { client: given, api: givenAp // says which room it is; `toName` stays the plain string the two renderers already print. .map(item => (item.kind === 'face_room_message' && item.roomId ? { ...item, toName: holdRoomName(item.roomId) ?? item.toName } : item)) .filter(item => item.kind !== 'face_room_message' || (ownLineIds()[item.id] || (item.roomId && faceHoldLive(item.roomId)))) - const own = items.filter(item => ownLineIds()[item.id]) - const held = items.filter(item => !ownLineIds()[item.id]) + const own = items.filter(item => item.kind !== 'grant_request' && ownLineIds()[item.id]) + const held = items.filter(item => item.kind === 'grant_request' || !ownLineIds()[item.id]).map(attachAutoApproveNotice) + pruneAutoApproveNotices([...held, ...own].map(item => item.id)) setPending(held) for (const item of own) void approveOwnLine(item) await syncApprovalNotices(held).catch(error => warn('approval notice failed', error)) @@ -3857,7 +3997,15 @@ export function createSocial(service, config = {}, { client: given, api: givenAp : undefined const item = Array.isArray(pending) ? pending.find(entry => entry.id === id) : undefined if (mapped === 'rejected') await postRejectNote(id) - const result = await confirmedCall('decide_approval', { approval_id: id, decision: mapped }) + let result + try { + result = await confirmedCall('decide_approval', { approval_id: id, decision: mapped }) + } catch (error) { + throw mapStoppedOrRemovedBot(error, { + frozen: 'One of the Bots on this approval is stopped on Bot Social. Resume it, then approve again.', + revoked: 'One of the Bots on this approval was removed from Bot Social, so it cannot be approved.', + }) ?? error + } // A held face-room line follows the click: a bubble once approved, a grey "Not sent" line once rejected (#456). flybot.rooms?.settleHeld?.(id, mapped) // The decided hold leaves the badge now; the rest stay until the next fetch (#226). @@ -3880,6 +4028,7 @@ export function createSocial(service, config = {}, { client: given, api: givenAp if (room?.sharedFrom?.invitedHandle) handles.add(norm(room.sharedFrom.invitedHandle)) const faceId = room?.face?.roomId return pendingCache.items.filter((item) => { + if (item.kind === 'grant_request') return false if (item.kind === 'face_room_message') { return Boolean(item.roomId) && (item.roomId === faceId || item.roomId === room.id) } @@ -3894,7 +4043,7 @@ export function createSocial(service, config = {}, { client: given, api: givenAp // A local Bot's own held sends wait on its row too, so a hold to a hidden friend chat still shows a dot (#371). if (!handle) return bot && !bot.remote ? pendingCache.items.filter(item => item.kind === 'outbound_message' && !item.roomId && item.fromId === bot.id) : [] return pendingCache.items.filter((item) => { - if (item.kind === 'face_room_message' || item.roomId) return false + if (item.kind === 'grant_request' || item.kind === 'face_room_message' || item.roomId) return false return norm(item.to) === handle || norm(item.from) === handle }) }) @@ -4613,7 +4762,10 @@ export function createSocial(service, config = {}, { client: given, api: givenAp if (outbound.human && sent.approvalId) { rememberOwnLine(sent.approvalId) await confirmedCall('decide_approval', { approval_id: sent.approvalId, decision: 'approved' }) - .catch(error => warn('face-room owner line not approved', error)) + .catch(error => { + noteAutoApproveFailure(sent.approvalId, error, { releaseOwn: true }) + warn('face-room owner line not approved', error) + }) } pendingCache.at = 0 // A Bot whose Auto-send is on (#457): its clean line goes out now, approved by the owner's switch. @@ -4641,6 +4793,7 @@ export function createSocial(service, config = {}, { client: given, api: givenAp pendingCache.at = 0 return true } catch (error) { + noteAutoApproveFailure(approvalId, error, { allowGeneric: true }) warn('face-room Auto-send did not approve the line', error) return false } diff --git a/plugins/social/test/face-rooms.test.js b/plugins/social/test/face-rooms.test.js index 21900ce7d..c24b5430e 100644 --- a/plugins/social/test/face-rooms.test.js +++ b/plugins/social/test/face-rooms.test.js @@ -74,6 +74,7 @@ test('error mapping covers the FACE_ROOMS.md codes', () => { assert.equal(mapFaceError({ error: { code: 'dlp_blocked' } }, 422).message, 'That message was blocked and was not sent.') assert.equal(mapFaceError({ error: { code: 'bot_not_found' } }, 404).message, 'That Bot is not one of yours on Bot Social.') assert.equal(mapFaceError({ error: { code: 'bot_revoked' } }, 403).message, 'This Bot is no longer available on Bot Social.') + assert.equal(mapFaceError({ error: { code: 'bot_frozen' } }, 403).message, 'This Bot is stopped on Bot Social. Resume it, then try again.') assert.equal(mapFaceError({ error: { code: 'forbidden' } }, 403).message, 'This Bot cannot join that room.') assert.equal(mapFaceError({ error: { code: 'unauthorized' } }, 401).message, 'Bot Social signed you out. Reconnect in Friends\' Bots, or restart FlyBot.') const limited = mapFaceError({ error: { code: 'rate_limited', retry_after: 45, scope: 'ip' } }, 429) diff --git a/plugins/social/test/social.test.js b/plugins/social/test/social.test.js index 8e0db2ca8..dc32a9702 100644 --- a/plugins/social/test/social.test.js +++ b/plugins/social/test/social.test.js @@ -8,7 +8,7 @@ import { test } from 'node:test' import { apply as applyDsBot } from 'ds-bot' import { fakeContext } from './fake-ctx.js' import { apply as applySocial, inject, name } from '../index.js' -import { approvalDraftText, approvalView, createSocial, draftText, holdAllowsFaceAutoSend, holdIsBlanket, homeHandleOf, isTurnFailureNotice, onboard, onboardHome, nextOnboardDisplayName, mapJoinInviteError, parseInviteInput, inviteLink, registerUnavailable, startSocial, TURN_FAILURE_NOTICES, unavailableMessage } from '../src/social.js' +import { approvalDraftText, approvalView, AUTO_APPROVE_CANCELLED, AUTO_APPROVE_FAILED, AUTO_APPROVE_FROZEN, AUTO_APPROVE_REVOKED, createSocial, draftText, grantRequestSentence, holdAllowsFaceAutoSend, holdIsBlanket, homeHandleOf, isTurnFailureNotice, onboard, onboardHome, nextOnboardDisplayName, mapAutoApproveError, mapJoinInviteError, mapShareFriendError, parseInviteInput, inviteLink, registerUnavailable, startSocial, TURN_FAILURE_NOTICES, unavailableMessage } from '../src/social.js' import { createMcpClient, createSocialApi, untrustedText, mapPool, socialHttpAgent, fetchOptions, grantPersonView, memberHandleOf, personHomeOf, normalizeGrant, isUnknownTool, isGrantNotFound, isMissingEndpoint } from '../src/mcp-client.js' import { lookFromServer, lookToServer, lookFingerprint, hexOfColor, shownLook, defaultShapeOf, defaultColorOf, DEFAULT_SHAPES as LOOK_DEFAULT_SHAPES, DEFAULT_COLORS as LOOK_DEFAULT_COLORS } from '../src/look.js' import { encodeRoomShare } from '../../../core/src/shared/room-share.js' @@ -39,6 +39,8 @@ function mockServer({ token = 'owner-token', friends = true } = {}) { if (a.code === 'USED') throw Object.assign(new Error('Bot Social join_invite: invite is used'), { code: 'invite_used' }) if (a.code === 'UNAVAIL') throw Object.assign(new Error('Bot Social join_invite: invite_unavailable'), { code: 'invite_unavailable' }) if (a.code === 'EXISTS') throw Object.assign(new Error('Bot Social join_invite: relationship_exists'), { code: 'relationship_exists', peer: { handle: '@bob.home', display_name: 'Bob' }, bot: { handle: '@coder.bob.home', display_name: 'Coder' } }) + if (a.code === 'FROZEN') throw Object.assign(new Error('Bot Social join_invite: bot is frozen (emergency stop)'), { code: 'bot_frozen' }) + if (a.code === 'REVOKEDBOT') throw Object.assign(new Error('Bot Social join_invite: this bot identity was revoked'), { code: 'bot_revoked' }) if (a.code === 'REGRANT') return { relationship_id: 'r1', status: 'active', regranted: true, inviter: { handle: 'bob.home', display_name: 'Bob' }, bot: { handle: '@coder.bob.home', display_name: 'Coder' } } return a.code === 'NEEDSOK' ? { relationship_id: 'r9', status: 'pending_requester_owner', awaiting: 'your_owner_approval', approval_id: 'apr9', inviter: { handle: 'eve.home', display_name: 'Eve' }, bot: { handle: '@helper.eve.home', display_name: 'Helper' } } @@ -1430,6 +1432,95 @@ test('#227: an owner line whose approve call failed is finished by the poll, nev await waitUntil(() => server.queue.length === 0) }) +test('#3110: Auto-send that fails because a Bot is stopped leaves a waiting card with plain words', async (t) => { + const { ctx, call, tool, stop } = await team() + t.after(stop) + const server = holdingServer() + const decide = server.tools.decide_approval + server.tools.decide_approval = () => { + throw Object.assign(new Error('Bot Social decide_approval: a Bot in this relationship is frozen (emergency stop)'), { code: 'bot_frozen' }) + } + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + await grantTeam(ctx.flybot) + await social.registerAll() + const chief = ctx.flybot.bot.list().find(bot => bot.name === 'Chief') + await call('flybot/social/auto-send', { botId: chief.id, home: '@bob.home', on: true }) + await tool('message_friend_bot', { to: '@coder.bob.home', message: 'goes now' }, chief.id) + const status = (await call('flybot/social/status', {})).value + assert.equal(status.pendingApprovals, 1) + const card = status.approvals[0] + assert.equal(card.status, 'pending') + assert.equal(card.autoApproveError, AUTO_APPROVE_FROZEN) + assert.equal(card.autoApproveCode, 'bot/frozen') + assert.doesNotMatch(String(card.autoApproveError), /bot_frozen|decide_approval/) + assert.equal(card.error, undefined, 'this is still a waiting card, not a failed send') + const again = (await call('flybot/social/status', {})).value + assert.equal(again.approvals[0].autoApproveError, AUTO_APPROVE_FROZEN, 'the sentence stays until the card leaves') + server.tools.decide_approval = decide + const decided = (await call('flybot/social/decide-approval', { approvalId: card.id, decision: 'approve' })).value + assert.equal(decided.status, 'approved') + const after = (await call('flybot/social/status', {})).value + assert.equal(after.pendingApprovals, 0) + assert.equal((after.approvals ?? []).some(item => item.autoApproveError), false) +}) + +test('#3110: an owner-typed line whose silent approve hits a stopped Bot becomes a card with plain words', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = holdingServer() + server.tools.decide_approval = () => { + throw Object.assign(new Error('Bot Social decide_approval: a Bot in this relationship is frozen (emergency stop)'), { code: 'bot_frozen' }) + } + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + await grantTeam(ctx.flybot) + await social.registerAll() + assert.equal(await social.sendChat({ handle: '@coder.bob.home', text: 'hi' }), '') + const status = (await call('flybot/social/status', {})).value + assert.equal(status.pendingApprovals, 1, 'the line is no longer hidden as an owner auto-retry') + assert.equal(status.approvals[0].status, 'pending') + assert.equal(status.approvals[0].autoApproveError, AUTO_APPROVE_FROZEN) + assert.doesNotMatch(String(status.approvals[0].autoApproveError), /bot_frozen|decide_approval/) +}) + +test('#3110: a hold not listed yet is not shown as an Auto-send failure', async (t) => { + const { ctx, call, tool, stop } = await team() + t.after(stop) + const server = holdingServer() + let listed = false + server.tools.list_approvals = () => ({ approvals: listed ? server.queue : [] }) + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + await grantTeam(ctx.flybot) + await social.registerAll() + const chief = ctx.flybot.bot.list().find(bot => bot.name === 'Chief') + await call('flybot/social/auto-send', { botId: chief.id, home: '@bob.home', on: true }) + await tool('message_friend_bot', { to: '@coder.bob.home', message: 'goes now' }, chief.id) + listed = true + const status = (await call('flybot/social/status', {})).value + assert.equal(status.pendingApprovals, 1) + assert.equal(status.approvals[0].autoApproveError, undefined) +}) + +test('#3110: joining an invite that needs this owner is worded when the silent approve hits a stopped Bot', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = mockServer() + server.tools.decide_approval = () => { + throw Object.assign(new Error('Bot Social decide_approval: a Bot in this relationship is frozen (emergency stop)'), { code: 'bot_frozen' }) + } + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + await grantTeam(ctx.flybot) + await social.registerAll() + const result = await call('flybot/social/join-invite', { code: 'NEEDSOK' }) + assert.equal(result.ok, false) + assert.equal(result.error?.code, 'bot/frozen') + assert.match(String(result.error?.message || result.error), /stopped on Bot Social\. Resume it, then try the invite again/) + assert.doesNotMatch(String(result.error?.message || result.error), /bot_frozen|decide_approval|Try again/) +}) + test('#847: a room envelope clears Bot Social\'s blanket hold: the add click is the consent', async (t) => { const { ctx, call, stop } = await team() t.after(stop) @@ -1807,6 +1898,185 @@ test('decide-approval (#69): owner click approves or rejects via Bot Social', as assert.equal(server.calls.some(c => c.name === 'set_auto_approve'), false) }) +// After Bot Social #776, approving a card that waited while a Bot was stopped or removed +// is refused and the card stays pending. FlyBot must say what to do next, not a raw +// tool line or "try again", and must not drop the card as if the decision went through. +// grant_request is listed in social/status.grantRequests (and in the pending count), +// not in the outbound-message dock (`approvals`). It is decided through decide-approval. +const heldGrantRequest = { + approval_id: 'apr-grant-1', + kind: 'grant_request', + status: 'pending', + summary: 'Share Chief with EveHome', + bot_id: 'm1', +} + +test('decide-approval: a late approve after a Bot is stopped keeps the card and says to resume', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = mockServer() + let queue = [{ ...heldOutbound }] + server.tools.list_approvals = () => ({ approvals: queue }) + server.tools.decide_approval = a => { + if (a.confirm_code === undefined) return { status: 'confirmation_required', confirm_code: 'C0DE02' } + throw Object.assign(new Error('Bot Social decide_approval: a Bot in this relationship is frozen (emergency stop)'), { code: 'bot_frozen' }) + } + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + await grantTeam(ctx.flybot) + await social.registerAll() + assert.equal((await call('flybot/social/status', {})).value.pendingApprovals, 1) + const result = await call('flybot/social/decide-approval', { approvalId: 'apr-hold-1', decision: 'approve' }) + assert.equal(result.ok, false, 'the click is refused, not reported as approved') + assert.match(String(result.error?.message || result.error), /stopped on Bot Social\. Resume it, then approve again/) + assert.doesNotMatch(String(result.error?.message || result.error), /Try again|decide_approval|bot_frozen/) + assert.equal(result.error?.code, 'bot/frozen') + assert.equal(queue.length, 1, 'Bot Social still holds the card') + assert.equal((await call('flybot/social/status', {})).value.pendingApprovals, 1, 'the dock still lists the card') + assert.deepEqual(server.calls.filter(c => c.name === 'decide_approval').map(c => c.args.confirm_code), [undefined, 'C0DE02'], 'the confirm handshake ran, then the server refused') +}) + +test('decide-approval: a late approve after a Bot is removed keeps the card and does not invite a retry', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = mockServer() + let queue = [{ ...heldOutbound, approval_id: 'apr-hold-2' }] + server.tools.list_approvals = () => ({ approvals: queue }) + server.tools.decide_approval = a => { + if (a.confirm_code === undefined) return { status: 'confirmation_required', confirm_code: 'C0DE02' } + throw Object.assign(new Error('Bot Social decide_approval: this bot identity was revoked'), { code: 'bot_revoked' }) + } + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + await grantTeam(ctx.flybot) + await social.registerAll() + const result = await call('flybot/social/decide-approval', { approvalId: 'apr-hold-2', decision: 'approve' }) + assert.equal(result.ok, false) + assert.match(String(result.error?.message || result.error), /removed from Bot Social, so it cannot be approved/) + assert.doesNotMatch(String(result.error?.message || result.error), /Try again|bot_revoked/) + assert.equal(result.error?.code, 'bot/revoked') + assert.equal((await call('flybot/social/status', {})).value.pendingApprovals, 1) +}) + +test('grant_request is listed for the owner in the Social section, not on the message dock', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = mockServer() + server.tools.list_approvals = () => ({ approvals: [heldGrantRequest] }) + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + await grantTeam(ctx.flybot) + await social.registerAll() + const status = (await call('flybot/social/status', {})).value + assert.equal(status.pendingApprovals, 1, 'the waiting count includes the grant request') + assert.equal((status.approvals ?? []).length, 0, 'the outbound-message dock does not list it') + assert.equal(status.grantRequests?.length, 1) + assert.equal(status.grantRequests[0].id, 'apr-grant-1') + assert.equal(status.grantRequests[0].kind, 'grant_request') + assert.match(status.grantRequests[0].text, /Share Chief with EveHome/) +}) + +test('decide-approval: a late grant_request card is named in plain words and stays in the Social list', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = mockServer() + server.tools.list_approvals = () => ({ approvals: [heldGrantRequest] }) + server.tools.decide_approval = a => { + if (a.confirm_code === undefined) return { status: 'confirmation_required', confirm_code: 'C0DE02' } + throw Object.assign(new Error('Bot Social decide_approval: a Bot in this relationship is frozen (emergency stop)'), { code: 'bot_frozen' }) + } + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + await grantTeam(ctx.flybot) + await social.registerAll() + const status = (await call('flybot/social/status', {})).value + assert.equal(status.pendingApprovals, 1) + assert.equal(status.grantRequests?.length, 1) + const result = await call('flybot/social/decide-approval', { approvalId: 'apr-grant-1', decision: 'approve' }) + assert.equal(result.ok, false) + assert.equal(result.error?.code, 'bot/frozen') + assert.match(String(result.error?.message || result.error), /stopped on Bot Social\. Resume it, then approve again/) + const after = (await call('flybot/social/status', {})).value + assert.equal(after.pendingApprovals, 1, 'the refused card stays until Bot Social drops it') + assert.equal(after.grantRequests?.length, 1) +}) + +test('decide-approval: approving a grant_request clears it from the Social list', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = mockServer() + let queue = [{ ...heldGrantRequest }] + server.tools.list_approvals = () => ({ approvals: queue }) + server.tools.decide_approval = a => { + if (a.confirm_code === undefined) return { status: 'confirmation_required', confirm_code: 'C0DE02' } + queue = [] + return { approval_id: a.approval_id, decision: a.decision, status: a.decision } + } + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + await grantTeam(ctx.flybot) + await social.registerAll() + const result = await call('flybot/social/decide-approval', { approvalId: 'apr-grant-1', decision: 'approve' }) + assert.equal(result.ok, true) + const status = (await call('flybot/social/status', {})).value + assert.equal(status.pendingApprovals, 0) + assert.deepEqual(status.grantRequests, []) +}) + +test('grantRequestSentence prefers the server summary and otherwise names the requester and capability', () => { + assert.equal(grantRequestSentence({ kind: 'grant_request', summary: 'Share Chief with EveHome' }), 'Share Chief with EveHome') + const card = { + kind: 'grant_request', + grant_request: { capability: 'chat.public', from: { display_name: 'Helper', handle: '@helper.eve.home' } }, + } + assert.equal(grantRequestSentence(card), 'Helper requests chat.public') + const viewed = approvalView({ + approval_id: 'apr-g', + kind: 'grant_request', + status: 'pending', + grant_request: { capability: 'chat.public', from: { display_name: 'Helper' } }, + }) + assert.equal(viewed.kind, 'grant_request') + assert.equal(viewed.capability, 'chat.public') + assert.equal(viewed.from, 'Helper') + assert.equal(viewed.text, 'Helper requests chat.public') + assert.equal(grantRequestSentence({ kind: 'outbound_message', summary: 'hello' }), '') +}) + +test('respond: accepting a request after a Bot is stopped says to resume, and does not mark the request accepted', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = mockServer() + server.tools.respond_friend_request = a => { + if (a.confirm_code === undefined) return { status: 'confirmation_required', confirm_code: 'C0DE01' } + throw Object.assign(new Error('Bot Social respond_friend_request: a Bot in this relationship is frozen (emergency stop)'), { code: 'bot_frozen' }) + } + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + const result = await call('flybot/social/respond', { relationshipId: 'r5', decision: 'accept' }) + assert.equal(result.ok, false) + assert.match(String(result.error?.message || result.error), /stopped on Bot Social\. Resume it, then accept again/) + assert.doesNotMatch(String(result.error?.message || result.error), /Try again|respond_friend_request|bot_frozen/) + assert.equal(result.error?.code, 'bot/frozen') +}) + +test('respond: accepting a request after a Bot is removed says so, and does not mark the request accepted', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = mockServer() + server.tools.respond_friend_request = a => { + if (a.confirm_code === undefined) return { status: 'confirmation_required', confirm_code: 'C0DE01' } + throw Object.assign(new Error('Bot Social respond_friend_request: this bot identity was revoked'), { code: 'bot_revoked' }) + } + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + const result = await call('flybot/social/respond', { relationshipId: 'r5', decision: 'accept' }) + assert.equal(result.ok, false) + assert.match(String(result.error?.message || result.error), /removed from Bot Social, so it cannot be accepted/) + assert.doesNotMatch(String(result.error?.message || result.error), /Try again|respond_friend_request|bot_revoked/) + assert.equal(result.error?.code, 'bot/revoked') +}) + test('#737: Auto-send clears the Bot Social hold on the same send, so the line leaves and no card is left behind', async (t) => { const { ctx, call, stop } = await team() t.after(stop) @@ -4440,6 +4710,29 @@ test('#371: a local Bot\'s hold shows in its own chat when the friend\'s chat is assert.equal(fresh().holdReasonLine([], undefined), '') }) +test('#3110: an Auto-send failure stays on the waiting card in plain words, not as a failed send', () => { + const { walk, pluginOf } = loadSocialClient(async () => ({})) + const hold = { + id: 'apr-3110', kind: 'outbound_message', status: 'pending', fromId: 'chief', from: 'Chief', to: '@coder.bob.home', toName: 'Bob', + text: 'hello', + autoApproveError: AUTO_APPROVE_FROZEN, + } + const sender = { id: 'chief', name: 'Chief' } + const tree = walk(pluginOf([[hold], [], '']).ChatApprovalDock({ bot: sender, roster: { bots: [] } })) + const line = tree.find(n => n.props['data-flybot'] === 'auto-approve-error') + assert.ok(line, 'the waiting card shows why Auto-send did not finish') + assert.deepEqual(line.children, [AUTO_APPROVE_FROZEN]) + assert.equal(tree.some(n => n.props['data-state'] === 'failed'), false) + assert.equal(tree.some(n => n.props['data-flybot'] === 'hold-error' || n.props['data-flybot'] === 'chat-approval-error'), false) + assert.ok(tree.some(n => n.type === 'button' && n.children?.[0] === 'Approve'), 'Approve stays available after Resume') + const plugin = pluginOf([[], [], '']) + const rows = [] + const walkCard = node => { if (node && typeof node === 'object') { rows.push(node); (node.children ?? []).forEach(walkCard) } } + walkCard(plugin.PendingApprovals({ items: [hold] })) + const one = rows.find(n => n.props.className === 'fs-pending-one') + assert.match(String(one?.children ?? ''), /stopped on Bot Social/) +}) + test('#260: Approve all approves Bot Social holds too, not only local ones', async () => { const calls = [] const { walk, pluginOf } = loadSocialClient(async (endpoint, payload) => { calls.push([endpoint, payload]); return {} }) @@ -9465,6 +9758,8 @@ test('#310: join_invite errors read as plain sentences, never as raw codes', asy assert.equal(plain(new Error('Bot Social join_invite: cannot join your own invite')), "That's your own invite. Send it to a friend instead.") assert.equal(plain(new Error('Bot Social join_invite: relationship is blocked')), "You can't add this friend.") assert.equal(plain(new Error('Bot Social join_invite: rate_limited')), 'Too many tries. Wait a moment and try again.') + assert.equal(plain(Object.assign(new Error('Bot Social join_invite: bot is frozen (emergency stop)'), { code: 'bot_frozen' })), 'The Bot this invite names is stopped. Ask its owner to resume it; the same link will work again then.') + assert.equal(plain(Object.assign(new Error('Bot Social join_invite: this bot identity was revoked'), { code: 'bot_revoked' })), 'The Bot this invite names was removed. Ask its owner for a new invite to one of their Bots.') const other = new Error('Bot Social is not connected') assert.equal(mapJoinInviteError(other), other) @@ -10567,6 +10862,70 @@ test('#336: the "Share this Bot?" card has only buttons: Share opens that Bot\'s assert.deepEqual(dismissed, ['evt1']) }) +test('a grant_request card in the Social section Approves or Rejects through decide-approval', () => { + const registered = [] + const sandbox = { window: { __ModuleLoader__: { load: r => registered.push(r) } }, setTimeout, clearTimeout, console, document: { getElementById: () => ({}), createElement: () => ({}), head: { appendChild() {} } } } + sandbox.globalThis = sandbox + sandbox.__flybot__ = { slots: { register: () => () => {} }, call: async () => ({}) } + runInNewContext(readFileSync(new URL('../client.js', import.meta.url), 'utf8'), sandbox) + const h = (type, props, ...children) => ({ type, props: props ?? {}, children: children.flat() }) + const plugin = registered[0].factory(() => ({ createElement: h, Fragment: 'F', useEffect() {}, useState: v => [v, () => {}], useRef: v => ({ current: v }), useMemo: f => f() })) + assert.equal(plugin.GrantRequests({ items: [] }), null) + const decided = [] + const tree = plugin.GrantRequests({ + items: [{ id: 'apr-grant-1', kind: 'grant_request', from: 'Helper', text: 'Share Chief with EveHome' }], + onDecide: (item, decision) => decided.push([item.id, decision]), + }) + const all = [] + const walk = node => { if (node && typeof node === 'object') { all.push(node); (node.children ?? []).forEach(walk) } } + walk(tree) + const text = all.find(n => n.props['data-flybot'] === 'grant-request-text') + assert.equal(text.children.join(''), 'Share Chief with EveHome') + const buttons = all.filter(n => n.type === 'button') + assert.deepEqual(buttons.map(n => n.children.join('')), ['Reject', 'Approve']) + buttons[1].props.onClick() + buttons[0].props.onClick() + assert.deepEqual(decided, [['apr-grant-1', 'approve'], ['apr-grant-1', 'reject']]) + const locked = plugin.GrantRequests({ + items: [{ id: 'apr-grant-1', kind: 'grant_request', text: 'Share Chief with EveHome' }], + locked: true, + onDecide: (item, decision) => decided.push([item.id, decision]), + }) + const lockedNodes = [] + const walkLocked = node => { if (node && typeof node === 'object') { lockedNodes.push(node); (node.children ?? []).forEach(walkLocked) } } + walkLocked(locked) + assert.equal(lockedNodes.filter(n => n.type === 'button').length, 0, 'a read-only window does not offer Approve or Reject') +}) + +test('#3110: a grant_request fallback sentence is translated, and a custom summary is kept', () => { + const registered = [] + const sandbox = { window: { __ModuleLoader__: { load: r => registered.push(r) } }, setTimeout, clearTimeout, console, document: { getElementById: () => ({}), createElement: () => ({}), head: { appendChild() {} } } } + sandbox.globalThis = sandbox + const table = { + 'A friend': '一位好友', + '{name} requests a share': '{name} 请求分享', + '{name} requests {capability}': '{name} 请求 {capability}', + Approve: '批准', + Reject: '拒绝', + } + sandbox.__flybot__ = { + slots: { register: () => () => {} }, + call: async () => ({}), + t: (key, params) => String(table[key] ?? key).replace(/\{(\w+)\}/g, (_, name) => String(params?.[name] ?? '')), + } + runInNewContext(readFileSync(new URL('../client.js', import.meta.url), 'utf8'), sandbox) + const h = (type, props, ...children) => ({ type, props: props ?? {}, children: children.flat() }) + const plugin = registered[0].factory(() => ({ createElement: h, Fragment: 'F', useEffect() {}, useState: v => [v, () => {}], useRef: v => ({ current: v }), useMemo: f => f() })) + const walk = (node, out = []) => { if (node && typeof node === 'object') { out.push(node); (node.children ?? []).forEach(child => walk(child, out)) } return out } + const line = (items) => walk(plugin.GrantRequests({ items })).find(n => n.props['data-flybot'] === 'grant-request-text')?.children.join('') + assert.equal(line([{ id: 'g1', kind: 'grant_request', from: 'Helper', capability: 'chat.public' }]), 'Helper 请求 chat.public') + assert.equal(line([{ id: 'g2', kind: 'grant_request', from: 'Helper', capability: 'chat.public', text: 'Helper requests chat.public' }]), 'Helper 请求 chat.public', 'the English fallback from the host is translated') + assert.equal(line([{ id: 'g3', kind: 'grant_request', from: 'Helper', text: 'Share Chief with EveHome' }]), 'Share Chief with EveHome') + assert.equal(line([{ id: 'g4', kind: 'grant_request' }]), '一位好友 请求分享') + const buttons = walk(plugin.GrantRequests({ items: [{ id: 'g1', kind: 'grant_request', from: 'Helper' }] })).filter(n => n.type === 'button').map(n => n.children.join('')) + assert.deepEqual(buttons, ['拒绝', '批准']) +}) + // #1054: B accepted A's Chief invite. Bot Social keeps the grant one-way (B sees Friend's Bot; A does // not get a friend row). A still has to see the accept, including after a reload, and have one step // that asks B to share a Bot back. list_bot_grants returning nobody is the reverify: People with @@ -14836,6 +15195,138 @@ test('#1128: a Bot the other home no longer lists is not shared, and the row say assert.equal(granted.length, 0, 'no grant is sent to a Bot that is gone') }) +// After Bot Social #776, a stopped or removed Bot is refused at grant time (403 bot_frozen / +// bot_revoked). FlyBot must say what to do next, not "try again", and must not report a share. +test('share-with-friend: a stopped Bot is refused with a resume sentence, not try-again', async (t) => { + const { ctx, home, call, stop } = await team() + t.after(stop) + const server = mockServer() + const granted = [] + server.tools.list_friends = () => ({ + bot: { handle: '@danyang.home' }, + friends: [{ relationship_id: 'r-eve', status: 'active', peer: { bot_id: 'pb-eve', handle: '@eve.home', display_name: 'EveHome', owner_display_name: 'Eve' } }], + pending_incoming: [], + pending_outgoing: [], + }) + server.tools.list_remote_bots = () => ({ + homes: [{ + relationship_id: 'r-eve', + home: { bot_id: 'h2', handle: '@eve.home', display_name: 'Eve', owner_display_name: 'Eve' }, + bots: [{ bot_id: 'pb-eve', handle: '@eve.home', display_name: 'EveHome' }], + }], + }) + server.tools.list_bot_grants = ({ bot_id }) => ({ bot: { bot_id }, grants: [] }) + server.tools.grant_bot_to_friend = (a) => { + granted.push(a) + throw Object.assign(new Error('Bot Social grant_bot_to_friend: bot is frozen (emergency stop)'), { code: 'bot_frozen' }) + } + const social = await startSocial(ctx.flybot, { + server: 'https://social.test', credentialsPath: join(home, 'flybot-social.json'), + fetch: server.fetch, inboxPollMs: 0, + }) + t.after(() => social.dispose()) + await settle() + const chief = ctx.flybot.bot.list().find(b => b.isMain) || ctx.flybot.bot.list()[0] + await call('flybot/social/create-invite', { botId: chief.id }) + const result = await call('flybot/social/share-with-friend', { + botId: chief.id, home: '@eve.home', peerBotId: 'pb-eve', friendName: 'EveHome (Eve)', + }) + assert.equal(result.ok, false, 'the share is refused, not reported as done') + assert.match(String(result.error?.message || result.error), /stopped on Bot Social\. Resume it, then share again/) + assert.doesNotMatch(String(result.error?.message || result.error), /Try again/) + assert.equal(result.error?.code, 'bot/frozen') + assert.equal(granted.length, 1, 'the grant was attempted and the server refused it') +}) + +test('share-with-friend: a removed Bot is refused without inviting a retry', async (t) => { + const { ctx, home, call, stop } = await team() + t.after(stop) + const server = mockServer() + server.tools.list_friends = () => ({ + bot: { handle: '@danyang.home' }, + friends: [{ relationship_id: 'r-eve', status: 'active', peer: { bot_id: 'pb-eve', handle: '@eve.home', display_name: 'EveHome', owner_display_name: 'Eve' } }], + pending_incoming: [], + pending_outgoing: [], + }) + server.tools.list_remote_bots = () => ({ + homes: [{ + relationship_id: 'r-eve', + home: { bot_id: 'h2', handle: '@eve.home', display_name: 'Eve', owner_display_name: 'Eve' }, + bots: [{ bot_id: 'pb-eve', handle: '@eve.home', display_name: 'EveHome' }], + }], + }) + server.tools.list_bot_grants = ({ bot_id }) => ({ bot: { bot_id }, grants: [] }) + server.tools.grant_bot_to_friend = () => { + throw Object.assign(new Error('Bot Social grant_bot_to_friend: this bot identity was revoked'), { code: 'bot_revoked' }) + } + const social = await startSocial(ctx.flybot, { + server: 'https://social.test', credentialsPath: join(home, 'flybot-social.json'), + fetch: server.fetch, inboxPollMs: 0, + }) + t.after(() => social.dispose()) + await settle() + const chief = ctx.flybot.bot.list().find(b => b.isMain) || ctx.flybot.bot.list()[0] + await call('flybot/social/create-invite', { botId: chief.id }) + const result = await call('flybot/social/share-with-friend', { + botId: chief.id, home: '@eve.home', peerBotId: 'pb-eve', friendName: 'EveHome (Eve)', + }) + assert.equal(result.ok, false) + assert.match(String(result.error?.message || result.error), /removed from Bot Social, so it cannot be shared/) + assert.doesNotMatch(String(result.error?.message || result.error), /Try again/) + assert.equal(result.error?.code, 'bot/revoked') +}) + +test('mapShareFriendError and mapJoinInviteError name a stopped or removed Bot in plain words', () => { + const frozenGrant = Object.assign(new Error('Bot Social POST /v1/bots/m1/grants: HTTP 403 bot_frozen'), { code: 'bot_frozen', status: 403 }) + const frozenShare = mapShareFriendError(frozenGrant) + assert.equal(frozenShare.code, 'bot/frozen') + assert.equal(frozenShare.message, 'One of the Bots in this share is stopped on Bot Social. Resume it, then share again.') + const revokedShare = mapShareFriendError(Object.assign(new Error('Bot Social grant_bot_to_friend: this bot identity was revoked'), { code: 'bot_revoked' })) + assert.equal(revokedShare.code, 'bot/revoked') + assert.equal(revokedShare.message, 'One of the Bots in this share was removed from Bot Social, so it cannot be shared.') + const generic = mapShareFriendError(new Error('Bot Social grant_bot_to_friend: MCP error -32603: boom')) + assert.match(generic.message, /Try again, or use an invite link/) + assert.equal(mapJoinInviteError(Object.assign(new Error('Bot Social join_invite: bot is frozen (emergency stop)'), { code: 'bot_frozen' })).code, 'bot/frozen') + assert.equal(mapJoinInviteError(Object.assign(new Error('Bot Social join_invite: this bot identity was revoked'), { code: 'bot_revoked' })).code, 'bot/revoked') +}) + +test('#3110: mapAutoApproveError names a stopped or removed Bot, and keeps raw codes off the card', () => { + const frozen = mapAutoApproveError(Object.assign(new Error('Bot Social decide_approval: a Bot in this relationship is frozen (emergency stop)'), { code: 'bot_frozen' })) + assert.equal(frozen.code, 'bot/frozen') + assert.equal(frozen.message, AUTO_APPROVE_FROZEN) + assert.doesNotMatch(frozen.message, /bot_frozen|decide_approval/) + const revoked = mapAutoApproveError(Object.assign(new Error('Bot Social decide_approval: this bot identity was revoked'), { code: 'bot_revoked' })) + assert.equal(revoked.code, 'bot/revoked') + assert.equal(revoked.message, AUTO_APPROVE_REVOKED) + const cancelled = mapAutoApproveError(Object.assign(new Error('Bot Social decide_approval: approval is cancelled'), { code: 'invalid_state' })) + assert.equal(cancelled.code, 'invalid_state') + assert.equal(cancelled.message, AUTO_APPROVE_CANCELLED) + assert.equal(mapAutoApproveError(new Error('network down')), undefined, 'a transient miss is retried, not shown as a card') + assert.equal(mapAutoApproveError(new Error('hold not listed yet')), undefined) + const generic = mapAutoApproveError(new Error('Bot Social decide_approval: boom'), { allowGeneric: true }) + assert.equal(generic.code, 'bot/auto-approve-failed') + assert.equal(generic.message, AUTO_APPROVE_FAILED) + assert.doesNotMatch(generic.message, /decide_approval|boom/) +}) + +test('join-invite: a stopped or removed inviter Bot is named, not a raw code', async (t) => { + const { ctx, call, stop } = await team() + t.after(stop) + const server = mockServer() + const social = createSocial(ctx.flybot, { autoAccept: false, inboxPollMs: 0 }, { client: createMcpClient({ server: 'https://s', token: 'owner-token', fetch: server.fetch }), home: { id: 'h1', handle: '@danyang.home' } }) + t.after(() => social.dispose()) + const frozen = await call('flybot/social/join-invite', { code: 'FROZEN' }) + assert.equal(frozen.ok, false) + assert.equal(frozen.error?.code, 'bot/frozen') + assert.match(String(frozen.error?.message || frozen.error), /stopped\. Ask its owner to resume it/) + assert.doesNotMatch(String(frozen.error?.message || frozen.error), /bot_frozen|Try again/) + const revoked = await call('flybot/social/join-invite', { code: 'REVOKEDBOT' }) + assert.equal(revoked.ok, false) + assert.equal(revoked.error?.code, 'bot/revoked') + assert.match(String(revoked.error?.message || revoked.error), /was removed\. Ask its owner for a new invite/) + assert.doesNotMatch(String(revoked.error?.message || revoked.error), /bot_revoked/) +}) + // #1128: the row keeps its place in the panel with the reason and a disabled button. A click that reaches // it anyway (an old row, a keyboard focus) says why instead of posting a share. test('#1128: a row for a Bot the other home removed is shown with the reason and cannot be shared', async () => {