RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
fix(agent): report missing Message variables clearly (#19831)
Sbaaoui Idriss08a9da65e5dc
diff --git a/internal/agent/component/message.go b/internal/agent/component/message.goindex 9ae96d8eb1..39435e110d 100644--- a/internal/agent/component/message.go+++ b/internal/agent/component/message.go@@ -377,6 +377,9 @@ func (m *MessageComponent) resolveDeferredTemplate(ctx context.Context, text strif len(matches) == 0 {return text, false, nil}+ if _, err := runtime.ResolveTemplate(text, state); err != nil {+ return "", false, err+ }// Ordinary Message templates are rendered and emitted once by Invoke.// Only templates that actually reference a DeferredStream belong to the// incremental presentation path below. Emitting literals/normal variablediff --git a/internal/agent/component/message_test.go b/internal/agent/component/message_test.goindex a4e71fca5d..16d6db09ba 100644--- a/internal/agent/component/message_test.go+++ b/internal/agent/component/message_test.go@@ -118,6 +118,37 @@ func TestMessage_NoTemplate(t *testing.T) {}}+func TestMessage_DanglingReference(t *testing.T) {+ c, _ := NewMessageComponent(nil)+ state := canvas.NewCanvasState("run-dangling", "task-dangling")+ ctx := withStateForTest(t.Context(), state)++ for _, text := range []string{+ "{{Agent:Deleted@content}}",+ "prefix {{Agent:Deleted@content}} suffix",+ } {+ _, err := c.Invoke(ctx, nil, map[string]any{"text": text})+ if err == nil || err.Error() != "Can't find variable: 'Agent:Deleted@content'" {+ t.Errorf("Invoke(%q) error = %v, want clean missing-variable error", text, err)+ }+ }+}++func TestMessage_ExistingEmptyReference(t *testing.T) {+ c, _ := NewMessageComponent(nil)+ state := canvas.NewCanvasState("run-empty", "task-empty")+ state.SetVar("Agent:Empty", "content", "")+ ctx := withStateForTest(t.Context(), state)++ out, err := c.Invoke(ctx, nil, map[string]any{"text": "{{Agent:Empty@content}}"})+ if err != nil {+ t.Fatalf("Invoke: %v", err)+ }+ if got, _ := out["content"].(string); got != "" {+ t.Fatalf("content = %q, want empty", got)+ }+}+func TestMessage_RuntimeContentInput(t *testing.T) {c, _ := NewMessageComponent(nil)state := canvas.NewCanvasState("run-4", "task-4")diff --git a/internal/agent/runtime/template.go b/internal/agent/runtime/template.goindex d15dcff89c..b7290e04e8 100644--- a/internal/agent/runtime/template.go+++ b/internal/agent/runtime/template.go@@ -101,7 +101,7 @@ func ResolveTemplate(s string, state *CanvasState) (string, error) {}if v == nil {if firstErr == nil {- firstErr = fmt.Errorf("canvas: unresolved reference %q", ref)+ firstErr = NewUserFacingError(fmt.Sprintf("Can't find variable: '%s'", ref))}return ""}diff --git a/internal/handler/agent.go b/internal/handler/agent.goindex 89f58b6c8e..007851fb1d 100644--- a/internal/handler/agent.go+++ b/internal/handler/agent.go@@ -1363,6 +1363,10 @@ func (h *AgentHandler) AgentChatCompletions(c *gin.Context) {hasEvents := falsefor ev := range events {hasEvents = true+ if ev.Type == "error" {+ common.ResponseWithCodeData(c, common.CodeServerError, false, agentRunEventMessage(ev, "Agent run failed."))+ return+ }var evData map[string]anyif err := json.Unmarshal([]byte(ev.Data), &evData); err == nil {if ev.Type == "message" {diff --git a/internal/handler/agent_test.go b/internal/handler/agent_test.goindex b3d6732022..00df11b28e 100644--- a/internal/handler/agent_test.go+++ b/internal/handler/agent_test.go@@ -871,6 +871,34 @@ func TestAgentChatCompletions_DefaultBranchNonStreaming(t *testing.T) {}}+func TestAgentChatCompletions_NonStreamingReturnsRunnerError(t *testing.T) {+ gin.SetMode(gin.TestMode)+ w := httptest.NewRecorder()+ c, _ := gin.CreateTestContext(w)+ c.Request = httptest.NewRequest("POST", "/api/v1/agents/chat/completions",+ strings.NewReader(`{"agent_id":"a1","query":"hello","stream":false}`))+ c.Request.Header.Set("Content-Type", "application/json")+ c.Set("user", &entity.User{ID: "u1"})+ c.Set("user_id", "u1")++ runner := &stubChatRunner{events: []canvas.RunEvent{+ {Type: "workflow_started", Data: `{"inputs":"hello"}`},+ {Type: "error", Data: `{"message":"Can't find variable: 'Agent:Deleted@content'","kind":"user"}`},+ }}+ (&AgentHandler{chatRunner: runner}).AgentChatCompletions(c)++ var response struct {+ Code int `json:"code"`+ Message string `json:"message"`+ }+ if err := json.Unmarshal(w.Body.Bytes(), &response); err != nil {+ t.Fatalf("decode response: %v", err)+ }+ if response.Code != int(common.CodeServerError) || response.Message != "Can't find variable: 'Agent:Deleted@content'" {+ t.Fatalf("response = %+v, want runner error", response)+ }+}+// TestAgentChatCompletions_NonStreamingPreservesThinkMarkers covers the// non-streaming aggregation: start_to_think/end_to_think message events must// survive as <think> tags in the final content, mirroring Python