CR and test fixes

Author: yuval-qf

plugins/qualifire/globals.ts

@@ -90,11 +90,20 @@ const convertToolCalls = (toolCalls: any) => {
     return undefined;
   }
 
-  return toolCalls.map((toolCall: any) => ({
-    id: toolCall.id,
-    name: toolCall.function.name,
-    arguments: JSON.parse(toolCall.function?.arguments ?? '{}'),
-  }));
+  return toolCalls.map((toolCall: any) => {
+    const rawArgs = toolCall.function?.arguments ?? '{}';
+    let parsedArgs: any = rawArgs;
+    try {
+      parsedArgs = typeof rawArgs === 'string' ? JSON.parse(rawArgs) : rawArgs;
+    } catch {
+      // leave as-is
+    }
+    return {
+      id: toolCall.id,
+      name: toolCall.function.name,
+      arguments: parsedArgs,
+    };
+  });
 };
 
 export const convertToMessages = (

plugins/qualifire/manifest.json

@@ -183,7 +183,7 @@
       "description": [
         {
           "type": "subHeading",
-          "text": "Checks that the model returnd a valid json object. If provided, also validated agains given json schema."
+          "text": "Checks that the model returned a valid json object. If provided, also validates agains the given json schema."
         }
       ],
       "parameters": {
@@ -266,7 +266,7 @@
       "description": [
         {
           "type": "subHeading",
-          "text": "Checks that the model returnd a valid sql code."
+          "text": "Checks that the model returnd valid sql code."
         }
       ],
       "parameters": {}
@@ -279,7 +279,7 @@
       "description": [
         {
           "type": "subHeading",
-          "text": "Checks that the model returnd a valid javascript code."
+          "text": "Checks that the model returnd valid javascript code."
         }
       ],
       "parameters": {}

plugins/qualifire/qualifire.test.ts

@@ -2737,18 +2737,18 @@ describe('policy handler', () => {
   });
 });
 
-describe('toolSelectionQuality handler', () => {
-  // Mock the globals module before importing toolSelectionQuality
+describe('toolUseQuality handler', () => {
+  // Mock the globals module before importing toolUseQuality
   jest.mock('./globals', () => ({
     postQualifire: jest.fn(),
     convertToMessages: jest.fn(),
     parseAvailableTools: jest.fn(),
   }));
 
-  let toolSelectionQualityHandler: any;
+  let toolUseQualityHandler: any;
 
   beforeAll(() => {
-    toolSelectionQualityHandler = require('./toolSelectionQuality').handler;
+    toolUseQualityHandler = require('./toolUseQuality').handler;
   });
 
   const mockContext = {
@@ -2848,7 +2848,7 @@ describe('toolSelectionQuality handler', () => {
         },
       ]);
 
-      const result = await toolSelectionQualityHandler(
+      const result = await toolUseQualityHandler(
         mockContext,
         mockParameters,
         'afterRequestHook' as HookEventType
@@ -2928,7 +2928,7 @@ describe('toolSelectionQuality handler', () => {
         },
       ]);
 
-      const result = await toolSelectionQualityHandler(
+      const result = await toolUseQualityHandler(
         mockContext,
         mockParameters,
         'afterRequestHook' as HookEventType
@@ -2940,7 +2940,7 @@ describe('toolSelectionQuality handler', () => {
 
   describe('when called with unsupported event types', () => {
     it('should return error for beforeRequestHook', async () => {
-      const result = await toolSelectionQualityHandler(
+      const result = await toolUseQualityHandler(
         mockContext,
         mockParameters,
         'beforeRequestHook' as HookEventType
@@ -2949,15 +2949,15 @@ describe('toolSelectionQuality handler', () => {
       expect(result).toEqual({
         error: {
           message:
-            'Qualifire Tool Selection Quality guardrail only supports after_request_hooks.',
+            'Qualifire Tool Use Quality guardrail only supports after_request_hooks.',
         },
         verdict: true,
         data: null,
       });
     });
 
     it('should return error for other event types', async () => {
-      const result = await toolSelectionQualityHandler(
+      const result = await toolUseQualityHandler(
         mockContext,
         mockParameters,
         'onErrorHook' as HookEventType
@@ -2966,7 +2966,7 @@ describe('toolSelectionQuality handler', () => {
       expect(result).toEqual({
         error: {
           message:
-            'Qualifire Tool Selection Quality guardrail only supports after_request_hooks.',
+            'Qualifire Tool Use Quality guardrail only supports after_request_hooks.',
         },
         verdict: true,
         data: null,
@@ -2989,7 +2989,7 @@ describe('toolSelectionQuality handler', () => {
       (convertToMessages as jest.Mock).mockReturnValue([]);
       (parseAvailableTools as jest.Mock).mockReturnValue([]);
 
-      const result = await toolSelectionQualityHandler(
+      const result = await toolUseQualityHandler(
         mockContext,
         mockParameters,
         'afterRequestHook' as HookEventType