Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
8 changes: 4 additions & 4 deletions src/core/webview/ClineProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2398,9 +2398,9 @@ export class ClineProvider
}

async postStateToWebview() {
const clineMessagesSeq = ++this.clineMessagesSeq
const state = await this.getStateToPostToWebview()
this.clineMessagesSeq++
state.clineMessagesSeq = this.clineMessagesSeq
state.clineMessagesSeq = clineMessagesSeq
await this.postMessageToWebview({ type: "state", state })
}

Expand All @@ -2413,9 +2413,9 @@ export class ClineProvider
* `taskHistoryUpdated` / `taskHistoryItemUpdated`.
*/
async postStateToWebviewWithoutTaskHistory(): Promise<void> {
const clineMessagesSeq = ++this.clineMessagesSeq
const state = await this.getStateToPostToWebview({ includeTaskHistory: false })
this.clineMessagesSeq++
state.clineMessagesSeq = this.clineMessagesSeq
state.clineMessagesSeq = clineMessagesSeq
const { taskHistory: _omit, ...rest } = state
await this.postMessageToWebview({ type: "state", state: rest })
}
Expand Down
38 changes: 38 additions & 0 deletions src/core/webview/__tests__/ClineProvider.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,44 @@ describe("ClineProvider", () => {
expect(statePostSettled).toBe(true)
})

test.each([
["postStateToWebview", (currentProvider: ClineProvider) => currentProvider.postStateToWebview()],
[
"postStateToWebviewWithoutTaskHistory",
(currentProvider: ClineProvider) => currentProvider.postStateToWebviewWithoutTaskHistory(),
],
])("%s assigns message sequence numbers before asynchronous state construction", async (_methodName, postState) => {
let releaseOlderSnapshot!: (state: ExtensionState) => void
const olderSnapshot = new Promise<ExtensionState>((resolve) => {
releaseOlderSnapshot = resolve
})
const baseState = await provider.getStateToPostToWebview({ includeTaskHistory: false })
const emptyState: ExtensionState = { ...baseState, taskHistory: [], clineMessages: [] }
const readyState: ExtensionState = {
...baseState,
taskHistory: [],
clineMessages: [{ ts: 1, type: "say", say: "text", text: "child ready" }],
}

vi.spyOn(provider, "getStateToPostToWebview")
.mockReturnValueOnce(olderSnapshot)
.mockResolvedValueOnce(readyState)
const postMessageSpy = vi.spyOn(provider, "postMessageToWebview").mockResolvedValue(undefined)

const olderPost = postState(provider)
await Promise.resolve()
const newerPost = postState(provider)
await newerPost
releaseOlderSnapshot(emptyState)
await olderPost

expect(postMessageSpy.mock.calls.map(([message]) => message.state?.clineMessages)).toEqual([
readyState.clineMessages,
emptyState.clineMessages,
])
expect(postMessageSpy.mock.calls.map(([message]) => message.state?.clineMessagesSeq)).toEqual([2, 1])
})

test.each([
[
"postStateToWebviewWithoutTaskHistory",
Expand Down
Loading