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/steady-code-edit-blocks.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"kilo-code": patch
---

Prevent expanded code edit blocks from flickering when an edit completes, and localize their display settings.
Comment thread
marius-kilocode marked this conversation as resolved.
Resolved
16 changes: 15 additions & 1 deletion packages/kilo-vscode/tests/unit/transcript-rows.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from "bun:test"
import { messageTurns } from "../../webview-ui/src/context/session-queue"
import { partitionRows, transcriptRows } from "../../webview-ui/src/context/transcript-rows"
import { partitionRows, retainTurn, transcriptRows } from "../../webview-ui/src/context/transcript-rows"
import type { Message, Part } from "../../webview-ui/src/types/messages"

const base = {
Expand Down Expand Up @@ -154,6 +154,20 @@ describe("transcriptRows", () => {
})
})

describe("retainTurn", () => {
it("keeps the completed turn mounted until another turn takes ownership", () => {
const active = retainTurn(undefined, "session", "u1", false)
expect(retainTurn(active, "session", undefined, false)).toBe(active)
expect(retainTurn(active, "session", "u2", false)).toEqual({ sid: "session", turn: "u2" })
})

it("keeps the paused turn and clears it when the session changes", () => {
const active = { sid: "session", turn: "u1" }
expect(retainTurn(active, "session", "u2", true)).toBe(active)
expect(retainTurn(active, "other", undefined, false)).toBeUndefined()
})
})

describe("partitionRows", () => {
it("keeps completed history and the active user row virtualized", () => {
const u1 = user("u1")
Expand Down
27 changes: 13 additions & 14 deletions packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ import {
stableMessageTurns,
type MessageTurn,
} from "../../context/session-queue"
import { partitionRows, transcriptRows, type TranscriptRow } from "../../context/transcript-rows"
import {
partitionRows,
retainTurn,
transcriptRows,
type TranscriptHold,
type TranscriptRow,
} from "../../context/transcript-rows"
import type { QuestionRequest, SuggestionRequest } from "../../types/messages"

interface MessageListProps {
Expand Down Expand Up @@ -113,21 +119,12 @@ export const MessageList: Component<MessageListProps> = (props) => {
prev,
)
})
const [held, setHeld] = createSignal<{ sid: string; turn: string }>()
const [held, setHeld] = createSignal<TranscriptHold>()
createEffect(() => {
const id = activeUserID()
const sid = session.currentSessionID()
const paused = autoScroll.userScrolled()
if (!sid || (!id && !paused)) {
setHeld(undefined)
return
}
if (!id) return
if (!paused) {
setHeld({ sid, turn: id })
return
}
setHeld((prev) => (prev?.sid === sid ? prev : { sid, turn: id }))
setHeld((prev) => retainTurn(prev, sid, id, paused))
})
const direct = createMemo(() => {
const item = held()
Expand All @@ -140,6 +137,8 @@ export const MessageList: Component<MessageListProps> = (props) => {
// Virtua continues to own completed history and stable live chunks, but not
// the growing assistant suffix whose measurements would produce visible jumps.
const partition = createMemo(() => partitionRows(rows(), direct()))
const tail = createMemo(() => partition().direct.map((row) => row.key))
const lookup = createMemo(() => new Map(partition().direct.map((row) => [row.key, row])))
const keys = createMemo(() => partition().virtual.map((row) => row.key))
const fingerprint = createMemo(() => rowFingerprint(keys()))
const measurement = createMemo(() => {
Expand Down Expand Up @@ -322,8 +321,8 @@ export const MessageList: Component<MessageListProps> = (props) => {
)}
</Virtualizer>
</Show>
<For each={partition().direct}>
{(row) => <TranscriptRowView row={row} onForkMessage={props.onForkMessage} />}
<For each={tail()}>
{(key) => <TranscriptRowView row={lookup().get(key)!} onForkMessage={props.onForkMessage} />}
</For>
</div>
</Show>
Expand Down
17 changes: 17 additions & 0 deletions packages/kilo-vscode/webview-ui/src/context/transcript-rows.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,23 @@ export interface TranscriptPartition {
queued: TranscriptRow[]
}

export interface TranscriptHold {
sid: string
turn: string
}

export function retainTurn(
prev: TranscriptHold | undefined,
sid: string | undefined,
turn: string | undefined,
paused: boolean,
) {
if (!sid) return undefined
if (!turn || paused) return prev?.sid === sid ? prev : turn ? { sid, turn } : undefined
if (prev?.sid === sid && prev.turn === turn) return prev
return { sid, turn }
}

function same<T>(a: T[], b: T[]) {
if (a.length !== b.length) return false
for (let i = 0; i < a.length; i += 1) {
Expand Down
9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/ar.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/br.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/bs.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/da.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/de.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/es.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/fr.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/it.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/ja.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/ko.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/nl.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/no.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/pl.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions packages/kilo-vscode/webview-ui/src/i18n/ru.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading