Multiplayer agent harness for work.
Keep a scrolled-up reader in place when a turn ends (#1548)
Joshua France941c4a19adf7
diff --git a/plugins/web-ui/src/chat.ts b/plugins/web-ui/src/chat.tsindex b2c939b77..43dbdc6f0 100644--- a/plugins/web-ui/src/chat.ts+++ b/plugins/web-ui/src/chat.ts@@ -1924,9 +1924,11 @@ export function createChatSurface(const work = (message as AssistantWork).work;const phase = work ? currentTextPhase(work) : null;const streamingFinal = isStreaming && phase?.phase === "final_answer";+ const workActive =+ hasWork && isStreaming && !streamingFinal && (work?.status === "working" || work?.status === "thinking");const text = streamingFinal ? chunk.text.slice(phase.streamOffset) : chunk.text;for (const [partIndex, part] of setupContent(- assistantDisplayText(isStreaming && hasWork && !streamingFinal ? "" : text, message.stopReason),+ assistantDisplayText(workActive ? "" : text, message.stopReason),).entries()) {if (part.type !== "text") {if (!(message as AssistantWork).persisted) continue;diff --git a/plugins/web-ui/src/transcript-viewport.ts b/plugins/web-ui/src/transcript-viewport.tsindex c76057943..d3fb1aa51 100644--- a/plugins/web-ui/src/transcript-viewport.ts+++ b/plugins/web-ui/src/transcript-viewport.ts@@ -35,10 +35,6 @@ export function createTranscriptViewport() {let promptKey: string | undefined;let expanded = false;let lastTop = 0;- let lastBottom = 0;- let previousBottom = 0;- let bottomChangedAt = 0;- let inputBottom: number | null = null;let observer: ResizeObserver | null = null;let following = false;let frame: number | null = null;@@ -49,12 +45,7 @@ export function createTranscriptViewport() {if (scroller) scroller.style.overflowAnchor = value ? "none" : "";}- function clearInput(): void {- inputBottom = null;- }-function cancelFollow(): void {- clearInput();setFollowing(false);if (frame !== null) cancelAnimationFrame(frame);frame = null;@@ -125,15 +116,9 @@ export function createTranscriptViewport() {if (!scroller || contentUpdates.size > 0) return;const movingUp = scroller.scrollTop < lastTop;const atBottom = scroller.scrollHeight - scroller.clientHeight - scroller.scrollTop <= 1;- const reachedPreviousBottom =- scroller.scrollTop > lastTop &&- (Math.abs(scroller.scrollTop - lastBottom) <= 1 ||- (inputBottom !== null && Math.abs(scroller.scrollTop - inputBottom) <= 1));- if (atBottom || reachedPreviousBottom) setFollowing(true);- else if (scroller.scrollTop < lastTop) cancelFollow();- if (scroller.scrollTop !== lastTop) clearInput();+ if (atBottom && (following || !movingUp)) setFollowing(true);+ else if (movingUp) cancelFollow();lastTop = scroller.scrollTop;- measureBottom();syncSticky();if (movingUp) loadEarlier();}@@ -146,19 +131,9 @@ export function createTranscriptViewport() {button.click();}- function measureBottom(): void {- if (!scroller) return;- const bottom = scroller.scrollHeight - scroller.clientHeight;- if (bottom === lastBottom) return;- previousBottom = lastBottom;- lastBottom = bottom;- bottomChangedAt = performance.now();- }-function beforeRender(): void {if (!scroller || contentUpdates.size > 0) return;if (scroller.scrollTop !== lastTop) onScroll();- measureBottom();}function onContentUpdating(event: Event): void {@@ -174,7 +149,6 @@ export function createTranscriptViewport() {function afterRender(): void {if (!scroller || !following || contentUpdates.size > 0) return;lastTop = scroller.scrollTop;- measureBottom();if (frame !== null) cancelAnimationFrame(frame);frame = null;follow();@@ -184,28 +158,15 @@ export function createTranscriptViewport() {if (!scroller) return;if (event.deltaY < 0) loadEarlier();if (event.deltaY < 0 && scroller.scrollTop > 0) cancelFollow();- if (event.deltaY > 0) {- clearInput();- inputBottom = scroller.scrollHeight - scroller.clientHeight;- }- if (- event.deltaY > 0 &&- event.timeStamp < bottomChangedAt &&- scroller.scrollTop > lastTop &&- Math.abs(scroller.scrollTop - previousBottom) <= 1- )- setFollowing(true);}function onKeyDown(event: KeyboardEvent): void {- clearInput();if (event.target !== scroller || event.key !== "End" || event.shiftKey || event.altKey) return;event.preventDefault();follow(true);}function dispose(): void {- clearInput();if (frame !== null) cancelAnimationFrame(frame);frame = null;observer?.disconnect();@@ -214,13 +175,12 @@ export function createTranscriptViewport() {scroller?.removeEventListener("scroll", onScroll);scroller?.removeEventListener("wheel", onWheel);scroller?.removeEventListener("click", onClick);- scroller?.removeEventListener("pointerdown", clearInput);scroller?.removeEventListener("keydown", onKeyDown);scroller?.style.removeProperty("--chat-sticky-top");scroller?.style.removeProperty("overflow-anchor");clearPrompt();scroller = pins = prompt = stack = content = null;- lastTop = lastBottom = previousBottom = bottomChangedAt = 0;+ lastTop = 0;following = false;contentUpdates.clear();}@@ -232,13 +192,11 @@ export function createTranscriptViewport() {dispose();scroller = element;lastTop = scroller?.scrollTop ?? 0;- lastBottom = previousBottom = scroller ? scroller.scrollHeight - scroller.clientHeight : 0;setFollowing(false);scroller?.addEventListener("qm-content-updating", onContentUpdating);scroller?.addEventListener("scroll", onScroll, { passive: true });scroller?.addEventListener("wheel", onWheel, { passive: true });scroller?.addEventListener("click", onClick);- scroller?.addEventListener("pointerdown", clearInput);scroller?.addEventListener("keydown", onKeyDown);if (typeof ResizeObserver !== "undefined") {observer = new ResizeObserver(() => {diff --git a/plugins/web-ui/test/transcript-viewport.test.ts b/plugins/web-ui/test/transcript-viewport.test.tsindex 686f298f3..3c5854e85 100644--- a/plugins/web-ui/test/transcript-viewport.test.ts+++ b/plugins/web-ui/test/transcript-viewport.test.ts@@ -555,25 +555,29 @@ test("a pre-render check handles an upward scroll before its event", () => {}});-test("a deferred scroll event recognizes the previous bottom after asynchronous content growth", () => {+test("a downward scroll that reaches only the previous bottom does not resume following", () => {const f = fixture();try {f.scroll(700);- f.s.scrollTop = 800;f.grow();- f.s.dispatchEvent(new f.s.ownerDocument.defaultView!.Event("scroll"));+ f.scroll(800);f.viewport.follow();f.flush();- assert.equal(f.s.scrollTop, 900);+ assert.equal(f.s.scrollTop, 800);+ f.grow();+ f.resize(30, 50);+ f.flush();+ assert.equal(f.s.scrollTop, 800);} finally {f.close();}});-test("a measured resize invalidates the previous bottom for readers who have not moved", () => {+test("a downward wheel gesture that lands short of the bottom is left alone", () => {const f = fixture();try {f.scroll(700);+ f.s.dispatchEvent(new f.s.ownerDocument.defaultView!.WheelEvent("wheel", { deltaY: 300 }));f.grow();f.resize(30, 50);f.scroll(800);@@ -603,21 +607,7 @@ test("the changing streamed reply cannot become the browser's native scroll anchassert.match(css, /\.streaming-text\.live-stream \{\s*overflow-anchor: none;/);});-test("a resize callback records a pending return before replacing the measured bottom", () => {- const f = fixture();- try {- f.scroll(700);- f.s.scrollTop = 800;- f.grow();- f.resize(30, 50);- f.flush();- assert.equal(f.s.scrollTop, 900);- } finally {- f.close();- }-});--test("asynchronous growth leaves a reader in place and advances the measured bottom", () => {+test("asynchronous growth leaves a reader in place", () => {const f = fixture();try {f.scroll(600);@@ -634,17 +624,14 @@ test("asynchronous growth leaves a reader in place and advances the measured bot}});-test("a downward wheel preserves its bottom through multiple layouts before native scrolling", () => {+test("reaching the real bottom by hand resumes following", () => {const f = fixture();try {f.scroll(700);- f.s.dispatchEvent(new f.s.ownerDocument.defaultView!.WheelEvent("wheel", { deltaY: 300 }));f.grow();- f.resize(30, 50);+ f.scroll(900);f.grow();f.resize(30, 50);- f.scroll(800);- f.viewport.follow();f.flush();assert.equal(f.s.scrollTop, 1000);} finally {@@ -652,94 +639,70 @@ test("a downward wheel preserves its bottom through multiple layouts before nati}});-test("a compositor scroll can arrive before its delayed wheel event", () => {+test("closing live work preserves following through delayed final markdown layout", () => {const f = fixture();try {- f.scroll(700);- const wheel = new f.s.ownerDocument.defaultView!.WheelEvent("wheel", { deltaY: 300 });- Object.defineProperty(wheel, "timeStamp", { value: 0 });+ f.viewport.beforeRender();+ f.viewport.follow();+ f.collapse();+ f.viewport.afterRender();f.grow();f.resize(30, 50);- f.s.scrollTop = 800;- f.s.dispatchEvent(wheel);- f.s.dispatchEvent(new f.s.ownerDocument.defaultView!.Event("scroll"));- f.viewport.follow();f.flush();- assert.equal(f.s.scrollTop, 900);+ assert.equal(f.s.scrollTop, 300);+ f.grow();+ f.resize(30, 50);+ f.flush();+ assert.equal(f.s.scrollTop, 400);} finally {f.close();}});-test("a fresh wheel after layout cannot resume at an obsolete bottom", () => {+test("a reader who left the bottom is not pulled back when work closes", () => {const f = fixture();try {- f.scroll(700);+ f.scroll(100);+ f.viewport.beforeRender();+ f.collapse();+ f.viewport.afterRender();f.grow();f.resize(30, 50);- f.s.scrollTop = 800;- const wheel = new f.s.ownerDocument.defaultView!.WheelEvent("wheel", { deltaY: 100 });- Object.defineProperty(wheel, "timeStamp", { value: performance.now() + 1 });- f.s.dispatchEvent(wheel);- f.s.dispatchEvent(new f.s.ownerDocument.defaultView!.Event("scroll"));- f.viewport.follow();f.flush();- assert.equal(f.s.scrollTop, 800);+ assert.equal(f.s.scrollTop, 100);} finally {f.close();}});-for (const type of ["pointerdown", "keydown"]) {- test(`${type} invalidates an unfinished wheel gesture`, () => {- const f = fixture();- try {- f.scroll(700);- f.s.dispatchEvent(new f.s.ownerDocument.defaultView!.WheelEvent("wheel", { deltaY: 300 }));- f.grow();- f.resize(30, 50);- f.s.dispatchEvent(new f.s.ownerDocument.defaultView!.Event(type, { bubbles: true }));- f.scroll(800);- f.viewport.follow();- f.flush();- assert.equal(f.s.scrollTop, 800);- } finally {- f.close();- }- });-}--test("closing live work preserves following through delayed final markdown layout", () => {+test("a shrink that clamps a reader to the bottom does not resume following", () => {const f = fixture();try {+ f.scroll(700);f.viewport.beforeRender();- f.viewport.follow();f.collapse();+ f.s.dispatchEvent(new f.s.ownerDocument.defaultView!.Event("scroll"));f.viewport.afterRender();f.grow();f.resize(30, 50);f.flush();- assert.equal(f.s.scrollTop, 300);- f.grow();- f.resize(30, 50);- f.flush();- assert.equal(f.s.scrollTop, 400);+ assert.equal(f.s.scrollTop, 200);} finally {f.close();}});-test("a reader who left the bottom is not pulled back when work closes", () => {+test("a bottom-pinned reader keeps following when the browser clamps a shrink", () => {const f = fixture();try {- f.scroll(100);f.viewport.beforeRender();f.collapse();+ f.s.dispatchEvent(new f.s.ownerDocument.defaultView!.Event("scroll"));f.viewport.afterRender();f.grow();f.resize(30, 50);f.flush();- assert.equal(f.s.scrollTop, 100);+ assert.equal(f.s.scrollTop, 300);} finally {f.close();}diff --git a/plugins/web-ui/test/work-fold-source.test.ts b/plugins/web-ui/test/work-fold-source.test.tsindex d17c01758..9b8893897 100644--- a/plugins/web-ui/test/work-fold-source.test.ts+++ b/plugins/web-ui/test/work-fold-source.test.ts@@ -15,6 +15,15 @@ test("live and completed work share one chronological duration fold", () => {assert.doesNotMatch(chat, /function segmentSummaryLabel/);});+test("the reply text is hidden only while the work fold is active, never for a finished-but-streaming turn", () => {+ assert.match(+ chat,+ /const workActive =\s*hasWork && isStreaming && !streamingFinal && \(work\?\.status === "working" \|\| work\?\.status === "thinking"\);/,+ );+ assert.match(chat, /assistantDisplayText\(workActive \? "" : text, message\.stopReason\)/);+ assert.doesNotMatch(chat, /isStreaming && hasWork && !streamingFinal \? ""/);+});+test("promoted speech keeps full reply styling", () => {assert.match(css, /\.work-said \{[\s\S]{0,200}?color: var\(--foreground\);/);});