Agent Zero AI framework
scroller polishing, icon tooltips
frdeld20d9e776b44
diff --git a/webui/components/chat/message-queue/message-queue-store.js b/webui/components/chat/message-queue/message-queue-store.jsindex 14fc8e804..74db5f052 100644--- a/webui/components/chat/message-queue/message-queue-store.js+++ b/webui/components/chat/message-queue/message-queue-store.js@@ -1,4 +1,5 @@import { createStore } from "/js/AlpineStore.js";+import { store as navStore } from "/components/chat/navigation/chat-navigation-store.js";import * as api from "/js/api.js";const model = {@@ -71,6 +72,7 @@ const model = {const context = globalThis.getContext?.();if (!context || !this.hasQueue) return;try {+ navStore.scrollToBottom();await api.callJsonApi("/message_queue_send", { context, send_all: true });} catch (e) {console.error("Failed to send all queued:", e);diff --git a/webui/components/messages/process-group/process-group.css b/webui/components/messages/process-group/process-group.cssindex 296b06969..34146ef6f 100644--- a/webui/components/messages/process-group/process-group.css+++ b/webui/components/messages/process-group/process-group.css@@ -659,6 +659,7 @@padding: var(--spacing-xs);background: rgba(0, 0, 0, 0.8);min-height: 5em;+ min-width: 20em;width: max-content;border-radius: var(--border-radius-sm);color: #c9d1d9;diff --git a/webui/js/messages.js b/webui/js/messages.jsindex c8e54d84f..c8ad6cb61 100644--- a/webui/js/messages.js+++ b/webui/js/messages.js@@ -11,6 +11,7 @@ import {import { store as stepDetailStore } from "/components/modals/process-step-detail/step-detail-store.js";import { store as preferencesStore } from "/components/sidebar/bottom/preferences/preferences-store.js";import { formatDuration } from "./time-utils.js";+import { Scroller } from "./scroller.js";// Delay before collapsing previous steps when a new step is addedconst STEP_COLLAPSE_DELAY = {@@ -74,7 +75,7 @@ export function setMessages(messages) {const cutoff = isLargeAppend ? Math.max(0, messages.length - 2) : 0;const massRender = historyEmpty || isLargeAppend;- const mainScroller = new Scroller(history, { smooth: !massRender, toleranceRem: 6 });+ const mainScroller = new Scroller(history, { smooth: !massRender, toleranceRem: 4, reapplyDelayMs: 1000 });// process messagesfor (let i = 0; i < messages.length; i++) {@@ -667,8 +668,8 @@ export function drawMessageAgent({}) {const title = cleanStepTitle(heading);let displayKvps = {};- if (kvps?.thoughts) displayKvps["icon://lightbulb"] = kvps.thoughts;- if (kvps?.step) displayKvps["icon://step"] = kvps.step;+ if (kvps?.thoughts) displayKvps["icon://lightbulb[Thoughts]"] = kvps.thoughts;+ if (kvps?.step) displayKvps["icon://step[Step]"] = kvps.step;const thoughtsText = String(kvps?.thoughts ?? "");const headerLabels = [kvps?.tool_name && { label: kvps.tool_name, class: "tool-name-badge" },@@ -1380,9 +1381,9 @@ function drawKvpsIncremental(container, kvps, latex) {th = row.insertCell(0);th.classList.add("kvps-key");}- const iconName = extractIconFromKey(key);- if (iconName) {- th.innerHTML = `<span class="material-symbols-outlined">${iconName}</span>`;+ const convertedKey = convertIcons(String(key), "");+ if (convertedKey !== String(key)) {+ th.innerHTML = convertedKey;} else {th.textContent = convertToTitleCase(key);}@@ -1499,12 +1500,6 @@ function convertFilePaths(str) {return str.replace(/file:\/\//g, "/download_work_dir_file?path=");}-export function convertIcons(str) {- return str.replace(- /icon:\/\/([a-zA-Z0-9_]+)/g,- '<span class="icon material-symbols-outlined">$1</span>',- );-}function escapeHTML(str) {const escapeChars = {@@ -1624,72 +1619,6 @@ function adjustMarkdownRender(element) {});}-export class Scroller {- constructor(element, { smooth = false, toleranceRem = 2 } = {}) {- this.element = element;- this.smooth = smooth;- this.tolerance = toleranceRem * parseFloat(getComputedStyle(document.documentElement).fontSize);- this.wasAtBottom = this.isAtBottom();- this._scrollListener = null;- }-- _getEffectiveScrollTop() {- const scrollingToRaw = this.element?.dataset?.scrollingTo;- const scrollingTo = scrollingToRaw == null ? null : Number(scrollingToRaw);- if (Number.isFinite(scrollingTo)) return scrollingTo;- return this.element.scrollTop;- }-- _setScrollingTo(target) {- this.element.dataset.scrollingTo = String(target);-- if (this._scrollListener) return;-- this._scrollListener = () => {- const current = this.element.scrollTop;- const activeTargetRaw = this.element?.dataset?.scrollingTo;- const activeTarget = activeTargetRaw == null ? null : Number(activeTargetRaw);- if (!Number.isFinite(activeTarget)) {- this._clearScrollingTo();- return;- }-- if (current >= activeTarget - 1) this._clearScrollingTo();- };-- this.element.addEventListener("scroll", this._scrollListener, { passive: true });- }-- _clearScrollingTo() {- delete this.element.dataset.scrollingTo;- if (this._scrollListener) {- this.element.removeEventListener("scroll", this._scrollListener);- this._scrollListener = null;- }- }-- isAtBottom() {- const { scrollHeight, clientHeight } = this.element;- const scrollTop = this._getEffectiveScrollTop();- return scrollHeight - scrollTop - clientHeight <= this.tolerance;- }-- scrollToBottom() {- const target = Math.max(0, this.element.scrollHeight - this.element.clientHeight);- if (this.smooth) {- this._setScrollingTo(target);- this.element.scrollTo({ top: target, behavior: "smooth" });- } else {- this._clearScrollingTo();- this.element.scrollTop = target;- }- }-- reApplyScroll() {- if (this.wasAtBottom && !this.isAtBottom()) this.scrollToBottom();- }-}-/*** Create a new collapsible process group*/@@ -1893,12 +1822,30 @@ function getStepTitle(heading, kvps, type) {}/**- * Extract icon name from a key with icon:// prefix+ * Convert icon://name[Optional Tooltip] into a material icon span.+ * Tooltip supports escaped brackets inside, e.g. [Tooltip of \[brackets\]].*/-function extractIconFromKey(key) {- if (!key) return null;- const match = String(key).match(/^icon:\/\/([a-zA-Z0-9_]+)/);- return match ? match[1] : null;+export function convertIcons(html, classes = "") {+ if (html == null) return "";++ return String(html).replace(+ /icon:\/\/([a-zA-Z0-9_]+)(\[(?:\\.|[^\]])*\])?/g,+ (match, iconName, tooltipBlock) => {+ if (!tooltipBlock) {+ return `<span class="icon material-symbols-outlined ${classes}">${iconName}</span>`;+ }++ const tooltipRaw = tooltipBlock+ .slice(1, -1)+ .replace(/\\\[/g, "[")+ .replace(/\\\]/g, "]")+ .replace(/\\\\/g, "\\");++ const tooltip = escapeHTML(tooltipRaw);++ return `<span class="icon material-symbols-outlined ${classes}" title="${tooltip}" data-bs-placement="top" data-bs-trigger="hover">${iconName}</span>`;+ },+ );}/**@@ -1909,8 +1856,8 @@ function cleanStepTitle(text, maxLength = 100) {if (!text) return "";let cleaned = String(text);- // Remove icon:// patterns (e.g., "icon://network_intelligence")- cleaned = cleaned.replace(/icon:\/\/[a-zA-Z0-9_]+\s*/g, "");+ // Remove icon:// patterns (e.g., "icon://network_intelligence" or "icon://network_intelligence[Tooltip]")+ cleaned = cleaned.replace(/icon:\/\/[a-zA-Z0-9_]+(\[(?:\\.|[^\]])*\])?\s*/g, "");// Trim whitespacecleaned = cleaned.trim();diff --git a/webui/js/scroller.js b/webui/js/scroller.jsnew file mode 100644index 000000000..4cbf7a26d--- /dev/null+++ b/webui/js/scroller.js@@ -0,0 +1,144 @@+export class Scroller {+ constructor(+ element,+ {+ smooth = false,+ toleranceRem = 2,+ reapplyDelayMs = 0,+ reapplyToleranceRatio = 0,+ } = {},+ ) {+ this.element = element;+ this.smooth = smooth;+ this.reapplyDelayMs = reapplyDelayMs;+ this.reapplyToleranceRatio = reapplyToleranceRatio;+ this.tolerance =+ toleranceRem *+ parseFloat(getComputedStyle(document.documentElement).fontSize);+ this.wasAtBottom = this.isAtBottom();+ this._scrollListener = null;+ }++ _getEffectiveScrollTop() {+ const scrollingToRaw = this.element?.dataset?.scrollingTo;+ const scrollingTo = scrollingToRaw == null ? null : Number(scrollingToRaw);+ if (Number.isFinite(scrollingTo)) return scrollingTo;+ return this.element.scrollTop;+ }++ _setScrollingTo(target) {+ this.element.dataset.scrollingTo = String(target);++ if (this._scrollListener) return;++ this._scrollListener = () => {+ const current = this.element.scrollTop;+ const activeTargetRaw = this.element?.dataset?.scrollingTo;+ const activeTarget = activeTargetRaw == null ? null : Number(activeTargetRaw);+ if (!Number.isFinite(activeTarget)) {+ this._clearScrollingTo();+ return;+ }++ if (current >= activeTarget - 1) this._clearScrollingTo();+ };++ this.element.addEventListener("scroll", this._scrollListener, {+ passive: true,+ });+ }++ _clearScrollingTo() {+ delete this.element.dataset.scrollingTo;+ if (this._scrollListener) {+ this.element.removeEventListener("scroll", this._scrollListener);+ this._scrollListener = null;+ }+ }++ isAtBottom() {+ const { scrollHeight, clientHeight } = this.element;+ const scrollTop = this._getEffectiveScrollTop();+ return scrollHeight - scrollTop - clientHeight <= this.tolerance;+ }++ _getBottomDistancePx() {+ const { scrollHeight, clientHeight } = this.element;+ const scrollTop = this._getEffectiveScrollTop();+ return scrollHeight - scrollTop - clientHeight;+ }++ scrollToBottom() {+ const target = Math.max(+ 0,+ this.element.scrollHeight - this.element.clientHeight,+ );+ if (this.smooth) {+ this._setScrollingTo(target);+ this.element.scrollTo({ top: target, behavior: "smooth" });+ } else {+ this._clearScrollingTo();+ this.element.scrollTop = target;+ }+ }++ _getReapplyTimeoutId() {+ const raw = this.element?.dataset?.scrollerTimeout;+ const parsed = raw == null ? null : Number(raw);+ if (!Number.isFinite(parsed)) return null;+ return parsed;+ }++ _clearReapplyTimeout() {+ const id = this._getReapplyTimeoutId();+ if (id != null) clearTimeout(id);+ delete this.element.dataset.scrollerTimeout;+ }++ _scheduleReapplyScrollToBottom() {+ this._clearReapplyTimeout();++ const id = setTimeout(() => {+ delete this.element.dataset.scrollerTimeout;++ if (!this.wasAtBottom) return;+ if (!this.isAtBottom()) return;++ this.scrollToBottom();+ }, this.reapplyDelayMs);++ this.element.dataset.scrollerTimeout = String(id);+ }++ reApplyScroll(instant = false) {+ this._clearReapplyTimeout();++ if (!this.wasAtBottom) return;++ if (instant) {+ this.scrollToBottom();+ return;+ }++ if (!this.isAtBottom()) {+ this.scrollToBottom();+ return;+ }++ const ratio = this.reapplyToleranceRatio;+ if (ratio <= 0) {+ if (this.reapplyDelayMs > 0) this._scheduleReapplyScrollToBottom();+ else this.scrollToBottom();+ return;+ }++ const dist = this._getBottomDistancePx();+ const tolerance = this.tolerance;+ const clampedDist = Math.max(0, Math.min(dist, tolerance));+ const progress = tolerance > 0 ? 1 - clampedDist / tolerance : 1;+ if (progress < ratio) return;++ if (this.reapplyDelayMs > 0) this._scheduleReapplyScrollToBottom();+ else this.scrollToBottom();+ }+}