AskaEth
0624d9ee36
按 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）
80 lines
2.9 KiB
Go
80 lines
2.9 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/agent"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/trace"
|
|
)
|
|
|
|
// stepOutcome is the loop's internal view of one model step, normalized from the
|
|
// agent's *agent.StepResult (non-streaming) or the equivalent built by the
|
|
// streaming path.
|
|
type stepOutcome struct {
|
|
final bool
|
|
text string
|
|
toolCalls []agent.ToolCall
|
|
stopReason string
|
|
// modelStopReason is the provider's raw stop/finish reason for the model
|
|
// call (Anthropic max_tokens / end_turn / tool_use), recorded on the llm_call
|
|
// span so a truncation is visible even when the step itself ended normally.
|
|
modelStopReason string
|
|
// model is the routed model that served the call, known on the streaming path
|
|
// (which builds the request itself) and empty on the agent path. It is
|
|
// recorded on the llm_call span's log event.
|
|
model string
|
|
}
|
|
|
|
// step runs a single model call. When an OnStream callback is configured it
|
|
// drives the adapter's ChatStream directly, threading deltas to OnStream and
|
|
// applying the loop's guardrails; otherwise it delegates to the agent's RunStep,
|
|
// which runs the agent's own guardrails and records its own CallRecord. The whole
|
|
// call is wrapped in an llm_call span so the M9 panel sees each LLM invocation.
|
|
func (l *Loop) step(ctx context.Context, sessionID string, messages []model.Message) (*stepOutcome, error) {
|
|
_, llmSpan := l.span(ctx, "llm.call", trace.SpanKindLLM)
|
|
|
|
var (
|
|
out *stepOutcome
|
|
err error
|
|
)
|
|
// Muted (internal autonomous pass) bypasses streaming: it neither streams to
|
|
// the UI nor pays the streaming path's extra overhead. Normal chat streams.
|
|
if l.onStream != nil && !isMutedBroadcast(ctx) {
|
|
out, err = l.streamStep(ctx, messages)
|
|
} else {
|
|
out, err = l.agentStep(ctx, sessionID, messages)
|
|
}
|
|
if err != nil {
|
|
l.spanProp(llmSpan, "error", err.Error())
|
|
l.finishSpan(llmSpan, trace.SpanStatusError)
|
|
return nil, fmt.Errorf("loop: model step: %w", err)
|
|
}
|
|
|
|
l.spanProp(llmSpan, "stop_reason", out.stopReason)
|
|
if out.modelStopReason != "" {
|
|
l.spanProp(llmSpan, "model_stop_reason", out.modelStopReason)
|
|
}
|
|
l.spanProp(llmSpan, "tool_calls", len(out.toolCalls))
|
|
l.recordLLMDone(llmSpan, out, l.agentFor(ctx))
|
|
l.finishSpan(llmSpan, trace.SpanStatusOK)
|
|
return out, nil
|
|
}
|
|
|
|
// agentStep delegates a non-streaming step to the turn's agent, which runs input
|
|
// and output guardrails, calls the model and decodes any tool calls.
|
|
func (l *Loop) agentStep(ctx context.Context, sessionID string, messages []model.Message) (*stepOutcome, error) {
|
|
sr, err := l.agentFor(ctx).RunStep(ctx, sessionID, messages)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("loop: agent step: %w", err)
|
|
}
|
|
return &stepOutcome{
|
|
final: sr.Final,
|
|
text: sr.Text,
|
|
toolCalls: sr.ToolCalls,
|
|
stopReason: sr.StopReason,
|
|
modelStopReason: sr.ModelStopReason,
|
|
}, nil
|
|
}
|