feat(workflow): add WorkflowRunID to message handling and related services

This commit is contained in:
mlogclub
2026-06-24 17:49:39 +08:00
parent 05233820fb
commit 0b5a24975c
16 changed files with 513 additions and 39 deletions
+1 -1
Submodule docs updated: da1f6d7c39...6adafa1069
+3 -1
View File
@@ -22,6 +22,7 @@ type replyCommitInput struct {
AIAgent models.AIAgent AIAgent models.AIAgent
ReplyText string ReplyText string
ClientPrefix string ClientPrefix string
WorkflowRunID int64
IncrementRound bool IncrementRound bool
} }
@@ -34,7 +35,7 @@ func (s *replyCommitService) SendAIReply(input replyCommitInput) (*models.Messag
if replyText == "" { if replyText == "" {
return nil, nil return nil, nil
} }
replyMessage, err := svc.MessageService.SendAIMessageWithRequestID( replyMessage, err := svc.MessageService.SendAIMessageWithRequestIDAndWorkflowRunID(
input.Conversation.ID, input.Conversation.ID,
input.AIAgent.ID, input.AIAgent.ID,
fmt.Sprintf("%s_%d", strings.TrimSpace(input.ClientPrefix), input.Message.ID), fmt.Sprintf("%s_%d", strings.TrimSpace(input.ClientPrefix), input.Message.ID),
@@ -43,6 +44,7 @@ func (s *replyCommitService) SendAIReply(input replyCommitInput) (*models.Messag
"", "",
s.buildAIPrincipal(input.AIAgent), s.buildAIPrincipal(input.AIAgent),
input.Message.RequestID, input.Message.RequestID,
input.WorkflowRunID,
) )
if err != nil || !input.IncrementRound { if err != nil || !input.IncrementRound {
return replyMessage, err return replyMessage, err
@@ -0,0 +1,120 @@
package runtime
import (
"strings"
"testing"
"time"
"agent-desk/internal/models"
"agent-desk/internal/pkg/enums"
"github.com/glebarez/sqlite"
"github.com/mlogclub/simple/sqls"
"gorm.io/gorm"
"gorm.io/gorm/schema"
)
func TestReplyCommitStoresWorkflowRunIDOnAIMessage(t *testing.T) {
db := setupReplyCommitTestDB(t)
aiAgent := createReplyCommitTestAIAgent(t, db)
conversation := createReplyCommitTestConversation(t, db, aiAgent.ID)
replyMessage, err := newReplyCommitService().CommitAIReply(replyCommitInput{
Conversation: *conversation,
Message: models.Message{ID: 101, RequestID: "trace-101"},
AIAgent: *aiAgent,
ReplyText: "AI reply",
ClientPrefix: "ai_reply",
WorkflowRunID: 9988,
})
if err != nil {
t.Fatalf("CommitAIReply() error = %v", err)
}
if replyMessage == nil {
t.Fatalf("expected reply message")
}
if replyMessage.WorkflowRunID != 9988 {
t.Fatalf("replyMessage.WorkflowRunID=%d want 9988", replyMessage.WorkflowRunID)
}
var stored models.Message
if err := db.First(&stored, replyMessage.ID).Error; err != nil {
t.Fatalf("find reply message: %v", err)
}
if stored.WorkflowRunID != 9988 {
t.Fatalf("stored.WorkflowRunID=%d want 9988", stored.WorkflowRunID)
}
}
func setupReplyCommitTestDB(t *testing.T) *gorm.DB {
t.Helper()
dbName := "reply_commit_test_" + strings.NewReplacer("/", "_").Replace(t.Name())
db, err := gorm.Open(sqlite.Open("file:"+dbName+"?mode=memory&cache=shared"), &gorm.Config{
NamingStrategy: schema.NamingStrategy{
TablePrefix: "t_",
SingularTable: true,
},
})
if err != nil {
t.Fatalf("open sqlite db: %v", err)
}
sqlDB, err := db.DB()
if err != nil {
t.Fatalf("get sqlite db: %v", err)
}
t.Cleanup(func() {
if err := sqlDB.Close(); err != nil {
t.Fatalf("close sqlite db: %v", err)
}
})
if err := db.AutoMigrate(
&models.AIAgent{},
&models.Channel{},
&models.ChannelMessageOutbox{},
&models.Conversation{},
&models.ConversationReadState{},
&models.ConversationEventLog{},
&models.Message{},
); err != nil {
t.Fatalf("auto migrate: %v", err)
}
sqls.SetDB(db)
return db
}
func createReplyCommitTestAIAgent(t *testing.T, db *gorm.DB) *models.AIAgent {
t.Helper()
now := time.Now()
item := &models.AIAgent{
Name: "reply-agent",
Status: enums.StatusOk,
AuditFields: models.AuditFields{
CreatedAt: now,
UpdatedAt: now,
},
}
if err := db.Create(item).Error; err != nil {
t.Fatalf("create ai agent: %v", err)
}
return item
}
func createReplyCommitTestConversation(t *testing.T, db *gorm.DB, aiAgentID int64) *models.Conversation {
t.Helper()
now := time.Now()
item := &models.Conversation{
CustomerID: 1,
ChannelID: 11,
AIAgentID: aiAgentID,
Status: enums.IMConversationStatusAIServing,
LastActiveAt: now,
AuditFields: models.AuditFields{
CreatedAt: now,
UpdatedAt: now,
},
}
if err := db.Create(item).Error; err != nil {
t.Fatalf("create conversation: %v", err)
}
return item
}
+24 -20
View File
@@ -32,11 +32,12 @@ func (s *replyInterruptService) ResumePendingInterrupt(ctx context.Context, owne
summary = expiredInterruptSummary() summary = expiredInterruptSummary()
replyCtx.setSummary(summary) replyCtx.setSummary(summary)
replyMessage, expireErr := owner.commit.CommitAIReply(replyCommitInput{ replyMessage, expireErr := owner.commit.CommitAIReply(replyCommitInput{
Conversation: replyCtx.Conversation, Conversation: replyCtx.Conversation,
Message: replyCtx.Message, Message: replyCtx.Message,
AIAgent: replyCtx.AIAgent, AIAgent: replyCtx.AIAgent,
ReplyText: summary.ReplyText, ReplyText: summary.ReplyText,
ClientPrefix: "ai_interrupt_expired", ClientPrefix: "ai_interrupt_expired",
WorkflowRunID: summary.WorkflowRunID,
}) })
if expireErr != nil { if expireErr != nil {
return expireErr return expireErr
@@ -57,11 +58,12 @@ func (s *replyInterruptService) ResumePendingInterrupt(ctx context.Context, owne
} }
if summary != nil && strings.TrimSpace(summary.ReplyText) != "" { if summary != nil && strings.TrimSpace(summary.ReplyText) != "" {
replyMessage, err := owner.commit.CommitAIReply(replyCommitInput{ replyMessage, err := owner.commit.CommitAIReply(replyCommitInput{
Conversation: replyCtx.Conversation, Conversation: replyCtx.Conversation,
Message: replyCtx.Message, Message: replyCtx.Message,
AIAgent: replyCtx.AIAgent, AIAgent: replyCtx.AIAgent,
ReplyText: summary.ReplyText, ReplyText: summary.ReplyText,
ClientPrefix: "ai_resume", ClientPrefix: "ai_resume",
WorkflowRunID: summary.WorkflowRunID,
}) })
if err != nil { if err != nil {
return err return err
@@ -86,11 +88,12 @@ func (s *replyInterruptService) HandleInterruptedSummary(owner *aiReplyService,
pending = svc.ConversationInterruptService.GetByCheckPointID(summary.CheckPointID) pending = svc.ConversationInterruptService.GetByCheckPointID(summary.CheckPointID)
replyText := resolveInterruptPrompt(summary) replyText := resolveInterruptPrompt(summary)
replyMessage, err := owner.commit.CommitAIReply(replyCommitInput{ replyMessage, err := owner.commit.CommitAIReply(replyCommitInput{
Conversation: replyCtx.Conversation, Conversation: replyCtx.Conversation,
Message: replyCtx.Message, Message: replyCtx.Message,
AIAgent: replyCtx.AIAgent, AIAgent: replyCtx.AIAgent,
ReplyText: replyText, ReplyText: replyText,
ClientPrefix: "ai_interrupt", ClientPrefix: "ai_interrupt",
WorkflowRunID: summary.WorkflowRunID,
}) })
if err != nil { if err != nil {
return err return err
@@ -107,11 +110,12 @@ func (s *replyInterruptService) HandleInterruptedResume(owner *aiReplyService, r
} }
replyText := resolveInterruptPrompt(summary) replyText := resolveInterruptPrompt(summary)
replyMessage, err := owner.commit.CommitAIReply(replyCommitInput{ replyMessage, err := owner.commit.CommitAIReply(replyCommitInput{
Conversation: replyCtx.Conversation, Conversation: replyCtx.Conversation,
Message: replyCtx.Message, Message: replyCtx.Message,
AIAgent: replyCtx.AIAgent, AIAgent: replyCtx.AIAgent,
ReplyText: replyText, ReplyText: replyText,
ClientPrefix: "ai_interrupt_resume", ClientPrefix: "ai_interrupt_resume",
WorkflowRunID: summary.WorkflowRunID,
}) })
if err != nil { if err != nil {
return err return err
+6 -5
View File
@@ -84,11 +84,12 @@ func (s *aiReplyService) executeReply(ctx context.Context, replyCtx aiReplyConte
} }
if summary != nil && strings.TrimSpace(summary.ReplyText) != "" { if summary != nil && strings.TrimSpace(summary.ReplyText) != "" {
_, err := s.commit.CommitAIReply(replyCommitInput{ _, err := s.commit.CommitAIReply(replyCommitInput{
Conversation: replyCtx.Conversation, Conversation: replyCtx.Conversation,
Message: replyCtx.Message, Message: replyCtx.Message,
AIAgent: replyCtx.AIAgent, AIAgent: replyCtx.AIAgent,
ReplyText: summary.ReplyText, ReplyText: summary.ReplyText,
ClientPrefix: "ai_reply", ClientPrefix: "ai_reply",
WorkflowRunID: summary.WorkflowRunID,
}) })
if err != nil { if err != nil {
return err return err
@@ -150,6 +150,7 @@ func BuildMessageWithReadStatesAndLocale(item *models.Message, agentReadState, c
ID: item.ID, ID: item.ID,
ConversationID: item.ConversationID, ConversationID: item.ConversationID,
RequestID: item.RequestID, RequestID: item.RequestID,
WorkflowRunID: item.WorkflowRunID,
ClientMsgID: item.ClientMsgID, ClientMsgID: item.ClientMsgID,
SenderType: item.SenderType, SenderType: item.SenderType,
SenderID: item.SenderID, SenderID: item.SenderID,
@@ -3,6 +3,8 @@ package builders
import ( import (
"testing" "testing"
"agent-desk/internal/models"
"agent-desk/internal/pkg/enums"
"agent-desk/internal/pkg/i18nx" "agent-desk/internal/pkg/i18nx"
) )
@@ -97,3 +99,18 @@ func TestLocalizeRenderableMessageContent(t *testing.T) {
}) })
} }
} }
func TestBuildMessageIncludesWorkflowRunID(t *testing.T) {
resp := BuildMessageWithReadStatesAndLocale(&models.Message{
ID: 1,
ConversationID: 2,
SenderType: enums.IMSenderTypeAI,
MessageType: enums.IMMessageTypeText,
Content: "AI reply",
WorkflowRunID: 9988,
}, nil, nil, nil, nil, nil, i18nx.DefaultLocale)
if resp.WorkflowRunID != 9988 {
t.Fatalf("resp.WorkflowRunID=%d want 9988", resp.WorkflowRunID)
}
}
+1
View File
@@ -390,6 +390,7 @@ type Message struct {
ID int64 `gorm:"primaryKey;autoIncrement"` ID int64 `gorm:"primaryKey;autoIncrement"`
ConversationID int64 `gorm:"type:bigint;not null;index;uniqueIndex:uk_conversation_seq;uniqueIndex:uk_conversation_client_msg"` ConversationID int64 `gorm:"type:bigint;not null;index;uniqueIndex:uk_conversation_seq;uniqueIndex:uk_conversation_client_msg"`
RequestID string `gorm:"type:varchar(128);not null;default:'';index"` RequestID string `gorm:"type:varchar(128);not null;default:'';index"`
WorkflowRunID int64 `gorm:"type:bigint;not null;default:0;index"`
ClientMsgID string `gorm:"type:varchar(128);not null;default:'';uniqueIndex:uk_conversation_client_msg"` ClientMsgID string `gorm:"type:varchar(128);not null;default:'';uniqueIndex:uk_conversation_client_msg"`
SenderType enums.IMSenderType `gorm:"type:varchar(30);not null;default:'';index"` SenderType enums.IMSenderType `gorm:"type:varchar(30);not null;default:'';index"`
SenderID int64 `gorm:"type:bigint;not null;default:0;index"` SenderID int64 `gorm:"type:bigint;not null;default:0;index"`
@@ -6,6 +6,7 @@ type MessageResponse struct {
ID int64 `json:"id"` ID int64 `json:"id"`
ConversationID int64 `json:"conversationId"` ConversationID int64 `json:"conversationId"`
RequestID string `json:"requestId,omitempty"` RequestID string `json:"requestId,omitempty"`
WorkflowRunID int64 `json:"workflowRunId,omitempty"`
ClientMsgID string `json:"clientMsgId,omitempty"` ClientMsgID string `json:"clientMsgId,omitempty"`
SenderType enums.IMSenderType `json:"senderType"` SenderType enums.IMSenderType `json:"senderType"`
SenderID int64 `json:"senderId"` SenderID int64 `json:"senderId"`
+15 -10
View File
@@ -132,11 +132,11 @@ func (s *messageService) GetConversationReadTarget(conversationID, messageID int
func (s *messageService) SendMessage(conversationID int64, senderType enums.IMSenderType, reqSenderID int64, clientMsgID string, messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, external *openidentity.ExternalUser) (*models.Message, error) { func (s *messageService) SendMessage(conversationID int64, senderType enums.IMSenderType, reqSenderID int64, clientMsgID string, messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, external *openidentity.ExternalUser) (*models.Message, error) {
switch senderType { switch senderType {
case enums.IMSenderTypeAgent: case enums.IMSenderTypeAgent:
return s.sendMessage(conversationID, enums.IMSenderTypeAgent, reqSenderID, clientMsgID, messageType, content, payload, operator, nil, "") return s.sendMessage(conversationID, enums.IMSenderTypeAgent, reqSenderID, clientMsgID, messageType, content, payload, operator, nil, "", 0)
case enums.IMSenderTypeAI: case enums.IMSenderTypeAI:
return s.sendMessage(conversationID, enums.IMSenderTypeAI, reqSenderID, clientMsgID, messageType, content, payload, operator, nil, "") return s.sendMessage(conversationID, enums.IMSenderTypeAI, reqSenderID, clientMsgID, messageType, content, payload, operator, nil, "", 0)
case enums.IMSenderTypeCustomer: case enums.IMSenderTypeCustomer:
return s.sendMessage(conversationID, enums.IMSenderTypeCustomer, 0, clientMsgID, messageType, content, payload, nil, external, "") return s.sendMessage(conversationID, enums.IMSenderTypeCustomer, 0, clientMsgID, messageType, content, payload, nil, external, "", 0)
default: default:
return nil, errorsx.InvalidParamI18n("error.e0080") return nil, errorsx.InvalidParamI18n("error.e0080")
} }
@@ -147,7 +147,7 @@ func (s *messageService) SendAgentMessage(conversationID int64, reqSenderID int6
} }
func (s *messageService) SendAgentMessageWithRequestID(conversationID int64, reqSenderID int64, clientMsgID string, messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, requestID string) (*models.Message, error) { func (s *messageService) SendAgentMessageWithRequestID(conversationID int64, reqSenderID int64, clientMsgID string, messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, requestID string) (*models.Message, error) {
return s.sendMessage(conversationID, enums.IMSenderTypeAgent, reqSenderID, clientMsgID, messageType, content, payload, operator, nil, requestID) return s.sendMessage(conversationID, enums.IMSenderTypeAgent, reqSenderID, clientMsgID, messageType, content, payload, operator, nil, requestID, 0)
} }
func (s *messageService) RecallAgentMessage(messageID int64, operator *dto.AuthPrincipal) (*models.Message, error) { func (s *messageService) RecallAgentMessage(messageID int64, operator *dto.AuthPrincipal) (*models.Message, error) {
@@ -250,7 +250,11 @@ func (s *messageService) SendAIMessage(conversationID int64, aiAgentID int64, cl
} }
func (s *messageService) SendAIMessageWithRequestID(conversationID int64, aiAgentID int64, clientMsgID string, messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, requestID string) (*models.Message, error) { func (s *messageService) SendAIMessageWithRequestID(conversationID int64, aiAgentID int64, clientMsgID string, messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, requestID string) (*models.Message, error) {
return s.sendMessage(conversationID, enums.IMSenderTypeAI, aiAgentID, clientMsgID, messageType, content, payload, operator, nil, requestID) return s.SendAIMessageWithRequestIDAndWorkflowRunID(conversationID, aiAgentID, clientMsgID, messageType, content, payload, operator, requestID, 0)
}
func (s *messageService) SendAIMessageWithRequestIDAndWorkflowRunID(conversationID int64, aiAgentID int64, clientMsgID string, messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, requestID string, workflowRunID int64) (*models.Message, error) {
return s.sendMessage(conversationID, enums.IMSenderTypeAI, aiAgentID, clientMsgID, messageType, content, payload, operator, nil, requestID, workflowRunID)
} }
func (s *messageService) SendAIServiceNotice(conversationID int64, aiAgentID int64, content string) (*models.Message, error) { func (s *messageService) SendAIServiceNotice(conversationID int64, aiAgentID int64, content string) (*models.Message, error) {
@@ -269,7 +273,7 @@ func (s *messageService) SendAIServiceNoticeWithRequestID(conversationID int64,
UserID: 0, UserID: 0,
Username: "system", Username: "system",
Nickname: "system", Nickname: "system",
}, nil, requestID) }, nil, requestID, 0)
} }
func (s *messageService) createAIWelcomeMessage(ctx *sqls.TxContext, conversation *models.Conversation, aiAgent *models.AIAgent, now time.Time) (*models.Message, error) { func (s *messageService) createAIWelcomeMessage(ctx *sqls.TxContext, conversation *models.Conversation, aiAgent *models.AIAgent, now time.Time) (*models.Message, error) {
@@ -370,11 +374,11 @@ func (s *messageService) SendCustomerMessage(conversationID int64, clientMsgID s
func (s *messageService) SendCustomerMessageWithRequestID(conversationID int64, clientMsgID string, messageType enums.IMMessageType, content, payload string, external openidentity.ExternalUser, requestID string) (*models.Message, error) { func (s *messageService) SendCustomerMessageWithRequestID(conversationID int64, clientMsgID string, messageType enums.IMMessageType, content, payload string, external openidentity.ExternalUser, requestID string) (*models.Message, error) {
ext := external ext := external
return s.sendMessage(conversationID, enums.IMSenderTypeCustomer, 0, clientMsgID, messageType, content, payload, nil, &ext, requestID) return s.sendMessage(conversationID, enums.IMSenderTypeCustomer, 0, clientMsgID, messageType, content, payload, nil, &ext, requestID, 0)
} }
func (s *messageService) sendMessage(conversationID int64, senderType enums.IMSenderType, reqSenderID int64, clientMsgID string, func (s *messageService) sendMessage(conversationID int64, senderType enums.IMSenderType, reqSenderID int64, clientMsgID string,
messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, external *openidentity.ExternalUser, requestID string) (*models.Message, error) { messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, external *openidentity.ExternalUser, requestID string, workflowRunID int64) (*models.Message, error) {
if senderType == enums.IMSenderTypeCustomer { if senderType == enums.IMSenderTypeCustomer {
if external == nil || strings.TrimSpace(external.ExternalID) == "" { if external == nil || strings.TrimSpace(external.ExternalID) == "" {
@@ -391,11 +395,11 @@ func (s *messageService) sendMessage(conversationID int64, senderType enums.IMSe
if err != nil { if err != nil {
return nil, err return nil, err
} }
return s.sendValidatedMessage(conversation, senderType, reqSenderID, clientMsgID, messageType, content, payload, operator, external, requestID) return s.sendValidatedMessage(conversation, senderType, reqSenderID, clientMsgID, messageType, content, payload, operator, external, requestID, workflowRunID)
} }
func (s *messageService) sendValidatedMessage(conversation *models.Conversation, senderType enums.IMSenderType, reqSenderID int64, clientMsgID string, func (s *messageService) sendValidatedMessage(conversation *models.Conversation, senderType enums.IMSenderType, reqSenderID int64, clientMsgID string,
messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, external *openidentity.ExternalUser, requestID string) (*models.Message, error) { messageType enums.IMMessageType, content, payload string, operator *dto.AuthPrincipal, external *openidentity.ExternalUser, requestID string, workflowRunID int64) (*models.Message, error) {
var err error var err error
var summary string var summary string
@@ -432,6 +436,7 @@ func (s *messageService) sendValidatedMessage(conversation *models.Conversation,
message := &models.Message{ message := &models.Message{
ConversationID: conversation.ID, ConversationID: conversation.ID,
RequestID: traceID, RequestID: traceID,
WorkflowRunID: workflowRunID,
ClientMsgID: clientMsgID, ClientMsgID: clientMsgID,
SenderType: senderType, SenderType: senderType,
SenderID: reqSenderID, SenderID: reqSenderID,
+57
View File
@@ -6,6 +6,7 @@ import (
"time" "time"
"agent-desk/internal/models" "agent-desk/internal/models"
"agent-desk/internal/pkg/dto"
"agent-desk/internal/pkg/enums" "agent-desk/internal/pkg/enums"
"agent-desk/internal/pkg/openidentity" "agent-desk/internal/pkg/openidentity"
@@ -103,6 +104,30 @@ func welcomeTestExternalUser(id string) openidentity.ExternalUser {
} }
} }
func createMessageTestConversation(t *testing.T, db *gorm.DB, aiAgentID int64) *models.Conversation {
t.Helper()
now := time.Now()
conversation := &models.Conversation{
CustomerID: 1,
ChannelID: 11,
AIAgentID: aiAgentID,
Status: enums.IMConversationStatusAIServing,
LastActiveAt: now,
AuditFields: models.AuditFields{
CreatedAt: now,
UpdatedAt: now,
},
}
if err := db.Create(conversation).Error; err != nil {
t.Fatalf("create conversation: %v", err)
}
return conversation
}
func workflowTestAIPrincipal() *dto.AuthPrincipal {
return &dto.AuthPrincipal{UserID: 0, Username: "AI", Nickname: "AI"}
}
func TestConversationCreateCreatesAIWelcomeMessage(t *testing.T) { func TestConversationCreateCreatesAIWelcomeMessage(t *testing.T) {
db := setupMessageWelcomeTestDB(t) db := setupMessageWelcomeTestDB(t)
aiAgent := createWelcomeTestAIAgent(t, db, " 您好,请问有什么可以帮您? ") aiAgent := createWelcomeTestAIAgent(t, db, " 您好,请问有什么可以帮您? ")
@@ -197,6 +222,38 @@ func TestSendCustomerMessageStoresRequestIDOnMessageAndEvent(t *testing.T) {
} }
} }
func TestSendAIMessageStoresWorkflowRunID(t *testing.T) {
db := setupMessageWelcomeTestDB(t)
aiAgent := createWelcomeTestAIAgent(t, db, "")
conversation := createMessageTestConversation(t, db, aiAgent.ID)
message, err := MessageService.SendAIMessageWithRequestIDAndWorkflowRunID(
conversation.ID,
aiAgent.ID,
"ai-reply-workflow-1",
enums.IMMessageTypeText,
"AI reply",
"",
workflowTestAIPrincipal(),
"trace-workflow-1",
9988,
)
if err != nil {
t.Fatalf("SendAIMessageWithRequestIDAndWorkflowRunID() error = %v", err)
}
if message.WorkflowRunID != 9988 {
t.Fatalf("message.WorkflowRunID=%d want 9988", message.WorkflowRunID)
}
var stored models.Message
if err := db.First(&stored, message.ID).Error; err != nil {
t.Fatalf("find message: %v", err)
}
if stored.WorkflowRunID != 9988 {
t.Fatalf("stored.WorkflowRunID=%d want 9988", stored.WorkflowRunID)
}
}
func TestConversationCreateDoesNotDuplicateWelcomeMessageForExistingConversation(t *testing.T) { func TestConversationCreateDoesNotDuplicateWelcomeMessageForExistingConversation(t *testing.T) {
db := setupMessageWelcomeTestDB(t) db := setupMessageWelcomeTestDB(t)
aiAgent := createWelcomeTestAIAgent(t, db, "欢迎咨询") aiAgent := createWelcomeTestAIAgent(t, db, "欢迎咨询")
+1
View File
@@ -327,6 +327,7 @@ func (s *wsService) buildRealtimeMessage(item *models.Message) response.MessageR
ID: item.ID, ID: item.ID,
ConversationID: item.ConversationID, ConversationID: item.ConversationID,
RequestID: item.RequestID, RequestID: item.RequestID,
WorkflowRunID: item.WorkflowRunID,
ClientMsgID: item.ClientMsgID, ClientMsgID: item.ClientMsgID,
SenderType: item.SenderType, SenderType: item.SenderType,
SenderID: item.SenderID, SenderID: item.SenderID,
@@ -9,14 +9,24 @@ import {
useRef, useRef,
useState, useState,
} from "react"; } from "react";
import { BotIcon, LockKeyholeIcon, UserCheckIcon } from "lucide-react"; import {
AlertTriangleIcon,
BotIcon,
LockKeyholeIcon,
TimerIcon,
UserCheckIcon,
WorkflowIcon,
} from "lucide-react";
import { toast } from "sonner"; import { toast } from "sonner";
import { ConversationTransferDialog } from "@/components/conversation-actions/transfer-dialog"; import { ConversationTransferDialog } from "@/components/conversation-actions/transfer-dialog";
import { ImMessageHTML } from "@/components/im-message-html"; import { ImMessageHTML } from "@/components/im-message-html";
import { useImageLightbox } from "@/components/image-lightbox"; import { useImageLightbox } from "@/components/image-lightbox";
import { JsonTreeViewer } from "@/components/json-tree-viewer";
import { ProjectDialog } from "@/components/project-dialog";
import { useI18n } from "@/i18n/provider"; import { useI18n } from "@/i18n/provider";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"; import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
Dialog, Dialog,
@@ -36,6 +46,11 @@ import {
assignAgentConversation, assignAgentConversation,
type AgentMessage, type AgentMessage,
} from "@/lib/api/agent"; } from "@/lib/api/agent";
import {
fetchAIWorkflowRun,
type AIWorkflowNodeRun,
type AIWorkflowRun,
} from "@/lib/api/admin";
import { readSession } from "@/lib/auth"; import { readSession } from "@/lib/auth";
import { renderIMMessageHTML } from "@/lib/im-message"; import { renderIMMessageHTML } from "@/lib/im-message";
import { import {
@@ -153,6 +168,10 @@ export function ChatPanel() {
const [claiming, setClaiming] = useState(false); const [claiming, setClaiming] = useState(false);
const [claimDialogOpen, setClaimDialogOpen] = useState(false); const [claimDialogOpen, setClaimDialogOpen] = useState(false);
const [transferDialogOpen, setTransferDialogOpen] = useState(false); const [transferDialogOpen, setTransferDialogOpen] = useState(false);
const [workflowRunDialogOpen, setWorkflowRunDialogOpen] = useState(false);
const [workflowRunLoading, setWorkflowRunLoading] = useState(false);
const [activeWorkflowRun, setActiveWorkflowRun] =
useState<AIWorkflowRun | null>(null);
const isLgUp = useIsLgUp(); const isLgUp = useIsLgUp();
const isClosedConversation = conversation?.status === 4; const isClosedConversation = conversation?.status === 4;
const isPendingConversation = conversation?.status === 2; const isPendingConversation = conversation?.status === 2;
@@ -397,6 +416,23 @@ export function ChatPanel() {
await loadMessages(conversationId, { forceLoading: true, reset: true }); await loadMessages(conversationId, { forceLoading: true, reset: true });
}; };
const openWorkflowRunDetail = useCallback(
async (runId: number) => {
setWorkflowRunDialogOpen(true);
setWorkflowRunLoading(true);
try {
const data = await fetchAIWorkflowRun(runId);
setActiveWorkflowRun(data);
} catch (error) {
toast.error(error instanceof Error ? error.message : "加载 AI 执行详情失败");
setWorkflowRunDialogOpen(false);
} finally {
setWorkflowRunLoading(false);
}
},
[],
);
if (!conversation) { if (!conversation) {
return ( return (
<div className="mt-10 flex flex-1 items-center justify-center px-4"> <div className="mt-10 flex flex-1 items-center justify-center px-4">
@@ -447,6 +483,7 @@ export function ChatPanel() {
onRecall={async (messageId) => { onRecall={async (messageId) => {
await recallMessage(messageId); await recallMessage(messageId);
}} }}
onOpenWorkflowRun={openWorkflowRunDetail}
/> />
)) ))
) : ( ) : (
@@ -594,6 +631,17 @@ export function ChatPanel() {
await reloadConversationData(conversation.id); await reloadConversationData(conversation.id);
}} }}
/> />
<WorkflowRunDetailDialog
open={workflowRunDialogOpen}
loading={workflowRunLoading}
run={activeWorkflowRun}
onOpenChange={(open) => {
setWorkflowRunDialogOpen(open);
if (!open) {
setActiveWorkflowRun(null);
}
}}
/>
</div> </div>
); );
} }
@@ -604,6 +652,7 @@ type MessageItemProps = {
canRecall: boolean; canRecall: boolean;
recalling: boolean; recalling: boolean;
onRecall: (messageId: number) => Promise<void>; onRecall: (messageId: number) => Promise<void>;
onOpenWorkflowRun: (runId: number) => Promise<void>;
}; };
const MessageItem = memo( const MessageItem = memo(
@@ -613,6 +662,7 @@ const MessageItem = memo(
canRecall, canRecall,
recalling, recalling,
onRecall, onRecall,
onOpenWorkflowRun,
}: MessageItemProps) { }: MessageItemProps) {
const t = useI18n(); const t = useI18n();
const { open: openImageLightbox } = useImageLightbox(); const { open: openImageLightbox } = useImageLightbox();
@@ -706,6 +756,20 @@ const MessageItem = memo(
{recalling ? t("conversation.recalling") : t("conversation.recall")} {recalling ? t("conversation.recalling") : t("conversation.recall")}
</Button> </Button>
) : null} ) : null}
{isAi && message.workflowRunId ? (
<Button
type="button"
variant="ghost"
size="sm"
className="h-auto gap-1 px-1 py-0 text-xs text-muted-foreground"
onClick={() => {
void onOpenWorkflowRun(message.workflowRunId ?? 0);
}}
>
<WorkflowIcon className="size-3" />
</Button>
) : null}
</div> </div>
</div> </div>
<Avatar className="size-8 shrink-0"> <Avatar className="size-8 shrink-0">
@@ -754,7 +818,8 @@ const MessageItem = memo(
prevProps.onImageSettled === nextProps.onImageSettled && prevProps.onImageSettled === nextProps.onImageSettled &&
prevProps.canRecall === nextProps.canRecall && prevProps.canRecall === nextProps.canRecall &&
prevProps.recalling === nextProps.recalling && prevProps.recalling === nextProps.recalling &&
prevProps.onRecall === nextProps.onRecall, prevProps.onRecall === nextProps.onRecall &&
prevProps.onOpenWorkflowRun === nextProps.onOpenWorkflowRun,
); );
function buildMessageHTML(message: { function buildMessageHTML(message: {
@@ -764,3 +829,199 @@ function buildMessageHTML(message: {
}) { }) {
return renderIMMessageHTML(message); return renderIMMessageHTML(message);
} }
function WorkflowRunDetailDialog({
open,
loading,
run,
onOpenChange,
}: {
open: boolean;
loading: boolean;
run: AIWorkflowRun | null;
onOpenChange: (open: boolean) => void;
}) {
return (
<ProjectDialog
open={open}
onOpenChange={onOpenChange}
title={
<span className="flex items-center gap-2">
<WorkflowIcon className="size-4" />
AI
</span>
}
description={run ? `Run #${run.id}` : "Workflow 执行链路"}
size="xl"
allowFullscreen
footer={
<Button variant="outline" onClick={() => onOpenChange(false)}>
</Button>
}
>
{loading ? (
<div className="px-6 py-10 text-sm text-muted-foreground">
</div>
) : run ? (
<div className="space-y-4 px-6 pb-6">
<div className="grid gap-2 rounded-lg border bg-muted/20 p-3 text-sm md:grid-cols-2">
<WorkflowRunDetailRow
label="Workflow"
value={`#${run.workflowId} / v${run.workflowVersionId}`}
/>
<WorkflowRunDetailRow label="会话" value={`#${run.conversationId}`} />
<WorkflowRunDetailRow label="消息" value={`#${run.messageId}`} />
<WorkflowRunDetailRow label="Agent" value={`#${run.aiAgentId}`} />
<WorkflowRunDetailRow
label="状态"
value={run.statusName || String(run.status)}
/>
<WorkflowRunDetailRow
label="开始"
value={run.startedAt ? formatDateTime(run.startedAt) : ""}
/>
<WorkflowRunDetailRow
label="结束"
value={run.endedAt ? formatDateTime(run.endedAt) : ""}
/>
<WorkflowRunDetailRow label="中断节点" value={run.interruptNodeId || ""} />
</div>
{run.errorMessage ? (
<div className="rounded-lg border border-destructive/30 bg-destructive/5 px-3 py-2 text-sm text-destructive">
{run.errorMessage}
</div>
) : null}
<div className="space-y-3">
{(run.nodes ?? []).map((node) => (
<WorkflowNodeRunBlock key={node.id} node={node} />
))}
{!run.nodes || run.nodes.length === 0 ? (
<p className="text-sm text-muted-foreground"></p>
) : null}
</div>
</div>
) : (
<div className="px-6 py-10 text-sm text-muted-foreground">
</div>
)}
</ProjectDialog>
);
}
function WorkflowRunDetailRow({
label,
value,
}: {
label: string;
value: string;
}) {
const empty = !value.trim();
return (
<div className="flex gap-2.5 text-sm leading-snug">
<span className="w-17 shrink-0 pt-px text-xs text-muted-foreground">
{label}
</span>
<span
className={`min-w-0 flex-1 break-all ${
empty ? "text-muted-foreground" : "text-foreground"
}`}
>
{empty ? "—" : value}
</span>
</div>
);
}
function WorkflowNodeRunBlock({ node }: { node: AIWorkflowNodeRun }) {
const inputValue = safeParseJSON(node.inputPreview);
const outputValue = safeParseJSON(node.outputPreview);
return (
<div className="rounded-lg border bg-background p-3">
<div className="flex flex-wrap items-start justify-between gap-2">
<div className="min-w-0">
<div className="flex min-w-0 items-center gap-2">
<span className="truncate text-sm font-medium text-foreground">
{node.nodeId || `Node #${node.id}`}
</span>
<WorkflowRunStatusBadge statusName={node.statusName} />
</div>
<div className="mt-1 text-xs text-muted-foreground">
{node.nodeType || "unknown"}
</div>
</div>
<div className="flex items-center gap-1 text-xs text-muted-foreground">
<TimerIcon className="size-3.5" />
{node.durationMs} ms
</div>
</div>
{node.errorMessage ? (
<div className="mt-3 flex items-start gap-1.5 rounded-md bg-destructive/5 px-3 py-2 text-xs text-destructive">
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<span className="break-all">{node.errorMessage}</span>
</div>
) : null}
<div className="mt-3 grid gap-3 lg:grid-cols-2">
<WorkflowPreviewBlock title="输入" raw={node.inputPreview} value={inputValue} />
<WorkflowPreviewBlock title="输出" raw={node.outputPreview} value={outputValue} />
</div>
</div>
);
}
function WorkflowPreviewBlock({
title,
raw,
value,
}: {
title: string;
raw: string;
value: unknown;
}) {
return (
<div className="min-w-0">
<div className="mb-1 text-xs font-medium text-muted-foreground">{title}</div>
{value !== null ? (
<JsonTreeViewer value={value} collapsed={2} />
) : raw.trim() ? (
<pre className="max-h-72 overflow-auto rounded-md border bg-muted/20 p-3 text-xs whitespace-pre-wrap break-all">
{raw}
</pre>
) : (
<div className="rounded-md border bg-muted/20 px-3 py-2 text-xs text-muted-foreground">
</div>
)}
</div>
);
}
function WorkflowRunStatusBadge({ statusName }: { statusName: string }) {
const normalized = statusName.trim();
const variant =
normalized === "failed"
? "destructive"
: normalized === "interrupted"
? "outline"
: "secondary";
return (
<Badge variant={variant} className="h-5 px-1.5 text-[11px]">
{normalized || "unknown"}
</Badge>
);
}
function safeParseJSON(raw: string): unknown | null {
const trimmed = raw.trim();
if (!trimmed) {
return null;
}
try {
return JSON.parse(trimmed) as unknown;
} catch {
return null;
}
}
+1
View File
@@ -143,6 +143,7 @@ export type AdminConversationDetail = AdminConversation & {
export type AdminMessage = { export type AdminMessage = {
id: number id: number
conversationId: number conversationId: number
workflowRunId?: number
clientMsgId?: string clientMsgId?: string
senderType: string senderType: string
senderId: number senderId: number
+1
View File
@@ -70,6 +70,7 @@ export type AgentConversationDetail = AgentConversation & {
export type AgentMessage = { export type AgentMessage = {
id: number id: number
conversationId: number conversationId: number
workflowRunId?: number
clientMsgId?: string clientMsgId?: string
senderType: string senderType: string
senderId: number senderId: number
+1
View File
@@ -64,6 +64,7 @@ export type ImConversationDetail = ImConversation
export type ImMessage = { export type ImMessage = {
id: number id: number
conversationId: number conversationId: number
workflowRunId?: number
clientMsgId?: string clientMsgId?: string
senderType: string senderType: string
senderId: number senderId: number