@@ -15,6 +15,9 @@ const toolAsk = (payload: unknown, extra: Partial<ClineMessage> = {}): ClineMess
1515 ...extra ,
1616} )
1717
18+ const approvedAsk = ( payload : unknown , extra : Partial < ClineMessage > = { } ) : ClineMessage =>
19+ toolAsk ( payload , { isAnswered : true , ...extra } )
20+
1821const bigOriginal = "line of the original file\n" . repeat ( 2000 )
1922
2023describe ( "omitOriginalContent" , ( ) => {
@@ -140,17 +143,20 @@ describe("omitOriginalContent", () => {
140143describe ( "findOriginalContent" , ( ) => {
141144 it ( "returns the originalContent of the tool message with that ts" , ( ) => {
142145 const messages = [
143- toolAsk ( { tool : "appliedDiff" , path : "a.ts" , originalContent : bigOriginal } ) ,
144- toolAsk ( { tool : "appliedDiff" , path : "b.ts" , originalContent : "other" } ) ,
146+ approvedAsk ( { tool : "appliedDiff" , path : "a.ts" , originalContent : bigOriginal } ) ,
147+ approvedAsk ( { tool : "appliedDiff" , path : "b.ts" , originalContent : "other" } ) ,
145148 ]
146149
147150 expect ( findOriginalContent ( messages , { ts : messages [ 0 ] ! . ts } ) ) . toBe ( bigOriginal )
148151 expect ( findOriginalContent ( messages , { ts : messages [ 1 ] ! . ts } ) ) . toBe ( "other" )
149152 } )
150153
151154 it ( "tells messages created in the same millisecond apart by messageId" , ( ) => {
152- const first = toolAsk ( { tool : "appliedDiff" , path : "a.ts" , originalContent : "first" } , { messageId : "id-1" } )
153- const second = toolAsk (
155+ const first = approvedAsk (
156+ { tool : "appliedDiff" , path : "a.ts" , originalContent : "first" } ,
157+ { messageId : "id-1" } ,
158+ )
159+ const second = approvedAsk (
154160 { tool : "appliedDiff" , path : "b.ts" , originalContent : "second" } ,
155161 { messageId : "id-2" , ts : first . ts } ,
156162 )
@@ -195,8 +201,38 @@ describe("findOriginalContent", () => {
195201 expect ( findOriginalContent ( undefined , { ts : 1 } ) ) . toBeNull ( )
196202 } )
197203
204+ it ( "does not disclose the original of a pending or denied approval" , ( ) => {
205+ const payload = { tool : "appliedDiff" , path : "a.ts" , originalContent : bigOriginal }
206+ const pending = toolAsk ( payload )
207+ const denied = toolAsk ( payload , { isAnswered : false } )
208+ const all = [ pending , denied ]
209+
210+ for ( const message of all ) {
211+ expect ( findOriginalContent ( all , { ts : message . ts } ) ) . toBeNull ( )
212+ }
213+ } )
214+
215+ it ( "does not disclose the original of a partial message" , ( ) => {
216+ const message = approvedAsk (
217+ { tool : "appliedDiff" , path : "a.ts" , originalContent : bigOriginal } ,
218+ { partial : true } ,
219+ )
220+
221+ expect ( findOriginalContent ( [ message ] , { ts : message . ts } ) ) . toBeNull ( )
222+ } )
223+
224+ it ( "only discloses the original of file-edit tools" , ( ) => {
225+ const message = approvedAsk ( { tool : "readFile" , path : ".env" , originalContent : "SECRET=1" } )
226+ const missingTool = approvedAsk ( { path : "a.ts" , originalContent : "x" } )
227+ const all = [ message , missingTool ]
228+
229+ for ( const m of all ) {
230+ expect ( findOriginalContent ( all , { ts : m . ts } ) ) . toBeNull ( )
231+ }
232+ } )
233+
198234 it ( "returns an empty original as an empty string" , ( ) => {
199- const message = toolAsk ( { tool : "newFileCreated" , content : "x" , originalContent : "" } )
235+ const message = approvedAsk ( { tool : "newFileCreated" , content : "x" , originalContent : "" } )
200236
201237 expect ( findOriginalContent ( [ message ] , { ts : message . ts } ) ) . toBe ( "" )
202238 } )
0 commit comments