Fully autonomous AI Agents system capable of performing complex penetration testing tasks
Go ai-agentsai-security-toolanthropicautonomous-agentsgolanggptgraphqlmulti-agent-systemoffensive-securityopen-sourceopenaipenetration-testingpenetration-testing-toolsreactsecurity-automationsecurity-testingsecurity-toolsself-hosted
feat: enable runtime provider switching
Dmitry Ng7c25f356eda2
diff --git a/backend/cmd/ctester/main.go b/backend/cmd/ctester/main.goindex c8ac8ac8..e1cd7976 100644--- a/backend/cmd/ctester/main.go+++ b/backend/cmd/ctester/main.go@@ -129,7 +129,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating custom provider config: %w", err)}- return custom.New(cfg, providerConfig)+ return custom.New(cfg, provider.DefaultProviderNameCustom, providerConfig)case "openai":if cfg.OpenAIKey == "" {@@ -139,7 +139,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating openai provider config: %w", err)}- return openai.New(cfg, providerConfig)+ return openai.New(cfg, provider.DefaultProviderNameOpenAI, providerConfig)case "anthropic":if cfg.AnthropicAPIKey == "" {@@ -149,7 +149,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating anthropic provider config: %w", err)}- return anthropic.New(cfg, providerConfig)+ return anthropic.New(cfg, provider.DefaultProviderNameAnthropic, providerConfig)case "gemini":if cfg.GeminiAPIKey == "" {@@ -159,7 +159,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating gemini provider config: %w", err)}- return gemini.New(cfg, providerConfig)+ return gemini.New(cfg, provider.DefaultProviderNameGemini, providerConfig)case "bedrock":if !cfg.BedrockDefaultAuth && cfg.BedrockBearerToken == "" &&@@ -172,7 +172,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating bedrock provider config: %w", err)}- return bedrock.New(cfg, providerConfig)+ return bedrock.New(cfg, provider.DefaultProviderNameBedrock, providerConfig)case "ollama":if cfg.OllamaServerURL == "" {@@ -182,7 +182,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating ollama provider config: %w", err)}- return ollama.New(cfg, providerConfig)+ return ollama.New(cfg, provider.DefaultProviderNameOllama, providerConfig)case "deepseek":if cfg.DeepSeekAPIKey == "" {@@ -192,7 +192,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating deepseek provider config: %w", err)}- return deepseek.New(cfg, providerConfig)+ return deepseek.New(cfg, provider.DefaultProviderNameDeepSeek, providerConfig)case "glm":if cfg.GLMAPIKey == "" {@@ -202,7 +202,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating glm provider config: %w", err)}- return glm.New(cfg, providerConfig)+ return glm.New(cfg, provider.DefaultProviderNameGLM, providerConfig)case "kimi":if cfg.KimiAPIKey == "" {@@ -212,7 +212,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating kimi provider config: %w", err)}- return kimi.New(cfg, providerConfig)+ return kimi.New(cfg, provider.DefaultProviderNameKimi, providerConfig)case "qwen":if cfg.QwenAPIKey == "" {@@ -222,7 +222,7 @@ func createProvider(providerType string, cfg *config.Config) (provider.Provider,if err != nil {return nil, fmt.Errorf("error creating qwen provider config: %w", err)}- return qwen.New(cfg, providerConfig)+ return qwen.New(cfg, provider.DefaultProviderNameQwen, providerConfig)default:return nil, fmt.Errorf("unsupported provider type: %s", providerType)diff --git a/backend/pkg/controller/context.go b/backend/pkg/controller/context.goindex b28878c1..b098eab8 100644--- a/backend/pkg/controller/context.go+++ b/backend/pkg/controller/context.go@@ -19,8 +19,9 @@ var ErrNothingToLoad = errors.New("nothing to load")type FlowContext struct {DB database.Querier- UserID int64- FlowID int64+ UserID int64+ FlowID int64+ TraceID stringExecutor tools.FlowToolsExecutorProvider providers.FlowProviderdiff --git a/backend/pkg/controller/flow.go b/backend/pkg/controller/flow.goindex 7053d736..e8909ffe 100644--- a/backend/pkg/controller/flow.go+++ b/backend/pkg/controller/flow.go@@ -39,7 +39,7 @@ type FlowWorker interface {DeleteAssistant(ctx context.Context, assistantID int64) errorListAssistants(ctx context.Context) []AssistantWorkerListTasks(ctx context.Context) []TaskWorker- PutInput(ctx context.Context, input string) error+ PutInput(ctx context.Context, input string, prv provider.Provider) errorFinish(ctx context.Context) errorStop(ctx context.Context) errorRename(ctx context.Context, title string) error@@ -219,6 +219,7 @@ func NewFlowWorker(DB: fwc.db,UserID: fwc.userID,FlowID: flow.ID,+ TraceID: observation.TraceID(),Executor: executor,Provider: flowProvider,Publisher: pub,@@ -263,7 +264,7 @@ func NewFlowWorker(go fw.worker()if !fwc.dryRun {- if err := fw.PutInput(ctx, fwc.input); err != nil {+ if err := fw.PutInput(ctx, fwc.input, nil); err != nil {return nil, wrapErrorEndSpan(ctx, flowSpan, "failed to run flow worker", err)}}@@ -368,6 +369,7 @@ func LoadFlowWorker(ctx context.Context, flow database.Flow, fwc flowWorkerCtx)DB: fwc.db,UserID: flow.UserID,FlowID: flow.ID,+ TraceID: observation.TraceID(),Executor: executor,Provider: flowProvider,Publisher: pub,@@ -565,10 +567,18 @@ func (fw *flowWorker) ListTasks(ctx context.Context) []TaskWorker {return fw.tc.ListTasks(ctx)}-func (fw *flowWorker) PutInput(ctx context.Context, input string) error {+func (fw *flowWorker) PutInput(+ ctx context.Context,+ input string,+ prv provider.Provider,+) error {ctx, span := obs.Observer.NewSpan(ctx, obs.SpanKindInternal, "controller.flowWorker.PutInput")defer span.End()+ if err := fw.switchProvider(ctx, prv); err != nil {+ return fmt.Errorf("failed to switch provider: %w", err)+ }+flin := flowInput{input: input, done: make(chan error, 1)}select {case <-fw.ctx.Done():@@ -676,6 +686,58 @@ func (fw *flowWorker) Rename(ctx context.Context, title string) error {return nil}+// switchProvider performs runtime provider switch for the flow+func (fw *flowWorker) switchProvider(ctx context.Context, prv provider.Provider) error {+ ctx, span := obs.Observer.NewSpan(ctx, obs.SpanKindInternal, "controller.flowWorker.switchProvider")+ defer span.End()++ if prv == nil {+ return nil // no provider to switch to+ }++ logger := fw.logger.WithFields(logrus.Fields{+ "old_provider_name": fw.flowCtx.Provider.Name().String(),+ "old_provider_type": fw.flowCtx.Provider.Type().String(),+ "new_provider_name": prv.Name().String(),+ "new_provider_type": prv.Type().String(),+ })++ if fw.flowCtx.Provider.Name() == prv.Name() {+ logger.Debug("provider is the same, skipping switch")+ return nil+ }++ logger.Info("switching flow provider")++ if err := fw.flowCtx.Provider.SetProvider(ctx, prv); err != nil {+ logger.WithError(err).Error("failed to set provider")+ return fmt.Errorf("failed to set provider: %w", err)+ }++ flow, err := fw.flowCtx.DB.UpdateFlowProvider(ctx, database.UpdateFlowProviderParams{+ ModelProviderName: prv.Name().String(),+ ModelProviderType: database.ProviderType(prv.Type()),+ ToolCallIDTemplate: fw.flowCtx.Provider.ToolCallIDTemplate(),+ Model: fw.flowCtx.Provider.Model(pconfig.OptionsTypePrimaryAgent),+ ID: fw.flowCtx.FlowID,+ })+ if err != nil {+ logger.WithError(err).Error("failed to update flow provider in DB")+ return fmt.Errorf("failed to update flow provider in DB: %w", err)+ }++ logger.WithFields(logrus.Fields{+ "new_tool_call_id_template": fw.flowCtx.Provider.ToolCallIDTemplate(),+ "new_model": fw.flowCtx.Provider.Model(pconfig.OptionsTypePrimaryAgent),+ }).Info("provider switched successfully")++ if containers, err := fw.flowCtx.DB.GetFlowContainers(ctx, fw.flowCtx.FlowID); err == nil {+ fw.flowCtx.Publisher.FlowUpdated(ctx, flow, containers)+ }++ return nil+}+func (fw *flowWorker) finish() error {if err := fw.ctx.Err(); err != nil {if errors.Is(err, context.Canceled) {diff --git a/backend/pkg/controller/subtask.go b/backend/pkg/controller/subtask.goindex eacd0289..6adab45e 100644--- a/backend/pkg/controller/subtask.go+++ b/backend/pkg/controller/subtask.go@@ -290,6 +290,10 @@ func (stw *subtaskWorker) Run(ctx context.Context) error {msgChainID = stw.subtaskCtx.MsgChainID)+ if err := stw.subtaskCtx.Provider.EnsureChainConsistency(ctx, msgChainID); err != nil {+ return fmt.Errorf("failed to ensure chain consistency for subtask %d: %w", subtaskID, err)+ }+performResult, err := stw.subtaskCtx.Provider.PerformAgentChain(ctx, taskID, subtaskID, msgChainID)if err != nil {if errors.Is(err, context.Canceled) {diff --git a/backend/pkg/database/flows.sql.go b/backend/pkg/database/flows.sql.goindex 0e5ffdab..e04a2132 100644--- a/backend/pkg/database/flows.sql.go+++ b/backend/pkg/database/flows.sql.go@@ -556,6 +556,49 @@ func (q *Queries) UpdateFlowLanguage(ctx context.Context, arg UpdateFlowLanguagereturn i, err}+const updateFlowProvider = `-- name: UpdateFlowProvider :one+UPDATE flows+SET model_provider_name = $1, model_provider_type = $2, tool_call_id_template = $3, model = $4+WHERE id = $5+RETURNING id, status, title, model, model_provider_name, language, functions, user_id, created_at, updated_at, deleted_at, trace_id, model_provider_type, tool_call_id_template+`++type UpdateFlowProviderParams struct {+ ModelProviderName string `json:"model_provider_name"`+ ModelProviderType ProviderType `json:"model_provider_type"`+ ToolCallIDTemplate string `json:"tool_call_id_template"`+ Model string `json:"model"`+ ID int64 `json:"id"`+}++func (q *Queries) UpdateFlowProvider(ctx context.Context, arg UpdateFlowProviderParams) (Flow, error) {+ row := q.db.QueryRowContext(ctx, updateFlowProvider,+ arg.ModelProviderName,+ arg.ModelProviderType,+ arg.ToolCallIDTemplate,+ arg.Model,+ arg.ID,+ )+ var i Flow+ err := row.Scan(+ &i.ID,+ &i.Status,+ &i.Title,+ &i.Model,+ &i.ModelProviderName,+ &i.Language,+ &i.Functions,+ &i.UserID,+ &i.CreatedAt,+ &i.UpdatedAt,+ &i.DeletedAt,+ &i.TraceID,+ &i.ModelProviderType,+ &i.ToolCallIDTemplate,+ )+ return i, err+}+const updateFlowStatus = `-- name: UpdateFlowStatus :oneUPDATE flowsSET status = $1diff --git a/backend/pkg/database/msgchains.sql.go b/backend/pkg/database/msgchains.sql.goindex d953d9a0..8e0e84de 100644--- a/backend/pkg/database/msgchains.sql.go+++ b/backend/pkg/database/msgchains.sql.go@@ -1243,19 +1243,27 @@ func (q *Queries) GetUserTotalUsageStats(ctx context.Context, userID int64) (Getconst updateMsgChain = `-- name: UpdateMsgChain :oneUPDATE msgchains-SET chain = $1, duration_seconds = duration_seconds + $2-WHERE id = $3+SET chain = $1, duration_seconds = duration_seconds + $2, model = $3, model_provider = $4+WHERE id = $5RETURNING id, type, model, model_provider, usage_in, usage_out, chain, flow_id, task_id, subtask_id, created_at, updated_at, usage_cache_in, usage_cache_out, usage_cost_in, usage_cost_out, duration_seconds`type UpdateMsgChainParams struct {Chain json.RawMessage `json:"chain"`DurationSeconds float64 `json:"duration_seconds"`+ Model string `json:"model"`+ ModelProvider string `json:"model_provider"`ID int64 `json:"id"`}func (q *Queries) UpdateMsgChain(ctx context.Context, arg UpdateMsgChainParams) (Msgchain, error) {- row := q.db.QueryRowContext(ctx, updateMsgChain, arg.Chain, arg.DurationSeconds, arg.ID)+ row := q.db.QueryRowContext(ctx, updateMsgChain,+ arg.Chain,+ arg.DurationSeconds,+ arg.Model,+ arg.ModelProvider,+ arg.ID,+ )var i Msgchainerr := row.Scan(&i.ID,diff --git a/backend/pkg/database/querier.go b/backend/pkg/database/querier.goindex 8f52b2c8..cdf7f98d 100644--- a/backend/pkg/database/querier.go+++ b/backend/pkg/database/querier.go@@ -227,6 +227,7 @@ type Querier interface {UpdateContainerStatusLocalID(ctx context.Context, arg UpdateContainerStatusLocalIDParams) (Container, error)UpdateFlow(ctx context.Context, arg UpdateFlowParams) (Flow, error)UpdateFlowLanguage(ctx context.Context, arg UpdateFlowLanguageParams) (Flow, error)+ UpdateFlowProvider(ctx context.Context, arg UpdateFlowProviderParams) (Flow, error)UpdateFlowStatus(ctx context.Context, arg UpdateFlowStatusParams) (Flow, error)UpdateFlowTemplate(ctx context.Context, arg UpdateFlowTemplateParams) (FlowTemplate, error)UpdateFlowTitle(ctx context.Context, arg UpdateFlowTitleParams) (Flow, error)diff --git a/backend/pkg/graph/generated.go b/backend/pkg/graph/generated.goindex da6d67a5..2104fc72 100644--- a/backend/pkg/graph/generated.go+++ b/backend/pkg/graph/generated.go@@ -322,7 +322,7 @@ type ComplexityRoot struct {DeletePrompt func(childComplexity int, promptID int64) intDeleteProvider func(childComplexity int, providerID int64) intFinishFlow func(childComplexity int, flowID int64) int- PutUserInput func(childComplexity int, flowID int64, input string) int+ PutUserInput func(childComplexity int, flowID int64, input string, modelProvider *string) intRenameFlow func(childComplexity int, flowID int64, title string) intStopAssistant func(childComplexity int, flowID int64, assistantID int64) intStopFlow func(childComplexity int, flowID int64) int@@ -647,7 +647,7 @@ type ComplexityRoot struct {type MutationResolver interface {CreateFlow(ctx context.Context, modelProvider string, input string) (*model.Flow, error)- PutUserInput(ctx context.Context, flowID int64, input string) (model.ResultType, error)+ PutUserInput(ctx context.Context, flowID int64, input string, modelProvider *string) (model.ResultType, error)StopFlow(ctx context.Context, flowID int64) (model.ResultType, error)FinishFlow(ctx context.Context, flowID int64) (model.ResultType, error)DeleteFlow(ctx context.Context, flowID int64) (model.ResultType, error)@@ -2139,7 +2139,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity inreturn 0, false}- return e.complexity.Mutation.PutUserInput(childComplexity, args["flowId"].(int64), args["input"].(string)), true+ return e.complexity.Mutation.PutUserInput(childComplexity, args["flowId"].(int64), args["input"].(string), args["modelProvider"].(*string)), truecase "Mutation.renameFlow":if e.complexity.Mutation.RenameFlow == nil {@@ -4982,6 +4982,11 @@ func (ec *executionContext) field_Mutation_putUserInput_args(ctx context.Contextreturn nil, err}args["input"] = arg1+ arg2, err := ec.field_Mutation_putUserInput_argsModelProvider(ctx, rawArgs)+ if err != nil {+ return nil, err+ }+ args["modelProvider"] = arg2return args, nil}func (ec *executionContext) field_Mutation_putUserInput_argsFlowID(@@ -5028,6 +5033,28 @@ func (ec *executionContext) field_Mutation_putUserInput_argsInput(return zeroVal, nil}+func (ec *executionContext) field_Mutation_putUserInput_argsModelProvider(+ ctx context.Context,+ rawArgs map[string]interface{},+) (*string, error) {+ // We won't call the directive if the argument is null.+ // Set call_argument_directives_with_null to true to call directives+ // even if the argument is null.+ _, ok := rawArgs["modelProvider"]+ if !ok {+ var zeroVal *string+ return zeroVal, nil+ }++ ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("modelProvider"))+ if tmp, ok := rawArgs["modelProvider"]; ok {+ return ec.unmarshalOString2ᚖstring(ctx, tmp)+ }++ var zeroVal *string+ return zeroVal, nil+}+func (ec *executionContext) field_Mutation_renameFlow_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {var err errorargs := map[string]interface{}{}@@ -15093,7 +15120,7 @@ func (ec *executionContext) _Mutation_putUserInput(ctx context.Context, field gr}()resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {ctx = rctx // use context from middleware stack in children- return ec.resolvers.Mutation().PutUserInput(rctx, fc.Args["flowId"].(int64), fc.Args["input"].(string))+ return ec.resolvers.Mutation().PutUserInput(rctx, fc.Args["flowId"].(int64), fc.Args["input"].(string), fc.Args["modelProvider"].(*string))})if err != nil {ec.Error(ctx, err)diff --git a/backend/pkg/graph/schema.graphqls b/backend/pkg/graph/schema.graphqlsindex 19dff49a..e5c72def 100644--- a/backend/pkg/graph/schema.graphqls+++ b/backend/pkg/graph/schema.graphqls@@ -856,7 +856,7 @@ type Query {type Mutation {# Flow managementcreateFlow(modelProvider: String!, input: String!): Flow!- putUserInput(flowId: ID!, input: String!): ResultType!+ putUserInput(flowId: ID!, input: String!, modelProvider: String): ResultType!stopFlow(flowId: ID!): ResultType!finishFlow(flowId: ID!): ResultType!deleteFlow(flowId: ID!): ResultType!diff --git a/backend/pkg/graph/schema.resolvers.go b/backend/pkg/graph/schema.resolvers.goindex 610ede42..864e6efe 100644--- a/backend/pkg/graph/schema.resolvers.go+++ b/backend/pkg/graph/schema.resolvers.go@@ -82,23 +82,43 @@ func (r *mutationResolver) CreateFlow(ctx context.Context, modelProvider string,}// PutUserInput is the resolver for the putUserInput field.-func (r *mutationResolver) PutUserInput(ctx context.Context, flowID int64, input string) (model.ResultType, error) {+func (r *mutationResolver) PutUserInput(ctx context.Context, flowID int64, input string, modelProvider *string) (model.ResultType, error) {uid, err := validatePermissionWithFlowID(ctx, "flows.edit", flowID, r.DB)if err != nil {return model.ResultTypeError, err}- r.Logger.WithFields(logrus.Fields{+ fields := logrus.Fields{"uid": uid,"flow": flowID,- }).Debug("put user input")+ }+ if modelProvider != nil {+ if *modelProvider == "" {+ fields["modelProvider"] = "empty"+ } else {+ fields["modelProvider"] = *modelProvider+ }+ } else {+ fields["modelProvider"] = "unknown"+ }++ r.Logger.WithFields(fields).Debug("put user input")fw, err := r.Controller.GetFlow(ctx, flowID)if err != nil {return model.ResultTypeError, err}- if err := fw.PutInput(ctx, input); err != nil {+ var prv provider.Provider+ if modelProvider != nil && *modelProvider != "" {+ name := provider.ProviderName(*modelProvider)+ prv, err = r.ProvidersCtrl.GetProvider(ctx, name, uid)+ if err != nil {+ return model.ResultTypeError, fmt.Errorf("failed to get provider '%s': %w", *modelProvider, err)+ }+ }++ if err := fw.PutInput(ctx, input, prv); err != nil {return model.ResultTypeError, err}diff --git a/backend/pkg/providers/anthropic/anthropic.go b/backend/pkg/providers/anthropic/anthropic.goindex afeef483..914901b2 100644--- a/backend/pkg/providers/anthropic/anthropic.go+++ b/backend/pkg/providers/anthropic/anthropic.go@@ -59,10 +59,15 @@ func DefaultModels() (pconfig.ModelsConfig, error) {type anthropicProvider struct {llm *anthropic.LLMmodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfig}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {baseURL := cfg.AnthropicServerURLhttpClient, err := system.GetHTTPClient(cfg)if err != nil {@@ -94,6 +99,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Preturn &anthropicProvider{llm: client,models: models,+ providerName: providerName,providerConfig: providerConfig,}, nil}@@ -102,6 +108,10 @@ func (p *anthropicProvider) Type() provider.ProviderType {return provider.ProviderAnthropic}+func (p *anthropicProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *anthropicProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/anthropic/anthropic_test.go b/backend/pkg/providers/anthropic/anthropic_test.goindex 90eea57f..d7ec5669 100644--- a/backend/pkg/providers/anthropic/anthropic_test.go+++ b/backend/pkg/providers/anthropic/anthropic_test.go@@ -19,7 +19,7 @@ func TestConfigLoading(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameAnthropic, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -65,7 +65,7 @@ func TestProviderType(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameAnthropic, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}diff --git a/backend/pkg/providers/assistant.go b/backend/pkg/providers/assistant.goindex 3e17e102..adb10dd6 100644--- a/backend/pkg/providers/assistant.go+++ b/backend/pkg/providers/assistant.go@@ -234,16 +234,29 @@ func (ap *assistantProvider) PutInputToAgentChain(ctx context.Context, input str"input": input[:min(len(input), 1000)],})- return ap.fp.processChain(ctx, ap.msgChainID, logger, func(chain []llms.MessageContent) ([]llms.MessageContent, error) {- return ap.updateAssistantChain(ctx, chain, input)- })+ return ap.fp.processChain(ctx, pconfig.OptionsTypeAssistant, ap.msgChainID, logger,+ func(chain []llms.MessageContent) ([]llms.MessageContent, error) {+ return ap.updateAssistantChain(ctx, chain, input)+ },+ )}func (ap *assistantProvider) EnsureChainConsistency(ctx context.Context) error {ctx, span := obs.Observer.NewSpan(ctx, obs.SpanKindInternal, "providers.assistantProvider.EnsureChainConsistency")defer span.End()- return ap.fp.EnsureChainConsistency(ctx, ap.msgChainID)+ logger := logrus.WithContext(ctx).WithFields(logrus.Fields{+ "provider": ap.fp.Type(),+ "flow_id": ap.fp.flowID,+ "msg_chain_id": ap.msgChainID,+ "assistant_id": ap.id,+ })++ return ap.fp.processChain(ctx, pconfig.OptionsTypeAssistant, ap.msgChainID, logger,+ func(chain []llms.MessageContent) ([]llms.MessageContent, error) {+ return ap.fp.ensureChainConsistency(chain)+ },+ )}func (ap *assistantProvider) updateAssistantChain(diff --git a/backend/pkg/providers/bedrock/bedrock.go b/backend/pkg/providers/bedrock/bedrock.goindex 242451ee..0c325276 100644--- a/backend/pkg/providers/bedrock/bedrock.go+++ b/backend/pkg/providers/bedrock/bedrock.go@@ -69,6 +69,7 @@ func DefaultModels() (pconfig.ModelsConfig, error) {type bedrockProvider struct {llm *bedrock.LLMmodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfigtoolCallIDTemplate string@@ -76,7 +77,11 @@ type bedrockProvider struct {toolCallIDTemplateErr error}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {opts := []func(*bconfig.LoadOptions) error{bconfig.WithRegion(cfg.BedrockRegion),}@@ -141,6 +146,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Preturn &bedrockProvider{llm: client,models: models,+ providerName: providerName,providerConfig: providerConfig,}, nil}@@ -149,6 +155,10 @@ func (p *bedrockProvider) Type() provider.ProviderType {return provider.ProviderBedrock}+func (p *bedrockProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *bedrockProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/bedrock/bedrock_test.go b/backend/pkg/providers/bedrock/bedrock_test.goindex 71ec530e..c9470eb4 100644--- a/backend/pkg/providers/bedrock/bedrock_test.go+++ b/backend/pkg/providers/bedrock/bedrock_test.go@@ -26,7 +26,7 @@ func TestConfigLoading(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -73,7 +73,7 @@ func TestProviderType(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -159,7 +159,7 @@ func TestGetUsage(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -889,7 +889,7 @@ func TestAuthenticationStrategies(t *testing.T) {BedrockSecretKey: "test-secret-key",}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider with static credentials: %v", err)}@@ -909,7 +909,7 @@ func TestAuthenticationStrategies(t *testing.T) {BedrockSessionToken: "test-session-token",}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider with session token: %v", err)}@@ -924,7 +924,7 @@ func TestAuthenticationStrategies(t *testing.T) {BedrockBearerToken: "test-bearer-token-value",}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider with bearer token: %v", err)}@@ -939,7 +939,7 @@ func TestAuthenticationStrategies(t *testing.T) {BedrockDefaultAuth: true,}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider with default auth: %v", err)}@@ -956,7 +956,7 @@ func TestAuthenticationStrategies(t *testing.T) {BedrockSecretKey: "secret-key",}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -974,7 +974,7 @@ func TestAuthenticationStrategies(t *testing.T) {BedrockSecretKey: "secret-key",}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -991,7 +991,7 @@ func TestAuthenticationStrategies(t *testing.T) {BedrockSecretKey: "test-secret",}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider with custom server URL: %v", err)}@@ -1008,7 +1008,7 @@ func TestAuthenticationStrategies(t *testing.T) {ProxyURL: "http://proxy.example.com:8080",}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err != nil {t.Fatalf("Failed to create provider with proxy: %v", err)}@@ -1031,7 +1031,7 @@ func TestAuthenticationErrors(t *testing.T) {// No auth credentials set}- _, err := New(cfg, providerConfig)+ _, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err == nil {t.Error("Expected error when no authentication method is configured")}@@ -1047,7 +1047,7 @@ func TestAuthenticationErrors(t *testing.T) {// BedrockSecretKey not set}- _, err := New(cfg, providerConfig)+ _, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err == nil {t.Error("Expected error when only access key is provided")}@@ -1060,7 +1060,7 @@ func TestAuthenticationErrors(t *testing.T) {// BedrockAccessKey not set}- _, err := New(cfg, providerConfig)+ _, err := New(cfg, provider.DefaultProviderNameBedrock, providerConfig)if err == nil {t.Error("Expected error when only secret key is provided")}diff --git a/backend/pkg/providers/custom/custom.go b/backend/pkg/providers/custom/custom.goindex 10eb914a..2a178586 100644--- a/backend/pkg/providers/custom/custom.go+++ b/backend/pkg/providers/custom/custom.go@@ -52,11 +52,16 @@ type customProvider struct {llm *openai.LLMmodel stringmodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfigproviderPrefix string}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {baseKey := cfg.LLMServerKeybaseURL := cfg.LLMServerURLbaseModel := cfg.LLMServerModel@@ -98,6 +103,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Pllm: client,model: baseModel,models: models,+ providerName: providerName,providerConfig: providerConfig,providerPrefix: cfg.LLMServerProvider,}, nil@@ -107,6 +113,10 @@ func (p *customProvider) Type() provider.ProviderType {return provider.ProviderCustom}+func (p *customProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *customProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/custom/custom_test.go b/backend/pkg/providers/custom/custom_test.goindex 64490434..f361c839 100644--- a/backend/pkg/providers/custom/custom_test.go+++ b/backend/pkg/providers/custom/custom_test.go@@ -54,7 +54,7 @@ func TestConfigLoading(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(&testCfg, providerConfig)+ prov, err := New(&testCfg, provider.DefaultProviderNameCustom, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -102,7 +102,7 @@ func TestProviderType(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameCustom, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -218,7 +218,7 @@ func TestProviderModelsIntegration(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameCustom, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}diff --git a/backend/pkg/providers/custom/example_test.go b/backend/pkg/providers/custom/example_test.goindex 8c9bc82b..0203680f 100644--- a/backend/pkg/providers/custom/example_test.go+++ b/backend/pkg/providers/custom/example_test.go@@ -7,6 +7,7 @@ import ("pentagi/pkg/config""pentagi/pkg/providers/pconfig"+ "pentagi/pkg/providers/provider")func TestCustomProviderUsageModes(t *testing.T) {@@ -98,7 +99,7 @@ func TestCustomProviderUsageModes(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameCustom, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -182,7 +183,7 @@ func TestCustomProviderConfigValidation(t *testing.T) {t.Fatalf("Unexpected error for %s: %v", tt.description, err)}- prov, err := New(tt.config, providerConfig)+ prov, err := New(tt.config, provider.DefaultProviderNameCustom, providerConfig)if err != nil {t.Fatalf("Failed to create provider for %s: %v", tt.description, err)}diff --git a/backend/pkg/providers/deepseek/deepseek.go b/backend/pkg/providers/deepseek/deepseek.goindex 7494f2ae..a5c2a071 100644--- a/backend/pkg/providers/deepseek/deepseek.go+++ b/backend/pkg/providers/deepseek/deepseek.go@@ -59,11 +59,16 @@ func DefaultModels() (pconfig.ModelsConfig, error) {type deepseekProvider struct {llm *openai.LLMmodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfigproviderPrefix string}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {if cfg.DeepSeekAPIKey == "" {return nil, fmt.Errorf("missing DEEPSEEK_API_KEY environment variable")}@@ -92,6 +97,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Preturn &deepseekProvider{llm: client,models: models,+ providerName: providerName,providerConfig: providerConfig,providerPrefix: cfg.DeepSeekProvider,}, nil@@ -101,6 +107,10 @@ func (p *deepseekProvider) Type() provider.ProviderType {return provider.ProviderDeepSeek}+func (p *deepseekProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *deepseekProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/deepseek/deepseek_test.go b/backend/pkg/providers/deepseek/deepseek_test.goindex 48d7cad8..8b5e8227 100644--- a/backend/pkg/providers/deepseek/deepseek_test.go+++ b/backend/pkg/providers/deepseek/deepseek_test.go@@ -19,7 +19,7 @@ func TestConfigLoading(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameDeepSeek, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -65,7 +65,7 @@ func TestProviderType(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameDeepSeek, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -109,7 +109,7 @@ func TestModelWithPrefix(t *testing.T) {cfg := &config.Config{DeepSeekAPIKey: "test-key",DeepSeekServerURL: "https://api.deepseek.com",- DeepSeekProvider: "deepseek",+ DeepSeekProvider: "deepseek",}providerConfig, err := DefaultProviderConfig()@@ -117,7 +117,7 @@ func TestModelWithPrefix(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameDeepSeek, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -144,7 +144,7 @@ func TestModelWithoutPrefix(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameDeepSeek, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -170,7 +170,7 @@ func TestMissingAPIKey(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- _, err = New(cfg, providerConfig)+ _, err = New(cfg, provider.DefaultProviderNameDeepSeek, providerConfig)if err == nil {t.Fatal("Expected error when API key is missing")}@@ -187,7 +187,7 @@ func TestGetUsage(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameDeepSeek, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}diff --git a/backend/pkg/providers/gemini/gemini.go b/backend/pkg/providers/gemini/gemini.goindex dd6b0e6d..891fef14 100644--- a/backend/pkg/providers/gemini/gemini.go+++ b/backend/pkg/providers/gemini/gemini.go@@ -64,10 +64,15 @@ func DefaultModels() (pconfig.ModelsConfig, error) {type geminiProvider struct {llm *googleai.GoogleAImodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfig}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {opts := []googleai.Option{googleai.WithRest(),googleai.WithAPIKey(cfg.GeminiAPIKey),@@ -103,6 +108,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Preturn &geminiProvider{llm: client,models: models,+ providerName: providerName,providerConfig: providerConfig,}, nil}@@ -111,6 +117,10 @@ func (p *geminiProvider) Type() provider.ProviderType {return provider.ProviderGemini}+func (p *geminiProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *geminiProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/gemini/gemini_test.go b/backend/pkg/providers/gemini/gemini_test.goindex 2d0930eb..1a3433bd 100644--- a/backend/pkg/providers/gemini/gemini_test.go+++ b/backend/pkg/providers/gemini/gemini_test.go@@ -26,7 +26,7 @@ func TestConfigLoading(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameGemini, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -72,7 +72,7 @@ func TestProviderType(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameGemini, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -152,7 +152,7 @@ func TestGetUsage(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameGemini, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -453,7 +453,7 @@ func TestGeminiProviderWithProxyConfiguration(t *testing.T) {ProxyURL: tc.proxyURL,}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameGemini, providerConfig)if tc.wantErr {if err == nil {diff --git a/backend/pkg/providers/glm/glm.go b/backend/pkg/providers/glm/glm.goindex 55e083bf..49431ee7 100644--- a/backend/pkg/providers/glm/glm.go+++ b/backend/pkg/providers/glm/glm.go@@ -58,11 +58,16 @@ func DefaultModels() (pconfig.ModelsConfig, error) {type glmProvider struct {llm *openai.LLMmodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfigproviderPrefix string}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {if cfg.GLMAPIKey == "" {return nil, fmt.Errorf("missing GLM_API_KEY environment variable")}@@ -90,6 +95,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Preturn &glmProvider{llm: client,models: models,+ providerName: providerName,providerConfig: providerConfig,providerPrefix: cfg.GLMProvider,}, nil@@ -99,6 +105,10 @@ func (p *glmProvider) Type() provider.ProviderType {return provider.ProviderGLM}+func (p *glmProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *glmProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/glm/glm_test.go b/backend/pkg/providers/glm/glm_test.goindex ff71e342..28c00a5c 100644--- a/backend/pkg/providers/glm/glm_test.go+++ b/backend/pkg/providers/glm/glm_test.go@@ -19,7 +19,7 @@ func TestConfigLoading(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameGLM, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -65,7 +65,7 @@ func TestProviderType(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameGLM, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -109,7 +109,7 @@ func TestModelWithPrefix(t *testing.T) {cfg := &config.Config{GLMAPIKey: "test-key",GLMServerURL: "https://api.z.ai/api/paas/v4",- GLMProvider: "zhipu",+ GLMProvider: "zhipu",}providerConfig, err := DefaultProviderConfig()@@ -117,7 +117,7 @@ func TestModelWithPrefix(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameGLM, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -144,7 +144,7 @@ func TestModelWithoutPrefix(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameGLM, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -170,7 +170,7 @@ func TestMissingAPIKey(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- _, err = New(cfg, providerConfig)+ _, err = New(cfg, provider.DefaultProviderNameGLM, providerConfig)if err == nil {t.Fatal("Expected error when API key is missing")}@@ -187,7 +187,7 @@ func TestGetUsage(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameGLM, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}diff --git a/backend/pkg/providers/helpers.go b/backend/pkg/providers/helpers.goindex 19c48ed2..7c714473 100644--- a/backend/pkg/providers/helpers.go+++ b/backend/pkg/providers/helpers.go@@ -37,6 +37,7 @@ const (extractLastMessagesCount = 30extractToolCallsCount = 10toolCallsHistorySeparator = "---------------TOOL_CALLS_HISTORY---------------"+ ChainContinuationMessage = "Continue from where we left off")type dummyMessage struct {@@ -578,8 +579,10 @@ func (fp *flowProvider) restoreChain(}// Eliminates code duplication by abstracting database operations on message chains+// optAgentType is used to detect model changes within same providerfunc (fp *flowProvider) processChain(ctx context.Context,+ optAgentType pconfig.ProviderOptionsType,msgChainID int64,logger *logrus.Entry,transform func([]llms.MessageContent) ([]llms.MessageContent, error),@@ -602,6 +605,48 @@ func (fp *flowProvider) processChain(return fmt.Errorf("failed to transform chain: %w", err)}+ // Check if provider or model has changed since chain was created+ currentProvider := string(fp.Type())+ currentModel := fp.Model(optAgentType)+ providerChanged := msgChain.ModelProvider != currentProvider+ modelChanged := msgChain.Model != currentModel++ if providerChanged || modelChanged {+ logger.WithFields(logrus.Fields{+ "old_provider": msgChain.ModelProvider,+ "new_provider": currentProvider,+ "old_model": msgChain.Model,+ "new_model": currentModel,+ "provider_changed": providerChanged,+ "model_changed": modelChanged,+ }).Info("provider or model changed, normalizing chain")++ // Normalize chain for new provider/model+ ast, err := cast.NewChainAST(updatedChain, true)+ if err != nil {+ logger.WithError(err).Warn("failed to create chain AST for normalization")+ } else {+ // Normalize tool call IDs to new format+ if err := ast.NormalizeToolCallIDs(fp.tcIDTemplate); err != nil {+ logger.WithError(err).Warn("failed to normalize tool call IDs")+ }++ // Clear provider-specific reasoning signatures+ if err := ast.ClearReasoning(); err != nil {+ logger.WithError(err).Warn("failed to clear reasoning")+ }++ // Check if last message is Human - if not, add continuation message+ messages := ast.Messages()+ if len(messages) > 0 && messages[len(messages)-1].Role != llms.ChatMessageTypeHuman {+ ast.AppendHumanMessage(ChainContinuationMessage)+ logger.Debug("added continuation human message after provider switch")+ }++ updatedChain = ast.Messages()+ }+ }+chainBlob, err := json.Marshal(updatedChain)if err != nil {logger.WithError(err).Error("failed to marshal updated chain")@@ -609,8 +654,11 @@ func (fp *flowProvider) processChain(}_, err = fp.db.UpdateMsgChain(ctx, database.UpdateMsgChainParams{- Chain: chainBlob,- ID: msgChainID,+ Chain: chainBlob,+ DurationSeconds: 0.0,+ Model: currentModel,+ ModelProvider: currentProvider,+ ID: msgChainID,})if err != nil {logger.WithError(err).Error("failed to update message chain")diff --git a/backend/pkg/providers/kimi/kimi.go b/backend/pkg/providers/kimi/kimi.goindex c7c3b20b..8fe3a541 100644--- a/backend/pkg/providers/kimi/kimi.go+++ b/backend/pkg/providers/kimi/kimi.go@@ -59,11 +59,16 @@ func DefaultModels() (pconfig.ModelsConfig, error) {type kimiProvider struct {llm *openai.LLMmodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfigproviderPrefix string}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {if cfg.KimiAPIKey == "" {return nil, fmt.Errorf("missing KIMI_API_KEY environment variable")}@@ -92,6 +97,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Preturn &kimiProvider{llm: client,models: models,+ providerName: providerName,providerConfig: providerConfig,providerPrefix: cfg.KimiProvider,}, nil@@ -101,6 +107,10 @@ func (p *kimiProvider) Type() provider.ProviderType {return provider.ProviderKimi}+func (p *kimiProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *kimiProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/kimi/kimi_test.go b/backend/pkg/providers/kimi/kimi_test.goindex 7be345a1..706da45c 100644--- a/backend/pkg/providers/kimi/kimi_test.go+++ b/backend/pkg/providers/kimi/kimi_test.go@@ -19,7 +19,7 @@ func TestConfigLoading(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameKimi, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -65,7 +65,7 @@ func TestProviderType(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameKimi, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -109,7 +109,7 @@ func TestModelWithPrefix(t *testing.T) {cfg := &config.Config{KimiAPIKey: "test-key",KimiServerURL: "https://api.moonshot.ai/v1",- KimiProvider: "moonshot",+ KimiProvider: "moonshot",}providerConfig, err := DefaultProviderConfig()@@ -117,7 +117,7 @@ func TestModelWithPrefix(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameKimi, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -144,7 +144,7 @@ func TestModelWithoutPrefix(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameKimi, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -170,7 +170,7 @@ func TestMissingAPIKey(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- _, err = New(cfg, providerConfig)+ _, err = New(cfg, provider.DefaultProviderNameKimi, providerConfig)if err == nil {t.Fatal("Expected error when API key is missing")}@@ -187,7 +187,7 @@ func TestGetUsage(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameKimi, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}diff --git a/backend/pkg/providers/ollama/ollama.go b/backend/pkg/providers/ollama/ollama.goindex 4bcdcd64..fb7c9bc2 100644--- a/backend/pkg/providers/ollama/ollama.go+++ b/backend/pkg/providers/ollama/ollama.go@@ -146,10 +146,15 @@ type ollamaProvider struct {llm *ollama.LLMmodel stringmodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfig}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {httpClient, err := system.GetHTTPClient(cfg)if err != nil {return nil, err@@ -210,6 +215,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Pllm: client,model: baseModel,models: availableModels,+ providerName: providerName,providerConfig: providerConfig,}, nil}@@ -218,6 +224,10 @@ func (p *ollamaProvider) Type() provider.ProviderType {return provider.ProviderOllama}+func (p *ollamaProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *ollamaProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/ollama/ollama_test.go b/backend/pkg/providers/ollama/ollama_test.goindex 18a92c61..181abd4c 100644--- a/backend/pkg/providers/ollama/ollama_test.go+++ b/backend/pkg/providers/ollama/ollama_test.go@@ -67,7 +67,7 @@ func TestNew(t *testing.T) {providerConfig, err := DefaultProviderConfig(cfg)require.NoError(t, err)- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameOllama, providerConfig)require.NoError(t, err)assert.NotNil(t, prov)@@ -99,7 +99,7 @@ func TestOllamaProviderWithProxy(t *testing.T) {providerConfig, err := DefaultProviderConfig(cfg)require.NoError(t, err)- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameOllama, providerConfig)require.NoError(t, err)assert.NotNil(t, prov)}@@ -114,7 +114,7 @@ func TestOllamaProviderWithCustomConfig(t *testing.T) {providerConfig, err := DefaultProviderConfig(cfg)if err == nil {// if file exists, check that provider can be created- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameOllama, providerConfig)require.NoError(t, err)assert.NotNil(t, prov)} else {@@ -123,7 +123,7 @@ func TestOllamaProviderWithCustomConfig(t *testing.T) {providerConfig, err := DefaultProviderConfig(cfg)require.NoError(t, err)- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameOllama, providerConfig)require.NoError(t, err)assert.NotNil(t, prov)}@@ -137,7 +137,7 @@ func TestOllamaProviderPricing(t *testing.T) {providerConfig, err := DefaultProviderConfig(cfg)require.NoError(t, err)- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameOllama, providerConfig)require.NoError(t, err)// ollama is free local inference, so pricing should be nil for most cases@@ -163,7 +163,7 @@ func TestGetUsageEdgeCases(t *testing.T) {providerConfig, err := DefaultProviderConfig(cfg)require.NoError(t, err)- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameOllama, providerConfig)require.NoError(t, err)// test empty infodiff --git a/backend/pkg/providers/openai/openai.go b/backend/pkg/providers/openai/openai.goindex 0c8cb22c..675004a0 100644--- a/backend/pkg/providers/openai/openai.go+++ b/backend/pkg/providers/openai/openai.go@@ -58,10 +58,15 @@ func DefaultModels() (pconfig.ModelsConfig, error) {type openaiProvider struct {llm *openai.LLMmodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfig}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {baseURL := cfg.OpenAIServerURLhttpClient, err := system.GetHTTPClient(cfg)if err != nil {@@ -86,6 +91,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Preturn &openaiProvider{llm: client,models: models,+ providerName: providerName,providerConfig: providerConfig,}, nil}@@ -94,6 +100,10 @@ func (p *openaiProvider) Type() provider.ProviderType {return provider.ProviderOpenAI}+func (p *openaiProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *openaiProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/openai/openai_test.go b/backend/pkg/providers/openai/openai_test.goindex 4bed6bfc..f3a128cf 100644--- a/backend/pkg/providers/openai/openai_test.go+++ b/backend/pkg/providers/openai/openai_test.go@@ -19,7 +19,7 @@ func TestConfigLoading(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameOpenAI, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -65,7 +65,7 @@ func TestProviderType(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameOpenAI, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}diff --git a/backend/pkg/providers/performer.go b/backend/pkg/providers/performer.goindex 47a0a44b..44676fc0 100644--- a/backend/pkg/providers/performer.go+++ b/backend/pkg/providers/performer.go@@ -179,7 +179,7 @@ func (fp *flowProvider) performAgentChain(}chain = append(chain, msg)- if err := fp.updateMsgChain(ctx, chainID, chain, rollLastUpdateTime()); err != nil {+ if err := fp.updateMsgChain(ctx, optAgentType, chainID, chain, rollLastUpdateTime()); err != nil {logger.WithError(err).Error("failed to update msg chain")return err}@@ -218,7 +218,7 @@ func (fp *flowProvider) performAgentChain(},},})- if err := fp.updateMsgChain(ctx, chainID, chain, rollLastUpdateTime()); err != nil {+ if err := fp.updateMsgChain(ctx, optAgentType, chainID, chain, rollLastUpdateTime()); err != nil {logger.WithError(err).Error("failed to update msg chain")return err}@@ -250,7 +250,7 @@ func (fp *flowProvider) performAgentChain(}),)logger.WithError(err).Warn("failed to summarize chain")- } else if err := fp.updateMsgChain(ctx, chainID, chain, rollLastUpdateTime()); err != nil {+ } else if err := fp.updateMsgChain(ctx, optAgentType, chainID, chain, rollLastUpdateTime()); err != nil {logger.WithError(err).Error("failed to update msg chain")return err}@@ -840,7 +840,7 @@ func (fp *flowProvider) processAssistantResult(}chain = append(chain, msg)durationDelta += time.Since(processAssistantResultStartTime).Seconds()- if err := fp.updateMsgChain(ctx, chainID, chain, durationDelta); err != nil {+ if err := fp.updateMsgChain(ctx, pconfig.OptionsTypeAssistant, chainID, chain, durationDelta); err != nil {return fmt.Errorf("failed to update msg chain: %w", err)}@@ -849,6 +849,7 @@ func (fp *flowProvider) processAssistantResult(func (fp *flowProvider) updateMsgChain(ctx context.Context,+ optAgentType pconfig.ProviderOptionsType,chainID int64,chain []llms.MessageContent,durationDelta float64,@@ -861,6 +862,8 @@ func (fp *flowProvider) updateMsgChain(_, err = fp.db.UpdateMsgChain(ctx, database.UpdateMsgChainParams{Chain: chainBlob,DurationSeconds: durationDelta,+ Model: fp.Model(optAgentType),+ ModelProvider: string(fp.Type()),ID: chainID,})if err != nil {diff --git a/backend/pkg/providers/provider.go b/backend/pkg/providers/provider.goindex 83c8a6e8..e13abc68 100644--- a/backend/pkg/providers/provider.go+++ b/backend/pkg/providers/provider.go@@ -73,6 +73,7 @@ type FlowProvider interface {ID() int64DB() database.QuerierType() provider.ProviderType+ Name() provider.ProviderNameModel(opt pconfig.ProviderOptionsType) stringImage() stringTitle() string@@ -85,6 +86,7 @@ type FlowProvider interface {SetTitle(title string)SetAgentLogProvider(agentLog tools.AgentLogProvider)SetMsgLogProvider(msgLog tools.MsgLogProvider)+ SetProvider(ctx context.Context, newProvider provider.Provider) errorGetTaskTitle(ctx context.Context, input string) (string, error)GenerateSubtasks(ctx context.Context, taskID int64) ([]tools.SubtaskInfo, error)@@ -172,6 +174,25 @@ func (fp *flowProvider) SetMsgLogProvider(msgLog tools.MsgLogProvider) {fp.msgLog = msgLog}+func (fp *flowProvider) SetProvider(ctx context.Context, newProvider provider.Provider) error {+ ctx, span := obs.Observer.NewSpan(ctx, obs.SpanKindInternal, "providers.flowProvider.SetProvider")+ defer span.End()++ fp.mx.Lock()+ defer fp.mx.Unlock()++ // Update provider-specific fields+ fp.Provider = newProvider++ var err error+ fp.tcIDTemplate, err = newProvider.GetToolCallIDTemplate(ctx, fp.prompter)+ if err != nil {+ return fmt.Errorf("failed to get tool call ID template: %w", err)+ }++ return nil+}+func (fp *flowProvider) ID() int64 {fp.mx.RLock()defer fp.mx.RUnlock()@@ -855,9 +876,11 @@ func (fp *flowProvider) PutInputToAgentChain(ctx context.Context, msgChainID int"input": input[:min(len(input), 1000)],})- return fp.processChain(ctx, msgChainID, logger, func(chain []llms.MessageContent) ([]llms.MessageContent, error) {- return fp.updateMsgChainResult(chain, tools.AskUserToolName, input)- })+ return fp.processChain(ctx, pconfig.OptionsTypePrimaryAgent, msgChainID, logger,+ func(chain []llms.MessageContent) ([]llms.MessageContent, error) {+ return fp.updateMsgChainResult(chain, tools.AskUserToolName, input)+ },+ )}// EnsureChainConsistency ensures a message chain is in a consistent state by adding@@ -872,9 +895,11 @@ func (fp *flowProvider) EnsureChainConsistency(ctx context.Context, msgChainID i"msg_chain_id": msgChainID,})- return fp.processChain(ctx, msgChainID, logger, func(chain []llms.MessageContent) ([]llms.MessageContent, error) {- return fp.ensureChainConsistency(chain)- })+ return fp.processChain(ctx, pconfig.OptionsTypePrimaryAgent, msgChainID, logger,+ func(chain []llms.MessageContent) ([]llms.MessageContent, error) {+ return fp.ensureChainConsistency(chain)+ },+ )}func (fp *flowProvider) putMsgLog(diff --git a/backend/pkg/providers/provider/provider.go b/backend/pkg/providers/provider/provider.goindex 2870146b..ecff39e4 100644--- a/backend/pkg/providers/provider/provider.go+++ b/backend/pkg/providers/provider/provider.go@@ -53,6 +53,7 @@ const (type Provider interface {Type() ProviderType+ Name() ProviderNameModel(opt pconfig.ProviderOptionsType) string// ModelWithPrefix returns model name WITH provider prefix for LLM API calls and Langfuse loggingModelWithPrefix(opt pconfig.ProviderOptionsType) stringdiff --git a/backend/pkg/providers/providers.go b/backend/pkg/providers/providers.goindex c6609629..9a9a5a7d 100644--- a/backend/pkg/providers/providers.go+++ b/backend/pkg/providers/providers.go@@ -230,7 +230,7 @@ func NewProviderController(}if cfg.OpenAIKey != "" {- p, err := openai.New(cfg, defaultConfigs[provider.ProviderOpenAI])+ p, err := openai.New(cfg, provider.DefaultProviderNameOpenAI, defaultConfigs[provider.ProviderOpenAI])if err != nil {return nil, fmt.Errorf("failed to create openai provider: %w", err)}@@ -239,7 +239,7 @@ func NewProviderController(}if cfg.AnthropicAPIKey != "" {- p, err := anthropic.New(cfg, defaultConfigs[provider.ProviderAnthropic])+ p, err := anthropic.New(cfg, provider.DefaultProviderNameAnthropic, defaultConfigs[provider.ProviderAnthropic])if err != nil {return nil, fmt.Errorf("failed to create anthropic provider: %w", err)}@@ -248,7 +248,7 @@ func NewProviderController(}if cfg.GeminiAPIKey != "" {- p, err := gemini.New(cfg, defaultConfigs[provider.ProviderGemini])+ p, err := gemini.New(cfg, provider.DefaultProviderNameGemini, defaultConfigs[provider.ProviderGemini])if err != nil {return nil, fmt.Errorf("failed to create gemini provider: %w", err)}@@ -262,7 +262,7 @@ func NewProviderController(// 3. Static credentials (BedrockAccessKey + BedrockSecretKey)if cfg.BedrockDefaultAuth || cfg.BedrockBearerToken != "" ||(cfg.BedrockAccessKey != "" && cfg.BedrockSecretKey != "") {- p, err := bedrock.New(cfg, defaultConfigs[provider.ProviderBedrock])+ p, err := bedrock.New(cfg, provider.DefaultProviderNameBedrock, defaultConfigs[provider.ProviderBedrock])if err != nil {return nil, fmt.Errorf("failed to create bedrock provider: %w", err)}@@ -270,7 +270,7 @@ func NewProviderController(}if cfg.OllamaServerURL != "" {- p, err := ollama.New(cfg, defaultConfigs[provider.ProviderOllama])+ p, err := ollama.New(cfg, provider.DefaultProviderNameOllama, defaultConfigs[provider.ProviderOllama])if err != nil {return nil, fmt.Errorf("failed to create ollama provider: %w", err)}@@ -278,7 +278,7 @@ func NewProviderController(}if cfg.LLMServerURL != "" && (cfg.LLMServerModel != "" || cfg.LLMServerConfig != "") {- p, err := custom.New(cfg, defaultConfigs[provider.ProviderCustom])+ p, err := custom.New(cfg, provider.DefaultProviderNameCustom, defaultConfigs[provider.ProviderCustom])if err != nil {return nil, fmt.Errorf("failed to create custom provider: %w", err)}@@ -287,7 +287,7 @@ func NewProviderController(}if cfg.DeepSeekAPIKey != "" {- p, err := deepseek.New(cfg, defaultConfigs[provider.ProviderDeepSeek])+ p, err := deepseek.New(cfg, provider.DefaultProviderNameDeepSeek, defaultConfigs[provider.ProviderDeepSeek])if err != nil {return nil, fmt.Errorf("failed to create deepseek provider: %w", err)}@@ -296,7 +296,7 @@ func NewProviderController(}if cfg.GLMAPIKey != "" {- p, err := glm.New(cfg, defaultConfigs[provider.ProviderGLM])+ p, err := glm.New(cfg, provider.DefaultProviderNameGLM, defaultConfigs[provider.ProviderGLM])if err != nil {return nil, fmt.Errorf("failed to create glm provider: %w", err)}@@ -305,7 +305,7 @@ func NewProviderController(}if cfg.KimiAPIKey != "" {- p, err := kimi.New(cfg, defaultConfigs[provider.ProviderKimi])+ p, err := kimi.New(cfg, provider.DefaultProviderNameKimi, defaultConfigs[provider.ProviderKimi])if err != nil {return nil, fmt.Errorf("failed to create kimi provider: %w", err)}@@ -314,7 +314,7 @@ func NewProviderController(}if cfg.QwenAPIKey != "" {- p, err := qwen.New(cfg, defaultConfigs[provider.ProviderQwen])+ p, err := qwen.New(cfg, provider.DefaultProviderNameQwen, defaultConfigs[provider.ProviderQwen])if err != nil {return nil, fmt.Errorf("failed to create qwen provider: %w", err)}@@ -759,6 +759,7 @@ func (pc *providerController) NewProvider(prv database.Provider) (provider.Provi}// Check if the provider type is available via check default one+ providerName := provider.ProviderName(prv.Name)providerType := provider.ProviderType(prv.Type)if !pc.ListTypes().Contains(providerType) {return nil, fmt.Errorf("provider type '%s' is not available", prv.Type)@@ -770,61 +771,61 @@ func (pc *providerController) NewProvider(prv database.Provider) (provider.Proviif err != nil {return nil, fmt.Errorf("failed to build openai provider config: %w", err)}- return openai.New(pc.cfg, openaiConfig)+ return openai.New(pc.cfg, providerName, openaiConfig)case provider.ProviderAnthropic:anthropicConfig, err := anthropic.BuildProviderConfig(prv.Config)if err != nil {return nil, fmt.Errorf("failed to build anthropic provider config: %w", err)}- return anthropic.New(pc.cfg, anthropicConfig)+ return anthropic.New(pc.cfg, providerName, anthropicConfig)case provider.ProviderGemini:geminiConfig, err := gemini.BuildProviderConfig(prv.Config)if err != nil {return nil, fmt.Errorf("failed to build gemini provider config: %w", err)}- return gemini.New(pc.cfg, geminiConfig)+ return gemini.New(pc.cfg, providerName, geminiConfig)case provider.ProviderBedrock:bedrockConfig, err := bedrock.BuildProviderConfig(prv.Config)if err != nil {return nil, fmt.Errorf("failed to build bedrock provider config: %w", err)}- return bedrock.New(pc.cfg, bedrockConfig)+ return bedrock.New(pc.cfg, providerName, bedrockConfig)case provider.ProviderOllama:ollamaConfig, err := ollama.BuildProviderConfig(pc.cfg, prv.Config)if err != nil {return nil, fmt.Errorf("failed to build ollama provider config: %w", err)}- return ollama.New(pc.cfg, ollamaConfig)+ return ollama.New(pc.cfg, providerName, ollamaConfig)case provider.ProviderCustom:customConfig, err := custom.BuildProviderConfig(pc.cfg, prv.Config)if err != nil {return nil, fmt.Errorf("failed to build custom provider config: %w", err)}- return custom.New(pc.cfg, customConfig)+ return custom.New(pc.cfg, providerName, customConfig)case provider.ProviderDeepSeek:deepseekConfig, err := deepseek.BuildProviderConfig(prv.Config)if err != nil {return nil, fmt.Errorf("failed to build deepseek provider config: %w", err)}- return deepseek.New(pc.cfg, deepseekConfig)+ return deepseek.New(pc.cfg, providerName, deepseekConfig)case provider.ProviderGLM:glmConfig, err := glm.BuildProviderConfig(prv.Config)if err != nil {return nil, fmt.Errorf("failed to build glm provider config: %w", err)}- return glm.New(pc.cfg, glmConfig)+ return glm.New(pc.cfg, providerName, glmConfig)case provider.ProviderKimi:kimiConfig, err := kimi.BuildProviderConfig(prv.Config)if err != nil {return nil, fmt.Errorf("failed to build kimi provider config: %w", err)}- return kimi.New(pc.cfg, kimiConfig)+ return kimi.New(pc.cfg, providerName, kimiConfig)case provider.ProviderQwen:qwenConfig, err := qwen.BuildProviderConfig(prv.Config)if err != nil {return nil, fmt.Errorf("failed to build qwen provider config: %w", err)}- return qwen.New(pc.cfg, qwenConfig)+ return qwen.New(pc.cfg, providerName, qwenConfig)default:return nil, fmt.Errorf("unknown provider type: %s", prv.Type)}@@ -985,7 +986,8 @@ func (pc *providerController) TestAgent(}// Create temporary provider for testing using existing provider logic- tempProvider, err := pc.buildProviderFromConfig(prvtype, patchedConfig)+ providerName := provider.ProviderName("test-provider")+ tempProvider, err := pc.buildProviderFromConfig(prvtype, providerName, patchedConfig)if err != nil {return result, fmt.Errorf("failed to create provider for testing: %w", err)}@@ -1054,7 +1056,8 @@ func (pc *providerController) TestProvider(}// Create provider for testing- testProvider, err := pc.buildProviderFromConfig(prvtype, patchedConfig)+ providerName := provider.ProviderName("test-provider")+ testProvider, err := pc.buildProviderFromConfig(prvtype, providerName, patchedConfig)if err != nil {return results, fmt.Errorf("failed to create provider for testing: %w", err)}@@ -1137,29 +1140,30 @@ func (pc *providerController) patchProviderConfig(func (pc *providerController) buildProviderFromConfig(prvtype provider.ProviderType,+ prvname provider.ProviderName,config *pconfig.ProviderConfig,) (provider.Provider, error) {switch prvtype {case provider.ProviderOpenAI:- return openai.New(pc.cfg, config)+ return openai.New(pc.cfg, prvname, config)case provider.ProviderAnthropic:- return anthropic.New(pc.cfg, config)+ return anthropic.New(pc.cfg, prvname, config)case provider.ProviderCustom:- return custom.New(pc.cfg, config)+ return custom.New(pc.cfg, prvname, config)case provider.ProviderGemini:- return gemini.New(pc.cfg, config)+ return gemini.New(pc.cfg, prvname, config)case provider.ProviderBedrock:- return bedrock.New(pc.cfg, config)+ return bedrock.New(pc.cfg, prvname, config)case provider.ProviderOllama:- return ollama.New(pc.cfg, config)+ return ollama.New(pc.cfg, prvname, config)case provider.ProviderDeepSeek:- return deepseek.New(pc.cfg, config)+ return deepseek.New(pc.cfg, prvname, config)case provider.ProviderGLM:- return glm.New(pc.cfg, config)+ return glm.New(pc.cfg, prvname, config)case provider.ProviderKimi:- return kimi.New(pc.cfg, config)+ return kimi.New(pc.cfg, prvname, config)case provider.ProviderQwen:- return qwen.New(pc.cfg, config)+ return qwen.New(pc.cfg, prvname, config)default:return nil, fmt.Errorf("unknown provider type: %s", prvtype)}diff --git a/backend/pkg/providers/qwen/qwen.go b/backend/pkg/providers/qwen/qwen.goindex 84b46830..beee6f63 100644--- a/backend/pkg/providers/qwen/qwen.go+++ b/backend/pkg/providers/qwen/qwen.go@@ -59,11 +59,16 @@ func DefaultModels() (pconfig.ModelsConfig, error) {type qwenProvider struct {llm *openai.LLMmodels pconfig.ModelsConfig+ providerName provider.ProviderNameproviderConfig *pconfig.ProviderConfigproviderPrefix string}-func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Provider, error) {+func New(+ cfg *config.Config,+ providerName provider.ProviderName,+ providerConfig *pconfig.ProviderConfig,+) (provider.Provider, error) {if cfg.QwenAPIKey == "" {return nil, fmt.Errorf("missing QWEN_API_KEY environment variable")}@@ -91,6 +96,7 @@ func New(cfg *config.Config, providerConfig *pconfig.ProviderConfig) (provider.Preturn &qwenProvider{llm: client,models: models,+ providerName: providerName,providerConfig: providerConfig,providerPrefix: cfg.QwenProvider,}, nil@@ -100,6 +106,10 @@ func (p *qwenProvider) Type() provider.ProviderType {return provider.ProviderQwen}+func (p *qwenProvider) Name() provider.ProviderName {+ return p.providerName+}+func (p *qwenProvider) GetRawConfig() []byte {return p.providerConfig.GetRawConfig()}diff --git a/backend/pkg/providers/qwen/qwen_test.go b/backend/pkg/providers/qwen/qwen_test.goindex ae4e11a2..3d193246 100644--- a/backend/pkg/providers/qwen/qwen_test.go+++ b/backend/pkg/providers/qwen/qwen_test.go@@ -19,7 +19,7 @@ func TestConfigLoading(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameQwen, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -65,7 +65,7 @@ func TestProviderType(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameQwen, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -109,7 +109,7 @@ func TestModelWithPrefix(t *testing.T) {cfg := &config.Config{QwenAPIKey: "test-key",QwenServerURL: "https://dashscope-us.aliyuncs.com/compatible-mode/v1",- QwenProvider: "tongyi",+ QwenProvider: "tongyi",}providerConfig, err := DefaultProviderConfig()@@ -117,7 +117,7 @@ func TestModelWithPrefix(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameQwen, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -144,7 +144,7 @@ func TestModelWithoutPrefix(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameQwen, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}@@ -170,7 +170,7 @@ func TestMissingAPIKey(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- _, err = New(cfg, providerConfig)+ _, err = New(cfg, provider.DefaultProviderNameQwen, providerConfig)if err == nil {t.Fatal("Expected error when API key is missing")}@@ -187,7 +187,7 @@ func TestGetUsage(t *testing.T) {t.Fatalf("Failed to create provider config: %v", err)}- prov, err := New(cfg, providerConfig)+ prov, err := New(cfg, provider.DefaultProviderNameQwen, providerConfig)if err != nil {t.Fatalf("Failed to create provider: %v", err)}diff --git a/backend/pkg/providers/tester/mock/provider.go b/backend/pkg/providers/tester/mock/provider.goindex 476395e8..c0c65641 100644--- a/backend/pkg/providers/tester/mock/provider.go+++ b/backend/pkg/providers/tester/mock/provider.go@@ -18,6 +18,7 @@ import (// Provider implements provider.Provider for testing purposestype Provider struct {providerType provider.ProviderType+ providerName provider.ProviderNamemodelName stringresponses map[string]interface{} // key -> response mappingdefaultResp string@@ -31,9 +32,10 @@ type ResponseConfig struct {}// NewProvider creates a new mock provider-func NewProvider(providerType provider.ProviderType, modelName string) *Provider {+func NewProvider(providerType provider.ProviderType, providerName provider.ProviderName, modelName string) *Provider {return &Provider{providerType: providerType,+ providerName: providerName,modelName: modelName,responses: make(map[string]interface{}),defaultResp: "Mock response",@@ -63,6 +65,11 @@ func (p *Provider) Type() provider.ProviderType {return p.providerType}+// Name implements provider.Provider+func (p *Provider) Name() provider.ProviderName {+ return p.providerName+}+// Model implements provider.Providerfunc (p *Provider) Model(opt pconfig.ProviderOptionsType) string {return p.modelNamediff --git a/backend/pkg/providers/tester/runner_test.go b/backend/pkg/providers/tester/runner_test.goindex 8fa3c956..47eda9d6 100644--- a/backend/pkg/providers/tester/runner_test.go+++ b/backend/pkg/providers/tester/runner_test.go@@ -15,7 +15,7 @@ import (func TestTestProvider(t *testing.T) {// create mock provider- mockProvider := mock.NewProvider(provider.ProviderCustom, "test-model")+ mockProvider := mock.NewProvider(provider.ProviderCustom, provider.DefaultProviderNameCustom, "test-model")mockProvider.SetResponses([]mock.ResponseConfig{{Key: "What is 2+2?", Response: "4"},{Key: "Hello World", Response: "HELLO WORLD"},@@ -64,7 +64,7 @@ func TestTestProvider(t *testing.T) {func TestTestProviderWithOptions(t *testing.T) {// create mock provider- mockProvider := mock.NewProvider(provider.ProviderCustom, "test-model")+ mockProvider := mock.NewProvider(provider.ProviderCustom, provider.DefaultProviderNameCustom, "test-model")mockProvider.SetResponses([]mock.ResponseConfig{{Key: "What is 2+2?", Response: "4"},{Key: "Hello World", Response: "HELLO WORLD"},@@ -99,7 +99,7 @@ func TestTestProviderWithOptions(t *testing.T) {func TestTestProviderStreamingMode(t *testing.T) {// create mock provider with streaming delay- mockProvider := mock.NewProvider(provider.ProviderCustom, "test-model")+ mockProvider := mock.NewProvider(provider.ProviderCustom, provider.DefaultProviderNameCustom, "test-model")mockProvider.SetStreamingDelay(time.Millisecond * 5)mockProvider.SetResponses([]mock.ResponseConfig{{Key: "What is 2+2?", Response: "The answer is 4"},@@ -140,7 +140,7 @@ func TestTestProviderStreamingMode(t *testing.T) {func TestTestProviderJSONTests(t *testing.T) {// create mock provider with JSON responses- mockProvider := mock.NewProvider(provider.ProviderCustom, "test-model")+ mockProvider := mock.NewProvider(provider.ProviderCustom, provider.DefaultProviderNameCustom, "test-model")mockProvider.SetResponses([]mock.ResponseConfig{{Key: "Return JSON", Response: `{"name": "John Doe", "age": 30, "city": "New York"}`},{Key: "Create JSON array", Response: `[{"name": "red", "hex": "#FF0000"}]`},@@ -178,7 +178,7 @@ func TestTestProviderJSONTests(t *testing.T) {func TestTestProviderToolTests(t *testing.T) {// create mock provider with tool call responses- mockProvider := mock.NewProvider(provider.ProviderCustom, "test-model")+ mockProvider := mock.NewProvider(provider.ProviderCustom, provider.DefaultProviderNameCustom, "test-model")// set up tool call responsetoolResponse := &llms.ContentResponse{@@ -233,7 +233,7 @@ func TestTestProviderToolTests(t *testing.T) {func TestTestProviderErrorHandling(t *testing.T) {// create mock provider that returns errors for specific requests- mockProvider := mock.NewProvider(provider.ProviderCustom, "test-model")+ mockProvider := mock.NewProvider(provider.ProviderCustom, provider.DefaultProviderNameCustom, "test-model")mockProvider.SetResponses([]mock.ResponseConfig{{Key: "What is 2+2?", Response: fmt.Errorf("mock API error")},})@@ -270,7 +270,7 @@ func TestTestProviderErrorHandling(t *testing.T) {func TestTestProviderGroups(t *testing.T) {// create mock provider- mockProvider := mock.NewProvider(provider.ProviderCustom, "test-model")+ mockProvider := mock.NewProvider(provider.ProviderCustom, provider.DefaultProviderNameCustom, "test-model")mockProvider.SetDefaultResponse("Group test response")tests := []struct {diff --git a/backend/pkg/server/docs/docs.go b/backend/pkg/server/docs/docs.goindex 8fb6efac..4b86a05f 100644--- a/backend/pkg/server/docs/docs.go+++ b/backend/pkg/server/docs/docs.go@@ -6596,6 +6596,9 @@ const docTemplate = `{"name": {"type": "string","example": "new flow name"+ },+ "provider": {+ "type": "string"}}},diff --git a/backend/pkg/server/docs/swagger.json b/backend/pkg/server/docs/swagger.jsonindex 20467088..f0b37125 100644--- a/backend/pkg/server/docs/swagger.json+++ b/backend/pkg/server/docs/swagger.json@@ -6588,6 +6588,9 @@"name": {"type": "string","example": "new flow name"+ },+ "provider": {+ "type": "string"}}},diff --git a/backend/pkg/server/docs/swagger.yaml b/backend/pkg/server/docs/swagger.yamlindex 1b3c3bd1..862c4917 100644--- a/backend/pkg/server/docs/swagger.yaml+++ b/backend/pkg/server/docs/swagger.yaml@@ -759,6 +759,8 @@ definitions:name:example: new flow nametype: string+ provider:+ type: stringrequired:- actiontype: objectdiff --git a/backend/pkg/server/models/flows.go b/backend/pkg/server/models/flows.goindex 56a86790..6e8cd5d4 100644--- a/backend/pkg/server/models/flows.go+++ b/backend/pkg/server/models/flows.go@@ -96,9 +96,10 @@ func (cf CreateFlow) Valid() error {// PatchFlow is model to contain flow patching paylaod// nolint:llltype PatchFlow struct {- Action string `form:"action" json:"action" validate:"required,oneof=stop finish input rename" enums:"stop,finish,input,rename" default:"stop"`- Input *string `form:"input,omitempty" json:"input,omitempty" validate:"required_if=Action input" example:"user input for waiting flow"`- Name *string `form:"name,omitempty" json:"name,omitempty" validate:"required_if=Action rename" example:"new flow name"`+ Action string `form:"action" json:"action" validate:"required,oneof=stop finish input rename" enums:"stop,finish,input,rename" default:"stop"`+ Input *string `form:"input,omitempty" json:"input,omitempty" validate:"required_if=Action input" example:"user input for waiting flow"`+ Provider *string `form:"provider,omitempty" json:"provider,omitempty" validate:"omitempty"`+ Name *string `form:"name,omitempty" json:"name,omitempty" validate:"required_if=Action rename" example:"new flow name"`}// Valid is function to control input/output datadiff --git a/backend/pkg/server/services/flows.go b/backend/pkg/server/services/flows.goindex d47e90ac..3bfa12fe 100644--- a/backend/pkg/server/services/flows.go+++ b/backend/pkg/server/services/flows.go@@ -468,7 +468,17 @@ func (s *FlowService) PatchFlow(c *gin.Context) {return}- if err := fw.PutInput(c, *patchFlow.Input); err != nil {+ var prv provider.Provider+ if patchFlow.Provider != nil && *patchFlow.Provider != "" {+ prv, err = s.pc.GetProvider(c, provider.ProviderName(*patchFlow.Provider), int64(uid))+ if err != nil {+ logger.FromContext(c).WithError(err).Errorf("error getting provider by name")+ response.Error(c, response.ErrInternal, err)+ return+ }+ }++ if err := fw.PutInput(c, *patchFlow.Input, prv); err != nil {logger.FromContext(c).WithError(err).Errorf("error sending input to flow")response.Error(c, response.ErrInternal, err)returndiff --git a/backend/sqlc/models/flows.sql b/backend/sqlc/models/flows.sqlindex f24cd1d0..8767c8f4 100644--- a/backend/sqlc/models/flows.sql+++ b/backend/sqlc/models/flows.sql@@ -65,6 +65,12 @@ SET tool_call_id_template = $1WHERE id = $2RETURNING *;+-- name: UpdateFlowProvider :one+UPDATE flows+SET model_provider_name = $1, model_provider_type = $2, tool_call_id_template = $3, model = $4+WHERE id = $5+RETURNING *;+-- name: DeleteFlow :oneUPDATE flowsSET deleted_at = CURRENT_TIMESTAMPdiff --git a/backend/sqlc/models/msgchains.sql b/backend/sqlc/models/msgchains.sqlindex 3bb05d3e..104c0adb 100644--- a/backend/sqlc/models/msgchains.sql+++ b/backend/sqlc/models/msgchains.sql@@ -106,8 +106,8 @@ RETURNING *;-- name: UpdateMsgChain :oneUPDATE msgchains-SET chain = $1, duration_seconds = duration_seconds + $2-WHERE id = $3+SET chain = $1, duration_seconds = duration_seconds + $2, model = $3, model_provider = $4+WHERE id = $5RETURNING *;-- name: UpdateMsgChainUsage :onediff --git a/frontend/graphql-schema.graphql b/frontend/graphql-schema.graphqlindex 66afa645..fae09675 100644--- a/frontend/graphql-schema.graphql+++ b/frontend/graphql-schema.graphql@@ -957,8 +957,8 @@ mutation deleteFlow($flowId: ID!) {deleteFlow(flowId: $flowId)}-mutation putUserInput($flowId: ID!, $input: String!) {- putUserInput(flowId: $flowId, input: $input)+mutation putUserInput($flowId: ID!, $input: String!, $modelProvider: String) {+ putUserInput(flowId: $flowId, input: $input, modelProvider: $modelProvider)}mutation finishFlow($flowId: ID!) {diff --git a/frontend/src/features/flows/messages/flow-automation-messages.tsx b/frontend/src/features/flows/messages/flow-automation-messages.tsxindex c97dcf8d..800ccc21 100644--- a/frontend/src/features/flows/messages/flow-automation-messages.tsx+++ b/frontend/src/features/flows/messages/flow-automation-messages.tsx@@ -208,6 +208,7 @@ const FlowAutomationMessages = ({ className }: FlowAutomationMessagesProps) => {const isFormDisabled = flowStatus === StatusType.Finished || flowStatus === StatusType.Failed;const isFormLoading = flowStatus === StatusType.Created || flowStatus === StatusType.Running;+ const isProviderChangeAllowed = flowStatus === StatusType.Waiting;return (<div className={cn('flex h-full flex-col', className)}>@@ -336,7 +337,7 @@ const FlowAutomationMessages = ({ className }: FlowAutomationMessagesProps) => {isCanceling={isCanceling}isDisabled={isFormDisabled}isLoading={isFormLoading}- isProviderDisabled={true}+ isProviderDisabled={!isProviderChangeAllowed}isSubmitting={isSubmitting}onCancel={handleStopAutomation}onSubmit={handleSubmitMessage}diff --git a/frontend/src/graphql/types.ts b/frontend/src/graphql/types.tsindex 0edfd31a..964c4942 100644--- a/frontend/src/graphql/types.ts+++ b/frontend/src/graphql/types.ts@@ -477,6 +477,7 @@ export type MutationFinishFlowArgs = {export type MutationPutUserInputArgs = {flowId: Scalars['ID']['input'];input: Scalars['String']['input'];+ modelProvider?: InputMaybe<Scalars['String']['input']>;};export type MutationRenameFlowArgs = {@@ -1751,6 +1752,7 @@ export type DeleteFlowMutation = { deleteFlow: ResultType };export type PutUserInputMutationVariables = Exact<{flowId: Scalars['ID']['input'];input: Scalars['String']['input'];+ modelProvider?: InputMaybe<Scalars['String']['input']>;}>;export type PutUserInputMutation = { putUserInput: ResultType };@@ -5070,8 +5072,8 @@ export type DeleteFlowMutationHookResult = ReturnType<typeof useDeleteFlowMutatiexport type DeleteFlowMutationResult = Apollo.MutationResult<DeleteFlowMutation>;export type DeleteFlowMutationOptions = Apollo.BaseMutationOptions<DeleteFlowMutation, DeleteFlowMutationVariables>;export const PutUserInputDocument = gql`- mutation putUserInput($flowId: ID!, $input: String!) {- putUserInput(flowId: $flowId, input: $input)+ mutation putUserInput($flowId: ID!, $input: String!, $modelProvider: String) {+ putUserInput(flowId: $flowId, input: $input, modelProvider: $modelProvider)}`;export type PutUserInputMutationFn = Apollo.MutationFunction<PutUserInputMutation, PutUserInputMutationVariables>;@@ -5091,6 +5093,7 @@ export type PutUserInputMutationFn = Apollo.MutationFunction<PutUserInputMutatio* variables: {* flowId: // value for 'flowId'* input: // value for 'input'+ * modelProvider: // value for 'modelProvider'* },* });*/diff --git a/frontend/src/pages/flows/flows.tsx b/frontend/src/pages/flows/flows.tsxindex d4efc2bb..511988a2 100644--- a/frontend/src/pages/flows/flows.tsx+++ b/frontend/src/pages/flows/flows.tsx@@ -16,8 +16,7 @@ import {Trash,} from 'lucide-react';import { Check, CheckCircle2, X, XCircle } from 'lucide-react';-import { useState } from 'react';-import { useCallback, useMemo } from 'react';+import { useCallback, useMemo, useRef, useState } from 'react';import { useNavigate } from 'react-router-dom';import { useSearchParams } from 'react-router-dom';import { toast } from 'sonner';@@ -99,7 +98,7 @@ const Flows = () => {const [finishingFlowIds, setFinishingFlowIds] = useState<Set<string>>(new Set());const [deletingFlowIds, setDeletingFlowIds] = useState<Set<string>>(new Set());const [editingFlowId, setEditingFlowId] = useState<null | string>(null);- const [editingFlowTitle, setEditingFlowTitle] = useState('');+ const editingInputRef = useRef<HTMLInputElement>(null);const [renameFlowMutation, { loading: isRenameLoading }] = useRenameFlowMutation();// Three-way sorting handler: null -> asc -> desc -> null@@ -160,7 +159,6 @@ const Flows = () => {const handleFlowRenameStart = useCallback((flow: Flow) => {setEditingFlowId(flow.id);- setEditingFlowTitle(flow.title);}, []);const handleFlowDelete = async () => {@@ -187,7 +185,9 @@ const Flows = () => {};const handleFlowRenameSave = useCallback(async () => {- if (!editingFlowId || !editingFlowTitle.trim()) {+ const newTitle = editingInputRef.current?.value.trim();++ if (!editingFlowId || !newTitle) {return;}@@ -195,24 +195,22 @@ const Flows = () => {const { data } = await renameFlowMutation({variables: {flowId: editingFlowId,- title: editingFlowTitle.trim(),+ title: newTitle,},});if (data?.renameFlow === ResultType.Success) {toast.success('Flow renamed successfully');setEditingFlowId(null);- setEditingFlowTitle('');}} catch (error) {const errorMessage = error instanceof Error ? error.message : 'Failed to rename flow';toast.error(errorMessage);}- }, [editingFlowId, editingFlowTitle, renameFlowMutation]);+ }, [editingFlowId, renameFlowMutation]);const handleFlowRenameCancel = useCallback(() => {setEditingFlowId(null);- setEditingFlowTitle('');}, []);const handleFlowFinish = useCallback(@@ -276,7 +274,7 @@ const Flows = () => {><InputGroupInputautoFocus- onChange={(e) => setEditingFlowTitle(e.target.value)}+ defaultValue={title}onKeyDown={(e) => {if (e.key === 'Enter') {handleFlowRenameSave();@@ -291,14 +289,14 @@ const Flows = () => {}}}placeholder="Flow title"- value={editingFlowTitle}+ ref={editingInputRef}/><InputGroupAddonalign="inline-end"className="gap-0 pr-2"><InputGroupButton- disabled={isRenameLoading || !editingFlowTitle.trim()}+ disabled={isRenameLoading}onClick={() => handleFlowRenameSave()}>{isRenameLoading ? <Loader2 className="animate-spin" /> : <Check />}@@ -670,7 +668,6 @@ const Flows = () => {[deletingFlowIds,editingFlowId,- editingFlowTitle,finishingFlowIds,handleColumnSort,handleFlowDeleteDialogOpen,diff --git a/frontend/src/pages/settings/settings-api-tokens.tsx b/frontend/src/pages/settings/settings-api-tokens.tsxindex d4cbaa06..0f6a8c4b 100644--- a/frontend/src/pages/settings/settings-api-tokens.tsx+++ b/frontend/src/pages/settings/settings-api-tokens.tsx@@ -18,7 +18,7 @@ import {Trash,X,} from 'lucide-react';-import { useCallback, useMemo, useState } from 'react';+import { useCallback, useMemo, useRef, useState } from 'react';import { useSearchParams } from 'react-router-dom';import { toast } from 'sonner';@@ -65,7 +65,6 @@ interface CreateFormData {}interface EditFormData {- name: string;status: TokenStatusEnum;}@@ -200,14 +199,15 @@ const SettingsAPITokens = () => {const [editingTokenId, setEditingTokenId] = useState<null | string>(null);const [creatingToken, setCreatingToken] = useState(false);- const [editFormData, setEditFormData] = useState<EditFormData>({ name: '', status: TokenStatusEnum.Active });+ const [editFormData, setEditFormData] = useState<EditFormData>({ status: TokenStatusEnum.Active });const [createFormData, setCreateFormData] = useState<CreateFormData>({ expiresAt: null, name: '' });const [tokenSecret, setTokenSecret] = useState<null | string>(null);const [showTokenDialog, setShowTokenDialog] = useState(false);const [deleteErrorMessage, setDeleteErrorMessage] = useState<null | string>(null);const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);const [deletingToken, setDeletingToken] = useState<APIToken | null>(null);-+ const editingInputRef = useRef<HTMLInputElement>(null);+ const creatingInputRef = useRef<HTMLInputElement>(null);// Get current page from URLconst currentPage = useMemo(() => {@@ -273,24 +273,25 @@ const SettingsAPITokens = () => {const handleEdit = useCallback((token: APIToken) => {setEditingTokenId(token.tokenId);setEditFormData({- name: token.name || '',status: token.status,});}, []);const handleCancelEdit = useCallback(() => {setEditingTokenId(null);- setEditFormData({ name: '', status: TokenStatusEnum.Active });+ setEditFormData({ status: TokenStatusEnum.Active });}, []);const handleSave = useCallback(async (tokenId: string) => {+ const name = editingInputRef.current?.value.trim() || null;+try {await updateAPIToken({refetchQueries: ['apiTokens'],variables: {input: {- name: editFormData.name || null,+ name,status: editFormData.status,},tokenId,@@ -298,12 +299,12 @@ const SettingsAPITokens = () => {});setEditingTokenId(null);- setEditFormData({ name: '', status: TokenStatusEnum.Active });+ setEditFormData({ status: TokenStatusEnum.Active });} catch (error) {console.error('Failed to update token:', error);}},- [editFormData, updateAPIToken],+ [editFormData.status, updateAPIToken],);const handleCreateNew = useCallback(() => {@@ -321,13 +322,15 @@ const SettingsAPITokens = () => {return;}+ const name = creatingInputRef.current?.value.trim() || null;+try {const ttl = calculateTTL(createFormData.expiresAt);const result = await createAPIToken({refetchQueries: ['apiTokens'],variables: {input: {- name: createFormData.name || null,+ name,ttl,},},@@ -343,7 +346,7 @@ const SettingsAPITokens = () => {} catch (error) {console.error('Failed to create token:', error);}- }, [createAPIToken, createFormData]);+ }, [createAPIToken, createFormData.expiresAt]);const handleDeleteDialogOpen = useCallback((token: APIToken) => {setDeletingToken(token);@@ -399,23 +402,25 @@ const SettingsAPITokens = () => {<InputautoFocusclassName="h-8"+ defaultValue=""key="create-name-input"- onChange={(e) => setCreateFormData((prev) => ({ ...prev, name: e.target.value }))}placeholder="Token name (optional)"- value={createFormData.name}+ ref={creatingInputRef}/>);}if (isEditing) {+ const tokenName = token.name || '';+return (<InputautoFocusclassName="h-8"+ defaultValue={tokenName}key={`edit-name-input-${token.tokenId}`}- onChange={(e) => setEditFormData((prev) => ({ ...prev, name: e.target.value }))}placeholder="Token name (optional)"- value={editFormData.name}+ ref={editingInputRef}/>);}@@ -799,9 +804,7 @@ const SettingsAPITokens = () => {],[createFormData.expiresAt,- createFormData.name,deletingToken,- editFormData.name,editFormData.status,editingTokenId,handleCancelCreate,diff --git a/frontend/src/providers/flow-provider.tsx b/frontend/src/providers/flow-provider.tsxindex bc1d344e..efbdb08e 100644--- a/frontend/src/providers/flow-provider.tsx+++ b/frontend/src/providers/flow-provider.tsx@@ -194,13 +194,14 @@ export const FlowProvider = ({ children }: FlowProviderProps) => {return;}- const { message: input } = values;+ const { message: input, providerName } = values;try {await putUserInput({variables: {flowId,input,+ modelProvider: providerName || undefined,},});} catch (error) {