Merge pull request #1441 from refly-ai/feat/tool_call_status

feat(tool-call): implement tool call management and enhance action de…

Author: mrcfps

.vscode/launch.json

@@ -7,10 +7,27 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "Launch Program",
-      "skipFiles": ["<node_internals>/**"],
-      "program": "${file}",
-      "outFiles": ["${workspaceFolder}/**/*.js"]
+      "name": "Launch API (debug)",
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["--filter", "api", "dev"],
+      "cwd": "${workspaceFolder}",
+      "console": "integratedTerminal",
+      "env": {
+        "NODE_OPTIONS": "--inspect=0.0.0.0:9229"
+      },
+      "autoAttachChildProcesses": true,
+      "skipFiles": ["<node_internals>/**"]
+    },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach to API",
+      "port": 9229,
+      "address": "localhost",
+      "restart": false,
+      "localRoot": "${workspaceFolder}",
+      "remoteRoot": "${workspaceFolder}",
+      "skipFiles": ["<node_internals>/**"]
     }
   ]
 }

apps/api/prisma/schema.prisma

@@ -1528,19 +1528,28 @@ model Toolset {
 
 model ToolCallResult {
   /// Primary key
-  pk        Int       @id @default(autoincrement())
+  pk        Int     @id @default(autoincrement())
+  /// Result ID
+  resultId  String  @map("result_id")
+  /// Result version
+  version   Int     @default(0) @map("version")
   /// Call ID
-  callId    String    @unique @map("call_id")
+  callId    String  @unique @map("call_id")
   /// UID
-  uid       String    @map("uid")
+  uid       String  @map("uid")
   /// Toolset ID
-  toolsetId String    @map("toolset_id")
+  toolsetId String  @map("toolset_id")
   /// Tool name
-  toolName  String    @map("tool_name")
+  toolName  String  @map("tool_name")
+  /// Step name
+  stepName  String? @map("step_name")
   /// Input data
-  input     String    @map("input")
+  input     String  @map("input")
   /// Output data
-  output    String    @map("output")
+  output    String  @map("output")
+
+  /// Status: enum
+  status    String    @default("executing") @map("status")
   /// Error message
   error     String?   @map("error")
   /// Create timestamp
@@ -1550,6 +1559,7 @@ model ToolCallResult {
   /// Deletion timestamp
   deletedAt DateTime? @map("deleted_at") @db.Timestamptz()
 
+  @@index([resultId, version])
   @@index([toolsetId, deletedAt])
   @@index([toolName, deletedAt])
   @@map("tool_call_results")

apps/api/src/modules/action/action.dto.ts

@@ -6,25 +6,48 @@ import {
   EntityType,
   ModelInfo,
   ModelTier,
+  ToolCallResult,
 } from '@refly/openapi-schema';
 import {
   ActionResult as ActionResultModel,
   ActionStep as ActionStepModel,
+  ToolCallResult as ToolCallResultModel,
 } from '../../generated/client';
 import { pick, safeParseJSON } from '@refly/utils';
 
+type ActionStepDetail = ActionStepModel & {
+  toolCalls?: ToolCallResultModel[];
+};
+
 export type ActionDetail = ActionResultModel & {
-  steps?: ActionStepModel[];
+  steps?: ActionStepDetail[];
   modelInfo?: ModelInfo;
 };
 
-export function actionStepPO2DTO(step: ActionStepModel): ActionStep {
+export function actionStepPO2DTO(step: ActionStepDetail): ActionStep {
   return {
     ...pick(step, ['name', 'content', 'reasoningContent']),
     logs: safeParseJSON(step.logs || '[]'),
     artifacts: safeParseJSON(step.artifacts || '[]'),
     structuredData: safeParseJSON(step.structuredData || '{}'),
     tokenUsage: safeParseJSON(step.tokenUsage || '[]'),
+    toolCalls: step.toolCalls?.map(toolCallResultPO2DTO),
+  };
+}
+
+export function toolCallResultPO2DTO(toolCall: ToolCallResultModel): ToolCallResult {
+  return {
+    callId: toolCall.callId,
+    uid: toolCall.uid,
+    toolsetId: toolCall.toolsetId,
+    toolName: toolCall.toolName,
+    input: safeParseJSON(toolCall.input || '{}'),
+    output: safeParseJSON(toolCall.output || '{}'),
+    error: toolCall.error || '',
+    status: toolCall.status as 'executing' | 'completed' | 'failed',
+    createdAt: toolCall.createdAt.getTime(),
+    updatedAt: toolCall.updatedAt.getTime(),
+    deletedAt: toolCall.deletedAt?.getTime(),
   };
 }
 

apps/api/src/modules/action/action.module.ts

@@ -1,12 +1,13 @@
 import { Module, forwardRef } from '@nestjs/common';
-import { ActionController } from './action.controller';
-import { ActionService } from './action.service';
 import { CommonModule } from '../common/common.module';
 import { ProviderModule } from '../provider/provider.module';
 import { SkillModule } from '../skill/skill.module';
+import { ToolCallModule } from '../tool-call/tool-call.module';
+import { ActionController } from './action.controller';
+import { ActionService } from './action.service';
 
 @Module({
-  imports: [CommonModule, ProviderModule, forwardRef(() => SkillModule)],
+  imports: [CommonModule, ProviderModule, ToolCallModule, forwardRef(() => SkillModule)],
   controllers: [ActionController],
   providers: [ActionService],
   exports: [ActionService],

apps/api/src/modules/action/action.service.ts

@@ -1,13 +1,14 @@
-import { ActionDetail } from '../action/action.dto';
-import { PrismaService } from '../common/prisma.service';
 import { Injectable, Logger } from '@nestjs/common';
 import { ActionResultNotFoundError } from '@refly/errors';
-import { ActionResult } from '../../generated/client';
 import { AbortActionRequest, EntityType, GetActionResultData, User } from '@refly/openapi-schema';
 import { batchReplaceRegex, genActionResultID, pick } from '@refly/utils';
 import pLimit from 'p-limit';
-import { ProviderService } from '../provider/provider.service';
+import { ActionResult } from '../../generated/client';
+import { ActionDetail } from '../action/action.dto';
+import { PrismaService } from '../common/prisma.service';
 import { providerItem2ModelInfo } from '../provider/provider.dto';
+import { ProviderService } from '../provider/provider.service';
+import { ToolCallService } from '../tool-call/tool-call.service';
 
 @Injectable()
 export class ActionService {
@@ -22,6 +23,7 @@ export class ActionService {
   constructor(
     private readonly prisma: PrismaService,
     private readonly providerService: ProviderService,
+    private readonly toolCallService: ToolCallService,
   ) {}
 
   async getActionResult(user: User, param: GetActionResultData['query']): Promise<ActionDetail> {
@@ -58,7 +60,12 @@ export class ActionService {
       orderBy: { order: 'asc' },
     });
 
-    return { ...result, steps, modelInfo };
+    const toolCalls = await this.toolCallService.fetchToolCalls(result.resultId, result.version);
+    const toolCallsByStep = this.toolCallService.groupToolCallsByStep(steps, toolCalls);
+    const stepsWithToolCalls = this.toolCallService.attachToolCallsToSteps(steps, toolCallsByStep);
+    await this.toolCallService.deriveAndUpdateActionStatus(result, toolCalls);
+
+    return { ...result, steps: stepsWithToolCalls, modelInfo };
   }
 
   async duplicateActionResults(