Fix merge conflicts

Author: laileni-aws

packages/core/src/codewhispererChat/tools/listDirectory.ts

@@ -48,7 +48,7 @@ export class ListDirectory {
         updates.end()
     }
 
-    public async invoke(updates: Writable): Promise<InvokeOutput> {
+    public async invoke(updates?: Writable): Promise<InvokeOutput> {
         try {
             const fileUri = vscode.Uri.file(this.fsPath)
             const listing = await readDirectoryRecursively(fileUri, 0)

packages/core/src/test/codewhispererChat/tools/toolShared.test.ts

@@ -151,7 +151,7 @@ describe('ToolUtils', function () {
             const result = await ToolUtils.invoke(tool, mockWritable as unknown as Writable)
 
             assert.deepStrictEqual(result, expectedOutput)
-            assert(mockListDirectory.invoke.calledOnceWith(mockWritable))
+            assert(mockListDirectory.invoke.calledOnceWith(mockWritable as unknown as Writable | undefined))
         })
     })