按 DevDocs/design/22 批次 1 后端(§2/§3/§4.1-4.5/§4.7/§5 验收 1-6)。
- 迁移 0011:chat_sessions.persona_id + chat_messages.persona_id(均 DEFAULT '',无回填 → 升级零风险);同步包内幂等 DDL;**真实库升级验证**(拷贝 data/cyrene.db 到临时目录跑 MigrateUp:既有 1 会话/109 消息 persona 仍为 '',原库未被触碰)
- history:SessionMeta/Message 加 PersonaID + SetSessionPersona;ListSessions/List/scan/Append 带上
- runtime:SessionEnv.PersonaID + loop.personaFor(ctx) 替换固定 l.personaID(memory/request/turn)+ **agent 池**(Options.Agents,按角色取 instructions,未命中回落)+ **提取器不再把 persona 烤死在构造期**(多角色下记忆不再永远记在 cyrene 名下)+ **thinking 旋钮改为按会话角色解析**(否则角色 Y 会用角色 X 的预算/展示)
- gateway:会话 DTO/POST/PATCH 支持 personaId;ws/rest/voice 的 OwnerEnv 硬编改为**按会话解析角色**(actor 元数据语义不变);admin memories 搜索去掉硬编 cyrene
- Docs/api-client v0.42;**两处有意的行为收紧**已写明:POST /sessions body 非法 JSON → 400(原先完全忽略 body;空/null/{} 仍 201);POST /admin/memories/search 省略 personaId 且无默认角色 → 400(原先默认查 cyrene)
- 测试:design/22 §5 验收 1-6(记忆隔离/提示词首条 system/情绪按角色/提取 persona 归属/迁移兼容)+ 进程内 e2e(断言 adapter 收到的 model.Request.Messages[0] 即该角色的 systemPrompt)
- **已知未做(留批次 2 / 待确认)**:① IM 与渠道级未做 → **§7-3「owner 私聊镜像随主会话角色」尚未生效**;② 请求级覆盖未实现(本批只做会话级);③ **§7-5 的「上下文发送角色标记」只完成存储+DTO 半边**——消息 persona 已落库且 DTO 已带,但模型上下文不从 chat_messages 重建,「第 N 条是谁说的」尚未进上下文(需确认是否属批次 2);④「切角色重建摘要」当前是空操作(压缩未接线);⑤ thinking 旋钮仅在流式路径生效(非流式 agent.RunStep 不带,A 批次既有性质)
- 验收:go build/vet/test 全绿 + linux/amd64 与 darwin/arm64 交叉编译(既有 flake 本轮未触发;同批 session_orchestrator.go 一度 501 行 → 抽出 session_tail.go)
125 lines
5.4 KiB
Go
125 lines
5.4 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/agent"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/capacity"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/trace"
|
|
)
|
|
|
|
// Run drives the agent loop: assemble a fresh model-visible context every round
|
|
// (re-inject relevant memory from the current conversation, optionally compacting
|
|
// the older turns when the context exceeds the configured budget), then run up to
|
|
// MaxRounds steps. Each step runs the model (streaming through OnStream when
|
|
// configured) and any requested tool calls are executed under a per-invoke
|
|
// timeout and fed back as RoleTool messages so the model can continue.
|
|
// A checkpoint is persisted at every step, every step is traced as a
|
|
// state_transition span (with an llm_call child and tool_call spans for each
|
|
// invocation), and when the turn settles the memory Extractor runs over the
|
|
// turn's conversation (design/03 §1: the LLM extractor on a background
|
|
// goroutine, so extraction never delays the reply) with errors logged rather
|
|
// than fatal.
|
|
//
|
|
// When a turn settles with a Result, the OnTurnEnd hook is called once for that
|
|
// turn (never per step) and its mood label is recorded on Result.Mood, so the
|
|
// layers around the loop can advance persona state and tag the persisted reply.
|
|
//
|
|
// It returns the final answer, or a partial Result with StopReasonMaxRounds when
|
|
// the budget is exhausted without a final answer. Step errors are wrapped with %w
|
|
// so callers can classify them with errors.Is.
|
|
func (l *Loop) Run(ctx context.Context, sessionID string, messages []model.Message) (*Result, error) {
|
|
if ctx == nil {
|
|
ctx = context.Background()
|
|
}
|
|
if l.agent == nil && len(l.agents) == 0 {
|
|
return nil, fmt.Errorf("loop: run: %w", ErrNilAgent)
|
|
}
|
|
|
|
// Seed the per-Run capacity accumulator at quiet so the state can progress
|
|
// (quiet→awake→full) across a multi-step tool loop; a nil/disabled decider
|
|
// leaves it unused. It is scoped to this Run, so concurrent runs never share.
|
|
// The session id rides the same context so a capacity_awaken emission can be
|
|
// targeted to the session that produced it (design/14 §5).
|
|
ctx = withCapState(ctx, &capStateAccum{state: capacity.StateQuiet})
|
|
ctx = withLoopSession(ctx, sessionID)
|
|
|
|
// Resume an interrupted run (design §1 durable execution): when the session
|
|
// has a resumable checkpoint, rebuild its context and continue at the next
|
|
// step rather than restarting from a fresh conversation. A different
|
|
// sessionID — or a checkpoint left by a completed run — falls through to a
|
|
// fresh start (LoadLatest misses, or the stop reason is not resumable).
|
|
msgs, startStep, _ := l.loadCheckpoint(ctx, sessionID, messages)
|
|
msgs = l.resolveImages(ctx, msgs)
|
|
toolState := &toolLoopState{prevFP: make(map[string]bool)}
|
|
res := &Result{}
|
|
// A branch Run (a sub-agent) folds its spans into the parent session's live
|
|
// graph; only the owning Run starts and ends a round. Without this a sub-agent
|
|
// would reset the frontend's single flowGraph and gap the parent's own nodes.
|
|
if _, isBranch := flowBranch(ctx); l.flow != nil && !isBranch {
|
|
l.flow.StartRound(sessionID, lastUserText(msgs))
|
|
defer func() { l.flow.EndRound(sessionID, res.Text) }()
|
|
}
|
|
for step := startStep; step <= l.maxRounds; step++ {
|
|
if err := ctx.Err(); err != nil {
|
|
return nil, fmt.Errorf("loop: run: step %d: %w", step, err)
|
|
}
|
|
|
|
// Compact older turns when the conversation exceeds the context budget,
|
|
// then assemble the model-visible context for this round (fresh memory
|
|
// injection + transform hook), so every step sees an up-to-date context.
|
|
msgs = l.compactIfNeeded(ctx, msgs)
|
|
view := l.assembleContext(ctx, msgs, step)
|
|
|
|
rc, roundSpan := l.span(ctx, "loop.step", trace.SpanKindStateTransition)
|
|
outcome, err := l.step(rc, sessionID, view)
|
|
if err != nil {
|
|
l.spanProp(roundSpan, "error", err.Error())
|
|
l.finishSpan(roundSpan, trace.SpanStatusError)
|
|
return nil, fmt.Errorf("loop: run: step %d: %w", step, err)
|
|
}
|
|
l.spanProp(roundSpan, "step", step)
|
|
l.spanProp(roundSpan, "stop_reason", outcome.stopReason)
|
|
l.finishSpan(roundSpan, trace.SpanStatusOK)
|
|
|
|
res.Steps = step
|
|
if outcome.final {
|
|
res.Text = outcome.text
|
|
res.StopReason = outcome.stopReason
|
|
l.saveCheckpoint(ctx, sessionID, step, msgs, outcome.stopReason)
|
|
l.extractMemoryAsync(ctx, msgs, step)
|
|
l.settleTurn(ctx, sessionID, msgs, res)
|
|
return res, nil
|
|
}
|
|
|
|
batch, err := l.runToolCalls(rc, msgs, outcome.toolCalls, toolState)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("loop: run: step %d: tools: %w", step, err)
|
|
}
|
|
msgs = batch.messages
|
|
res.ToolCallsExecuted += batch.executed
|
|
l.saveCheckpoint(ctx, sessionID, step, msgs, agent.StopReasonToolCalls)
|
|
|
|
// The critical-tool-loop safety net (or a terminating hook) stops the
|
|
// round without waiting for a real final answer.
|
|
if batch.terminate {
|
|
res.Text = criticalToolLoopTerminalReason
|
|
res.StopReason = StopReasonToolLoopTerminated
|
|
l.saveCheckpoint(ctx, sessionID, step, msgs, StopReasonToolLoopTerminated)
|
|
l.extractMemoryAsync(ctx, msgs, step)
|
|
l.settleTurn(ctx, sessionID, msgs, res)
|
|
return res, nil
|
|
}
|
|
}
|
|
|
|
// Budget exhausted without a final answer.
|
|
res.Steps = l.maxRounds
|
|
res.StopReason = StopReasonMaxRounds
|
|
l.saveCheckpoint(ctx, sessionID, l.maxRounds, msgs, StopReasonMaxRounds)
|
|
l.extractMemoryAsync(ctx, msgs, l.maxRounds)
|
|
l.settleTurn(ctx, sessionID, msgs, res)
|
|
return res, nil
|
|
}
|