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
fix(controller): avoid JSON round-trip and N+1 prompter loads
mason50523278c62b965f
diff --git a/backend/pkg/controller/assistant.go b/backend/pkg/controller/assistant.goindex 4627b991..d5aed0a9 100644--- a/backend/pkg/controller/assistant.go+++ b/backend/pkg/controller/assistant.go@@ -16,6 +16,7 @@ import ("pentagi/pkg/providers""pentagi/pkg/providers/pconfig""pentagi/pkg/providers/provider"+ "pentagi/pkg/templates""pentagi/pkg/tools""github.com/sirupsen/logrus"@@ -70,6 +71,12 @@ type assistantWorkerCtx struct {userID int64flowID int64+ // prompter is an optional reusable prompter for the user. When non-nil,+ // LoadAssistantWorker uses it instead of issuing another GetUserPrompts+ // query and merging defaults. LoadFlowWorker sets this so a flow load+ // with multiple assistants only pays the DB+merge cost once.+ prompter templates.Prompter+flowWorkerCtx}@@ -321,9 +328,12 @@ func LoadAssistantWorker(return nil, wrapErrorEndSpan(ctx, assistantSpan, "failed to create flow assistant log worker", err)}- prompter, err := newUserPrompter(ctx, awc.db, awc.userID)- if err != nil {- return nil, wrapErrorEndSpan(ctx, assistantSpan, "failed to build user prompter", err)+ prompter := awc.prompter+ if prompter == nil {+ prompter, err = newUserPrompter(ctx, awc.db, awc.userID)+ if err != nil {+ return nil, wrapErrorEndSpan(ctx, assistantSpan, "failed to build user prompter", err)+ }}executor, err := tools.NewFlowToolsExecutor(awc.db, awc.cfg, awc.docker, functions, awc.flowID)if err != nil {diff --git a/backend/pkg/controller/flow.go b/backend/pkg/controller/flow.goindex ce167089..7cbc0476 100644--- a/backend/pkg/controller/flow.go+++ b/backend/pkg/controller/flow.go@@ -425,6 +425,7 @@ func LoadFlowWorker(ctx context.Context, flow database.Flow, fwc flowWorkerCtx)awc := assistantWorkerCtx{userID: flow.UserID,flowID: flow.ID,+ prompter: prompter,flowWorkerCtx: fwc,}for _, assistant := range assistants {diff --git a/backend/pkg/controller/prompter.go b/backend/pkg/controller/prompter.goindex 76376fda..34700105 100644--- a/backend/pkg/controller/prompter.go+++ b/backend/pkg/controller/prompter.go@@ -2,7 +2,6 @@ package controllerimport ("context"- "encoding/json""fmt""pentagi/pkg/database"@@ -19,24 +18,22 @@ func newUserPrompter(ctx context.Context, db database.Querier, userID int64) (teif err != nil {return nil, fmt.Errorf("failed to load user prompts: %w", err)}- return buildUserPrompter(templates.NewDefaultPrompter(), userPrompts)-}-// buildUserPrompter is the pure merge step extracted from newUserPrompter-// so it can be unit-tested without a database fake. It seeds the result-// with every default template and then overrides each prompt type the-// user has saved a non-empty body for.-func buildUserPrompter(defaults templates.Prompter, userPrompts []database.Prompt) (templates.Prompter, error) {- blob, err := defaults.DumpTemplates()+ defaults, err := templates.LoadDefaultPromptsMap()if err != nil {- return nil, fmt.Errorf("failed to dump default templates: %w", err)+ return nil, fmt.Errorf("failed to load default templates: %w", err)}- merged := templates.PromptsMap{}- if err := json.Unmarshal(blob, &merged); err != nil {- return nil, fmt.Errorf("failed to parse default templates: %w", err)- }+ return buildUserPrompter(defaults, userPrompts), nil+}+// buildUserPrompter is the pure merge step extracted from newUserPrompter so+// it can be unit-tested without a database fake or filesystem access. It+// mutates the supplied defaults map by overlaying each non-empty user+// override on top, then returns a Prompter backed by that map. Callers must+// pass a fresh map (e.g., from templates.LoadDefaultPromptsMap) so the+// embedded defaults are not modified.+func buildUserPrompter(defaults templates.PromptsMap, userPrompts []database.Prompt) templates.Prompter {for _, p := range userPrompts {if p.Prompt == "" {// The Prompts UI uses delete (or reset, which writes the@@ -46,8 +43,8 @@ func buildUserPrompter(defaults templates.Prompter, userPrompts []database.Promp// ErrTemplateNotFound deep inside agent rendering.continue}- merged[templates.PromptType(p.Type)] = p.Prompt+ defaults[templates.PromptType(p.Type)] = p.Prompt}- return templates.NewFlowPrompter(merged), nil+ return templates.NewFlowPrompter(defaults)}diff --git a/backend/pkg/controller/prompter_test.go b/backend/pkg/controller/prompter_test.goindex e744ab4e..0f5a2a2c 100644--- a/backend/pkg/controller/prompter_test.go+++ b/backend/pkg/controller/prompter_test.go@@ -37,12 +37,19 @@ func getDefaultTemplate(t *testing.T, pt templates.PromptType) string {return body}-func TestBuildUserPrompter_NoUserPrompts(t *testing.T) {- defaults := templates.NewDefaultPrompter()- prompter, err := buildUserPrompter(defaults, nil)+// loadDefaults returns a fresh PromptsMap of the embedded default templates so+// each test mutates its own map without leaking state between cases.+func loadDefaults(t *testing.T) templates.PromptsMap {+ t.Helper()+ defaults, err := templates.LoadDefaultPromptsMap()if err != nil {- t.Fatalf("buildUserPrompter returned error: %v", err)+ t.Fatalf("LoadDefaultPromptsMap error: %v", err)}+ return defaults+}++func TestBuildUserPrompter_NoUserPrompts(t *testing.T) {+ prompter := buildUserPrompter(loadDefaults(t), nil)for _, pt := range []templates.PromptType{templates.PromptTypePrimaryAgent,@@ -65,10 +72,7 @@ func TestBuildUserPrompter_SingleOverride(t *testing.T) {{Type: database.PromptTypePrimaryAgent, Prompt: customBody},}- prompter, err := buildUserPrompter(templates.NewDefaultPrompter(), userPrompts)- if err != nil {- t.Fatalf("buildUserPrompter error: %v", err)- }+ prompter := buildUserPrompter(loadDefaults(t), userPrompts)got, err := prompter.GetTemplate(templates.PromptTypePrimaryAgent)if err != nil {@@ -105,10 +109,7 @@ func TestBuildUserPrompter_PartialOverridesPreserveDefaults(t *testing.T) {userPrompts = append(userPrompts, database.Prompt{Type: pt, Prompt: body})}- prompter, err := buildUserPrompter(templates.NewDefaultPrompter(), userPrompts)- if err != nil {- t.Fatalf("buildUserPrompter error: %v", err)- }+ prompter := buildUserPrompter(loadDefaults(t), userPrompts)for pt, want := range overrides {got, err := prompter.GetTemplate(templates.PromptType(pt))@@ -141,10 +142,7 @@ func TestBuildUserPrompter_EmptyBodyIsIgnored(t *testing.T) {{Type: database.PromptTypePrimaryAgent, Prompt: ""},}- prompter, err := buildUserPrompter(templates.NewDefaultPrompter(), userPrompts)- if err != nil {- t.Fatalf("buildUserPrompter error: %v", err)- }+ prompter := buildUserPrompter(loadDefaults(t), userPrompts)got, err := prompter.GetTemplate(templates.PromptTypePrimaryAgent)if err != nil {diff --git a/backend/pkg/templates/templates.go b/backend/pkg/templates/templates.goindex 5ac89414..fe16cd38 100644--- a/backend/pkg/templates/templates.go+++ b/backend/pkg/templates/templates.go@@ -636,12 +636,31 @@ func (dp *defaultPrompter) RenderTemplate(promptType PromptType, params any) (st}func (dp *defaultPrompter) DumpTemplates() ([]byte, error) {+ promptsMap, err := LoadDefaultPromptsMap()+ if err != nil {+ return nil, err+ }++ blob, err := json.Marshal(promptsMap)+ if err != nil {+ return nil, fmt.Errorf("failed to marshal templates: %w", err)+ }++ return blob, nil+}++// LoadDefaultPromptsMap returns a freshly populated PromptsMap of the embedded+// default templates. Callers that need to overlay overrides on top of the+// defaults can mutate the returned map directly, without going through the+// JSON dump path used by Prompter.DumpTemplates(). Each call returns a new+// map, so mutations do not affect subsequent callers.+func LoadDefaultPromptsMap() (PromptsMap, error) {prompts, err := promptTemplates.ReadDir("prompts")if err != nil {return nil, fmt.Errorf("failed to read templates: %w", err)}- promptsMap := make(PromptsMap)+ promptsMap := make(PromptsMap, len(prompts))for _, prompt := range prompts {promptBytes, err := promptTemplates.ReadFile(path.Join("prompts", prompt.Name()))if err != nil {@@ -652,12 +671,7 @@ func (dp *defaultPrompter) DumpTemplates() ([]byte, error) {promptsMap[PromptType(promptName)] = string(promptBytes)}- blob, err := json.Marshal(promptsMap)- if err != nil {- return nil, fmt.Errorf("failed to marshal templates: %w", err)- }-- return blob, nil+ return promptsMap, nil}func RenderPrompt(name, prompt string, params any) (string, error) {