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
5 changes: 5 additions & 0 deletions .changeset/sidebar-scroll-preservation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"kilo-code": patch
---

Preserve the Agent Manager sidebar scroll position when worktrees are deleted.
110 changes: 110 additions & 0 deletions packages/kilo-vscode/tests/unit/agent-manager-sidebar-scroll.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
import { afterEach, describe, expect, it } from "bun:test"
import { Window } from "happy-dom"
import { createSidebarScrollPreserver } from "../../webview-ui/agent-manager/sidebar-scroll"

const window = new Window()
const frames = new Map<number, FrameRequestCallback>()
let id = 0

function schedule(fn: FrameRequestCallback) {
const next = ++id
frames.set(next, fn)
return next
}

function cancel(id: number) {
frames.delete(id)
}

function preserver() {
return createSidebarScrollPreserver(window.document, schedule, cancel)
}

afterEach(() => {
window.document.body.innerHTML = ""
frames.clear()
id = 0
})

function list(cls = "am-worktree-list") {
const el = window.document.createElement("div")
el.className = cls
Object.defineProperty(el, "scrollTop", { configurable: true, value: 0, writable: true })
window.document.body.append(el)
return el
}

function flush() {
for (let i = 0; i < 2; i++) {
const next = frames.entries().next().value
if (!next) return
frames.delete(next[0])
next[1](0)
}
}

describe("Agent Manager sidebar scroll preservation", () => {
it("restores the scroll offset after the state update has rendered", () => {
const el = list()
el.scrollTop = 240
const preserve = preserver()

preserve(() => {
el.scrollTop = 0
})

expect(el.scrollTop).toBe(0)
flush()
expect(el.scrollTop).toBe(240)
})

it("tracks project and worktree scroll owners independently", () => {
const projects = list("am-projects-list")
const worktrees = list()
projects.scrollTop = 120
worktrees.scrollTop = 80
const preserve = preserver()

preserve(() => {
projects.scrollTop = 0
worktrees.scrollTop = 0
})
flush()

expect(projects.scrollTop).toBe(120)
expect(worktrees.scrollTop).toBe(80)
})

it("cancels stale restores when a newer state arrives", () => {
const el = list()
const preserve = preserver()
el.scrollTop = 120

preserve(() => {
el.scrollTop = 0
})
el.scrollTop = 210
preserve(() => {
el.scrollTop = 0
})
flush()

expect(el.scrollTop).toBe(210)
expect(frames.size).toBe(0)
})

it("does not restore a container that was removed by the update", () => {
const el = list()
el.scrollTop = 160
const preserve = preserver()

preserve(() => {
el.remove()
el.scrollTop = 0
})
flush()

expect(el.isConnected).toBe(false)
expect(el.scrollTop).toBe(0)
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
import "./agent-manager.css"
import "./agent-manager-review.css"
import { cycleAgent as cycle } from "../src/context/session-agent"
import { createSidebarScrollPreserver } from "./sidebar-scroll"
const REVIEW_TAB_ID = "review"
interface SetupState {
active: boolean
Expand Down Expand Up @@ -1111,6 +1112,7 @@
rename: setRenamingSection,
font: (font) => font && setTerminalFont(font),
})
const preserveSidebarScroll = createSidebarScrollPreserver()

/** Apply the active-transition effects of a state payload (data already landed in the store). */
const applyActiveState = (state: AgentManagerStateMessage) => {
Expand Down Expand Up @@ -1482,7 +1484,7 @@
if (msg.type === "agentManager.focusContextRequested") focusCtl.report()

if (msg.type === "agentManager.state" && msg.isGitRepo === false && !sessionsLoaded()) setSessionsLoaded(true)
if (msg.type === "agentManager.state") stateHandlers.state(msg)
if (msg.type === "agentManager.state") preserveSidebarScroll(() => stateHandlers.state(msg))

// When a multi-version progress update arrives, mark newly created worktrees as loading
if ((msg as { type: string }).type === "agentManager.multiVersionProgress") {
Expand Down Expand Up @@ -2796 +2798 @@
}
35 changes: 35 additions & 0 deletions packages/kilo-vscode/webview-ui/agent-manager/sidebar-scroll.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
type Entry = {
el: HTMLElement
top: number
}

export function createSidebarScrollPreserver(
root: ParentNode = document,
schedule: typeof requestAnimationFrame = requestAnimationFrame,
cancel: typeof cancelAnimationFrame = cancelAnimationFrame,
) {
let frame: number | undefined
let inner: number | undefined

return (fn: () => void): void => {
if (frame !== undefined) cancel(frame)
if (inner !== undefined) cancel(inner)

const scrolls: Entry[] = [...root.querySelectorAll<HTMLElement>(".am-worktree-list, .am-projects-list")].map(
(el) => ({
el,
top: el.scrollTop,
}),
)
fn()
frame = schedule(() => {
frame = undefined
inner = schedule(() => {
inner = undefined
for (const item of scrolls) {
if (item.el.isConnected) item.el.scrollTop = item.top
Comment thread
marius-kilocode marked this conversation as resolved.
Resolved
}
})
})
}
}
Loading