@@ -65,17 +65,17 @@ import type { ClineMessage } from "@roo-code/types"
6565
6666const originalFile = "const a = 1\nconst b = 2\n"
6767
68- const toolMessage = ( ts : number , payload : unknown , type : "ask" | "say" = "ask" ) : ClineMessage =>
68+ const toolMessage = ( ts : number , payload : unknown , type : "ask" | "say" = "ask" , messageId ?: string ) : ClineMessage =>
6969 type === "ask"
70- ? { ts, type : "ask" , ask : "tool" , text : JSON . stringify ( payload ) }
71- : { ts, type : "say" , say : "tool" , text : JSON . stringify ( payload ) }
70+ ? { ts, type : "ask" , ask : "tool" , text : JSON . stringify ( payload ) , ... ( messageId && { messageId } ) }
71+ : { ts, type : "say" , say : "tool" , text : JSON . stringify ( payload ) , ... ( messageId && { messageId } ) }
7272
7373function createProvider ( clineMessages : ClineMessage [ ] | undefined ) {
7474 const postMessageToWebview = vi . fn ( )
7575 // Only the members the handler touches for this message type.
7676 const provider = {
7777 postMessageToWebview,
78- getCurrentTask : vi . fn ( ) . mockReturnValue ( clineMessages ? { clineMessages } : undefined ) ,
78+ getCurrentTask : vi . fn ( ) . mockReturnValue ( clineMessages ? { taskId : "task-1" , clineMessages } : undefined ) ,
7979 } as unknown as ClineProvider
8080
8181 return { provider, postMessageToWebview }
@@ -96,7 +96,7 @@ describe("webviewMessageHandler - readOriginalContent", () => {
9696
9797 expect ( postMessageToWebview ) . toHaveBeenCalledWith ( {
9898 type : "originalContent" ,
99- originalContentInfo : { ts : 10 , content : originalFile } ,
99+ originalContentInfo : { ts : 10 , messageId : undefined , taskId : undefined , content : originalFile } ,
100100 } )
101101 } )
102102
@@ -105,14 +105,56 @@ describe("webviewMessageHandler - readOriginalContent", () => {
105105 await webviewMessageHandler ( unknown . provider , { type : "readOriginalContent" , messageTs : 999 } )
106106 expect ( unknown . postMessageToWebview ) . toHaveBeenCalledWith ( {
107107 type : "originalContent" ,
108- originalContentInfo : { ts : 999 , content : null } ,
108+ originalContentInfo : { ts : 999 , messageId : undefined , taskId : undefined , content : null } ,
109109 } )
110110
111111 const noTask = createProvider ( undefined )
112112 await webviewMessageHandler ( noTask . provider , { type : "readOriginalContent" , messageTs : 10 } )
113113 expect ( noTask . postMessageToWebview ) . toHaveBeenCalledWith ( {
114114 type : "originalContent" ,
115- originalContentInfo : { ts : 10 , content : null } ,
115+ originalContentInfo : { ts : 10 , messageId : undefined , taskId : undefined , content : null } ,
116+ } )
117+ } )
118+
119+ it ( "picks the message by messageId when two messages share a ts" , async ( ) => {
120+ const { provider, postMessageToWebview } = createProvider ( [
121+ toolMessage ( 10 , { tool : "appliedDiff" , path : "a.ts" , originalContent : "first" } , "ask" , "id-1" ) ,
122+ toolMessage ( 10 , { tool : "appliedDiff" , path : "b.ts" , originalContent : "second" } , "ask" , "id-2" ) ,
123+ ] )
124+
125+ await webviewMessageHandler ( provider , { type : "readOriginalContent" , messageTs : 10 , messageId : "id-2" } )
126+
127+ expect ( postMessageToWebview ) . toHaveBeenCalledWith ( {
128+ type : "originalContent" ,
129+ originalContentInfo : { ts : 10 , messageId : "id-2" , taskId : undefined , content : "second" } ,
130+ } )
131+ } )
132+
133+ it ( "echoes the task id and answers null for a request made for another task" , async ( ) => {
134+ const { provider, postMessageToWebview } = createProvider ( [
135+ toolMessage ( 10 , { tool : "appliedDiff" , originalContent : originalFile } , "ask" , "id-1" ) ,
136+ ] )
137+
138+ await webviewMessageHandler ( provider , {
139+ type : "readOriginalContent" ,
140+ messageTs : 10 ,
141+ messageId : "id-1" ,
142+ taskId : "task-1" ,
143+ } )
144+ await webviewMessageHandler ( provider , {
145+ type : "readOriginalContent" ,
146+ messageTs : 10 ,
147+ messageId : "id-1" ,
148+ taskId : "task-2" ,
149+ } )
150+
151+ expect ( postMessageToWebview ) . toHaveBeenNthCalledWith ( 1 , {
152+ type : "originalContent" ,
153+ originalContentInfo : { ts : 10 , messageId : "id-1" , taskId : "task-1" , content : originalFile } ,
154+ } )
155+ expect ( postMessageToWebview ) . toHaveBeenNthCalledWith ( 2 , {
156+ type : "originalContent" ,
157+ originalContentInfo : { ts : 10 , messageId : "id-1" , taskId : "task-2" , content : null } ,
116158 } )
117159 } )
118160
0 commit comments