Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

web-ui: collapse long pinned prompts (#983)

Joshua France0e3f9b9739f5
diff --git a/plugins/web-ui/src/chat.ts b/plugins/web-ui/src/chat.ts
index 9e47ed169..d5c863a77 100644
--- a/plugins/web-ui/src/chat.ts
+++ b/plugins/web-ui/src/chat.ts
@@ -136,7 +136,6 @@ import { createForkOriginController, forkOriginView } from "./fork-origin";
import { base64ToBytes } from "./paste-text";
import { tip } from "./tooltip";
import { workSeconds, workedLabel } from "./work-duration";
-import { markClampedPrompts } from "./prompt-clamp";
import { decorateTextCodeBlocks, normalizePlainTextFences } from "./text-code";
import { createTranscriptViewport } from "./transcript-viewport";
@@ -159,7 +158,6 @@ interface SettledRowKey {
speakerLabel: string | undefined;
edited: boolean;
deleted: boolean;
- expanded: boolean;
tpl: TemplateResult | typeof nothing;
}
const settledRowCache = new WeakMap<object, SettledRowKey>();
@@ -229,7 +227,6 @@ export function createChatSurface(
inheritedLoaded: false,
pins: [] as SessionPin[],
pinsExpanded: false,
- expandedPrompt: null as number | null,
labelSpeakers: false,
};
@@ -409,7 +406,6 @@ export function createChatSurface(
chatState.earlierCount = 0;
chatState.loadingEarlier = false;
chatState.pins = [];
- chatState.expandedPrompt = null;
chatState.host = document.createElement("div");
chatState.host.className = "custom-chat";
@@ -941,7 +937,6 @@ export function createChatSurface(
if (!sameSession) {
chatState.inheritedExpanded = false;
chatState.pins = [];
- chatState.expandedPrompt = null;
}
syncLocation();
@@ -1042,7 +1037,6 @@ export function createChatSurface(
);
requestAnimationFrame(() => {
decorateTextCodeBlocks(host);
- markClampedPrompts(host);
if (host.isConnected) transcriptViewport.sync(host.querySelector<HTMLElement>(".chat-scroll"));
});
};
@@ -1083,12 +1077,6 @@ export function createChatSurface(
else readonlyRedraw?.();
}
- function togglePromptExpanded(index: number): void {
- chatState.expandedPrompt = chatState.expandedPrompt === index ? null : index;
- if (chatState.agent) drawActiveChat(chatState.agent);
- else readonlyRedraw?.();
- }
-
function linkifiedText(text: string): TemplateResult {
return html`${splitLinks(text).map((seg) =>
seg.kind === "link"
@@ -1306,10 +1294,7 @@ export function createChatSurface(
chatState.host,
);
decorateStreamingTail();
- requestAnimationFrame(() => {
- decorateTextCodeBlocks(chatState.host);
- markClampedPrompts(chatState.host);
- });
+ requestAnimationFrame(() => decorateTextCodeBlocks(chatState.host));
ctx.composer.resizeComposer();
scrollTranscript(opts.forceScroll);
postCurrentPaneState();
@@ -1445,7 +1430,6 @@ export function createChatSurface(
const speakerLabel = speakerLabelFor(message);
const edited = Boolean((message as { edited?: boolean }).edited);
const deleted = Boolean((message as { deleted?: boolean }).deleted);
- const expanded = chatState.expandedPrompt === index;
const hit = settledRowCache.get(message as object);
if (
hit &&
@@ -1461,8 +1445,7 @@ export function createChatSurface(
hit.forkable === forkable &&
hit.speakerLabel === speakerLabel &&
hit.edited === edited &&
- hit.deleted === deleted &&
- hit.expanded === expanded
+ hit.deleted === deleted
) {
return hit.tpl;
}
@@ -1481,7 +1464,6 @@ export function createChatSurface(
speakerLabel,
edited,
deleted,
- expanded,
tpl,
});
return tpl;
@@ -1502,22 +1484,14 @@ export function createChatSurface(
<article class="message-row user-row ${steered ? "steered-row" : ""}" data-index=${index}>
${steered ? html`<div class="steer-label">↪ steered the running task</div>` : nothing}
${speaker ? html`<div class="speaker-label">${speaker}</div>` : nothing}
- <div
- class="message-bubble user-bubble ${deleted ? "deleted-bubble" : ""}"
- data-expanded=${chatState.expandedPrompt === index ? "true" : "false"}
- >
- ${isReadOnlySlackView() ? slackWireBubble(messageText(message)) : markdown(messageText(message))}
- ${attachments.length ? html`<div class="message-files">${attachments.map(userAttachmentBadge)}</div>` : nothing}
- ${edited || deleted ? html`<span class="revision-badge">(${deleted ? "deleted" : "edited"})</span>` : nothing}
- <button
- class="prompt-toggle"
- type="button"
- aria-expanded=${chatState.expandedPrompt === index ? "true" : "false"}
- @click=${() => togglePromptExpanded(index)}
- >
- ${chatState.expandedPrompt === index ? "Show less" : "Show more"}
- </button>
+ <div class="message-bubble user-bubble ${deleted ? "deleted-bubble" : ""}">
+ <div class="pin-content">
+ ${isReadOnlySlackView() ? slackWireBubble(messageText(message)) : markdown(messageText(message))}
+ ${attachments.length ? html`<div class="message-files">${attachments.map(userAttachmentBadge)}</div>` : nothing}
+ ${edited || deleted ? html`<span class="revision-badge">(${deleted ? "deleted" : "edited"})</span>` : nothing}
+ </div>
</div>
+ <button class="pin-toggle" type="button" hidden aria-expanded="false">Show more</button>
${
sendFailure
? html`<div class="send-failure">
diff --git a/plugins/web-ui/src/prompt-clamp.ts b/plugins/web-ui/src/prompt-clamp.ts
deleted file mode 100644
index 4458bc8b9..000000000
--- a/plugins/web-ui/src/prompt-clamp.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-const PINNED_BUBBLE = ".message-stack .user-row:not(:has(~ .user-row)) .user-bubble";
-
-export function markClampedPrompts(root: ParentNode | null): void {
- if (!root) return;
- for (const bubble of root.querySelectorAll<HTMLElement>(PINNED_BUBBLE)) {
- if (bubble.dataset.expanded === "true") continue;
- const body = bubble.querySelector<HTMLElement>(":scope > markdown-block, :scope > .slack-wire-text");
- if (!body) continue;
- bubble.dataset.clamped = String(body.scrollHeight - body.clientHeight > 1);
- }
-}
diff --git a/plugins/web-ui/src/shared-session.ts b/plugins/web-ui/src/shared-session.ts
index 323d1fa04..daa6eb95f 100644
--- a/plugins/web-ui/src/shared-session.ts
+++ b/plugins/web-ui/src/shared-session.ts
@@ -2,6 +2,7 @@ import "./shell.css";
import "@mariozechner/mini-lit/dist/ThemeToggle.js";
import { html, render } from "lit";
import { Lock, ArrowUpRight, Copy, File, FileImage } from "lucide";
+import { createTranscriptViewport } from "./transcript-viewport";
import { decorateTextCodeBlocks } from "./text-code";
import { markdown } from "./message-markdown";
import { installMarkdownSanitizer } from "./markdown-sanitize";
@@ -44,35 +45,38 @@ render(
(message) => html`
<article class=${`message-row ${message.role}-row`}>
<div class=${message.role === "user" ? "message-bubble user-bubble" : "assistant-body"}>
- ${markdown(message.text)}
- ${
- message.attachments?.length
- ? html`<div class="message-files">
- ${message.attachments.map((file) => {
- const href = `${location.pathname}/files/${encodeURIComponent(file.id)}`;
- const inlineImage = /^image\/(png|jpeg|gif|webp|avif)$/.test(file.mimetype);
- if (inlineImage && message.role !== "user") {
- return html`<a
- class="file-image"
- href=${href}
- download=${file.name}
- rel="noreferrer"
- ><img src=${`${href}?inline=1`} alt=${file.name} loading="lazy"
- /></a>`;
- }
- return chipBadge(
- inlineImage ? FileImage : File,
- file.name,
- file.sizeBytes,
- inlineImage ? `${href}?inline=1` : href,
- !inlineImage,
- );
- })}
- </div>`
- : ""
- }
+ <div class=${message.role === "user" ? "pin-content" : "shared-message-content"}>
+ ${markdown(message.text)}
+ ${
+ message.attachments?.length
+ ? html`<div class="message-files">
+ ${message.attachments.map((file) => {
+ const href = `${location.pathname}/files/${encodeURIComponent(file.id)}`;
+ const inlineImage = /^image\/(png|jpeg|gif|webp|avif)$/.test(file.mimetype);
+ if (inlineImage && message.role !== "user") {
+ return html`<a
+ class="file-image"
+ href=${href}
+ download=${file.name}
+ rel="noreferrer"
+ ><img src=${`${href}?inline=1`} alt=${file.name} loading="lazy"
+ /></a>`;
+ }
+ return chipBadge(
+ inlineImage ? FileImage : File,
+ file.name,
+ file.sizeBytes,
+ inlineImage ? `${href}?inline=1` : href,
+ !inlineImage,
+ );
+ })}
+ </div>`
+ : ""
+ }
+ </div>
${message.role === "assistant" ? html`<div class="message-meta"><button class="msg-copy" aria-label="Copy message" title="Copy" @click=${(e: Event) => void copyText(message.text, e.currentTarget as HTMLButtonElement)}>${icon(Copy, 13)}</button></div>` : ""}
</div>
+ ${message.role === "user" ? html`<button class="pin-toggle" type="button" hidden aria-expanded="false">Show more</button>` : ""}
${message.role === "user" ? html`<div class="message-meta"><button class="msg-copy" aria-label="Copy message" title="Copy" @click=${(e: Event) => void copyText(message.text, e.currentTarget as HTMLButtonElement)}>${icon(Copy, 13)}</button></div>` : ""}
</article>
`,
@@ -92,4 +96,8 @@ render(
document.getElementById("app")!,
);
-requestAnimationFrame(() => decorateTextCodeBlocks(document.getElementById("app")));
+const viewport = createTranscriptViewport();
+requestAnimationFrame(() => {
+ decorateTextCodeBlocks(document.getElementById("app"));
+ viewport.sync(document.querySelector<HTMLElement>(".chat-scroll"));
+});
diff --git a/plugins/web-ui/src/shell.css b/plugins/web-ui/src/shell.css
index ddc4546db..edb7c346a 100644
--- a/plugins/web-ui/src/shell.css
+++ b/plugins/web-ui/src/shell.css
@@ -1618,7 +1618,7 @@ a.chat-row-open {
.deleted-bubble {
opacity: 0.6;
}
-.deleted-bubble > :not(.revision-badge) {
+.deleted-bubble > .pin-content > :not(.revision-badge) {
text-decoration: line-through;
}
@@ -1772,51 +1772,32 @@ a.chat-row-open {
color: var(--foreground);
overflow-wrap: anywhere;
}
-.message-stack .user-row:not(:has(~ .user-row)) .user-bubble {
- display: flex;
- flex-direction: column;
- max-height: 40cqh;
+.user-bubble > .pin-content {
+ display: flow-root;
}
-.message-stack .user-row:not(:has(~ .user-row)) .user-bubble[data-expanded="true"] {
- max-height: none;
-}
-.message-stack .user-row:not(:has(~ .user-row)) .user-bubble > markdown-block,
-.message-stack .user-row:not(:has(~ .user-row)) .user-bubble > .slack-wire-text {
- flex-shrink: 1000;
- min-height: 0;
+.message-stack .user-row:not(:has(~ .user-row)):not(.pin-expanded) .user-bubble {
+ max-height: var(--pin-clamp, 320px);
overflow: hidden;
}
-.message-stack .user-row:not(:has(~ .user-row)) .user-bubble[data-expanded="true"] > markdown-block,
-.message-stack .user-row:not(:has(~ .user-row)) .user-bubble[data-expanded="true"] > .slack-wire-text {
- overflow: visible;
-}
-.message-stack .user-row:not(:has(~ .user-row)) .user-bubble > .message-files {
- min-height: 0;
- max-height: 20cqh;
- overflow-y: auto;
-}
-.prompt-toggle {
+.pin-toggle {
display: none;
- align-self: flex-start;
- flex-shrink: 0;
- margin-top: 6px;
- padding: 0;
+ pointer-events: auto;
border: 0;
- background: transparent;
+ border-radius: 6px;
+ background: var(--background);
color: var(--muted-foreground);
font: inherit;
font-size: 12px;
+ padding: 6px 8px;
cursor: pointer;
}
-.prompt-toggle:hover {
- color: var(--foreground);
- text-decoration: underline;
+.message-stack .user-row:not(:has(~ .user-row)) > .pin-toggle:not([hidden]) {
+ display: inline-flex;
}
-.message-stack .user-row:not(:has(~ .user-row)) .user-bubble[data-clamped="true"] > .prompt-toggle,
-.message-stack .user-row:not(:has(~ .user-row)) .user-bubble[data-expanded="true"] > .prompt-toggle {
- display: block;
+.pin-toggle:hover {
+ color: var(--foreground);
+ background: var(--secondary);
}
-
.message-files,
.attachment-strip {
display: flex;
@@ -8974,7 +8955,7 @@ h3.ambient-field-label {
.mini-convo-body .message-stack {
width: 100%;
}
-.mini-convo-body .message-stack .user-row:not(:has(~ .user-row)) .user-bubble {
+.mini-convo-body .message-stack .user-row:not(:has(~ .user-row)):not(.pin-expanded) .user-bubble {
max-height: 100px;
}
.mini-convo-missing {
diff --git a/plugins/web-ui/src/transcript-viewport.ts b/plugins/web-ui/src/transcript-viewport.ts
index 5d01d6461..3f1099909 100644
--- a/plugins/web-ui/src/transcript-viewport.ts
+++ b/plugins/web-ui/src/transcript-viewport.ts
@@ -1,10 +1,11 @@
-import { markClampedPrompts } from "./prompt-clamp.ts";
-
export function createTranscriptViewport() {
let scroller: HTMLElement | null = null;
let pins: HTMLElement | null = null;
let prompt: HTMLElement | null = null;
let stack: HTMLElement | null = null;
+ let content: HTMLElement | null = null;
+ let promptKey: string | undefined;
+ let expanded = false;
let lastTop = 0;
let observer: ResizeObserver | null = null;
let following = false;
@@ -21,8 +22,45 @@ export function createTranscriptViewport() {
frame = null;
}
+ function clearPrompt(): void {
+ prompt?.classList.remove("stuck", "sticky-disabled", "pin-expanded");
+ prompt?.style.removeProperty("--pin-clamp");
+ const toggle = prompt?.querySelector<HTMLButtonElement>(".pin-toggle");
+ if (toggle) toggle.hidden = true;
+ expanded = false;
+ promptKey = undefined;
+ }
+
+ function syncPrompt(): void {
+ if (!scroller || !prompt || !content) return;
+ prompt.style.setProperty(
+ "--pin-clamp",
+ `${Math.round(Math.min(320, Math.max(96, scroller.clientHeight * 0.35)))}px`,
+ );
+ prompt.classList.toggle("pin-expanded", expanded);
+ const bubble = prompt.querySelector<HTMLElement>(".user-bubble");
+ const clipped = !expanded && !!bubble && bubble.scrollHeight > bubble.clientHeight + 1;
+ const toggle = prompt.querySelector<HTMLButtonElement>(".pin-toggle");
+ if (toggle) {
+ toggle.hidden = !clipped && !expanded;
+ toggle.textContent = expanded ? "Show less" : "Show more";
+ toggle.setAttribute("aria-expanded", String(expanded));
+ }
+ }
+
+ function onClick(event: MouseEvent): void {
+ const target = event.target as HTMLElement | null;
+ if (target?.nodeType !== 1) return;
+ const toggle = target.closest<HTMLButtonElement>(".pin-toggle");
+ if (!toggle || !prompt?.contains(toggle)) return;
+ cancelFollow();
+ expanded = !expanded;
+ syncSticky();
+ }
+
function syncSticky(): void {
if (!scroller) return;
+ syncPrompt();
const top = pins?.getBoundingClientRect().height ?? 0;
scroller.style.setProperty("--chat-sticky-top", `${top}px`);
const style = getComputedStyle(scroller);
@@ -62,10 +100,11 @@ export function createTranscriptViewport() {
observer = null;
scroller?.removeEventListener("scroll", onScroll);
scroller?.removeEventListener("wheel", onWheel);
+ scroller?.removeEventListener("click", onClick);
scroller?.style.removeProperty("--chat-sticky-top");
scroller?.style.removeProperty("overflow-anchor");
- prompt?.classList.remove("stuck", "sticky-disabled");
- scroller = pins = prompt = stack = null;
+ clearPrompt();
+ scroller = pins = prompt = stack = content = null;
lastTop = 0;
following = false;
}
@@ -80,9 +119,9 @@ export function createTranscriptViewport() {
setFollowing(false);
scroller?.addEventListener("scroll", onScroll, { passive: true });
scroller?.addEventListener("wheel", onWheel, { passive: true });
+ scroller?.addEventListener("click", onClick);
if (typeof ResizeObserver !== "undefined") {
observer = new ResizeObserver(() => {
- markClampedPrompts(scroller);
syncSticky();
follow();
});
@@ -104,13 +143,21 @@ export function createTranscriptViewport() {
pins = nextPins;
if (pins) observer?.observe(pins);
}
- if (prompt !== nextPrompt) {
+ if (prompt !== nextPrompt || promptKey !== nextPrompt?.dataset.index) {
changed = true;
- prompt?.classList.remove("stuck", "sticky-disabled");
+ clearPrompt();
if (prompt) observer?.unobserve(prompt);
prompt = nextPrompt;
+ promptKey = prompt?.dataset.index;
if (prompt) observer?.observe(prompt);
}
+ const nextContent = prompt?.querySelector<HTMLElement>(".pin-content") ?? null;
+ if (content !== nextContent) {
+ changed = true;
+ if (content) observer?.unobserve(content);
+ content = nextContent;
+ if (content) observer?.observe(content);
+ }
if (changed) syncSticky();
}
diff --git a/plugins/web-ui/test/chat-settled-row-cache.test.ts b/plugins/web-ui/test/chat-settled-row-cache.test.ts
index 9e3fce457..21f650275 100644
--- a/plugins/web-ui/test/chat-settled-row-cache.test.ts
+++ b/plugins/web-ui/test/chat-settled-row-cache.test.ts
@@ -31,8 +31,11 @@ test("the cache key covers every mutable render input of a settled row", () => {
"hit.speakerLabel === speakerLabel",
"hit.edited === edited",
"hit.deleted === deleted",
- "hit.expanded === expanded",
]) {
assert.ok(chat.includes(field), `cache key must compare: ${field}`);
}
});
+
+test("prompt expansion is managed by the viewport without invalidating cached templates", () => {
+ assert.doesNotMatch(chat, /expandedPrompt|togglePromptExpanded/);
+});
diff --git a/plugins/web-ui/test/pinned-prompt-collapse.test.ts b/plugins/web-ui/test/pinned-prompt-collapse.test.ts
new file mode 100644
index 000000000..3e4a5a658
--- /dev/null
+++ b/plugins/web-ui/test/pinned-prompt-collapse.test.ts
@@ -0,0 +1,192 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { JSDOM } from "jsdom";
+import { createTranscriptViewport } from "../src/transcript-viewport.ts";
+
+function fixture() {
+ const dom = new JSDOM(
+ `<section class="chat-scroll"><div class="message-stack"><article class="user-row" data-index="1"><div class="user-bubble"><div class="pin-content">Example prompt</div></div><button class="pin-toggle" hidden>Show more</button></article></div></section>`,
+ );
+ const scroller = dom.window.document.querySelector<HTMLElement>("section")!;
+ const row = scroller.querySelector<HTMLElement>("article")!;
+ const bubble = row.querySelector<HTMLElement>(".user-bubble")!;
+ const content = row.querySelector<HTMLElement>(".pin-content")!;
+ const toggle = row.querySelector<HTMLButtonElement>("button")!;
+ let height = 300;
+ let fullHeight = 600;
+ Object.defineProperties(scroller, { clientHeight: { get: () => height }, scrollHeight: { value: 2000 } });
+ Object.defineProperties(bubble, {
+ scrollHeight: { get: () => fullHeight },
+ clientHeight: {
+ get: () =>
+ row.classList.contains("pin-expanded")
+ ? fullHeight
+ : Math.min(fullHeight, parseFloat(row.style.getPropertyValue("--pin-clamp")) || 320),
+ },
+ });
+ scroller.getBoundingClientRect = () => ({ top: 0 }) as DOMRect;
+ row.getBoundingClientRect = () => ({ top: 0, height: bubble.clientHeight + 24 }) as DOMRect;
+ const observed = new Set<Element>();
+ let resize = () => {};
+ const restore = ["ResizeObserver", "getComputedStyle"].map(
+ (key) => [key, Object.getOwnPropertyDescriptor(globalThis, key)] as const,
+ );
+ Object.assign(globalThis, {
+ getComputedStyle: dom.window.getComputedStyle.bind(dom.window),
+ ResizeObserver: class {
+ constructor(callback: () => void) {
+ resize = callback;
+ }
+ observe(element: Element) {
+ observed.add(element);
+ }
+ unobserve(element: Element) {
+ observed.delete(element);
+ }
+ disconnect() {
+ observed.clear();
+ }
+ },
+ });
+ const viewport = createTranscriptViewport();
+ viewport.sync(scroller);
+ return {
+ scroller,
+ row,
+ bubble,
+ content,
+ toggle,
+ observed,
+ viewport,
+ resize: (next: number) => {
+ height = next;
+ resize();
+ },
+ grow: (next: number) => {
+ fullHeight = next;
+ resize();
+ },
+ close: () => {
+ viewport.dispose();
+ dom.window.close();
+ for (const [key, descriptor] of restore) {
+ if (descriptor) Object.defineProperty(globalThis, key, descriptor);
+ else Reflect.deleteProperty(globalThis, key);
+ }
+ },
+ };
+}
+
+test("long prompts clamp to the pane and expand or collapse through their button", () => {
+ const f = fixture();
+ try {
+ assert.equal(f.row.style.getPropertyValue("--pin-clamp"), "105px");
+ assert.equal(f.toggle.hidden, false);
+ f.toggle.click();
+ assert.equal(f.row.classList.contains("pin-expanded"), true);
+ assert.equal(f.toggle.getAttribute("aria-expanded"), "true");
+ assert.equal(f.toggle.textContent, "Show less");
+ f.toggle.click();
+ assert.ok(f.bubble.scrollHeight > f.bubble.clientHeight);
+ assert.equal(f.toggle.getAttribute("aria-expanded"), "false");
+ } finally {
+ f.close();
+ }
+});
+
+test("pane resizes respect the minimum and maximum preview heights", () => {
+ const f = fixture();
+ try {
+ f.resize(100);
+ assert.equal(f.row.style.getPropertyValue("--pin-clamp"), "96px");
+ f.resize(2000);
+ assert.equal(f.row.style.getPropertyValue("--pin-clamp"), "320px");
+ } finally {
+ f.close();
+ }
+});
+
+test("late content growth reveals the control without a scroll or redraw", () => {
+ const f = fixture();
+ try {
+ assert.ok(f.observed.has(f.content));
+ f.grow(40);
+ assert.equal(f.toggle.hidden, true);
+ f.grow(800);
+ assert.equal(f.toggle.hidden, false);
+ assert.ok(f.bubble.scrollHeight > f.bubble.clientHeight);
+ } finally {
+ f.close();
+ }
+});
+
+test("a reused row resets expansion when its message index changes", () => {
+ const f = fixture();
+ try {
+ f.toggle.click();
+ assert.equal(f.row.classList.contains("pin-expanded"), true);
+ f.row.dataset.index = "2";
+ f.viewport.sync(f.scroller);
+ assert.equal(f.row.classList.contains("pin-expanded"), false);
+ assert.equal(f.toggle.textContent, "Show more");
+ } finally {
+ f.close();
+ }
+});
+
+test("read-only scrollers use the same control and disposal clears presentation", () => {
+ const f = fixture();
+ try {
+ f.scroller.classList.add("readonly-scroll");
+ f.toggle.click();
+ assert.equal(f.row.classList.contains("pin-expanded"), true);
+ f.viewport.dispose();
+ assert.equal(f.observed.size, 0);
+ assert.equal(f.row.classList.contains("pin-expanded"), false);
+ assert.equal(f.row.style.getPropertyValue("--pin-clamp"), "");
+ assert.equal(f.toggle.hidden, true);
+ f.toggle.click();
+ assert.equal(f.row.classList.contains("pin-expanded"), false);
+ } finally {
+ f.close();
+ }
+});
+
+test("only the last prompt is measured and expansion survives an unchanged redraw", () => {
+ const f = fixture();
+ try {
+ const earlier = f.row.cloneNode(true) as HTMLElement;
+ earlier.className = "user-row";
+ earlier.removeAttribute("style");
+ earlier.dataset.index = "0";
+ const earlierToggle = earlier.querySelector<HTMLButtonElement>(".pin-toggle")!;
+ earlierToggle.hidden = true;
+ f.row.before(earlier);
+ f.viewport.sync(f.scroller);
+ assert.equal(earlierToggle.hidden, true);
+ assert.equal(earlier.style.getPropertyValue("--pin-clamp"), "");
+ f.toggle.click();
+ f.viewport.sync(f.scroller);
+ assert.equal(f.row.classList.contains("pin-expanded"), true);
+ assert.equal(f.toggle.hidden, false);
+ assert.equal(f.toggle.textContent, "Show less");
+ } finally {
+ f.close();
+ }
+});
+
+test("switching to a new scroller resets expansion even when the message index is identical", () => {
+ const f = fixture();
+ try {
+ f.toggle.click();
+ const next = f.scroller.cloneNode(true) as HTMLElement;
+ const row = next.querySelector<HTMLElement>(".user-row")!;
+ f.scroller.after(next);
+ f.viewport.sync(next);
+ assert.equal(row.classList.contains("pin-expanded"), false);
+ assert.equal(row.querySelector(".pin-toggle")!.getAttribute("aria-expanded"), "false");
+ assert.equal(f.row.classList.contains("pin-expanded"), false);
+ } finally {
+ f.close();
+ }
+});
diff --git a/plugins/web-ui/test/prompt-clamp.test.ts b/plugins/web-ui/test/prompt-clamp.test.ts
deleted file mode 100644
index 987346f2c..000000000
--- a/plugins/web-ui/test/prompt-clamp.test.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import test from "node:test";
-import { JSDOM } from "jsdom";
-
-import { markClampedPrompts } from "../src/prompt-clamp.ts";
-
-const css = readFileSync(new URL("../src/shell.css", import.meta.url), "utf8");
-const chat = readFileSync(new URL("../src/chat.ts", import.meta.url), "utf8");
-
-const pinned = String.raw`\.message-stack \.user-row:not\(:has\(~ \.user-row\)\) \.user-bubble`;
-
-function bubbleDom(scrollHeight: number, clientHeight: number, expanded = "false"): HTMLElement {
- const dom = new JSDOM(`<div class="message-stack">
- <article class="message-row user-row">
- <div class="message-bubble user-bubble" data-expanded="${expanded}">
- <markdown-block></markdown-block>
- </div>
- </article>
- </div>`);
- const body = dom.window.document.querySelector("markdown-block")!;
- Object.defineProperty(body, "scrollHeight", { value: scrollHeight });
- Object.defineProperty(body, "clientHeight", { value: clientHeight });
- markClampedPrompts(dom.window.document);
- return dom.window.document.querySelector<HTMLElement>(".user-bubble")!;
-}
-
-test("a prompt taller than its cap is marked clamped; one that fits is not", () => {
- assert.equal(bubbleDom(800, 240).dataset.clamped, "true");
- assert.equal(bubbleDom(240, 240).dataset.clamped, "false");
-});
-
-test("an expanded prompt keeps its clamped mark so Show less stays reachable", () => {
- const dom = new JSDOM(`<div class="message-stack">
- <article class="message-row user-row">
- <div class="message-bubble user-bubble" data-clamped="true" data-expanded="true">
- <markdown-block></markdown-block>
- </div>
- </article>
- </div>`);
- const body = dom.window.document.querySelector("markdown-block")!;
- Object.defineProperty(body, "scrollHeight", { value: 800 });
- Object.defineProperty(body, "clientHeight", { value: 800 });
- markClampedPrompts(dom.window.document);
- assert.equal(dom.window.document.querySelector<HTMLElement>(".user-bubble")!.dataset.clamped, "true");
-});
-
-test("only the last user row is measured — earlier prompts are never clamped", () => {
- const dom = new JSDOM(`<div class="message-stack">
- <article class="message-row user-row"><div class="user-bubble"><markdown-block></markdown-block></div></article>
- <article class="message-row user-row"><div class="user-bubble"><markdown-block></markdown-block></div></article>
- </div>`);
- for (const body of dom.window.document.querySelectorAll("markdown-block")) {
- Object.defineProperty(body, "scrollHeight", { value: 800 });
- Object.defineProperty(body, "clientHeight", { value: 240 });
- }
- markClampedPrompts(dom.window.document);
- const bubbles = dom.window.document.querySelectorAll<HTMLElement>(".user-bubble");
- assert.equal(bubbles[0].dataset.clamped, undefined);
- assert.equal(bubbles[1].dataset.clamped, "true");
-});
-
-test("the clamped prompt clips instead of scrolling, and expanding lifts the cap", () => {
- const text =
- css.match(new RegExp(String.raw`\n${pinned} > markdown-block,\n${pinned} > \.slack-wire-text \{[^}]*\}`))?.[0] ??
- "";
- assert.match(text, /overflow: hidden;/);
- assert.doesNotMatch(text, /overflow-y: auto;/);
- assert.match(css, new RegExp(String.raw`\n${pinned}\[data-expanded="true"\] \{[^}]*max-height: none;`));
-});
-
-test("the toggle is hidden until the prompt actually overflows", () => {
- const base = css.match(/\n\.prompt-toggle \{[^}]*\}/)?.[0] ?? "";
- assert.match(base, /display: none;/);
- assert.match(
- css,
- new RegExp(
- String.raw`${pinned}\[data-clamped="true"\] > \.prompt-toggle,\n${pinned}\[data-expanded="true"\] > \.prompt-toggle \{\s*display: block;`,
- ),
- );
-});
-
-test("the toggle names its own next action and reports state to assistive tech", () => {
- assert.match(chat, /chatState\.expandedPrompt === index \? "Show less" : "Show more"/);
- assert.match(chat, /aria-expanded=\$\{chatState\.expandedPrompt === index \? "true" : "false"\}/);
- assert.match(chat, /@click=\$\{\(\) => togglePromptExpanded\(index\)\}/);
-});
-
-test("toggling a prompt redraws through whichever surface is mounted", () => {
- const fn = chat.match(/function togglePromptExpanded\(index: number\): void \{[\s\S]*?\n {2}\}/)?.[0] ?? "";
- assert.match(fn, /chatState\.expandedPrompt = chatState\.expandedPrompt === index \? null : index;/);
- assert.match(fn, /if \(chatState\.agent\) drawActiveChat\(chatState\.agent\);\s*else readonlyRedraw\?\.\(\);/);
-});
-
-test("both transcript surfaces re-measure after every render", () => {
- assert.equal(chat.match(/markClampedPrompts\((host|chatState\.host)\)/g)?.length, 2);
-});
-
-test("switching sessions collapses the prompt again — the index never carries over", () => {
- assert.equal(chat.match(/chatState\.expandedPrompt = null;/g)?.length, 2);
-});
diff --git a/plugins/web-ui/test/transcript-viewport.test.ts b/plugins/web-ui/test/transcript-viewport.test.ts
index 0a2c39395..6c95eda9d 100644
--- a/plugins/web-ui/test/transcript-viewport.test.ts
+++ b/plugins/web-ui/test/transcript-viewport.test.ts
@@ -129,22 +129,24 @@ test("a bottom-pinned stream follows growth instantly and coalesces frames", ()
test("resizing a settled transcript updates the prompt expansion control", () => {
const f = fixture();
try {
- f.prompt.innerHTML = '<div class="user-bubble" data-expanded="false"><markdown-block></markdown-block></div>';
+ f.prompt.innerHTML =
+ '<div class="user-bubble"><div class="pin-content"><markdown-block></markdown-block></div></div><button class="pin-toggle" hidden>Show more</button>';
const bubble = f.prompt.querySelector<HTMLElement>(".user-bubble")!;
- const body = bubble.querySelector("markdown-block")!;
+ const toggle = f.prompt.querySelector<HTMLButtonElement>(".pin-toggle")!;
let availableHeight = 240;
- Object.defineProperties(body, {
+ Object.defineProperties(bubble, {
scrollHeight: { value: 240 },
clientHeight: { get: () => availableHeight },
});
+ f.viewport.sync(f.s);
f.resize(30, 50);
- assert.equal(bubble.dataset.clamped, "false");
+ assert.equal(toggle.hidden, true);
availableHeight = 160;
f.resize(30, 50);
- assert.equal(bubble.dataset.clamped, "true");
+ assert.equal(toggle.hidden, false);
availableHeight = 240;
f.resize(30, 50);
- assert.equal(bubble.dataset.clamped, "false");
+ assert.equal(toggle.hidden, true);
} finally {
f.close();
}
diff --git a/plugins/web-ui/test/user-message-cap.test.ts b/plugins/web-ui/test/user-message-cap.test.ts
index 48719bdd0..79e5ae4e1 100644
--- a/plugins/web-ui/test/user-message-cap.test.ts
+++ b/plugins/web-ui/test/user-message-cap.test.ts
@@ -6,21 +6,16 @@ const css = readFileSync(new URL("../src/shell.css", import.meta.url), "utf8");
const chat = readFileSync(new URL("../src/chat.ts", import.meta.url), "utf8");
const shared = readFileSync(new URL("../src/shared-session.ts", import.meta.url), "utf8");
-const pinned = String.raw`\.message-stack \.user-row:not\(:has\(~ \.user-row\)\) \.user-bubble`;
+const pinned = String.raw`\.message-stack \.user-row:not\(:has\(~ \.user-row\)\):not\(\.pin-expanded\) \.user-bubble`;
-test("only the pinned prompt is capped, at 40% of its own scroller, and its text and chips shrink", () => {
- const bubble = css.match(new RegExp(String.raw`\n${pinned} \{[^}]*\}`))?.[0] ?? "";
- assert.match(bubble, /max-height: 40cqh;/);
- assert.match(bubble, /flex-direction: column;/);
- const text =
- css.match(new RegExp(String.raw`\n${pinned} > markdown-block,\n${pinned} > \.slack-wire-text \{[^}]*\}`))?.[0] ??
- "";
- assert.match(text, /flex-shrink: 1000;/);
- assert.match(text, /overflow: hidden;/);
- const files = css.match(new RegExp(String.raw`\n${pinned} > \.message-files \{[^}]*\}`))?.[0] ?? "";
- assert.match(files, /min-height: 0;/);
- assert.match(files, /max-height: 20cqh;/);
- assert.match(files, /overflow-y: auto;/);
+test("only the collapsed pinned prompt is capped and overflow clips instead of nesting scrollbars", () => {
+ const bubble =
+ css.match(
+ /\.message-stack \.user-row:not\(:has\(~ \.user-row\)\):not\(\.pin-expanded\) \.user-bubble \{[^}]*\}/,
+ )?.[0] ?? "";
+ assert.match(bubble, /max-height: var\(--pin-clamp, 320px\);/);
+ assert.match(bubble, /overflow: hidden;/);
+ assert.doesNotMatch(css, /\.user-bubble > (?:markdown-block|\.slack-wire-text)\s*\{/);
const base = css.match(/\n\.user-bubble \{[^}]*\}/)?.[0] ?? "";
assert.doesNotMatch(base, /max-height|flex/);
});
@@ -55,3 +50,12 @@ test("images a user attached render as chips that open inline on the share page"
/return chipBadge\(\s*inlineImage \? FileImage : File,\s*file\.name,\s*file\.sizeBytes,\s*inlineImage \? `\$\{href\}\?inline=1` : href,\s*!inlineImage,?\s*\);/,
);
});
+
+test("both transcript renderers provide an accessible control and an observable inner body", () => {
+ for (const source of [chat, shared]) {
+ assert.match(source, /pin-content/);
+ assert.match(source, /class="pin-toggle" type="button" hidden aria-expanded="false"/);
+ }
+ assert.match(shared, /viewport\.sync\(document\.querySelector<HTMLElement>\("\.chat-scroll"\)\)/);
+ assert.match(css, /\.deleted-bubble > \.pin-content > :not\(\.revision-badge\) \{\s*text-decoration: line-through;/);
+});