Address comments, change list directory result format

Author: jguoamz

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

@@ -63,7 +63,7 @@ export class FsRead {
             return this.handleFileRange(fileContents)
         } catch (error: any) {
             this.logger.error(`Failed to read "${this.fsPath}": ${error.message || error}`)
-            throw new Error(`[fs_read] Failed to read "${this.fsPath}": ${error.message || error}`)
+            throw new Error(`Failed to read "${this.fsPath}": ${error.message || error}`)
         }
     }
 

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

@@ -23,31 +23,28 @@ export class ListDirectory {
     }
 
     public async validate(): Promise<void> {
-        this.logger.debug(`Validating fsPath: ${this.fsPath}`)
         if (!this.fsPath || this.fsPath.trim().length === 0) {
             throw new Error('Path cannot be empty.')
         }
 
         const sanitized = sanitizePath(this.fsPath)
         this.fsPath = sanitized
 
-        const fileUri = vscode.Uri.file(this.fsPath)
-        let exists: boolean
+        const pathUri = vscode.Uri.file(this.fsPath)
+        let pathExists: boolean
         try {
-            exists = await fs.exists(fileUri)
-            if (!exists) {
+            pathExists = await fs.existsDir(pathUri)
+            if (!pathExists) {
                 throw new Error(`Path: "${this.fsPath}" does not exist or cannot be accessed.`)
             }
         } catch (err) {
             throw new Error(`Path: "${this.fsPath}" does not exist or cannot be accessed. (${err})`)
         }
-
-        this.logger.debug(`Validation succeeded for path: ${this.fsPath}`)
     }
 
     public queueDescription(updates: Writable): void {
         const fileName = path.basename(this.fsPath)
-        updates.write(`Listing directory on: [${fileName}]`)
+        updates.write(`Listing directory on filePath: ${fileName}`)
         updates.end()
     }
 
@@ -58,7 +55,7 @@ export class ListDirectory {
             return this.createOutput(listing.join('\n'))
         } catch (error: any) {
             this.logger.error(`Failed to list directory "${this.fsPath}": ${error.message || error}`)
-            throw new Error(`[fs_read] Failed to list directory "${this.fsPath}": ${error.message || error}`)
+            throw new Error(`Failed to list directory "${this.fsPath}": ${error.message || error}`)
         }
     }
 

packages/core/src/codewhispererChat/tools/tool_index.json

@@ -75,7 +75,7 @@
     },
     "listDirectory": {
         "name": "listDirectory",
-        "description": "List the contents of a directory.\n * Use this tool for discovery, before using more targeted tools like fsRead.\n *Useful to try to understand the file structure before diving deeper into specific files.\n *Can be used to explore the codebase.",
+        "description": "List the contents of a directory.\n * Use this tool for discovery, before using more targeted tools like fsRead.\n *Useful to try to understand the file structure before diving deeper into specific files.\n *Can be used to explore the codebase.\n *Results clearly distinguish between files, directories or symlinks with [FILE], [DIR] and [LINK] prefixes.",
         "inputSchema": {
             "type": "object",
             "properties": {

packages/core/src/shared/utilities/workspaceUtils.ts

@@ -673,14 +673,14 @@ export async function findStringInDirectory(searchStr: string, dirPath: string)
 }
 
 /**
- * Returns a one-character tag for a directory ('d'), symlink ('l'), or file ('-').
+ * Returns a prefix for a directory ('[DIR]'), symlink ('[LINK]'), or file ('[FILE]').
  */
 export function formatListing(name: string, fileType: vscode.FileType, fullPath: string): string {
-    let typeChar = '-'
+    let typeChar = '[FILE]'
     if (fileType === vscode.FileType.Directory) {
-        typeChar = 'd'
+        typeChar = '[DIR]'
     } else if (fileType === vscode.FileType.SymbolicLink) {
-        typeChar = 'l'
+        typeChar = '[LINK]'
     }
     return `${typeChar} ${fullPath}`
 }