Version: 0.9.1.dev.260406
后端: 1.新建conv/schedule_persist.go:ScheduleState Diff 持久化,事务内逐变更写库,支持 place/move/unplace 三种操作(当前 event source) 2.新建conv/schedule_provider.go:ScheduleState 加载适配,从 DB 合并 existing events + pending task items 3.新建dao/agent_state_store_adapter.go:Redis 状态快照存取适配,实现 AgentStateStore 接口 4.新建service/agentsvc/agent_newagent.go:newAgent service 集成层,串联 LLM 客户端、ScheduleProvider、SchedulePersistor 和 ChunkEmitter 5.更新node/execute.go:接入 SchedulePersistor(写操作确认后持久化)、完善 confirm resume 路径(PendingConfirmTool 恢复分支)、correction 机制增加连续失败计数上限 6.更新api/agent.go + cmd/start.go:接入 newAgent service,完成 API 层路由注册 7.新建node/execute_confirm_flow_test.go + llm_tool_orchestration_test.go:确认回路 7 个测试 + 端到端排课 5 个测试全部通过 8.新建newAgent/ARCHITECTURE.md + ROADMAP.md:全链路架构文档和缺口分析 9.代码审查整理:提取 prompt/base.go(通用 buildStageMessages 等5个辅助)、tools/args.go(参数解析辅助);write_tools 尾部辅助移入 write_helpers;修复 queryRangeSpecific sb.Reset() 逻辑缺陷和 Unplace guest Duration 未恢复;ScheduleStateProvider/SchedulePersistor 归入 state_store.go;emitter 内部 Build*Text 函数降级为私有 前端:无 仓库:无
This commit is contained in:
@@ -196,7 +196,7 @@ func (e *ChunkEmitter) EmitStatus(blockID, stage, code, summary string, includeR
|
||||
return nil
|
||||
}
|
||||
|
||||
text := BuildStageReasoningText(stage, summary)
|
||||
text := buildStageReasoningText(stage, summary)
|
||||
payload, err := ToOpenAIReasoningChunkWithExtra(
|
||||
e.RequestID,
|
||||
e.ModelName,
|
||||
@@ -220,7 +220,7 @@ func (e *ChunkEmitter) EmitToolCallStart(blockID, stage, toolName, summary, argu
|
||||
return nil
|
||||
}
|
||||
|
||||
text := BuildToolCallReasoningText(toolName, summary, argumentsPreview)
|
||||
text := buildToolCallReasoningText(toolName, summary, argumentsPreview)
|
||||
payload, err := ToOpenAIReasoningChunkWithExtra(
|
||||
e.RequestID,
|
||||
e.ModelName,
|
||||
@@ -244,7 +244,7 @@ func (e *ChunkEmitter) EmitToolCallResult(blockID, stage, toolName, summary, arg
|
||||
return nil
|
||||
}
|
||||
|
||||
text := BuildToolResultReasoningText(toolName, summary)
|
||||
text := buildToolResultReasoningText(toolName, summary)
|
||||
payload, err := ToOpenAIReasoningChunkWithExtra(
|
||||
e.RequestID,
|
||||
e.ModelName,
|
||||
@@ -273,7 +273,7 @@ func (e *ChunkEmitter) EmitConfirmRequest(ctx context.Context, blockID, stage, i
|
||||
return nil
|
||||
}
|
||||
|
||||
text := BuildConfirmAssistantText(title, summary)
|
||||
text := buildConfirmAssistantText(title, summary)
|
||||
extra := NewConfirmRequestExtra(blockID, stage, interactionID, title, summary)
|
||||
return e.emitPseudoText(
|
||||
ctx,
|
||||
@@ -310,7 +310,7 @@ func (e *ChunkEmitter) EmitInterruptMessage(ctx context.Context, blockID, stage,
|
||||
return nil
|
||||
}
|
||||
|
||||
text := BuildInterruptAssistantText(interactionType, summary)
|
||||
text := buildInterruptAssistantText(interactionType, summary)
|
||||
extra := NewInterruptExtra(blockID, stage, interactionID, interactionType, summary)
|
||||
return e.emitPseudoText(
|
||||
ctx,
|
||||
@@ -395,8 +395,7 @@ func EmitDone(emit PayloadEmitter) error {
|
||||
return NewChunkEmitter(emit, "", "", 0).EmitDone()
|
||||
}
|
||||
|
||||
// BuildStageReasoningText 生成统一阶段提示文本。
|
||||
func BuildStageReasoningText(stage, detail string) string {
|
||||
func buildStageReasoningText(stage, detail string) string {
|
||||
stage = strings.TrimSpace(stage)
|
||||
detail = strings.TrimSpace(detail)
|
||||
|
||||
@@ -410,8 +409,7 @@ func BuildStageReasoningText(stage, detail string) string {
|
||||
}
|
||||
}
|
||||
|
||||
// BuildToolCallReasoningText 生成“工具调用开始”时的可读提示文本。
|
||||
func BuildToolCallReasoningText(toolName, summary, argumentsPreview string) string {
|
||||
func buildToolCallReasoningText(toolName, summary, argumentsPreview string) string {
|
||||
toolName = strings.TrimSpace(toolName)
|
||||
summary = strings.TrimSpace(summary)
|
||||
argumentsPreview = strings.TrimSpace(argumentsPreview)
|
||||
@@ -429,8 +427,7 @@ func BuildToolCallReasoningText(toolName, summary, argumentsPreview string) stri
|
||||
return strings.TrimSpace(strings.Join(lines, "\n"))
|
||||
}
|
||||
|
||||
// BuildToolResultReasoningText 生成“工具调用结果”时的可读提示文本。
|
||||
func BuildToolResultReasoningText(toolName, summary string) string {
|
||||
func buildToolResultReasoningText(toolName, summary string) string {
|
||||
toolName = strings.TrimSpace(toolName)
|
||||
summary = strings.TrimSpace(summary)
|
||||
|
||||
@@ -444,8 +441,7 @@ func BuildToolResultReasoningText(toolName, summary string) string {
|
||||
}
|
||||
}
|
||||
|
||||
// BuildConfirmAssistantText 生成给用户看的确认文案。
|
||||
func BuildConfirmAssistantText(title, summary string) string {
|
||||
func buildConfirmAssistantText(title, summary string) string {
|
||||
title = strings.TrimSpace(title)
|
||||
summary = strings.TrimSpace(summary)
|
||||
|
||||
@@ -459,8 +455,7 @@ func BuildConfirmAssistantText(title, summary string) string {
|
||||
}
|
||||
}
|
||||
|
||||
// BuildInterruptAssistantText 生成给用户看的中断文案。
|
||||
func BuildInterruptAssistantText(interactionType, summary string) string {
|
||||
func buildInterruptAssistantText(interactionType, summary string) string {
|
||||
interactionType = strings.TrimSpace(interactionType)
|
||||
summary = strings.TrimSpace(summary)
|
||||
|
||||
|
||||
38
backend/newAgent/stream/sse_adapter.go
Normal file
38
backend/newAgent/stream/sse_adapter.go
Normal file
@@ -0,0 +1,38 @@
|
||||
package newagentstream
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
)
|
||||
|
||||
// NewSSEPayloadEmitter 创建将 chunk 事件写入 outChan 的 emitter。
|
||||
//
|
||||
// 职责边界:
|
||||
// 1. 接收 outChan(SSE 输出通道),返回 PayloadEmitter 函数;
|
||||
// 2. 只把原始 JSON payload 写入通道,不添加 "data: " 前缀和 "\n\n" 后缀;
|
||||
// 3. SSE 格式化("data: " + payload + "\n\n")由 API 层的 writeSSEData 统一处理;
|
||||
// 4. 发送失败时返回 error,但不关闭通道(通道由调用方管理)。
|
||||
//
|
||||
// 使用示例:
|
||||
//
|
||||
// emitter := NewSSEPayloadEmitter(outChan)
|
||||
// chunkEmitter := NewChunkEmitter(emitter, requestID, modelName, created)
|
||||
// chunkEmitter.EmitAssistantText("", "", "hello", true)
|
||||
func NewSSEPayloadEmitter(outChan chan<- string) PayloadEmitter {
|
||||
return func(payload string) error {
|
||||
if outChan == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if payload == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
select {
|
||||
case outChan <- payload:
|
||||
return nil
|
||||
default:
|
||||
// 通道已满或已关闭:不阻塞,直接返回错误。
|
||||
return fmt.Errorf("outChan full or closed")
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user