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(canvas): send a status message without feeding it to the next node (#20600)
Öndery815bde836d77
diff --git a/internal/agent/canvas/direct_message_downstream_test.go b/internal/agent/canvas/direct_message_downstream_test.goindex ed1e09f312..0e213d3ee3 100644--- a/internal/agent/canvas/direct_message_downstream_test.go+++ b/internal/agent/canvas/direct_message_downstream_test.go@@ -4,7 +4,7 @@ package canvasimport "testing"// TestDirectMessageDownstream covers the mixed-downstream contract:-// deferral is only allowed when every direct downstream is a Message.+// deferral is only allowed when every direct downstream is a terminal Message.func TestDirectMessageDownstream(t *testing.T) {cases := []struct {name string@@ -161,6 +161,26 @@ func TestDirectMessageDownstream(t *testing.T) {cpnID: "agent_0",deferred: false,},+ {+ name: "intermediate message stays eager",+ canvas: &Canvas{+ Components: map[string]CanvasComponent{+ "agent_0": {+ Obj: CanvasComponentObj{ComponentName: "Agent"},+ Downstream: []string{"message_0"},+ },+ "message_0": {+ Obj: CanvasComponentObj{ComponentName: "Message"},+ Downstream: []string{"llm_0"},+ },+ "llm_0": {+ Obj: CanvasComponentObj{ComponentName: "LLM"},+ },+ },+ },+ cpnID: "agent_0",+ deferred: false,+ },{name: "component name is case insensitive",canvas: &Canvas{diff --git a/internal/agent/canvas/loop_subgraph.go b/internal/agent/canvas/loop_subgraph.goindex 5194b519fd..11230b395c 100644--- a/internal/agent/canvas/loop_subgraph.go+++ b/internal/agent/canvas/loop_subgraph.go@@ -273,10 +273,19 @@ func buildSubWorkflow(for cpnID := range members {upstreams := c.Components[cpnID].Upstreamfirst := true+ wireMember := func(up string) {+ if !members[up] {+ return+ }+ if first {+ nodes[cpnID].AddInput(up)+ first = false+ } else {+ nodes[cpnID].AddDependency(up)+ }+ }for _, up := range upstreams {if up == loopID {- // Upstream is the parent Loop; in the sub-graph the- // data source is the synthetic init node.if first {nodes[cpnID].AddInput(loopInitKey)first = false@@ -285,20 +294,21 @@ func buildSubWorkflow(}continue}- if !members[up] {+ if messageEdgeIsOrderingOnly(c, up) {continue}- if first {- nodes[cpnID].AddInput(up)- first = false- } else {- nodes[cpnID].AddDependency(up)+ wireMember(up)+ }+ for _, up := range upstreams {+ if !members[up] || !messageEdgeIsOrderingOnly(c, up) {+ continue}+ nodes[cpnID].AddDependency(up)}if first {- // No in-subgraph upstream: wire from init (this happens- // for body entries whose only upstream in the DSL is the- // Loop itself).+ // No in-subgraph data upstream. The loop input stays the+ // data source, including when the only body predecessor is+ // a Message. That edge only orders execution.nodes[cpnID].AddInput(loopInitKey)}}diff --git a/internal/agent/canvas/message_predecessor_test.go b/internal/agent/canvas/message_predecessor_test.gonew file mode 100644index 0000000000..1f96125cc6--- /dev/null+++ b/internal/agent/canvas/message_predecessor_test.go@@ -0,0 +1,116 @@+package canvas++import (+ "context"+ "strings"+ "testing"++ "ragflow/internal/agent/component"+ "ragflow/internal/agent/runtime"++ "gorm.io/gorm"+)++// recordingComponent returns a fixed output and keeps the input map it received.+type recordingComponent struct {+ out map[string]any+ record *map[string]any+}++func (c *recordingComponent) Invoke(_ context.Context, _ *gorm.DB, in map[string]any) (map[string]any, error) {+ if c.record != nil {+ copied := make(map[string]any, len(in))+ for k, v := range in {+ copied[k] = v+ }+ *c.record = copied+ }+ out := make(map[string]any, len(c.out))+ for k, v := range c.out {+ out[k] = v+ }+ return out, nil+}++// TestMessageReadsPredecessorOutput runs Source → Message → Lookup → Message.+// Both messages must resolve a field from the node immediately before them.+// The lookup after the status message must not receive that status text.+func TestMessageReadsPredecessorOutput(t *testing.T) {+ var lookupInputs map[string]any+ factory := func(name string, params map[string]any) (runtime.Component, error) {+ switch strings.ToLower(name) {+ case "message":+ msg, err := component.NewMessageComponent(params)+ if err != nil {+ return nil, err+ }+ return msg, nil+ case "lookup":+ return &recordingComponent{+ out: map[string]any{"answer": "found-it"},+ record: &lookupInputs,+ }, nil+ default:+ return &recordingComponent{out: map[string]any{"summary": "shipping delayed"}}, nil+ }+ }++ c := &Canvas{+ Components: map[string]CanvasComponent{+ "source_0": {+ Obj: CanvasComponentObj{ComponentName: "Source", Params: map[string]any{}},+ Downstream: []string{"message_0"},+ },+ "message_0": {+ Obj: CanvasComponentObj{ComponentName: "Message", Params: map[string]any{+ "content": []any{"Checked {source_0@summary}."},+ }},+ Downstream: []string{"lookup_0"},+ Upstream: []string{"source_0"},+ },+ "lookup_0": {+ Obj: CanvasComponentObj{ComponentName: "Lookup", Params: map[string]any{}},+ Downstream: []string{"message_1"},+ Upstream: []string{"message_0"},+ },+ "message_1": {+ Obj: CanvasComponentObj{ComponentName: "Message", Params: map[string]any{+ "content": []any{"Result: {lookup_0@answer}."},+ }},+ Upstream: []string{"lookup_0"},+ },+ },+ }++ ctx := WithComponentFactory(t.Context(), factory)+ runState := NewCanvasState("run-message", "task-message")+ ctx = withState(ctx, runState)+ cc, err := Compile(ctx, c)+ if err != nil {+ t.Fatalf("Compile: %v", err)+ }+ if _, err = cc.Workflow.Invoke(ctx, map[string]any{"query": "where is the parcel"}); err != nil {+ t.Fatalf("Invoke: %v", err)+ }++ status, err := runState.GetVar("message_0@content")+ if err != nil {+ t.Fatalf("status message: %v", err)+ }+ if status != "Checked shipping delayed." {+ t.Fatalf("status message = %#v, want the source summary", status)+ }+ final, err := runState.GetVar("message_1@content")+ if err != nil {+ t.Fatalf("final message: %v", err)+ }+ if final != "Result: found-it." {+ t.Fatalf("final message = %#v, want the lookup answer", final)+ }+ if lookupInputs["query"] != "where is the parcel" {+ t.Fatalf("lookup input = %#v, want the workflow query", lookupInputs)+ }+ if lookupInputs["content"] != nil {+ t.Fatalf("status text was copied into lookup: %#v", lookupInputs)+ }+}diff --git a/internal/agent/canvas/scheduler.go b/internal/agent/canvas/scheduler.goindex 4d0b5d406d..8fa38d6c1d 100644--- a/internal/agent/canvas/scheduler.go+++ b/internal/agent/canvas/scheduler.go@@ -628,23 +628,34 @@ func BuildWorkflow(ctx context.Context, c *Canvas) (*compose.Workflow[map[string}wired := make(map[pendingEdge]struct{}, len(pending))first := make(map[string]bool, len(c.Components))- for _, e := range pending {- // Multiple output handles may converge on the same downstream- // node. The DSL keeps one upstream entry per handle, while eino- // permits only one control edge for a source/target pair.+ wireOne := func(e pendingEdge) error {if _, ok := wired[e]; ok {- continue+ return nil}wired[e] = struct{}{}if e.cpn == e.up {- return nil, fmt.Errorf("agent: self-edge on %q", e.cpn)+ return fmt.Errorf("agent: self-edge on %q", e.cpn)}if resolveNode(e.up) == nil {- return nil, fmt.Errorf("agent: component %q has unknown upstream %q", e.cpn, e.up)+ return fmt.Errorf("agent: component %q has unknown upstream %q", e.cpn, e.up)}cpnNode := resolveNode(e.cpn)if cpnNode == nil {- return nil, fmt.Errorf("agent: pending edge references unknown cpn %q", e.cpn)+ return fmt.Errorf("agent: pending edge references unknown cpn %q", e.cpn)+ }+ if messageEdgeIsOrderingOnly(c, e.up) {+ // This edge leaves a Message. Wait for it, but do not copy+ // its output. Edges into a Message are wired above and still+ // copy the previous node's output, including the final message.+ // When nothing else supplies data, read the workflow input+ // without a direct edge from START, so an unselected branch+ // does not run this node.+ cpnNode.AddDependency(e.up)+ if !first[e.cpn] {+ cpnNode.AddInputWithOptions(compose.START, nil, compose.WithNoDirectDependency())+ first[e.cpn] = true+ }+ return nil}if !first[e.cpn] {cpnNode.AddInput(e.up)@@ -652,6 +663,22 @@ func BuildWorkflow(ctx context.Context, c *Canvas) (*compose.Workflow[map[string} else {cpnNode.AddDependency(e.up)}+ return nil+ }+ var messageEdges []pendingEdge+ for _, e := range pending {+ if messageEdgeIsOrderingOnly(c, e.up) {+ messageEdges = append(messageEdges, e)+ continue+ }+ if err := wireOne(e); err != nil {+ return nil, err+ }+ }+ for _, e := range messageEdges {+ if err := wireOne(e); err != nil {+ return nil, err+ }}// Pass 2.5: install MultiBranch edges for runtime-control parents.@@ -724,9 +751,27 @@ func BuildWorkflow(ctx context.Context, c *Canvas) (*compose.Workflow[map[stringreturn wf, nil}+// messageEdgeIsOrderingOnly reports that an edge leaving a Message only+// schedules the next node. Message output is not that node's input.+// The check looks at the upstream id, so an edge whose target is a+// Message still carries the previous node's output into that Message.+func messageEdgeIsOrderingOnly(c *Canvas, upstreamID string) bool {+ if c == nil {+ return false+ }+ comp, ok := c.Components[upstreamID]+ if !ok {+ return false+ }+ return strings.EqualFold(comp.Obj.ComponentName, "Message")+}+// directMessageDownstream reports whether a component may hand a deferred// stream to its downstream consumers. Only a direct Message child enables lazy-// Agent execution, and only when EVERY direct downstream is a Message.+// Agent execution, and only when EVERY direct downstream is a Message that+// ends the branch. A Message that itself continues is a status line: the+// Agent must run eagerly and write a real value, or the stream is never+// opened and later nodes observe the unresolved placeholder.//// A mixed graph (Agent -> [Agent, Message]) must keep eager execution: the// deferred stream is opaque to non-Message consumers, which would otherwise@@ -746,6 +791,9 @@ func directMessageDownstream(c *Canvas, cpnID string) bool {if !ok || !strings.EqualFold(down.Obj.ComponentName, "Message") {return false}+ if len(down.Downstream) > 0 {+ return false+ }}return true}diff --git a/internal/agent/canvas/scheduler_test.go b/internal/agent/canvas/scheduler_test.goindex 32a1d3820a..35c94bc005 100644--- a/internal/agent/canvas/scheduler_test.go+++ b/internal/agent/canvas/scheduler_test.go@@ -49,6 +49,41 @@ func TestBuildWorkflow_3NodeLinear(t *testing.T) {}}+// TestBuildWorkflow_MessageThenNextNode keeps a status message between two+// steps. The edge after Message is ordering-only, so the graph still compiles+// when Message is not the terminal node.+func TestBuildWorkflow_MessageThenNextNode(t *testing.T) {+ c := &Canvas{+ Components: map[string]CanvasComponent{+ "begin_0": {+ Obj: CanvasComponentObj{ComponentName: "Begin", Params: map[string]any{}},+ Downstream: []string{"message_0"},+ },+ "message_0": {+ Obj: CanvasComponentObj{ComponentName: "Message", Params: map[string]any{"content": []any{"Searching the first source"}}},+ Downstream: []string{"llm_0"},+ Upstream: []string{"begin_0"},+ },+ "llm_0": {+ Obj: CanvasComponentObj{ComponentName: "LLM", Params: map[string]any{"prompt": "{sys.query}"}},+ Downstream: []string{"message_1"},+ Upstream: []string{"message_0"},+ },+ "message_1": {+ Obj: CanvasComponentObj{ComponentName: "Message", Params: map[string]any{"content": []any{"{llm_0@content}"}}},+ Upstream: []string{"llm_0"},+ },+ },+ }++ if _, err := BuildWorkflow(t.Context(), c); err != nil {+ t.Fatalf("BuildWorkflow: %v", err)+ }+ if _, err := Compile(t.Context(), c); err != nil {+ t.Fatalf("Compile: %v", err)+ }+}+// TestBuildWorkflow_5NodeDiamond exercises a diamond: A → B, A → C,// B → D, C → D. The two parallel branches converge at D.func TestBuildWorkflow_5NodeDiamond(t *testing.T) {diff --git a/web/src/pages/agent/canvas/node/dropdown/accordion-operators.tsx b/web/src/pages/agent/canvas/node/dropdown/accordion-operators.tsxindex 85c7a5eecd..69e0a634f4 100644--- a/web/src/pages/agent/canvas/node/dropdown/accordion-operators.tsx+++ b/web/src/pages/agent/canvas/node/dropdown/accordion-operators.tsx@@ -5,6 +5,7 @@ import {AccordionTrigger,} from '@/components/ui/accordion';import { Operator } from '@/constants/agent';+import { RestrictedUpstreamMap } from '@/pages/agent/constant';import { PropsWithChildren, useMemo } from 'react';import { useTranslation } from 'react-i18next';import useGraphStore from '../../../store';@@ -40,103 +41,132 @@ export function AccordionOperators({return [];}, [getOperatorTypeFromId, getParentIdById, nodeId]);+ const allow = useMemo(() => {+ const source = getOperatorTypeFromId(nodeId) as Operator | undefined;+ const blocked = new Set<Operator>(+ source && source in RestrictedUpstreamMap+ ? RestrictedUpstreamMap[source as keyof typeof RestrictedUpstreamMap]+ : [],+ );+ return (operators: Operator[]) =>+ operators.filter((operator) => !blocked.has(operator));+ }, [getOperatorTypeFromId, nodeId]);++ const foundation = allow([Operator.Agent, Operator.Retrieval]);+ const dialog = allow([Operator.Message, Operator.UserFillUp]);+ const flow = allow([+ Operator.Switch,+ Operator.Iteration,+ Operator.Loop,+ ...exitLoopList,+ Operator.Categorize,+ ]);+ const data = allow([+ Operator.Code,+ Operator.StringTransform,+ Operator.DataOperations,+ Operator.VariableAssigner,+ Operator.ListOperations,+ Operator.VariableAggregator,+ ]);+ const tools = allow([+ Operator.TavilySearch,+ Operator.TavilyExtract,+ Operator.QueritContents,+ Operator.QueritSearch,+ Operator.ExeSQL,+ Operator.Google,+ Operator.YahooFinance,+ Operator.Email,+ Operator.DuckDuckGo,+ Operator.Wikipedia,+ Operator.GoogleScholar,+ Operator.ArXiv,+ Operator.PubMed,+ Operator.BGPT,+ Operator.GitHub,+ Operator.Invoke,+ Operator.WenCai,+ Operator.SearXNG,+ Operator.KeenableSearch,+ Operator.YouComSearch,+ Operator.SofyaSearch,+ Operator.DocGenerator,+ Operator.Browser,+ ]);+return (<Accordiontype="multiple"className="px-2 text-text-title max-h-[45vh] overflow-auto"defaultValue={['item-1', 'item-2', 'item-3', 'item-4', 'item-5']}>- <AccordionItem value="item-1">- <OperatorAccordionTrigger>- {t('flow.foundation')}- </OperatorAccordionTrigger>- <AccordionContent className="flex flex-col gap-4 text-text-primary">- <OperatorItemList- operators={[Operator.Agent, Operator.Retrieval]}- isCustomDropdown={isCustomDropdown}- mousePosition={mousePosition}- ></OperatorItemList>- </AccordionContent>- </AccordionItem>- <AccordionItem value="item-2">- <OperatorAccordionTrigger>{t('flow.dialog')}</OperatorAccordionTrigger>- <AccordionContent className="flex flex-col gap-4 text-text-primary">- <OperatorItemList- operators={[Operator.Message, Operator.UserFillUp]}- isCustomDropdown={isCustomDropdown}- mousePosition={mousePosition}- ></OperatorItemList>- </AccordionContent>- </AccordionItem>- <AccordionItem value="item-3">- <OperatorAccordionTrigger>{t('flow.flow')}</OperatorAccordionTrigger>- <AccordionContent className="flex flex-col gap-4 text-text-primary">- <OperatorItemList- operators={[- Operator.Switch,- Operator.Iteration,- Operator.Loop,- ...exitLoopList,- Operator.Categorize,- ]}- isCustomDropdown={isCustomDropdown}- mousePosition={mousePosition}- ></OperatorItemList>- </AccordionContent>- </AccordionItem>- <AccordionItem value="item-4">- <OperatorAccordionTrigger>- {t('flow.dataManipulation')}- </OperatorAccordionTrigger>- <AccordionContent className="flex flex-col gap-4 text-text-primary">- <OperatorItemList- operators={[- Operator.Code,- Operator.StringTransform,- Operator.DataOperations,- Operator.VariableAssigner,- Operator.ListOperations,- Operator.VariableAggregator,- ]}- isCustomDropdown={isCustomDropdown}- mousePosition={mousePosition}- ></OperatorItemList>- </AccordionContent>- </AccordionItem>- <AccordionItem value="item-5">- <OperatorAccordionTrigger>{t('flow.tools')}</OperatorAccordionTrigger>- <AccordionContent className="flex flex-col gap-4 text-text-primary">- <OperatorItemList- operators={[- Operator.TavilySearch,- Operator.TavilyExtract,- Operator.QueritContents,- Operator.QueritSearch,- Operator.ExeSQL,- Operator.Google,- Operator.YahooFinance,- Operator.Email,- Operator.DuckDuckGo,- Operator.Wikipedia,- Operator.GoogleScholar,- Operator.ArXiv,- Operator.PubMed,- Operator.BGPT,- Operator.GitHub,- Operator.Invoke,- Operator.WenCai,- Operator.SearXNG,- Operator.KeenableSearch,- Operator.YouComSearch,- Operator.SofyaSearch,- Operator.DocGenerator,- Operator.Browser,- ]}- isCustomDropdown={isCustomDropdown}- mousePosition={mousePosition}- ></OperatorItemList>- </AccordionContent>- </AccordionItem>+ {foundation.length > 0 && (+ <AccordionItem value="item-1">+ <OperatorAccordionTrigger>+ {t('flow.foundation')}+ </OperatorAccordionTrigger>+ <AccordionContent className="flex flex-col gap-4 text-text-primary">+ <OperatorItemList+ operators={foundation}+ isCustomDropdown={isCustomDropdown}+ mousePosition={mousePosition}+ ></OperatorItemList>+ </AccordionContent>+ </AccordionItem>+ )}+ {dialog.length > 0 && (+ <AccordionItem value="item-2">+ <OperatorAccordionTrigger>+ {t('flow.dialog')}+ </OperatorAccordionTrigger>+ <AccordionContent className="flex flex-col gap-4 text-text-primary">+ <OperatorItemList+ operators={dialog}+ isCustomDropdown={isCustomDropdown}+ mousePosition={mousePosition}+ ></OperatorItemList>+ </AccordionContent>+ </AccordionItem>+ )}+ {flow.length > 0 && (+ <AccordionItem value="item-3">+ <OperatorAccordionTrigger>{t('flow.flow')}</OperatorAccordionTrigger>+ <AccordionContent className="flex flex-col gap-4 text-text-primary">+ <OperatorItemList+ operators={flow}+ isCustomDropdown={isCustomDropdown}+ mousePosition={mousePosition}+ ></OperatorItemList>+ </AccordionContent>+ </AccordionItem>+ )}+ {data.length > 0 && (+ <AccordionItem value="item-4">+ <OperatorAccordionTrigger>+ {t('flow.dataManipulation')}+ </OperatorAccordionTrigger>+ <AccordionContent className="flex flex-col gap-4 text-text-primary">+ <OperatorItemList+ operators={data}+ isCustomDropdown={isCustomDropdown}+ mousePosition={mousePosition}+ ></OperatorItemList>+ </AccordionContent>+ </AccordionItem>+ )}+ {tools.length > 0 && (+ <AccordionItem value="item-5">+ <OperatorAccordionTrigger>{t('flow.tools')}</OperatorAccordionTrigger>+ <AccordionContent className="flex flex-col gap-4 text-text-primary">+ <OperatorItemList+ operators={tools}+ isCustomDropdown={isCustomDropdown}+ mousePosition={mousePosition}+ ></OperatorItemList>+ </AccordionContent>+ </AccordionItem>+ )}</Accordion>);}diff --git a/web/src/pages/agent/canvas/node/message-node.tsx b/web/src/pages/agent/canvas/node/message-node.tsxindex d0dc4544f7..5ee37f2dc7 100644--- a/web/src/pages/agent/canvas/node/message-node.tsx+++ b/web/src/pages/agent/canvas/node/message-node.tsx@@ -2,25 +2,41 @@ import { NodeCollapsible } from '@/components/collapse';import { IMessageNode } from '@/interfaces/database/agent';import { cn } from '@/lib/utils';import { useGetVariableLabelOrTypeByValue } from '@/pages/agent/hooks/use-get-begin-query';-import { NodeProps } from '@xyflow/react';+import { NodeProps, Position } from '@xyflow/react';import classNames from 'classnames';import { get } from 'lodash';import { memo } from 'react';+import { NodeHandleId } from '../../constant';import { LabelCard } from './card';-import { LeftEndHandle } from './handle';+import { CommonHandle, LeftEndHandle } from './handle';+import { RightHandleStyle } from './handle-icon';import styles from './index.module.less';import NodeHeader from './node-header';import { NodeWrapper } from './node-wrapper';import { ToolBar } from './toolbar';import { VariableDisplay } from './variable-display';-function InnerMessageNode({ id, data, selected }: NodeProps<IMessageNode>) {+function InnerMessageNode({+ id,+ data,+ selected,+ isConnectable = true,+}: NodeProps<IMessageNode>) {const messages: string[] = get(data, 'form.content', []);const { getLabel } = useGetVariableLabelOrTypeByValue({ nodeId: id });return (<ToolBar selected={selected} id={id} label={data.label}><NodeWrapper selected={selected} id={id}><LeftEndHandle></LeftEndHandle>+ <CommonHandle+ type="source"+ position={Position.Right}+ isConnectable={isConnectable}+ id={NodeHandleId.Start}+ style={RightHandleStyle}+ nodeId={id}+ isConnectableEnd={false}+ ></CommonHandle><NodeHeaderid={id}diff --git a/web/src/pages/agent/constant/index.tsx b/web/src/pages/agent/constant/index.tsxindex 917bc7c30a..e456ceaf62 100644--- a/web/src/pages/agent/constant/index.tsx+++ b/web/src/pages/agent/constant/index.tsx@@ -778,7 +778,6 @@ export const RestrictedUpstreamMap = {[Operator.Message]: [Operator.Begin,Operator.Message,- Operator.Retrieval,Operator.RewriteQuestion,Operator.Categorize,],