Skip to content

Commit 5d46d8f

Browse files
committed
fix(webview): preserve task state publication order
1 parent a80b3b3 commit 5d46d8f

2 files changed

Lines changed: 40 additions & 4 deletions

File tree

‎src/core/webview/ClineProvider.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2398,9 +2398,9 @@ export class ClineProvider
23982398
}
23992399

24002400
async postStateToWebview() {
2401+
const clineMessagesSeq = ++this.clineMessagesSeq
24012402
const state = await this.getStateToPostToWebview()
2402-
this.clineMessagesSeq++
2403-
state.clineMessagesSeq = this.clineMessagesSeq
2403+
state.clineMessagesSeq = clineMessagesSeq
24042404
await this.postMessageToWebview({ type: "state", state })
24052405
}
24062406

@@ -2413,9 +2413,9 @@ export class ClineProvider
24132413
* `taskHistoryUpdated` / `taskHistoryItemUpdated`.
24142414
*/
24152415
async postStateToWebviewWithoutTaskHistory(): Promise<void> {
2416+
const clineMessagesSeq = ++this.clineMessagesSeq
24162417
const state = await this.getStateToPostToWebview({ includeTaskHistory: false })
2417-
this.clineMessagesSeq++
2418-
state.clineMessagesSeq = this.clineMessagesSeq
2418+
state.clineMessagesSeq = clineMessagesSeq
24192419
const { taskHistory: _omit, ...rest } = state
24202420
await this.postMessageToWebview({ type: "state", state: rest })
24212421
}

‎src/core/webview/__tests__/ClineProvider.spec.ts‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -884,6 +884,42 @@ describe("ClineProvider", () => {
884884
expect(statePostSettled).toBe(true)
885885
})
886886

887+
test.each([
888+
["postStateToWebview", (currentProvider: ClineProvider) => currentProvider.postStateToWebview()],
889+
[
890+
"postStateToWebviewWithoutTaskHistory",
891+
(currentProvider: ClineProvider) => currentProvider.postStateToWebviewWithoutTaskHistory(),
892+
],
893+
])("%s assigns message sequence numbers before asynchronous state construction", async (_methodName, postState) => {
894+
let releaseOlderSnapshot!: (state: ExtensionState) => void
895+
const olderSnapshot = new Promise<ExtensionState>((resolve) => {
896+
releaseOlderSnapshot = resolve
897+
})
898+
const emptyState = { taskHistory: [], clineMessages: [] } as unknown as ExtensionState
899+
const readyState = {
900+
taskHistory: [],
901+
clineMessages: [{ type: "say", say: "text", text: "child ready" }],
902+
} as unknown as ExtensionState
903+
904+
vi.spyOn(provider, "getStateToPostToWebview")
905+
.mockReturnValueOnce(olderSnapshot)
906+
.mockResolvedValueOnce(readyState)
907+
const postMessageSpy = vi.spyOn(provider, "postMessageToWebview").mockResolvedValue(undefined)
908+
909+
const olderPost = postState(provider)
910+
await Promise.resolve()
911+
const newerPost = postState(provider)
912+
await newerPost
913+
releaseOlderSnapshot(emptyState)
914+
await olderPost
915+
916+
expect(postMessageSpy.mock.calls.map(([message]) => message.state?.clineMessages)).toEqual([
917+
readyState.clineMessages,
918+
emptyState.clineMessages,
919+
])
920+
expect(postMessageSpy.mock.calls.map(([message]) => message.state?.clineMessagesSeq)).toEqual([2, 1])
921+
})
922+
887923
test.each([
888924
[
889925
"postStateToWebviewWithoutTaskHistory",

0 commit comments

Comments
 (0)