refactor: convert requestFiles, requestFile, and requestOptionalFile to use object parameters

Author: charleslien

backend/src/__tests__/cost-aggregation.integration.test.ts

@@ -237,9 +237,9 @@ describe('Cost Aggregation Integration Tests', () => {
 
     // Mock file reading
     spyOn(websocketAction, 'requestFiles').mockImplementation(
-      async (ws, paths) => {
+      async (params: { ws: any; filePaths: string[] }) => {
         const results: Record<string, string | null> = {}
-        paths.forEach((path) => {
+        params.filePaths.forEach((path) => {
           results[path] = path === 'hello.txt' ? 'Hello, World!' : null
         })
         return results

backend/src/__tests__/main-prompt.test.ts

@@ -115,9 +115,9 @@ describe('mainPrompt', () => {
 
     // Mock websocket actions
     spyOn(websocketAction, 'requestFiles').mockImplementation(
-      async (ws: any, paths: string[]) => {
+      async (params: { ws: any; filePaths: string[] }) => {
         const results: Record<string, string | null> = {}
-        paths.forEach((p) => {
+        params.filePaths.forEach((p) => {
           if (p === 'test.txt') {
             results[p] = 'mock content for test.txt'
           } else {
@@ -129,8 +129,8 @@ describe('mainPrompt', () => {
     )
 
     spyOn(websocketAction, 'requestFile').mockImplementation(
-      async (ws: any, path: string) => {
-        if (path === 'test.txt') {
+      async (params: { ws: any; filePath: string }) => {
+        if (params.filePath === 'test.txt') {
           return 'mock content for test.txt'
         }
         return null

backend/src/__tests__/prompt-caching-subagents.test.ts

@@ -136,9 +136,9 @@ describe('Prompt Caching for Subagents with inheritParentSystemPrompt', () => {
 
     // Mock file operations
     spyOn(websocketAction, 'requestFiles').mockImplementation(
-      async (ws, paths) => {
+      async (params: { ws: any; filePaths: string[] }) => {
         const results: Record<string, string | null> = {}
-        paths.forEach((path) => {
+        params.filePaths.forEach((path) => {
           results[path] = null
         })
         return results

backend/src/__tests__/run-agent-step-tools.test.ts

@@ -81,9 +81,9 @@ describe('runAgentStep - set_output tool', () => {
     spyOn(liveUserInputs, 'setSessionConnected').mockImplementation(() => {})
 
     spyOn(websocketAction, 'requestFiles').mockImplementation(
-      async (ws: any, paths: string[]) => {
+      async (params: { ws: any; filePaths: string[] }) => {
         const results: Record<string, string | null> = {}
-        paths.forEach((p) => {
+        params.filePaths.forEach((p) => {
           if (p === 'src/auth.ts') {
             results[p] = 'export function authenticate() { return true; }'
           } else if (p === 'src/user.ts') {
@@ -97,10 +97,10 @@ describe('runAgentStep - set_output tool', () => {
     )
 
     spyOn(websocketAction, 'requestFile').mockImplementation(
-      async (ws: any, path: string) => {
-        if (path === 'src/auth.ts') {
+      async (params: { ws: any; filePath: string }) => {
+        if (params.filePath === 'src/auth.ts') {
           return 'export function authenticate() { return true; }'
-        } else if (path === 'src/user.ts') {
+        } else if (params.filePath === 'src/user.ts') {
           return 'export interface User { id: string; name: string; }'
         }
         return null
@@ -365,9 +365,9 @@ describe('runAgentStep - set_output tool', () => {
 
     // Mock requestFiles to return test file content
     spyOn(websocketAction, 'requestFiles').mockImplementation(
-      async (ws: any, paths: string[]) => {
+      async (params: { ws: any; filePaths: string[] }) => {
         const results: Record<string, string | null> = {}
-        paths.forEach((p) => {
+        params.filePaths.forEach((p) => {
           if (p === 'src/test.ts') {
             results[p] = 'export function testFunction() { return "test"; }'
           } else {

backend/src/get-file-reading-updates.ts

@@ -13,7 +13,7 @@ export async function getFileReadingUpdates(
   }[]
 > {
   const allFilePaths = uniq(requestedFiles)
-  const loadedFiles = await requestFiles(ws, allFilePaths)
+  const loadedFiles = await requestFiles({ ws, filePaths: allFilePaths })
 
   const addedFiles = allFilePaths
     .filter(

backend/src/tools/batch-str-replace.ts

@@ -194,7 +194,7 @@ async function preloadOriginalContent(
 
   try {
     // Request all files from the client in one batch
-    const fileContents = await requestFiles(ws, pathsToLoad)
+    const fileContents = await requestFiles({ ws, filePaths: pathsToLoad })
 
     // Filter out null values and return only successfully loaded files
     const loadedContents: Record<string, string> = {}

backend/src/tools/handlers/tool/find-files.ts

@@ -184,7 +184,7 @@ async function uploadExpandedFileContextForTraining(
     repoId,
   )
 
-  const loadedFiles = await requestFiles(ws, files)
+  const loadedFiles = await requestFiles({ ws, filePaths: files })
 
   // Upload a map of:
   // {file_path: {content, token_count}}

backend/src/tools/handlers/tool/str-replace.ts

@@ -59,9 +59,9 @@ export const handleStrReplace = ((params: {
     ? previousEdit.then((maybeResult) =>
         maybeResult && 'content' in maybeResult
           ? maybeResult.content
-          : requestOptionalFile(ws, path),
+          : requestOptionalFile({ ws, filePath: path }),
       )
-    : requestOptionalFile(ws, path)
+    : requestOptionalFile({ ws, filePath: path })
 
   const newPromise = processStrReplace({
     path,

backend/src/tools/handlers/tool/write-file.ts

@@ -129,9 +129,9 @@ export const handleWriteFile = (({
     ? previousEdit.then((maybeResult) =>
         maybeResult && 'content' in maybeResult
           ? maybeResult.content
-          : requestOptionalFile(ws, path),
+          : requestOptionalFile({ ws, filePath: path }),
       )
-    : requestOptionalFile(ws, path)
+    : requestOptionalFile({ ws, filePath: path })
 
   const fileContentWithoutStartNewline = content.startsWith('\n')
     ? content.slice(1)

backend/src/websockets/websocket-action.ts

@@ -398,7 +398,11 @@ subscribeToAction('cancel-user-input', protec.run(onCancelUserInput))
  * @param filePaths - Array of file paths to request
  * @returns Promise resolving to an object mapping file paths to their contents
  */
-export async function requestFiles(ws: WebSocket, filePaths: string[]) {
+export async function requestFiles(params: {
+  ws: WebSocket
+  filePaths: string[]
+}) {
+  const { ws, filePaths } = params
   return new Promise<Record<string, string | null>>((resolve) => {
     const requestId = generateCompactId()
     const unsubscribe = subscribeToAction('read-files-response', (action) => {
@@ -424,13 +428,21 @@ export async function requestFiles(ws: WebSocket, filePaths: string[]) {
  * @param filePath - The path of the file to request
  * @returns Promise resolving to the file contents or null if not found
  */
-export async function requestFile(ws: WebSocket, filePath: string) {
-  const files = await requestFiles(ws, [filePath])
+export async function requestFile(params: {
+  ws: WebSocket
+  filePath: string
+}) {
+  const { ws, filePath } = params
+  const files = await requestFiles({ ws, filePaths: [filePath] })
   return files[filePath] ?? null
 }
 
-export async function requestOptionalFile(ws: WebSocket, filePath: string) {
-  const file = await requestFile(ws, filePath)
+export async function requestOptionalFile(params: {
+  ws: WebSocket
+  filePath: string
+}) {
+  const { ws, filePath } = params
+  const file = await requestFile({ ws, filePath })
   return toOptionalFile(file)
 }