按 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)
65 lines
2.8 KiB
Go
65 lines
2.8 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
)
|
|
|
|
// This file owns the loop's turn boundary: the point where one user turn has
|
|
// settled (a Run produced a Result) and the state that follows the persona —
|
|
// emotion and affection, design/01 §2 — is advanced outside the loop. The loop
|
|
// itself stays persona- and emotion-agnostic (design/16 §3.3: the engine
|
|
// generates text; state and persistence belong to the layers around it), so it
|
|
// only reports the turn and records the mood label the hook hands back.
|
|
|
|
// TurnEnd describes one settled turn to the loop's OnTurnEnd hook. It carries
|
|
// everything an observer needs without the loop knowing what the observer does.
|
|
type TurnEnd struct {
|
|
// SessionID is the conversation the turn belonged to.
|
|
SessionID string
|
|
// PersonaID is the role the turn speaks as: the session env's resolved role when
|
|
// the caller supplied one, otherwise the loop's configured default
|
|
// (design/22 §4.2). It keeps the observer persona-scoped (design/01 §2): the
|
|
// emotion machine and affection of that role — and only that role — advance.
|
|
PersonaID string
|
|
// UserText is the latest user message of the turn ("" when the turn carried
|
|
// no user text, e.g. a resumed tool round).
|
|
UserText string
|
|
// AssistantText is the turn's final assistant text.
|
|
AssistantText string
|
|
// StopReason classifies how the turn ended.
|
|
StopReason string
|
|
// Steps is the number of model steps the turn took.
|
|
Steps int
|
|
// Env is the conversation's resolved isolation environment (owner / group /
|
|
// stranger), so a hook can keep a restricted conversation read-only.
|
|
Env SessionEnv
|
|
}
|
|
|
|
// TurnEndHook observes a settled turn and returns the persona's mood label for
|
|
// it ("" when the caller tracks no emotion). It runs once per settled turn — not
|
|
// once per model step — so a multi-step tool turn applies its effect exactly
|
|
// once. It must not block: it runs on the Run path after the answer is complete,
|
|
// and its return value is carried on Result.Mood to the persistence layer.
|
|
type TurnEndHook func(TurnEnd) string
|
|
|
|
// settleTurn reports a settled turn to the hook (when wired) and records the
|
|
// returned mood label on the result, so the persisted assistant message carries
|
|
// the turn's mood (design/16 §3.3). The conversation environment travels on ctx,
|
|
// so a group/stranger turn reaches the hook as restricted.
|
|
func (l *Loop) settleTurn(ctx context.Context, sessionID string, msgs []model.Message, res *Result) {
|
|
if l.onTurnEnd == nil {
|
|
return
|
|
}
|
|
res.Mood = l.onTurnEnd(TurnEnd{
|
|
SessionID: sessionID,
|
|
PersonaID: l.personaFor(ctx),
|
|
UserText: lastUserText(msgs),
|
|
AssistantText: res.Text,
|
|
StopReason: res.StopReason,
|
|
Steps: res.Steps,
|
|
Env: sessionEnvFrom(ctx),
|
|
})
|
|
}
|