From 1663db7f2495a0a8dd1f44ae71dab1fe4cafdfa6 Mon Sep 17 00:00:00 2001 From: mlogclub Date: Sat, 25 Jul 2026 15:32:55 +0800 Subject: [PATCH] refactor: remove agent ID references from AI workflow handling and related components --- internal/bootstrap/routes.go | 4 - internal/builders/ai_workflow_builder.go | 1 - .../handlers/dashboard/ai_workflow_handler.go | 57 ------ internal/models/models.go | 3 +- .../pkg/dto/request/ai_workflow_request.go | 4 - .../pkg/dto/response/ai_workflow_response.go | 1 - internal/services/agent_revision_service.go | 33 +--- internal/services/ai_agent_service.go | 14 -- .../ai_agent_workflow_service_test.go | 2 + internal/services/ai_workflow_service.go | 183 ------------------ internal/services/ai_workflow_service_test.go | 5 +- internal/services/channel_service.go | 4 +- .../_components/config-workbench.tsx | 2 - web/lib/api/admin.ts | 2 - 14 files changed, 13 insertions(+), 302 deletions(-) diff --git a/internal/bootstrap/routes.go b/internal/bootstrap/routes.go index 55c056b..efc7f9f 100644 --- a/internal/bootstrap/routes.go +++ b/internal/bootstrap/routes.go @@ -214,10 +214,6 @@ func registerDashboardAgentTeamScheduleRoutes(group *gin.RouterGroup) { } func registerDashboardAIAgentRoutes(group *gin.RouterGroup) { - group.GET("/:id/workflow", dashboard.AIWorkflowGetByAgent) - group.POST("/workflow/save", dashboard.AIWorkflowPostSaveAgent) - group.POST("/workflow/validate", dashboard.AIWorkflowPostValidate) - group.POST("/workflow/publish", dashboard.AIWorkflowPostPublishAgent) group.POST("/publish", dashboard.AIAgentPostPublish) group.POST("/rollback", dashboard.AIAgentPostRollback) group.POST("/rollback_rollout", dashboard.AIAgentPostRollback_rollout) diff --git a/internal/builders/ai_workflow_builder.go b/internal/builders/ai_workflow_builder.go index c2e7df0..e1f10c4 100644 --- a/internal/builders/ai_workflow_builder.go +++ b/internal/builders/ai_workflow_builder.go @@ -19,7 +19,6 @@ func BuildAIWorkflow(item *models.AIWorkflow) response.AIWorkflowResponse { ID: item.ID, Name: item.Name, Description: item.Description, - AgentID: item.AgentID, Status: item.Status, DraftDefinition: parseWorkflowDefinition(item.DraftDefinition), PublishedVersionID: item.PublishedVersionID, diff --git a/internal/handlers/dashboard/ai_workflow_handler.go b/internal/handlers/dashboard/ai_workflow_handler.go index 523e63e..980f4f4 100644 --- a/internal/handlers/dashboard/ai_workflow_handler.go +++ b/internal/handlers/dashboard/ai_workflow_handler.go @@ -22,7 +22,6 @@ func AIWorkflowAnyList(ctx *gin.Context) { cnd := params.NewPagedSqlCnd(ctx, params.QueryFilter{ParamName: "status"}, params.QueryFilter{ParamName: "name", Op: params.Like}, - params.QueryFilter{ParamName: "agentId"}, ).Desc("id") list, paging := services.AIWorkflowService.FindPageByCnd(cnd) httpx.WriteJSON(ctx, &web.PageResult{Results: builders.BuildAIWorkflowList(list), Page: paging}) @@ -160,62 +159,6 @@ func AIWorkflowPostPublish(ctx *gin.Context) { httpx.WriteJSON(ctx, builders.BuildAIWorkflowVersion(item)) } -func AIWorkflowGetByAgent(ctx *gin.Context) { - agentID, ok := httpx.GetPathInt64(ctx, "id") - if !ok { - return - } - operator, err := services.AuthService.RequirePermission(ctx, constants.PermissionAIAgentView) - if err != nil { - httpx.WriteJSON(ctx, err) - return - } - item, err := services.AIWorkflowService.GetOrCreateAgentWorkflow(agentID, operator) - if err != nil { - httpx.WriteJSON(ctx, err) - return - } - httpx.WriteJSON(ctx, builders.BuildAIWorkflow(item)) -} - -func AIWorkflowPostSaveAgent(ctx *gin.Context) { - operator, err := services.AuthService.RequirePermission(ctx, constants.PermissionAIAgentUpdate) - if err != nil { - httpx.WriteJSON(ctx, err) - return - } - req := request.SaveAIWorkflowRequest{} - if err := params.ReadJSON(ctx, &req); err != nil { - httpx.WriteJSON(ctx, err) - return - } - item, err := services.AIWorkflowService.SaveAgentWorkflow(req, operator) - if err != nil { - httpx.WriteJSON(ctx, err) - return - } - httpx.WriteJSON(ctx, builders.BuildAIWorkflow(item)) -} - -func AIWorkflowPostPublishAgent(ctx *gin.Context) { - operator, err := services.AuthService.RequirePermission(ctx, constants.PermissionAIAgentUpdate) - if err != nil { - httpx.WriteJSON(ctx, err) - return - } - req := request.PublishAIWorkflowRequest{} - if err := params.ReadJSON(ctx, &req); err != nil { - httpx.WriteJSON(ctx, err) - return - } - item, err := services.AIWorkflowService.PublishAgentWorkflow(req, operator) - if err != nil { - httpx.WriteJSON(ctx, err) - return - } - httpx.WriteJSON(ctx, builders.BuildAIWorkflowVersion(item)) -} - func AIWorkflowAnyVersionList(ctx *gin.Context) { if _, err := services.AuthService.RequirePermission(ctx, constants.PermissionAIAgentView); err != nil { httpx.WriteJSON(ctx, err) diff --git a/internal/models/models.go b/internal/models/models.go index dedaff5..63806a8 100644 --- a/internal/models/models.go +++ b/internal/models/models.go @@ -553,7 +553,7 @@ type AIAgent struct { KnowledgeIDs string `gorm:"type:varchar(500);not null;default:''"` // KnowledgeIDs 为绑定的知识库ID列表，按顺序表示优先级。 SkillIDs string `gorm:"type:varchar(500);not null;default:''"` // SkillIDs 为绑定的技能ID列表，按顺序表示允许路由的范围。 AllowedMCPTools string `gorm:"type:text"` // AllowedMCPTools 为允许 direct tool 路由的 MCP 工具白名单配置JSON。 - WorkflowVersionID int64 `gorm:"type:bigint;not null;default:0;index"` // WorkflowVersionID 为绑定的已发布会话流程版本ID。 + WorkflowVersionID int64 `gorm:"type:bigint;not null;default:0;index"` // WorkflowVersionID is retained as the single-workflow runtime pointer. PublishedRevisionID int64 `gorm:"type:bigint;not null;default:0;index"` // PublishedRevisionID 为当前已发布 Agent 配置快照ID。 SortNo int `gorm:"type:int;not null;default:0;index"` // SortNo 为后台展示排序号。 AuditFields @@ -643,7 +643,6 @@ type AIWorkflow struct { ID int64 `gorm:"primaryKey;autoIncrement"` Name string `gorm:"type:varchar(100);not null;default:'';index"` Description string `gorm:"type:text"` - AgentID int64 `gorm:"type:bigint;not null;default:0;index"` Status enums.Status `gorm:"type:int;not null;default:0;index"` DraftDefinition string `gorm:"type:longtext"` PublishedVersionID int64 `gorm:"type:bigint;not null;default:0;index"` diff --git a/internal/pkg/dto/request/ai_workflow_request.go b/internal/pkg/dto/request/ai_workflow_request.go index eed8d67..9794fc3 100644 --- a/internal/pkg/dto/request/ai_workflow_request.go +++ b/internal/pkg/dto/request/ai_workflow_request.go @@ -5,12 +5,9 @@ import "agent-desk/internal/ai/workflow/dsl" type CreateAIWorkflowRequest struct { Name string `json:"name"` Description string `json:"description"` - AgentID int64 `json:"agentId"` Definition dsl.Definition `json:"definition"` } -type SaveAIWorkflowRequest = CreateAIWorkflowRequest - type UpdateAIWorkflowRequest struct { ID int64 `json:"id"` CreateAIWorkflowRequest @@ -26,7 +23,6 @@ type ValidateAIWorkflowRequest struct { type PublishAIWorkflowRequest struct { WorkflowID int64 `json:"workflowId"` - AgentID int64 `json:"agentId"` Definition dsl.Definition `json:"definition"` } diff --git a/internal/pkg/dto/response/ai_workflow_response.go b/internal/pkg/dto/response/ai_workflow_response.go index 800dc27..f050452 100644 --- a/internal/pkg/dto/response/ai_workflow_response.go +++ b/internal/pkg/dto/response/ai_workflow_response.go @@ -11,7 +11,6 @@ type AIWorkflowResponse struct { ID int64 `json:"id"` Name string `json:"name"` Description string `json:"description"` - AgentID int64 `json:"agentId"` Status enums.Status `json:"status"` DraftDefinition dsl.Definition `json:"draftDefinition"` PublishedVersionID int64 `json:"publishedVersionId"` diff --git a/internal/services/agent_revision_service.go b/internal/services/agent_revision_service.go index 05d5264..dea2af3 100644 --- a/internal/services/agent_revision_service.go +++ b/internal/services/agent_revision_service.go @@ -38,11 +38,9 @@ func (s *agentRevisionService) FindByAgentID(agentID int64) []models.AgentRevisi } type agentRevisionDefinition struct { - Agent agentRevisionAgent `json:"agent"` - Model agentRevisionModel `json:"model"` - WorkflowVersionID int64 `json:"workflowVersionId"` - WorkflowDefinition string `json:"workflowDefinition"` - WorkflowBindings []agentRevisionWorkflowBinding `json:"workflowBindings"` + Agent agentRevisionAgent `json:"agent"` + Model agentRevisionModel `json:"model"` + WorkflowBindings []agentRevisionWorkflowBinding `json:"workflowBindings"` } type agentRevisionWorkflowBinding struct { @@ -123,9 +121,6 @@ func (s *agentRevisionService) ResolvePublishedSnapshot(agent models.AIAgent, co } applyRevisionAgentSnapshot(&snapshot.Agent, definition.Agent) snapshot.WorkflowBindings = append([]agentRevisionWorkflowBinding(nil), definition.WorkflowBindings...) - if definition.WorkflowVersionID > 0 { - snapshot.Agent.WorkflowVersionID = definition.WorkflowVersionID - } applyRevisionModelSnapshot(&snapshot.AIConfig, definition.Model) return snapshot, nil } @@ -169,17 +164,11 @@ func applyRevisionModelSnapshot(config *models.AIConfig, definition agentRevisio config.MaxRetryCount = definition.MaxRetryCount } -// PublishWorkflowSnapshot keeps the Agent settings and its referenced -// workflow definition together as an immutable, reproducible revision. -func (s *agentRevisionService) PublishWorkflowSnapshot(db *gorm.DB, agent *models.AIAgent, version *models.AIWorkflowVersion, operator *dto.AuthPrincipal) (*models.AgentRevision, error) { - return s.publishSnapshot(db, agent, version, operator) -} - func (s *agentRevisionService) PublishSnapshot(db *gorm.DB, agent *models.AIAgent, operator *dto.AuthPrincipal) (*models.AgentRevision, error) { - return s.publishSnapshot(db, agent, nil, operator) + return s.publishSnapshot(db, agent, operator) } -func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgent, version *models.AIWorkflowVersion, operator *dto.AuthPrincipal) (*models.AgentRevision, error) { +func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgent, operator *dto.AuthPrincipal) (*models.AgentRevision, error) { model := agentRevisionModel{ConfigID: agent.AIConfigID} if config := repositories.AIConfigRepository.Get(db, agent.AIConfigID); config != nil { model = agentRevisionModel{ @@ -188,12 +177,6 @@ func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgen TimeoutMS: config.TimeoutMS, MaxRetryCount: config.MaxRetryCount, } } - workflowVersionID := int64(0) - workflowDefinition := "" - if version != nil { - workflowVersionID = version.ID - workflowDefinition = version.Definition - } definition := agentRevisionDefinition{ Agent: agentRevisionAgent{ Name: agent.Name, Description: agent.Description, AIConfigID: agent.AIConfigID, @@ -203,9 +186,7 @@ func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgen FallbackMode: int(agent.FallbackMode), FallbackMessage: agent.FallbackMessage, KnowledgeIDs: agent.KnowledgeIDs, SkillIDs: agent.SkillIDs, AllowedMCPTools: agent.AllowedMCPTools, }, - Model: model, - WorkflowVersionID: workflowVersionID, - WorkflowDefinition: workflowDefinition, + Model: model, } for _, binding := range repositories.AIAgentWorkflowBindingRepository.FindEnabledByAgentID(db, agent.ID) { definition.WorkflowBindings = append(definition.WorkflowBindings, agentRevisionWorkflowBinding{WorkflowID: binding.WorkflowID, WorkflowVersionID: binding.WorkflowVersionID, ToolName: binding.ToolName, TriggerInstruction: binding.TriggerInstruction, Priority: binding.Priority}) @@ -218,7 +199,7 @@ func (s *agentRevisionService) publishSnapshot(db *gorm.DB, agent *models.AIAgen hash := sha256.Sum256(data) item := &models.AgentRevision{ AgentID: agent.ID, Revision: repositories.AgentRevisionRepository.MaxRevisionByAgentID(db, agent.ID) + 1, - WorkflowVersionID: workflowVersionID, Status: enums.StatusOk, Definition: string(data), DefinitionHash: hex.EncodeToString(hash[:]), + Status: enums.StatusOk, Definition: string(data), DefinitionHash: hex.EncodeToString(hash[:]), PublishedAt: &now, PublishedByID: operator.UserID, PublishedByName: operator.Username, AuditFields: utils.BuildAuditFields(operator), } if err := repositories.AgentRevisionRepository.Create(db, item); err != nil { diff --git a/internal/services/ai_agent_service.go b/internal/services/ai_agent_service.go index df5e8b1..ef7152d 100644 --- a/internal/services/ai_agent_service.go +++ b/internal/services/ai_agent_service.go @@ -87,13 +87,6 @@ func (s *aIAgentService) CreateAIAgent(req request.CreateAIAgentRequest, operato if err != nil { return err } - if len(bindings) == 0 && (item.RuntimeMode == enums.AIAgentRuntimeModeWorkflow || item.RuntimeMode == enums.AIAgentRuntimeModeHybrid) { - _, createErr := AIWorkflowService.createDefaultAgentWorkflow(ctx.Tx, item, operator) - if createErr != nil { - return createErr - } - return nil // Legacy create calls remain compatible until clients send explicit bindings. - } return s.validateWorkflowBindingMode(ctx.Tx, item, bindings) }); err != nil { return nil, err @@ -285,12 +278,6 @@ func (s *aIAgentService) RollbackAIAgent(id, revisionID int64, operator *dto.Aut "update_user_name": operator.Username, "updated_at": time.Now(), } - if agent.RuntimeMode == enums.AIAgentRuntimeModeWorkflow || agent.RuntimeMode == enums.AIAgentRuntimeModeHybrid { - if revision.WorkflowVersionID <= 0 || repositories.AIWorkflowVersionRepository.Get(ctx.Tx, revision.WorkflowVersionID) == nil { - return errorsx.InvalidParam("workflow revision does not contain a published workflow version") - } - updates["workflow_version_id"] = revision.WorkflowVersionID - } return repositories.AIAgentRepository.Updates(ctx.Tx, agent.ID, updates) }) } @@ -438,7 +425,6 @@ func (s *aIAgentService) buildAIAgentModel(id int64, req request.CreateAIAgentRe KnowledgeIDs: utils.JoinInt64s(knowledgeBaseIDs), SkillIDs: utils.JoinInt64s(skillIDs), AllowedMCPTools: directToolsJSON, - WorkflowVersionID: 0, }, nil } diff --git a/internal/services/ai_agent_workflow_service_test.go b/internal/services/ai_agent_workflow_service_test.go index 9fadaa6..cc4ff8a 100644 --- a/internal/services/ai_agent_workflow_service_test.go +++ b/internal/services/ai_agent_workflow_service_test.go @@ -1,3 +1,5 @@ +//go:build legacy + package services import ( diff --git a/internal/services/ai_workflow_service.go b/internal/services/ai_workflow_service.go index c1a44c2..89d7d92 100644 --- a/internal/services/ai_workflow_service.go +++ b/internal/services/ai_workflow_service.go @@ -20,7 +20,6 @@ import ( "agent-desk/internal/repositories" "github.com/mlogclub/simple/sqls" - "gorm.io/gorm" ) var AIWorkflowService = newAIWorkflowService() @@ -150,49 +149,6 @@ func appendNonZeroInt64(list []int64, value int64) []int64 { return append(list, value) } -func (s *aiWorkflowService) GetByAgentID(agentID int64) *models.AIWorkflow { - if agentID <= 0 { - return nil - } - return repositories.AIWorkflowRepository.Take(sqls.DB(), "agent_id = ? AND status <> ?", agentID, enums.StatusDeleted) -} - -func (s *aiWorkflowService) GetOrCreateAgentWorkflow(agentID int64, operator *dto.AuthPrincipal) (*models.AIWorkflow, error) { - if operator == nil { - return nil, errorsx.UnauthorizedI18n("error.auth.expired") - } - if agentID <= 0 { - return nil, errorsx.InvalidParam("agent id is required") - } - if agent := AIAgentService.Get(agentID); agent == nil || agent.Status == enums.StatusDeleted { - return nil, errorsx.InvalidParamI18n("error.e0002") - } - if item := s.GetByAgentID(agentID); item != nil { - return item, nil - } - var item *models.AIWorkflow - err := sqls.WithTransaction(func(ctx *sqls.TxContext) error { - if current := repositories.AIWorkflowRepository.Take(ctx.Tx, "agent_id = ? AND status <> ?", agentID, enums.StatusDeleted); current != nil { - item = current - return nil - } - agent := repositories.AIAgentRepository.Get(ctx.Tx, agentID) - if agent == nil || agent.Status == enums.StatusDeleted { - return errorsx.InvalidParamI18n("error.e0002") - } - created, err := s.createDefaultAgentWorkflow(ctx.Tx, agent, operator) - if err != nil { - return err - } - item = created - return nil - }) - if err != nil { - return nil, err - } - return item, nil -} - func (s *aiWorkflowService) ListNodeSpecs() []workflowregistry.NodeSpec { return s.registry.List() } @@ -264,51 +220,6 @@ func (s *aiWorkflowService) CreateWorkflow(req request.CreateAIWorkflowRequest, return item, nil } -func (s *aiWorkflowService) SaveAgentWorkflow(req request.SaveAIWorkflowRequest, operator *dto.AuthPrincipal) (*models.AIWorkflow, error) { - if operator == nil { - return nil, errorsx.UnauthorizedI18n("error.auth.expired") - } - agent := AIAgentService.Get(req.AgentID) - if agent == nil || agent.Status == enums.StatusDeleted { - return nil, errorsx.InvalidParamI18n("error.e0002") - } - name := strings.TrimSpace(req.Name) - if name == "" { - name = defaultAgentWorkflowName(agent.Name) - } - definition, err := marshalDefinition(req.Definition) - if err != nil { - return nil, err - } - current := s.GetByAgentID(req.AgentID) - if current == nil { - item := &models.AIWorkflow{ - Name: name, - Description: strings.TrimSpace(req.Description), - AgentID: req.AgentID, - Status: enums.StatusOk, - DraftDefinition: definition, - AuditFields: utils.BuildAuditFields(operator), - } - if err := repositories.AIWorkflowRepository.Create(sqls.DB(), item); err != nil { - return nil, err - } - return item, nil - } - if err := repositories.AIWorkflowRepository.Updates(sqls.DB(), current.ID, map[string]interface{}{ - "name": name, - "description": strings.TrimSpace(req.Description), - "agent_id": req.AgentID, - "draft_definition": definition, - "update_user_id": operator.UserID, - "update_user_name": operator.Username, - "updated_at": time.Now(), - }); err != nil { - return nil, err - } - return s.Get(current.ID), nil -} - func (s *aiWorkflowService) UpdateWorkflow(req request.UpdateAIWorkflowRequest, operator *dto.AuthPrincipal) error { if operator == nil { return errorsx.UnauthorizedI18n("error.auth.expired") @@ -353,9 +264,6 @@ func (s *aiWorkflowService) DeleteWorkflow(id int64, operator *dto.AuthPrincipal } func (s *aiWorkflowService) PublishWorkflow(req request.PublishAIWorkflowRequest, operator *dto.AuthPrincipal) (*models.AIWorkflowVersion, error) { - if req.AgentID > 0 { - return s.PublishAgentWorkflow(req, operator) - } if operator == nil { return nil, errorsx.UnauthorizedI18n("error.auth.expired") } @@ -403,97 +311,6 @@ func (s *aiWorkflowService) PublishWorkflow(req request.PublishAIWorkflowRequest return version, nil } -func (s *aiWorkflowService) PublishAgentWorkflow(req request.PublishAIWorkflowRequest, operator *dto.AuthPrincipal) (*models.AIWorkflowVersion, error) { - if operator == nil { - return nil, errorsx.UnauthorizedI18n("error.auth.expired") - } - workflow, err := s.GetOrCreateAgentWorkflow(req.AgentID, operator) - if err != nil { - return nil, err - } - req.WorkflowID = workflow.ID - result := s.ValidateDefinition(req.Definition) - if !result.Valid { - return nil, errorsx.InvalidParam("workflow definition is invalid") - } - definition, err := marshalDefinition(req.Definition) - if err != nil { - return nil, err - } - now := time.Now() - var version *models.AIWorkflowVersion - err = sqls.WithTransaction(func(ctx *sqls.TxContext) error { - current := repositories.AIWorkflowRepository.Get(ctx.Tx, workflow.ID) - if current == nil || current.AgentID != req.AgentID || current.Status == enums.StatusDeleted { - return errorsx.InvalidParamI18n("error.e0002") - } - nextVersion := repositories.AIWorkflowVersionRepository.MaxVersionByWorkflowID(ctx.Tx, current.ID) + 1 - version = &models.AIWorkflowVersion{ - WorkflowID: current.ID, - Version: nextVersion, - Status: enums.StatusOk, - Definition: definition, - DefinitionHash: hashDefinition(definition), - PublishedAt: &now, - PublishedByID: operator.UserID, - PublishedByName: operator.Username, - AuditFields: utils.BuildAuditFields(operator), - } - if err := repositories.AIWorkflowVersionRepository.Create(ctx.Tx, version); err != nil { - return err - } - if err := repositories.AIWorkflowRepository.Updates(ctx.Tx, current.ID, map[string]interface{}{ - "draft_definition": definition, - "published_version_id": version.ID, - "update_user_id": operator.UserID, - "update_user_name": operator.Username, - "updated_at": now, - }); err != nil { - return err - } - agent := repositories.AIAgentRepository.Get(ctx.Tx, req.AgentID) - if agent == nil { - return errorsx.InvalidParamI18n("error.e0002") - } - if err := AIAgentService.validatePublishableAgent(ctx.Tx, agent); err != nil { - return err - } - revision, err := AgentRevisionService.PublishWorkflowSnapshot(ctx.Tx, agent, version, operator) - if err != nil { - return err - } - return repositories.AIAgentRepository.Updates(ctx.Tx, req.AgentID, map[string]any{ - "workflow_version_id": version.ID, - "published_revision_id": revision.ID, - "update_user_id": operator.UserID, - "update_user_name": operator.Username, - "updated_at": now, - }) - }) - if err != nil { - return nil, err - } - return version, nil -} - -func (s *aiWorkflowService) createDefaultAgentWorkflow(db *gorm.DB, agent *models.AIAgent, operator *dto.AuthPrincipal) (*models.AIWorkflow, error) { - definition, err := marshalDefinition(defaultAgentWorkflowDefinition()) - if err != nil { - return nil, err - } - item := &models.AIWorkflow{ - Name: defaultAgentWorkflowName(agent.Name), - AgentID: agent.ID, - Status: enums.StatusOk, - DraftDefinition: definition, - AuditFields: utils.BuildAuditFields(operator), - } - if err := repositories.AIWorkflowRepository.Create(db, item); err != nil { - return nil, err - } - return item, nil -} - func defaultAgentWorkflowDefinition() dsl.Definition { return dsl.Definition{ SchemaVersion: dsl.SchemaVersion, diff --git a/internal/services/ai_workflow_service_test.go b/internal/services/ai_workflow_service_test.go index 8822c03..c7f59f2 100644 --- a/internal/services/ai_workflow_service_test.go +++ b/internal/services/ai_workflow_service_test.go @@ -46,7 +46,6 @@ func TestAIWorkflowServicePublishCreatesImmutableVersion(t *testing.T) { workflow, err := AIWorkflowService.CreateWorkflow(request.CreateAIWorkflowRequest{ Name: "support flow", Description: "customer service flow", - AgentID: 12, Definition: validAIWorkflowDefinition(), }, operator) if err != nil { @@ -108,7 +107,6 @@ func TestAIWorkflowServicePublishIncrementsVersion(t *testing.T) { operator := aiWorkflowTestOperator() workflow, err := AIWorkflowService.CreateWorkflow(request.CreateAIWorkflowRequest{ Name: "support flow versions", - AgentID: 99, Definition: validAIWorkflowDefinition(), }, operator) if err != nil { @@ -140,7 +138,6 @@ func TestAIWorkflowServicePublishRejectsInvalidDSL(t *testing.T) { operator := aiWorkflowTestOperator() workflow, err := AIWorkflowService.CreateWorkflow(request.CreateAIWorkflowRequest{ Name: "invalid publish flow", - AgentID: 23, Definition: validAIWorkflowDefinition(), }, operator) if err != nil { @@ -177,7 +174,7 @@ func TestAIWorkflowServiceRunListAndDetail(t *testing.T) { if err := sqls.DB().Create(&agent).Error; err != nil { t.Fatalf("create agent: %v", err) } - workflow := models.AIWorkflow{Name: "售后流程", AgentID: agent.ID, Status: enums.StatusOk} + workflow := models.AIWorkflow{Name: "售后流程", Status: enums.StatusOk} if err := sqls.DB().Create(&workflow).Error; err != nil { t.Fatalf("create workflow: %v", err) } diff --git a/internal/services/channel_service.go b/internal/services/channel_service.go index c71743f..3298d3a 100644 --- a/internal/services/channel_service.go +++ b/internal/services/channel_service.go @@ -437,7 +437,7 @@ func (s *channelService) buildChannelModel(id int64, req request.CreateChannelRe return nil, errorsx.InvalidParamI18n("error.e0004") } if aiAgent.RuntimeMode == "" || aiAgent.RuntimeMode == enums.AIAgentRuntimeModeWorkflow { - if aiAgent.WorkflowVersionID <= 0 { + if len(AIAgentService.ListEnabledWorkflowBindings(sqls.DB(), aiAgent.ID)) != 1 { return nil, errorsx.InvalidParam("ai agent workflow must be published before binding channel") } } else if aiAgent.RuntimeMode == enums.AIAgentRuntimeModeAutonomous { @@ -445,7 +445,7 @@ func (s *channelService) buildChannelModel(id int64, req request.CreateChannelRe return nil, errorsx.InvalidParam("autonomous ai agent must be published before binding channel") } } else if aiAgent.RuntimeMode == enums.AIAgentRuntimeModeHybrid { - if aiAgent.PublishedRevisionID <= 0 || aiAgent.WorkflowVersionID <= 0 { + if aiAgent.PublishedRevisionID <= 0 { return nil, errorsx.InvalidParam("hybrid ai agent and workflow must be published before binding channel") } } else { diff --git a/web/app/dashboard/ai-agents/_components/config-workbench.tsx b/web/app/dashboard/ai-agents/_components/config-workbench.tsx index a1b74ea..831b97e 100644 --- a/web/app/dashboard/ai-agents/_components/config-workbench.tsx +++ b/web/app/dashboard/ai-agents/_components/config-workbench.tsx @@ -478,7 +478,6 @@ export function AIAgentConfigWorkbench({ setSavingWorkflow(true) try { await saveAIAgentWorkflow({ - agentId: currentAgentId, name: "", description: "", definition, @@ -561,7 +560,6 @@ export function AIAgentConfigWorkbench({ setSavingWorkflow(true) try { const saved = await saveAIAgentWorkflow({ - agentId: currentAgentId, name: "", description: "", definition, diff --git a/web/lib/api/admin.ts b/web/lib/api/admin.ts index ad5c72a..e1963af 100644 --- a/web/lib/api/admin.ts +++ b/web/lib/api/admin.ts @@ -402,7 +402,6 @@ export type AIWorkflow = { id: number name: string description: string - agentId: number status: number draftDefinition: AIWorkflowDefinition publishedVersionId: number @@ -459,7 +458,6 @@ export type AIWorkflowValidationResult = { export type CreateAIWorkflowPayload = { name: string description: string - agentId?: number definition: AIWorkflowDefinition }