Losita/smartmate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version: 0.9.3.dev.260407

Browse Source 
后端：
    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.上下文依然待审视

前端：无
仓库：无
This commit is contained in:
LoveLosita
2026-04-07 12:10:56 +08:00
parent 2038185730
commit 32bb740b75
17 changed files with 410 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
backend/service/agentsvc/agent.go
View File

@@ -289,6 +289,25 @@ func readAgentExtraInt(extra map[string]any, key string) int {
return value
}
func readAgentExtraBool(extra map[string]any, key string) bool {
if len(extra) == 0 {
return false
}
raw, ok := extra[key]
if !ok {
return false
}
switch v := raw.(type) {
case bool:
return v
case float64:
return v != 0
case string:
return strings.ToLower(strings.TrimSpace(v)) == "true"
}
return false
}
// readAgentExtraIntSlice 从 extra 中提取 []int。
// 支持 JSON 数组格式（[]any，每个元素为 float64/int）。
func readAgentExtraIntSlice(extra map[string]any, key string) []int {

103
backend/service/agentsvc/agent_newagent.go
View File

@@ -18,6 +18,7 @@ import (
"github.com/LoveLosita/smartflow/backend/conv"
"github.com/LoveLosita/smartflow/backend/model"
"github.com/LoveLosita/smartflow/backend/pkg"
"github.com/LoveLosita/smartflow/backend/respond"
eventsvc "github.com/LoveLosita/smartflow/backend/service/events"
)
@@ -101,18 +102,23 @@ func (s *AgentService) runNewAgentGraph(
conversationContext = s.loadConversationContext(requestCtx, chatID, userMessage)
}
// 5.5 若 extra 携带 task_class_ids，写入 CommonState（仅首轮/尚未设置时生效，跨轮持久化）。
// 5.5 若 extra 携带 task_class_ids，校验后写入 CommonState（仅首轮/尚未设置时生效，跨轮持久化）。
// 校验：通过 LoadTaskClassMetas → GetCompleteTaskClassesByIDs 检查所有 ID 是否存在且属于当前用户；
// 校验失败时向 errChan 推送 WrongTaskClassID（code=40040），前端收到 SSE 错误事件。
if taskClassIDs := readAgentExtraIntSlice(extra, "task_class_ids"); len(taskClassIDs) > 0 {
cs := runtimeState.EnsureCommonState()
if len(cs.TaskClassIDs) == 0 {
cs.TaskClassIDs = taskClassIDs
if s.scheduleProvider != nil {
if metas, metaErr := s.scheduleProvider.LoadTaskClassMetas(requestCtx, userID, taskClassIDs); metaErr != nil {
log.Printf("加载任务类约束元数据失败 chat=%s err=%v", chatID, metaErr)
} else {
cs.TaskClasses = metas
}
if s.scheduleProvider == nil {
pushErrNonBlocking(errChan, respond.WrongTaskClassID)
return
}
metas, metaErr := s.scheduleProvider.LoadTaskClassMetas(requestCtx, userID, taskClassIDs)
if metaErr != nil {
pushErrNonBlocking(errChan, respond.WrongTaskClassID)
return
}
cs.TaskClassIDs = taskClassIDs
cs.TaskClasses = metas
}
}
@@ -124,6 +130,7 @@ func (s *AgentService) runNewAgentGraph(
graphRequest := newagentmodel.AgentGraphRequest{
UserInput: userMessage,
ConfirmAction: confirmAction,
AlwaysExecute: readAgentExtraBool(extra, "always_execute"),
}
graphRequest.Normalize()
@@ -139,16 +146,17 @@ func (s *AgentService) runNewAgentGraph(
// 9. 构造 AgentGraphDeps（由 cmd/start.go 注入的依赖）。
deps := newagentmodel.AgentGraphDeps{
ChatClient: chatClient,
PlanClient: planClient,
ExecuteClient: executeClient,
DeliverClient: deliverClient,
ChunkEmitter: chunkEmitter,
StateStore: s.agentStateStore,
ToolRegistry: s.toolRegistry,
ScheduleProvider: s.scheduleProvider,
SchedulePersistor: s.schedulePersistor,
RoughBuildFunc: s.makeRoughBuildFunc(),
ChatClient: chatClient,
PlanClient: planClient,
ExecuteClient: executeClient,
DeliverClient: deliverClient,
ChunkEmitter: chunkEmitter,
StateStore: s.agentStateStore,
ToolRegistry: s.toolRegistry,
ScheduleProvider: s.scheduleProvider,
SchedulePersistor: s.schedulePersistor,
RoughBuildFunc: s.makeRoughBuildFunc(),
WriteSchedulePreview: s.makeWriteSchedulePreviewFunc(),
}
// 10. 构造 AgentGraphRunInput 并运行 graph。
@@ -181,23 +189,8 @@ func (s *AgentService) runNewAgentGraph(
eventsvc.PublishAgentStateSnapshot(requestCtx, s.eventPublisher, snapshot, chatID, userID)
}
// 11.6. 将排程结果写入 Redis 预览缓存，复用旧 agent 的 SchedulePlanPreviewCache 格式。
// 前端通过 GET /agent/schedule-preview 获取，无需改动。
if finalState != nil && finalState.ScheduleState != nil {
flowState := finalState.EnsureFlowState()
preview := conv.ScheduleStateToPreview(
finalState.ScheduleState,
userID,
chatID,
flowState.TaskClassIDs,
"", // summary 由转换函数自动生成
)
if preview != nil && s.cacheDAO != nil {
if err := s.cacheDAO.SetSchedulePlanPreviewToCache(requestCtx, userID, chatID, preview); err != nil {
log.Printf("[WARN] 写入排程预览缓存失败 chat=%s: %v", chatID, err)
}
}
}
// 排程预览缓存由 Deliver 节点负责写入（通过注入的 WriteSchedulePreview func），
// 保证只有任务真正完成时才写，中断路径不写中间态。
// 12. 发送 OpenAI 兼容的流式结束标记，告知客户端 stream 已完成。
_ = chunkEmitter.EmitDone()
@@ -425,34 +418,54 @@ func (s *AgentService) persistChatAfterGraph(
}
// makeRoughBuildFunc 把 AgentService 上的 HybridScheduleWithPlanMultiFunc 封装成
// newAgent 层的 RoughBuildFunc，完成外层 model.TaskClassItem → RoughBuildPlacement 的转换。
// newAgent 层的 RoughBuildFunc，将 HybridScheduleWithPlanMultiFunc 的结果转换为 RoughBuildPlacement。
// HybridScheduleWithPlanMultiFunc 未注入时返回 nil，RoughBuild 节点会静默跳过粗排。
//
// 修复说明：
// 旧实现使用第二个返回值 []TaskClassItem，只有 EmbeddedTime != nil 的条目（嵌入水课）才生成
// placement，普通时段放置的任务全部被丢弃。
// 正确做法：使用第一个返回值 []HybridScheduleEntry，过滤 Status="suggested" 且 TaskItemID>0 的条目，
// 这样嵌入和非嵌入的粗排结果都能正确写入 ScheduleState。
func (s *AgentService) makeRoughBuildFunc() newagentmodel.RoughBuildFunc {
if s.HybridScheduleWithPlanMultiFunc == nil {
return nil
}
return func(ctx context.Context, userID int, taskClassIDs []int) ([]newagentmodel.RoughBuildPlacement, error) {
_, items, err := s.HybridScheduleWithPlanMultiFunc(ctx, userID, taskClassIDs)
entries, _, err := s.HybridScheduleWithPlanMultiFunc(ctx, userID, taskClassIDs)
if err != nil {
return nil, err
}
placements := make([]newagentmodel.RoughBuildPlacement, 0, len(items))
for _, item := range items {
if item.EmbeddedTime == nil {
placements := make([]newagentmodel.RoughBuildPlacement, 0, len(entries))
for _, entry := range entries {
if entry.Status != "suggested" || entry.TaskItemID == 0 {
continue
}
placements = append(placements, newagentmodel.RoughBuildPlacement{
TaskItemID: item.ID,
Week: item.EmbeddedTime.Week,
DayOfWeek: item.EmbeddedTime.DayOfWeek,
SectionFrom: item.EmbeddedTime.SectionFrom,
SectionTo: item.EmbeddedTime.SectionTo,
TaskItemID: entry.TaskItemID,
Week: entry.Week,
DayOfWeek: entry.DayOfWeek,
SectionFrom: entry.SectionFrom,
SectionTo: entry.SectionTo,
})
}
return placements, nil
}
}
// makeWriteSchedulePreviewFunc 封装 cacheDAO 写排程预览缓存的操作，供 Deliver 节点注入。
func (s *AgentService) makeWriteSchedulePreviewFunc() newagentmodel.WriteSchedulePreviewFunc {
if s.cacheDAO == nil {
return nil
}
return func(ctx context.Context, state *newagenttools.ScheduleState, userID int, conversationID string, taskClassIDs []int) error {
preview := conv.ScheduleStateToPreview(state, userID, conversationID, taskClassIDs, "")
if preview == nil {
return nil
}
return s.cacheDAO.SetSchedulePlanPreviewToCache(ctx, userID, conversationID, preview)
}
}
// --- 依赖注入字段 ---
// toolRegistry 由 cmd/start.go 注入

2
backend/service/agentsvc/agent_schedule_preview.go
View File

@@ -101,6 +101,7 @@ func (s *AgentService) GetSchedulePlanPreview(ctx context.Context, userID int, c
TraceID: strings.TrimSpace(preview.TraceID),
Summary: strings.TrimSpace(preview.Summary),
CandidatePlans: plans,
HybridEntries: cloneHybridEntries(preview.HybridEntries),
GeneratedAt: preview.GeneratedAt,
}, nil
}
@@ -212,6 +213,7 @@ func snapshotToSchedulePlanPreviewResponse(snapshot *model.SchedulePlanStateSnap
TraceID: strings.TrimSpace(snapshot.TraceID),
Summary: schedulePlanSummaryOrFallback(strings.TrimSpace(snapshot.FinalSummary)),
CandidatePlans: plans,
HybridEntries: cloneHybridEntries(snapshot.HybridEntries),
GeneratedAt: generatedAt,
}
}