refactor: validate before invoking

Author: Hweinstock

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/fsRead.ts

@@ -45,6 +45,7 @@ export class FsRead {
     }
 
     public async invoke(params: FsReadParams): Promise<InvokeOutput> {
+        await this.validate(params)
         try {
             const fileContents = await this.readFile(params.path)
             this.logging.info(`Read file: ${params.path}, size: ${fileContents.length}`)
@@ -115,7 +116,7 @@ export class FsRead {
         }
     }
 
-    public static getSpec() {
+    public getSpec() {
         return {
             name: 'fsRead',
             description:

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/fsWrite.ts

@@ -43,6 +43,7 @@ export class FsWrite {
     }
 
     public async invoke(params: FsWriteParams): Promise<InvokeOutput> {
+        await this.validate(params)
         const sanitizedPath = sanitize(params.path)
 
         switch (params.command) {
@@ -162,7 +163,7 @@ export class FsWrite {
         return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
     }
 
-    public static getSpec() {
+    public getSpec() {
         return {
             name: 'fsWrite',
             description:

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/toolServer.ts

@@ -3,17 +3,12 @@ import { FsRead, FsReadParams } from './fsRead'
 import { FsWrite, FsWriteParams } from './fsWrite'
 
 export const FsToolsServer: Server = ({ workspace, logging, agent }) => {
-    const fsRead = new FsRead({ workspace, logging })
-    const fsWrite = new FsWrite({ workspace, logging })
+    const fsReadTool = new FsRead({ workspace, logging })
+    const fsWriteTool = new FsWrite({ workspace, logging })
 
-    agent.addTool(FsRead.getSpec(), (input: FsReadParams) => {
-        return fsRead.invoke(input)
-    })
+    agent.addTool(fsReadTool.getSpec(), (input: FsReadParams) => fsReadTool.invoke(input))
 
-    agent.addTool(FsWrite.getSpec(), (input: FsWriteParams) => {
-        return fsWrite.invoke(input)
-    })
+    agent.addTool(fsWriteTool.getSpec(), (input: FsWriteParams) => fsWriteTool.invoke(input))
 
-    // nothing to dispose of.
     return () => {}
 }