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(chat): preserve deep-research cancellation after workers finish (#18692)
Lem0nTea2002445e1956d45b
diff --git a/internal/service/deep_researcher.go b/internal/service/deep_researcher.goindex 7273f9b692..142b936b9a 100644--- a/internal/service/deep_researcher.go+++ b/internal/service/deep_researcher.go@@ -325,28 +325,22 @@ func (dr *DeepResearcher) _research(}(i, qp)}- // Wait with context cancellation support.- done := make(chan struct{})- go func() {- wg.Wait()- close(done)- }()-- select {- case <-done:- case <-ctx.Done():- // Sub-research goroutines invoke the progress callback, which- // writes to the caller's channel; do not orphan them. Draining- // here guarantees no callback fires after Research returns- // (mirrors Python's asyncio.gather cancellation semantics).- wg.Wait()- return retContent, ctx.Err()+ if err := waitForDeepResearchWorkers(ctx, &wg); err != nil {+ return retContent, err}// 7. Join resultsreturn strings.Join(results, "\n"), nil}+func waitForDeepResearchWorkers(ctx context.Context, workers *sync.WaitGroup) error {+ // Sub-research goroutines invoke the progress callback, which+ // writes to the caller's channel; do not orphan them. Draining+ // here guarantees no callback fires after Research returns.+ workers.Wait()+ return ctx.Err()+}+// ──────────────────────────────────────────────────────────────────────// Retrieval (KB + optional Web)// ──────────────────────────────────────────────────────────────────────diff --git a/internal/service/deep_researcher_wait_test.go b/internal/service/deep_researcher_wait_test.gonew file mode 100644index 0000000000..16e91c4fa5--- /dev/null+++ b/internal/service/deep_researcher_wait_test.go@@ -0,0 +1,70 @@+//+// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+//+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.+//++package service++import (+ "context"+ "errors"+ "sync"+ "testing"+ "time"+)++func TestWaitForDeepResearchWorkersReturnsCanceledAfterWorkersComplete(t *testing.T) {+ ctx, cancel := context.WithCancel(context.Background())+ cancel()+ var workers sync.WaitGroup++ if err := waitForDeepResearchWorkers(ctx, &workers); !errors.Is(err, context.Canceled) {+ t.Fatalf("err = %v, want context.Canceled", err)+ }+}++func TestWaitForDeepResearchWorkersWhenCanceledWaitsForActiveWorker(t *testing.T) {+ ctx, cancel := context.WithCancel(context.Background())+ var workers sync.WaitGroup+ releaseWorker := make(chan struct{})+ workers.Add(1)+ go func() {+ defer workers.Done()+ <-releaseWorker+ }()++ result := make(chan error, 1)+ cancel()+ go func() {+ result <- waitForDeepResearchWorkers(ctx, &workers)+ }()++ select {+ case err := <-result:+ close(releaseWorker)+ t.Fatalf("returned before worker completed: %v", err)+ case <-time.After(100 * time.Millisecond):+ }++ close(releaseWorker)++ select {+ case err := <-result:+ if !errors.Is(err, context.Canceled) {+ t.Fatalf("err = %v, want context.Canceled", err)+ }+ case <-time.After(2 * time.Second):+ t.Fatal("waitForDeepResearchWorkers did not return after worker completed")+ }+}