fix: address code review — use toolCallId matching, fix leftover code, clean test descriptions

Agent-Logs-Url: https://github.com/objectstack-ai/spec/sessions/05de3b78-8ac6-4821-a0c8-ae863084c76b

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

packages/services/service-ai/src/__tests__/auth-and-toolcalling.test.ts

@@ -149,7 +149,7 @@ describe('Conversation Ownership Enforcement', () => {
     expect((responseB.body as any).conversations).toHaveLength(1);
   });
 
-  it('should reject adding a message to another user\'s conversation', async () => {
+  it('should reject adding a message to another user conversation', async () => {
     const createRoute = getRoute('POST', '/api/v1/ai/conversations');
     const addMsgRoute = getRoute('POST', '/api/v1/ai/conversations/:id/messages');
 
@@ -170,7 +170,7 @@ describe('Conversation Ownership Enforcement', () => {
     expect((response.body as any).error).toContain('do not have access');
   });
 
-  it('should reject deleting another user\'s conversation', async () => {
+  it('should reject deleting another user conversation', async () => {
     const createRoute = getRoute('POST', '/api/v1/ai/conversations');
     const deleteRoute = getRoute('DELETE', '/api/v1/ai/conversations/:id');
 

packages/services/service-ai/src/ai-service.ts

@@ -187,16 +187,17 @@ export class AIService implements IAIService {
 
       // Process results: track errors and honour onToolError callback
       let aborted = false;
-      for (let i = 0; i < toolResults.length; i++) {
-        const tr = toolResults[i];
-
+      for (const tr of toolResults) {
         if (tr.isError) {
-          const errorEntry = { iteration, toolName: result.toolCalls[i].name, error: tr.content };
+          // Match tool call by toolCallId for robust attribution
+          const matchedCall = result.toolCalls!.find(tc => tc.id === tr.toolCallId);
+          const toolName = matchedCall?.name ?? 'unknown';
+          const errorEntry = { iteration, toolName, error: tr.content };
           toolErrors.push(errorEntry);
           this.logger.warn('[AI] chatWithTools tool error', errorEntry);
 
-          if (onToolError) {
-            const action = onToolError(result.toolCalls[i], tr.content);
+          if (onToolError && matchedCall) {
+            const action = onToolError(matchedCall, tr.content);
             if (action === 'abort') {
               aborted = true;
             }
@@ -288,12 +289,14 @@ export class AIService implements IAIService {
       const toolResults = await this.toolRegistry.executeAll(result.toolCalls);
 
       let aborted = false;
-      for (let i = 0; i < toolResults.length; i++) {
-        const tr = toolResults[i];
+      for (const tr of toolResults) {
         if (tr.isError && onToolError) {
-          const action = onToolError(result.toolCalls[i], tr.content);
-          if (action === 'abort') {
-            aborted = true;
+          const matchedCall = result.toolCalls!.find(tc => tc.id === tr.toolCallId);
+          if (matchedCall) {
+            const action = onToolError(matchedCall, tr.content);
+            if (action === 'abort') {
+              aborted = true;
+            }
           }
         }
         conversation.push({