refactor: convert parseRawToolCall, parseRawCustomToolCall, and fix getUserIdFromAuthToken call sites to use object parameters

Author: charleslien

backend/src/api/org.ts

@@ -35,7 +35,7 @@ async function isRepoCoveredHandler(
         .status(401)
         .json({ error: 'Missing x-codebuff-api-key header' })
     }
-    const userId = await getUserIdFromAuthToken(authToken)
+    const userId = await getUserIdFromAuthToken({ authToken })
 
     if (!userId) {
       return res.status(401).json({ error: INVALID_AUTH_TOKEN_MESSAGE })

backend/src/tools/tool-executor.ts

@@ -44,14 +44,15 @@ export type ToolCallError = {
   error: string
 } & Pick<CodebuffToolCall, 'toolCallId'>
 
-export function parseRawToolCall<T extends ToolName = ToolName>(
+export function parseRawToolCall<T extends ToolName = ToolName>(params: {
   rawToolCall: {
     toolName: T
     toolCallId: string
     input: Record<string, unknown>
-  },
-  autoInsertEndStepParam: boolean = false,
-): CodebuffToolCall<T> | ToolCallError {
+  }
+  autoInsertEndStepParam?: boolean
+}): CodebuffToolCall<T> | ToolCallError {
+  const { rawToolCall, autoInsertEndStepParam = false } = params
   const toolName = rawToolCall.toolName
 
   if (!(toolName in codebuffToolDefs)) {
@@ -152,14 +153,14 @@ export function executeToolCall<T extends ToolName>({
   autoInsertEndStepParam = false,
   excludeToolFromMessageHistory = false,
 }: ExecuteToolCallParams<T>): Promise<void> {
-  const toolCall: CodebuffToolCall<T> | ToolCallError = parseRawToolCall<T>(
-    {
+  const toolCall: CodebuffToolCall<T> | ToolCallError = parseRawToolCall<T>({
+    rawToolCall: {
       toolName,
       toolCallId: generateCompactId(),
       input,
     },
     autoInsertEndStepParam,
-  )
+  })
   if ('error' in toolCall) {
     const toolResult: ToolResultPart = {
       type: 'tool-result',
@@ -283,15 +284,16 @@ export function executeToolCall<T extends ToolName>({
   })
 }
 
-export function parseRawCustomToolCall(
-  customToolDefs: z.infer<typeof customToolDefinitionsSchema>,
+export function parseRawCustomToolCall(params: {
+  customToolDefs: z.infer<typeof customToolDefinitionsSchema>
   rawToolCall: {
     toolName: string
     toolCallId: string
     input: Record<string, unknown>
-  },
-  autoInsertEndStepParam: boolean = false,
-): CustomToolCall | ToolCallError {
+  }
+  autoInsertEndStepParam?: boolean
+}): CustomToolCall | ToolCallError {
+  const { customToolDefs, rawToolCall, autoInsertEndStepParam = false } = params
   const toolName = rawToolCall.toolName
 
   if (!(toolName in customToolDefs) && !toolName.includes('/')) {
@@ -376,20 +378,20 @@ export async function executeCustomToolCall({
   autoInsertEndStepParam = false,
   excludeToolFromMessageHistory = false,
 }: ExecuteToolCallParams<string>): Promise<void> {
-  const toolCall: CustomToolCall | ToolCallError = parseRawCustomToolCall(
-    await getMCPToolData({
+  const toolCall: CustomToolCall | ToolCallError = parseRawCustomToolCall({
+    customToolDefs: await getMCPToolData({
       ws,
       toolNames: agentTemplate.toolNames,
       mcpServers: agentTemplate.mcpServers,
       writeTo: cloneDeep(fileContext.customToolDefinitions),
     }),
-    {
+    rawToolCall: {
       toolName,
       toolCallId: generateCompactId(),
       input,
     },
     autoInsertEndStepParam,
-  )
+  })
   if ('error' in toolCall) {
     const toolResult: ToolResultPart = {
       type: 'tool-result',

backend/src/websockets/websocket-action.ts

@@ -139,7 +139,7 @@ const onPrompt = async (
   await withLoggerContext(
     { fingerprintId, clientRequestId: promptId, costMode },
     async () => {
-      const userId = await getUserIdFromAuthToken(authToken)
+      const userId = await getUserIdFromAuthToken({ authToken })
       if (!userId) {
         throw new Error('User not found')
       }
@@ -285,7 +285,7 @@ const onInit = async (
   ws: WebSocket,
 ) => {
   await withLoggerContext({ fingerprintId }, async () => {
-    const userId = await getUserIdFromAuthToken(authToken)
+    const userId = await getUserIdFromAuthToken({ authToken })
 
     if (!userId) {
       sendAction(ws, {
@@ -314,7 +314,7 @@ const onCancelUserInput = async ({
   authToken,
   promptId,
 }: ClientAction<'cancel-user-input'>) => {
-  const userId = await getUserIdFromAuthToken(authToken)
+  const userId = await getUserIdFromAuthToken({ authToken })
   if (!userId) {
     logger.error({ authToken }, 'User id not found for authToken')
     return

scripts/ft-file-selection/relabel-for-offline-scoring.ts

@@ -169,7 +169,7 @@ async function relabelTraceForModel(
   const messages = payload.messages as Message[]
   const system = payload.system as System
 
-  let transformedMessages = messagesWithSystem(messages, system)
+  let transformedMessages = messagesWithSystem({ messages, system })
   if (modelToTest === finetunedVertexModels.ft_filepicker_010) {
     transformedMessages = transformedMessages
       .map((msg, i) => {

scripts/ft-file-selection/relabel-traces.ts

@@ -58,10 +58,10 @@ async function runTraces() {
 
               if (model.startsWith('claude')) {
                 output = await promptAiSdk({
-                  messages: messagesWithSystem(
-                    messages as Message[],
-                    system as System,
-                  ),
+                  messages: messagesWithSystem({
+                    messages: messages as Message[],
+                    system: system as System,
+                  }),
                   model: model as typeof models.openrouter_claude_sonnet_4,
                   clientSessionId: 'relabel-trace-run',
                   fingerprintId: 'relabel-trace-run',
@@ -70,7 +70,10 @@ async function runTraces() {
                 })
               } else {
                 output = await promptFlashWithFallbacks(
-                  messagesWithSystem(messages as Message[], system as System),
+                  messagesWithSystem({
+                    messages: messages as Message[],
+                    system: system as System,
+                  }),
                   {
                     model:
                       model as typeof models.openrouter_gemini2_5_pro_preview,