后端: 1. 查任务功能(query_tasks)从旧 Agent 链路迁移为新 execute 工具 - 新增 newAgent/tools/taskquery.go:自包含 TaskQueryToolHandler,零引用旧 agent 包;参数校验(象限1~4、排序白名单、limit上限20)、时间边界解析(四种格式自动补齐)、结构化 JSON 结果 - newAgent/tools/registry.go:DefaultRegistryDeps 新增 TaskQuery 字段;scheduleFreeTools 新增 query_tasks;注册 query_tasks 读工具(无需 confirm,不依赖 ScheduleState) - newAgent/prompt/execute.go:有 plan / ReAct 两套系统 prompt 执行规则新增 query_tasks 读操作说明,支持按象限、关键词、截止时间筛选排序 - service/agentsvc/agent_task_query.go:queryTasksForAgent 导出为 QueryTasksForTool,供启动层闭包调用;内部调用同步改为 QueryTasksForTool - cmd/start.go:NewDefaultRegistryWithDeps 注入 TaskQuery 闭包,桥接新工具参数到旧 service 层查询能力,复用已有过滤/排序/紧急度提升逻辑;旧链路全部保留不动 2. order_guard 条件触发——仅日程写操作后走守卫节点 - newAgent/model/common_state.go:新增 HasScheduleWriteOps 标记字段;ResetForNextRun 追加清理 - newAgent/node/execute.go:executeToolCall / executePendingTool 两处写工具执行后,通过 registry.IsWriteTool 判断并置 HasScheduleWriteOps=true - newAgent/graph/common_graph.go:branchAfterExecute 分支条件新增 HasScheduleWriteOps 判断,非日程操作(query_tasks / quick_note_create / web_search 等)直接 deliver 跳过 order_guard;branchAfterRoughBuild 不变,粗排天然是写操作 前端: 1. 助手面板新增 SSE 流式请求停止按钮 - AssistantPanel.vue:新增 streamAbortController ref 和 stopStreaming 方法;fetchChatStream / streamAssistantReply 透传 AbortSignal;sendMessage 创建 AbortController,catch 区分用户主动中断与异常;流式期间显示红色停止按钮替代发送按钮 2. 象限卡片任务列表取消硬截断,改为滚动查看 - TaskQuadrantCard.vue:visibleTasks 不再 slice(0,4),全部展示;quadrant-list 新增 max-height + overflow-y + 自定义滚动条样式 仓库:无
190 lines
4.9 KiB
Go
190 lines
4.9 KiB
Go
package agentsvc
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"sort"
|
|
"strings"
|
|
"time"
|
|
|
|
agentgraph "github.com/LoveLosita/smartflow/backend/agent/graph"
|
|
agentmodel "github.com/LoveLosita/smartflow/backend/agent/model"
|
|
agentnode "github.com/LoveLosita/smartflow/backend/agent/node"
|
|
"github.com/LoveLosita/smartflow/backend/model"
|
|
"github.com/LoveLosita/smartflow/backend/respond"
|
|
"github.com/cloudwego/eino-ext/components/model/ark"
|
|
)
|
|
|
|
func (s *AgentService) runTaskQueryFlow(
|
|
ctx context.Context,
|
|
selectedModel *ark.ChatModel,
|
|
userMessage string,
|
|
userID int,
|
|
emitStage func(stage, detail string),
|
|
) (string, error) {
|
|
if s == nil || s.taskRepo == nil {
|
|
return "", errors.New("task query service dependency is not ready")
|
|
}
|
|
if selectedModel == nil {
|
|
return "", errors.New("task query model is nil")
|
|
}
|
|
|
|
requestNow := time.Now().In(time.Local).Format("2006-01-02 15:04")
|
|
state := agentmodel.NewTaskQueryState(strings.TrimSpace(userMessage), requestNow, agentmodel.DefaultTaskQueryReflectRetry)
|
|
return agentgraph.RunTaskQueryGraph(ctx, agentnode.TaskQueryGraphRunInput{
|
|
Model: selectedModel,
|
|
State: state,
|
|
EmitStage: emitStage,
|
|
Deps: agentnode.TaskQueryToolDeps{
|
|
QueryTasks: func(ctx context.Context, req agentnode.TaskQueryRequest) ([]agentnode.TaskQueryTaskRecord, error) {
|
|
req.UserID = userID
|
|
return s.QueryTasksForTool(ctx, req)
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
func (s *AgentService) QueryTasksForTool(ctx context.Context, req agentnode.TaskQueryRequest) ([]agentnode.TaskQueryTaskRecord, error) {
|
|
_ = ctx
|
|
if req.UserID <= 0 {
|
|
return nil, errors.New("invalid user_id in task query")
|
|
}
|
|
if s.taskRepo == nil {
|
|
return nil, errors.New("task repository is nil")
|
|
}
|
|
|
|
tasks, err := s.taskRepo.GetTasksByUserID(req.UserID)
|
|
if err != nil {
|
|
if errors.Is(err, respond.UserTasksEmpty) {
|
|
return make([]agentnode.TaskQueryTaskRecord, 0), nil
|
|
}
|
|
return nil, err
|
|
}
|
|
|
|
now := time.Now()
|
|
filtered := make([]model.Task, 0, len(tasks))
|
|
for _, originalTask := range tasks {
|
|
currentTask := originalTask
|
|
applyReadTimeUrgencyPromotion(¤tTask, now)
|
|
if !taskMatchesQueryFilter(currentTask, req) {
|
|
continue
|
|
}
|
|
filtered = append(filtered, currentTask)
|
|
}
|
|
|
|
sortTasksForQuery(filtered, req)
|
|
if req.Limit > 0 && len(filtered) > req.Limit {
|
|
filtered = filtered[:req.Limit]
|
|
}
|
|
|
|
records := make([]agentnode.TaskQueryTaskRecord, 0, len(filtered))
|
|
for _, task := range filtered {
|
|
records = append(records, agentnode.TaskQueryTaskRecord{
|
|
ID: task.ID,
|
|
Title: task.Title,
|
|
PriorityGroup: task.Priority,
|
|
IsCompleted: task.IsCompleted,
|
|
DeadlineAt: task.DeadlineAt,
|
|
UrgencyThresholdAt: task.UrgencyThresholdAt,
|
|
})
|
|
}
|
|
return records, nil
|
|
}
|
|
|
|
func applyReadTimeUrgencyPromotion(task *model.Task, now time.Time) {
|
|
if task == nil || task.IsCompleted || task.UrgencyThresholdAt == nil {
|
|
return
|
|
}
|
|
if task.UrgencyThresholdAt.After(now) {
|
|
return
|
|
}
|
|
switch task.Priority {
|
|
case 2:
|
|
task.Priority = 1
|
|
case 4:
|
|
task.Priority = 3
|
|
}
|
|
}
|
|
|
|
func taskMatchesQueryFilter(task model.Task, req agentnode.TaskQueryRequest) bool {
|
|
if !req.IncludeCompleted && task.IsCompleted {
|
|
return false
|
|
}
|
|
if req.Quadrant != nil && task.Priority != *req.Quadrant {
|
|
return false
|
|
}
|
|
keyword := strings.TrimSpace(req.Keyword)
|
|
if keyword != "" && !strings.Contains(strings.ToLower(task.Title), strings.ToLower(keyword)) {
|
|
return false
|
|
}
|
|
if req.DeadlineAfter != nil {
|
|
if task.DeadlineAt == nil || task.DeadlineAt.Before(*req.DeadlineAfter) {
|
|
return false
|
|
}
|
|
}
|
|
if req.DeadlineBefore != nil {
|
|
if task.DeadlineAt == nil || task.DeadlineAt.After(*req.DeadlineBefore) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
func sortTasksForQuery(tasks []model.Task, req agentnode.TaskQueryRequest) {
|
|
if len(tasks) <= 1 {
|
|
return
|
|
}
|
|
order := strings.ToLower(strings.TrimSpace(req.Order))
|
|
if order != "desc" {
|
|
order = "asc"
|
|
}
|
|
sortBy := strings.ToLower(strings.TrimSpace(req.SortBy))
|
|
if sortBy == "" {
|
|
sortBy = "deadline"
|
|
}
|
|
|
|
sort.SliceStable(tasks, func(i, j int) bool {
|
|
left := tasks[i]
|
|
right := tasks[j]
|
|
switch sortBy {
|
|
case "priority":
|
|
if left.Priority != right.Priority {
|
|
if order == "desc" {
|
|
return left.Priority > right.Priority
|
|
}
|
|
return left.Priority < right.Priority
|
|
}
|
|
return left.ID > right.ID
|
|
case "id":
|
|
if order == "desc" {
|
|
return left.ID > right.ID
|
|
}
|
|
return left.ID < right.ID
|
|
default:
|
|
if less, decided := compareDeadline(left.DeadlineAt, right.DeadlineAt, order); decided {
|
|
return less
|
|
}
|
|
return left.ID > right.ID
|
|
}
|
|
})
|
|
}
|
|
|
|
func compareDeadline(left, right *time.Time, order string) (less bool, decided bool) {
|
|
if left == nil && right == nil {
|
|
return false, false
|
|
}
|
|
if left == nil && right != nil {
|
|
return false, true
|
|
}
|
|
if left != nil && right == nil {
|
|
return true, true
|
|
}
|
|
if left.Equal(*right) {
|
|
return false, false
|
|
}
|
|
if order == "desc" {
|
|
return left.After(*right), true
|
|
}
|
|
return left.Before(*right), true
|
|
}
|