mirror of
https://github.com/RuoJi6/ARTEX.git
synced 2026-11-18 15:33:49 +08:00
fix: rebuild btw task fallback from current task context
This commit is contained in:
1 parent
62dca14821
commit
1ee4250403
3 files changed
+99
-2
No files matched your search
@@ -63,6 +63,12 @@ func (s *Server) initSideQuestions() {
|
||||
log.Printf("[btw] recover: %v", err)
|
||||
}
|
||||
s.ctx = sidequestion.WithPublisher(s.ctx, func(snap sidequestion.Snapshot) {
|
||||
// RunID=0 is reserved for the task-context fallback. It is rebuilt on
|
||||
// every request and must never enter the checkpoint publisher's memory
|
||||
// or flush queue, where it could mask a real main-agent checkpoint.
|
||||
if snap.RunID == 0 {
|
||||
return
|
||||
}
|
||||
s.side.mu.Lock()
|
||||
defer s.side.mu.Unlock()
|
||||
key := snap.Parent.Key()
|
||||
@@ -120,13 +126,20 @@ func (s *Server) flushSideSnapshots() {
|
||||
}
|
||||
|
||||
func (s *Server) sideSnapshot(ctx context.Context, p sidequestion.Parent) (*sidequestion.Snapshot, error) {
|
||||
taskMain := p.TaskID > 0 && p.IntentID == 0
|
||||
s.side.mu.Lock()
|
||||
snap, ok := s.side.latest[p.Key()]
|
||||
s.side.mu.Unlock()
|
||||
if ok {
|
||||
if ok && snap.RunID > 0 {
|
||||
return &snap, nil
|
||||
}
|
||||
if snap, err := s.m.pg.SideSnapshot(ctx, p.Key()); err != nil || snap != nil {
|
||||
// A task fallback is deliberately ephemeral from the point of view of
|
||||
// context selection. Older versions persisted it at (0,0), but that row
|
||||
// must not freeze the task material or model identity for later requests.
|
||||
if taskMain && snap != nil && snap.RunID == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
return snap, err
|
||||
}
|
||||
if p.ApprovalID > 0 {
|
||||
|
||||
@@ -282,6 +282,90 @@ func TestSideTaskContextFallbackRequiresUsableContext(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSideTaskSyntheticSnapshotRebuildsCurrentEvidence(t *testing.T) {
|
||||
f := newSideHTTPFixture(t)
|
||||
task, err := f.m.CreateTask("rebuild task context", "keep adding evidence", nil, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
id, _ := strconv.ParseInt(task.ID, 10, 64)
|
||||
t.Cleanup(func() { _ = f.m.pg.DeleteTask(id) })
|
||||
if err := f.m.pg.SetPaused(id, true); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
path := "/api/tasks/" + task.ID + "/chat/side-questions"
|
||||
// Opening the panel creates the old-style (0,0) row. It must not become
|
||||
// the source of truth for the next request.
|
||||
f.call(t, "GET", path, nil, 200)
|
||||
iid, err := task.Store.AddNode(db.KindIntent, map[string]any{"summary": "new worker evidence"}, 1, "paused", "planner", nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := task.Store.AppendActivity(db.Activity{NodeID: &iid, Worker: "worker", Kind: "result", Summary: "new worker found an unvalidated redirect"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := f.m.pg.AddFinding(id, iid, "OPEN_REDIRECT", "redirect validation", db.SeverityMedium, "redirect accepts an external target", "worker evidence marker", "worker", nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
e := decodeSide(t, f.call(t, "POST", path, map[string]string{"question": "最新发现是什么?", "client_request_id": "rebuild-current"}, 202))
|
||||
select {
|
||||
case req := <-f.provider.started:
|
||||
text := req.Messages[0].Text()
|
||||
for _, want := range []string{"new worker found an unvalidated redirect", "redirect accepts an external target"} {
|
||||
if !strings.Contains(text, want) {
|
||||
t.Fatalf("rebuilt task context missing %q: %s", want, text)
|
||||
}
|
||||
}
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("side request did not start from rebuilt task context")
|
||||
}
|
||||
f.call(t, "POST", "/api/side-questions/"+e.ID+"/cancel", nil, 200)
|
||||
}
|
||||
|
||||
func TestSideTaskSyntheticSnapshotUsesCurrentTaskModel(t *testing.T) {
|
||||
f := newSideHTTPFixture(t)
|
||||
profileA := &db.LLMProfile{Name: "btw-task-a", Format: "openai", BaseURL: "http://fixture.invalid", APIKey: "task-a", Model: "fixture-a", Streaming: true}
|
||||
aID, err := f.m.pg.SaveProfile(profileA)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
profileB := &db.LLMProfile{Name: "btw-task-b", Format: "openai", BaseURL: "http://fixture.invalid", APIKey: "task-b", Model: "fixture-b", Streaming: true}
|
||||
bID, err := f.m.pg.SaveProfile(profileB)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
_ = f.m.pg.DeleteProfile(aID)
|
||||
_ = f.m.pg.DeleteProfile(bID)
|
||||
})
|
||||
for _, id := range []int64{aID, bID} {
|
||||
cfg, ok := f.s.loadProfileConfig(id)
|
||||
if !ok {
|
||||
t.Fatalf("profile %d unavailable", id)
|
||||
}
|
||||
f.s.provByProfile[id] = &provEntry{prov: f.provider, cfg: cfg}
|
||||
}
|
||||
task, err := f.m.CreateTask("model switch task", "retain task context", &aID, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
id, _ := strconv.ParseInt(task.ID, 10, 64)
|
||||
t.Cleanup(func() { _ = f.m.pg.DeleteTask(id) })
|
||||
if err := f.m.pg.SetPaused(id, true); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
path := "/api/tasks/" + task.ID + "/chat/side-questions"
|
||||
f.call(t, "GET", path, nil, 200)
|
||||
if err := f.m.pg.ReplaceTaskLLMProfiles(id, []int64{bID}, bID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
e := decodeSide(t, f.call(t, "POST", path, map[string]string{"question": "模型切换后还能问吗?", "client_request_id": "model-switch"}, 202))
|
||||
if e.Model.ProfileID != bID {
|
||||
t.Fatalf("side request retained stale model: %+v", e.Model)
|
||||
}
|
||||
f.call(t, "POST", "/api/side-questions/"+e.ID+"/cancel", nil, 200)
|
||||
}
|
||||
|
||||
func TestSideTaskSyntheticSnapshotIsOverriddenByCheckpoint(t *testing.T) {
|
||||
f := newSideHTTPFixture(t)
|
||||
task, err := f.m.CreateTask("synthetic checkpoint", "keep real context", nil, 0, 0)
|
||||
|
||||
@@ -35,7 +35,7 @@ flowchart LR
|
||||
|
||||
快照按父会话合并写入,每 250 ms 刷新一次,数据库比较 `(run_id, version)` 防止旧版本覆盖。旁路提交前再次保存选定快照。成功保存后释放内存中的大快照;失败时保留待写版本。回答累计内容在流式事件到来时最多每 250 ms 写入一次,终态立即保存并在数据库错误时有限重试。
|
||||
|
||||
服务启动将遗留 `running` 请求标记为 `interrupted`,保留已落库的部分回答和用量,不自动重放请求。最近成功保存的上下文可直接用于下一次提问。任务主会话若没有主 Agent 快照,会在任务已有描述、Planner/Worker 结果或发现记录时使用只读任务级上下文;该合成快照使用最低版本,后续真实检查点可以覆盖它。会话、Worker 和审批旁路仍要求各自的 Agent 快照或审批材料;确实没有可用材料时才提示对应的准备方式。
|
||||
服务启动将遗留 `running` 请求标记为 `interrupted`,保留已落库的部分回答和用量,不自动重放请求。最近成功保存的上下文可直接用于下一次提问。任务主会话若没有主 Agent 快照,会在任务已有描述、Planner/Worker 结果或发现记录时使用只读任务级上下文;每次 GET/POST 都按当前任务材料和当前模型重新构建 `RunID=0, Version=0` 的合成快照。数据库中历史遗留的 `(0,0)` 行只用于旁路会话初始化,不作为最终上下文返回,也不会进入 `side.latest/seen`;后续真实检查点(`RunID>0`)始终优先。会话、Worker 和审批旁路仍要求各自的 Agent 快照或审批材料;确实没有可用材料时才提示对应的准备方式。
|
||||
|
||||
清空操作递增清理版本并删除请求;条件更新阻止迟到的回调重新写回。物理父资源删除依靠外键级联,Worker 逻辑删除在同一事务中删除旁路数据,并拒绝后续迟到快照。任务归档先阻止新请求、等待主流程停止、取消并等待旁路落库;归档格式为 v3,同时兼容不含旁路表的 v1/v2。
|
||||
|
||||
|
||||
Reference in new issue
Block a user