Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions packages/app/e2e/session/session-renderer-diagnostics.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,27 @@ async function resetTimelineToTop(page: Page) {
expect(found, "session timeline viewport should exist").toBe(true)
}

async function wheelTimelineBy(page: Page, deltaY: number) {
const box = await page.evaluate(
({ scrollViewportSelector, turnListSelector }) => {
const list = document.querySelector(turnListSelector)
const viewport = list?.closest(scrollViewportSelector)
if (!(viewport instanceof HTMLElement)) return null
const rect = viewport.getBoundingClientRect()
return {
x: rect.left,
y: rect.top,
width: rect.width,
height: rect.height,
}
},
{ scrollViewportSelector, turnListSelector: sessionTurnListSelector },
)
expect(box, "session timeline viewport should exist").not.toBeNull()
await page.mouse.move(box!.x + box!.width / 2, box!.y + Math.min(box!.height / 2, box!.height - 4))
await page.mouse.wheel(0, deltaY)
}

async function markTimelinePointerGesture(page: Page) {
const found = await page.evaluate(
({ scrollViewportSelector, turnListSelector }) => {
Expand Down Expand Up @@ -344,6 +365,59 @@ test("captures renderer diagnostics while guarding send scroll position", async
})
})

test("honors weak upward wheel after submit instead of restoring latest", async ({ page, project }) => {
test.setTimeout(120_000)

await installRendererDiagnosticsCapture(page)
await project.open()
const sdk = project.sdk

await withSession(sdk, `e2e weak wheel reading ${Date.now()}`, async (session) => {
project.trackSession(session.id)
await seedSessionTurns({ sdk, sessionID: session.id, count: 18 })

await project.gotoSession(session.id)
await expect(page.locator(sessionMessageItemSelector)).toHaveCount(10, { timeout: 30_000 })
await scrollTimelineToBottom(page)
await expect.poll(async () => (await expectTimelineMetrics(page)).distanceFromBottom).toBeLessThan(40)

const promptText = `weak wheel guard ${Date.now()}`
await sendVisiblePrompt({ page, text: promptText })
await expect(page.locator(sessionMessageItemSelector).last()).toContainText(promptText, { timeout: 30_000 })

const wheelCheckpoint = (await readRendererDiagnostics(page)).length
for (let i = 0; i < 8; i++) {
await wheelTimelineBy(page, -48)
}

await expect
.poll(async () => (await expectTimelineMetrics(page)).distanceFromBottom, { timeout: 10_000 })
.toBeGreaterThan(160)

const events = (await readRendererDiagnostics(page)).slice(wheelCheckpoint)
expect(
events.some(
(event) =>
event.name === "session.timeline.scroll_controller" &&
event.data?.intent_type === "wheel_scroll" &&
event.data?.reason === "user_upward_navigation" &&
event.data?.mode_after === "reading_history",
),
).toBe(true)
expect(
events.some(
(event) =>
event.name === "session.timeline.scroll_controller" &&
event.data?.accepted === false &&
event.data?.reason === "submit_restore_latest_after_top_reset",
),
).toBe(false)

await page.getByRole("button", { name: "Jump to latest" }).click()
await expect.poll(async () => (await expectTimelineMetrics(page)).distanceFromBottom).toBeLessThan(80)
})
})

test("honors scrollbar thumb drag after submit instead of restoring latest", async ({ page, project }) => {
test.setTimeout(120_000)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@ describe("session timeline scroll controller", () => {
nestedScrollable: false,
})

expect(result.reason).toBe("strong_upward_navigation")
expect(result.reason).toBe("user_upward_navigation")
expect(controller.state().mode).toBe("reading_history")
})

test("weak upward wheel intent does not leave latest", () => {
test("weak upward wheel intent leaves latest", () => {
const { controller } = makeController()

const result = controller.intent({
Expand All @@ -244,10 +244,74 @@ describe("session timeline scroll controller", () => {
nestedScrollable: false,
})

expect(result.reason).toBe("user_upward_navigation")
expect(result.recovery).toEqual({ type: "none" })
expect(controller.state().mode).toBe("reading_history")
expect(controller.state().latestProtected).toBe(false)
})

test("nested weak upward wheel intent does not leave latest", () => {
const { controller } = makeController()

const result = controller.intent({
type: "wheel_scroll",
source: "timeline",
direction: "up",
strength: "weak",
nestedScrollable: true,
})

expect(result.reason).toBe("weak_scroll_observed")
expect(result.recovery).toEqual({ type: "none" })
expect(controller.state().mode).toBe("following_latest")
})

test("weak upward touch intent leaves latest", () => {
const { controller } = makeController()

const result = controller.intent({
type: "touch_scroll",
source: "timeline",
direction: "up",
strength: "weak",
nestedScrollable: false,
})

expect(result.reason).toBe("user_upward_navigation")
expect(result.recovery).toEqual({ type: "none" })
expect(controller.state().mode).toBe("reading_history")
expect(controller.state().latestProtected).toBe(false)
})

test("weak upward wheel after submit prevents top-reset restore latest", () => {
const { controller } = makeController()

controller.intent({
type: "submit",
originMode: "following_latest",
})
const intentResult = controller.intent({
type: "wheel_scroll",
source: "timeline",
direction: "up",
strength: "weak",
nestedScrollable: false,
})
const scrollResult = controller.observe({
type: "scroll_sample",
metrics: topMetrics,
safePosition: readingAnchor,
})

expect(intentResult.reason).toBe("user_upward_navigation")
expect(scrollResult.accepted).toBe(true)
expect(scrollResult.recovery).toEqual({ type: "none" })
expect(scrollResult.reason).toBe("reading_anchor_preserved")
expect(controller.state().mode).toBe("reading_history")
expect(controller.state().latestProtected).toBe(false)
expect(controller.state().lastSafePosition).toEqual(readingAnchor)
})

test("explicit bottom navigation rejoins latest from reading", () => {
const { controller } = makeController()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export type TimelineScrollReason =
| "explicit_top_navigation"
| "explicit_bottom_navigation"
| "follow_latest_preserved"
| "user_upward_navigation"
Comment thread
Astro-Han marked this conversation as resolved.
Resolved
| "strong_upward_navigation"
| "strong_downward_navigation"
| "weak_scroll_observed"
Expand Down Expand Up @@ -285,7 +286,7 @@ export function createTimelineScrollControllerDiagnostic(input: {
function isExplicitTopIntent(intent: TimelineScrollIntent) {
if (intent.type === "keyboard_scroll") return intent.key === "Home" || intent.key === "PageUp"
if (intent.type === "wheel_scroll" || intent.type === "touch_scroll") {
return intent.direction === "up" && intent.strength === "strong" && !intent.nestedScrollable
return intent.direction === "up" && !intent.nestedScrollable
Comment thread
Astro-Han marked this conversation as resolved.
Resolved
}
if (intent.type === "scrollbar_drag_end") return !intent.metrics.nearBottom
return false
Expand Down Expand Up @@ -414,7 +415,7 @@ export function createSessionTimelineScrollController(
if (isExplicitTopIntent(intent)) {
state.mode = "reading_history"
state.latestProtected = false
const reason = intent.type === "keyboard_scroll" ? "explicit_top_navigation" : "strong_upward_navigation"
const reason = intent.type === "keyboard_scroll" ? "explicit_top_navigation" : "user_upward_navigation"
return result({
before,
intent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ export function createSessionTimelineInteraction(input: {
if (current.sessionOwner !== owner.sessionOwner || current.viewportOwner !== owner.viewportOwner) return

if (recovery.type === "restore_latest") {
if (current.mode !== "following_latest") return
historyWindow.resumeLatestWindow()
resumeScroll()
return
Expand Down
Loading