后端:
1.Execute 上下文修复(无限循环 / 重复确认根治)
- 更新node/execute.go:speak 写入历史(修复旧 TODO);confirm 动作 speak 不再丢失;
continue 无工具调用时写 reason 保证上下文推进;区分 tool_call 数组/JSON损坏两种
correction hint;goal_check hint 区分 plan/ReAct 模式
- 更新node/execute.go:新增 AlwaysExecute 字段,extra.always_execute=true 时写工具
跳过确认闸门直接执行并持久化
- 更新model/graph_run_state.go:AgentGraphRequest 新增 AlwaysExecute;新增
WriteSchedulePreviewFunc 类型和 WriteSchedulePreview Dep
- 更新service/agentsvc/agent.go:新增 readAgentExtraBool 辅助
2.粗排全链路修复
- 更新service/agentsvc/agent_newagent.go:makeRoughBuildFunc 改用 HybridScheduleEntry
而非 TaskClassItem.EmbeddedTime,普通时段放置不再被丢弃
- 更新conv/schedule_provider.go:LoadScheduleState 从 task class 日期范围推算多周
规划窗口,不再硬编码当前周 7 天;DayMapping 覆盖全部相关周,粗排跨周结果不再
被 WeekDayToDay 静默丢弃
- 更新node/rough_build.go:pinned block 区分有/无未覆盖 pending 任务两种情况,
有 pending 时明确操作顺序(find_free→place)和完成判定,防止 LLM 重复调
list_tasks;新增 countPendingTasks 辅助(只统计 Slots 为空的真正未覆盖任务)
- 更新model/common_state.go:新增 StartDirectExecute(),Chat 直接路由 execute 时
清空旧 PlanSteps,修复跨会话 HasPlan() 误判导致 ReAct 走 plan 模式的 bug
- 更新node/chat.go:handleRouteExecute 改用 StartDirectExecute()
3.排程预览缓存迁移至 Deliver 节点
- 更新node/agent_nodes.go:Deliver 节点完成后调用 WriteSchedulePreview,只有任务
真正完成才写预览缓存,中断路径不写中间态
- 更新service/agentsvc/agent_newagent.go:注入 makeWriteSchedulePreviewFunc;移除
graph 结束后的内联写入;makeRoughBuildFunc 注释修正
- 更新conv/schedule_preview.go:ScheduleStateToPreview 补设 GeneratedAt
- 更新model/agent.go:GetSchedulePlanPreviewResponse 新增 HybridEntries 字段
- 更新service/agentsvc/agent_schedule_preview.go:GET handler Redis/MySQL 两条路径
均透传 HybridEntries
4.Execute thinking 模式修复
- 更新newAgent/llm/ark_adapter.go:thinking 开启时强制 temperature=1,MaxTokens 自
动托底至 16000,调用方与适配层行为对齐
- 更新node/execute.go:调用参数同步改为 temperature=1.0 / MaxTokens=16000
undo:
1.流式推送换行未修复(undo)
2.上下文依然待审视
前端:无
仓库:无
226 lines
6.9 KiB
Go
226 lines
6.9 KiB
Go
package conv
|
||
|
||
import (
|
||
"context"
|
||
"fmt"
|
||
"sort"
|
||
"time"
|
||
|
||
"github.com/LoveLosita/smartflow/backend/dao"
|
||
"github.com/LoveLosita/smartflow/backend/model"
|
||
newagenttools "github.com/LoveLosita/smartflow/backend/newAgent/tools"
|
||
)
|
||
|
||
// ScheduleProvider 实现 model.ScheduleStateProvider 接口。
|
||
// 通过 DAO 层加载用户的日程和任务数据,调用 LoadScheduleState 构建内存状态。
|
||
//
|
||
// 职责边界:
|
||
// 1. 只负责"从 DB 查数据 + 调 LoadScheduleState 转换",不含业务逻辑;
|
||
// 2. 不负责缓存(由上层 Service 决定是否缓存);
|
||
// 3. 不负责 Diff 和持久化(由 Confirm 流程负责)。
|
||
type ScheduleProvider struct {
|
||
scheduleDAO *dao.ScheduleDAO
|
||
taskClassDAO *dao.TaskClassDAO
|
||
}
|
||
|
||
// NewScheduleProvider 创建 ScheduleProvider。
|
||
func NewScheduleProvider(scheduleDAO *dao.ScheduleDAO, taskClassDAO *dao.TaskClassDAO) *ScheduleProvider {
|
||
return &ScheduleProvider{
|
||
scheduleDAO: scheduleDAO,
|
||
taskClassDAO: taskClassDAO,
|
||
}
|
||
}
|
||
|
||
// LoadScheduleState 实现 model.ScheduleStateProvider 接口。
|
||
//
|
||
// 窗口策略:
|
||
// 1. 优先从 task class 的 StartDate/EndDate 推算规划窗口,覆盖粗排所需的完整日期范围;
|
||
// 2. task class 无日期信息时,降级到当前周 7 天(兼容普通查询场景)。
|
||
//
|
||
// 日程加载策略:对窗口内每周分别调用 GetUserWeeklySchedule 并合并结果。
|
||
func (p *ScheduleProvider) LoadScheduleState(ctx context.Context, userID int) (*newagenttools.ScheduleState, error) {
|
||
// 1. 加载用户所有任务类(含 Items 预加载)。
|
||
taskClasses, err := p.loadCompleteTaskClasses(ctx, userID)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
// 2. 确定规划窗口:优先使用 task class 日期范围,降级到当前周。
|
||
windowDays, weeks := buildWindowFromTaskClasses(taskClasses)
|
||
if len(windowDays) == 0 {
|
||
now := time.Now()
|
||
currentWeek, _, err := RealDateToRelativeDate(now.Format(DateFormat))
|
||
if err != nil {
|
||
return nil, fmt.Errorf("解析当前日期失败: %w", err)
|
||
}
|
||
windowDays = make([]WindowDay, 7)
|
||
for i := 0; i < 7; i++ {
|
||
windowDays[i] = WindowDay{Week: currentWeek, DayOfWeek: i + 1}
|
||
}
|
||
weeks = []int{currentWeek}
|
||
}
|
||
|
||
// 3. 按周加载日程(含 Event + EmbeddedTask 预加载)。
|
||
var allSchedules []model.Schedule
|
||
for _, w := range weeks {
|
||
weekSchedules, err := p.scheduleDAO.GetUserWeeklySchedule(ctx, userID, w)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("加载用户周日程失败 week=%d: %w", w, err)
|
||
}
|
||
allSchedules = append(allSchedules, weekSchedules...)
|
||
}
|
||
|
||
// 4. 构建额外 item category 映射。
|
||
extraItemCategories := buildExtraItemCategories(allSchedules, taskClasses)
|
||
|
||
// 5. 调用已有的 LoadScheduleState 构建内存状态。
|
||
return LoadScheduleState(allSchedules, taskClasses, extraItemCategories, windowDays), nil
|
||
}
|
||
|
||
// buildWindowFromTaskClasses 从 task class 的 StartDate/EndDate 推算规划窗口。
|
||
//
|
||
// 返回值:
|
||
// - windowDays:窗口内每天的 (week, dayOfWeek) 有序列表;
|
||
// - weeks:窗口覆盖的周号(去重、升序),供按周加载日程使用;
|
||
// - 若无有效日期信息,返回空切片,调用方应降级到默认窗口。
|
||
func buildWindowFromTaskClasses(taskClasses []model.TaskClass) (windowDays []WindowDay, weeks []int) {
|
||
var minDate, maxDate *time.Time
|
||
for _, tc := range taskClasses {
|
||
if tc.StartDate != nil && (minDate == nil || tc.StartDate.Before(*minDate)) {
|
||
t := *tc.StartDate
|
||
minDate = &t
|
||
}
|
||
if tc.EndDate != nil && (maxDate == nil || tc.EndDate.After(*maxDate)) {
|
||
t := *tc.EndDate
|
||
maxDate = &t
|
||
}
|
||
}
|
||
if minDate == nil || maxDate == nil {
|
||
return nil, nil
|
||
}
|
||
|
||
startWeek, startDay, err := RealDateToRelativeDate(minDate.Format(DateFormat))
|
||
if err != nil {
|
||
return nil, nil
|
||
}
|
||
endWeek, endDay, err := RealDateToRelativeDate(maxDate.Format(DateFormat))
|
||
if err != nil {
|
||
return nil, nil
|
||
}
|
||
|
||
weeksSet := make(map[int]bool)
|
||
w, d := startWeek, startDay
|
||
for {
|
||
windowDays = append(windowDays, WindowDay{Week: w, DayOfWeek: d})
|
||
weeksSet[w] = true
|
||
if w == endWeek && d == endDay {
|
||
break
|
||
}
|
||
d++
|
||
if d > 7 {
|
||
d = 1
|
||
w++
|
||
}
|
||
if w > endWeek+1 { // 防止因日期转换异常导致无限循环
|
||
break
|
||
}
|
||
}
|
||
|
||
weeks = make([]int, 0, len(weeksSet))
|
||
for wk := range weeksSet {
|
||
weeks = append(weeks, wk)
|
||
}
|
||
sort.Ints(weeks)
|
||
return windowDays, weeks
|
||
}
|
||
|
||
// loadCompleteTaskClasses 批量加载用户所有任务类(含 Items 预加载)。
|
||
func (p *ScheduleProvider) loadCompleteTaskClasses(ctx context.Context, userID int) ([]model.TaskClass, error) {
|
||
basicClasses, err := p.taskClassDAO.GetUserTaskClasses(userID)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("加载用户任务类失败: %w", err)
|
||
}
|
||
if len(basicClasses) == 0 {
|
||
return nil, nil
|
||
}
|
||
|
||
ids := make([]int, len(basicClasses))
|
||
for i, tc := range basicClasses {
|
||
ids[i] = tc.ID
|
||
}
|
||
|
||
complete, err := p.taskClassDAO.GetCompleteTaskClassesByIDs(ctx, userID, ids)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("加载完整任务类失败: %w", err)
|
||
}
|
||
return complete, nil
|
||
}
|
||
|
||
// LoadTaskClassMetas 加载指定任务类的约束元数据(不含 Items、不含日程),供 Plan 阶段提前消费。
|
||
func (p *ScheduleProvider) LoadTaskClassMetas(ctx context.Context, userID int, taskClassIDs []int) ([]newagenttools.TaskClassMeta, error) {
|
||
if len(taskClassIDs) == 0 {
|
||
return nil, nil
|
||
}
|
||
complete, err := p.taskClassDAO.GetCompleteTaskClassesByIDs(ctx, userID, taskClassIDs)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("加载任务类元数据失败: %w", err)
|
||
}
|
||
metas := make([]newagenttools.TaskClassMeta, 0, len(complete))
|
||
for _, tc := range complete {
|
||
meta := newagenttools.TaskClassMeta{
|
||
ID: tc.ID,
|
||
Name: derefString(tc.Name),
|
||
}
|
||
if tc.Strategy != nil {
|
||
meta.Strategy = *tc.Strategy
|
||
}
|
||
if tc.TotalSlots != nil {
|
||
meta.TotalSlots = *tc.TotalSlots
|
||
}
|
||
if tc.AllowFillerCourse != nil {
|
||
meta.AllowFillerCourse = *tc.AllowFillerCourse
|
||
}
|
||
if tc.ExcludedSlots != nil {
|
||
meta.ExcludedSlots = []int(tc.ExcludedSlots)
|
||
}
|
||
if tc.StartDate != nil {
|
||
meta.StartDate = tc.StartDate.Format("2006-01-02")
|
||
}
|
||
if tc.EndDate != nil {
|
||
meta.EndDate = tc.EndDate.Format("2006-01-02")
|
||
}
|
||
metas = append(metas, meta)
|
||
}
|
||
return metas, nil
|
||
}
|
||
|
||
func derefString(s *string) string {
|
||
if s == nil {
|
||
return ""
|
||
}
|
||
return *s
|
||
}
|
||
|
||
// buildExtraItemCategories 从已有日程中提取不属于给定 taskClasses 的 task event 的 category 映射。
|
||
// 当加载全部 taskClass 时,通常返回空 map。
|
||
func buildExtraItemCategories(schedules []model.Schedule, taskClasses []model.TaskClass) map[int]string {
|
||
knownItemIDs := make(map[int]bool)
|
||
for _, tc := range taskClasses {
|
||
for _, item := range tc.Items {
|
||
knownItemIDs[item.ID] = true
|
||
}
|
||
}
|
||
|
||
categories := make(map[int]string)
|
||
for _, s := range schedules {
|
||
if s.Event == nil || s.Event.Type != "task" || s.Event.RelID == nil {
|
||
continue
|
||
}
|
||
itemID := *s.Event.RelID
|
||
if !knownItemIDs[itemID] {
|
||
categories[itemID] = "任务"
|
||
}
|
||
}
|
||
return categories
|
||
}
|