按 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)
114 lines
5.1 KiB
Go
114 lines
5.1 KiB
Go
package gateway
|
|
|
|
import (
|
|
"context"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/history"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/loop"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
)
|
|
|
|
// This file owns the orchestrator's chat-history persistence hooks (design/16
|
|
// §3.3): the user stream is written at submit time and the assistant reply when a
|
|
// turn settles. Both are silent no-ops when no history store is wired, so the
|
|
// orchestrator runs unchanged without a store (tests / an unwired gateway).
|
|
|
|
// modeChat is the behavior mode persisted when a turn carries none (design/01 §3,
|
|
// design/16 §5.1). It is also the only mode the IM paths ever write, because IM
|
|
// carries chat text alone.
|
|
const modeChat = "chat"
|
|
|
|
// modeOrDefault returns mode, or modeChat when the caller supplied none, so a
|
|
// persisted message never carries an empty behavior mode (design/16 §5.1).
|
|
func modeOrDefault(mode string) string {
|
|
if mode == "" {
|
|
return modeChat
|
|
}
|
|
return mode
|
|
}
|
|
|
|
// messageModeContextKey is the context key carrying a turn's behavior mode
|
|
// (design/01 §3, design/16 §5.1) from the HTTP/WS boundary into the orchestrator's
|
|
// persistence, so each persisted message is tagged with the mode it was sent in.
|
|
type messageModeContextKey struct{}
|
|
|
|
// withMode returns a context carrying mode so the orchestrator can tag the
|
|
// persisted user message and assistant reply. An empty mode is a no-op (the
|
|
// persistence layer falls back to modeChat).
|
|
func withMode(ctx context.Context, mode string) context.Context {
|
|
return context.WithValue(ctx, messageModeContextKey{}, mode)
|
|
}
|
|
|
|
// modeFrom returns the behavior mode carried by ctx, or "" when none was set.
|
|
func modeFrom(ctx context.Context) string {
|
|
v, _ := ctx.Value(messageModeContextKey{}).(string)
|
|
return v
|
|
}
|
|
|
|
// persistUserMessages writes each RoleUser message of a submitted turn to the
|
|
// history store so the raw user stream is durable before the turn resolves, then
|
|
// notifies the transport so every browser of the same account can append it
|
|
// without a manual refresh (design/16 §3.3, §4.2). deviceID tags the message with
|
|
// the sending client (design/16 §4.5), mode is the behavior mode the turn was
|
|
// sent in (design/16 §5.1), falling back to modeChat when empty, and personaID is
|
|
// the role the turn speaks as (design/22 §7-5) — the role of the moment, so a
|
|
// session that later switches roles keeps an accurate "who said this" stream. It
|
|
// is a no-op when no history store is wired. Rejected turns (empty, pending-full)
|
|
// never reach it, so nothing vacuous is persisted.
|
|
func (o *Orchestrator) persistUserMessages(ctx context.Context, sessionID string, messages []model.Message, deviceID, mode, personaID string) {
|
|
if o.history == nil {
|
|
return
|
|
}
|
|
for _, m := range messages {
|
|
if m.Role != model.RoleUser {
|
|
continue
|
|
}
|
|
text, image := messageTextImage(m)
|
|
if text == "" && image == "" {
|
|
continue
|
|
}
|
|
full, err := o.history.AppendFull(ctx, history.Message{SessionID: sessionID, Role: history.RoleUser, Content: text, Image: image, DeviceID: deviceID, Mode: modeOrDefault(mode), PersonaID: personaID})
|
|
if err != nil {
|
|
o.log.Error("orchestrator persist user", "err", err, "session", sessionID, "device_id", deviceID)
|
|
continue
|
|
}
|
|
o.notifyPersisted(full)
|
|
}
|
|
}
|
|
|
|
// persistAssistantReply writes the final assistant text of a settled turn to the
|
|
// history store, then notifies the transport (design/16 §3.3, §4.2). deviceID tags
|
|
// the reply with the client that sent the turn (design/16 §4.5), mode is the
|
|
// behavior mode of that turn (design/16 §5.1), falling back to modeChat when
|
|
// empty, and personaID is the role that produced the reply (design/22 §7-5). Mood
|
|
// is the persona's mood for that turn (design/01 §2 情绪状态机), taken off the loop
|
|
// result, so the stored/DTO/`message_persisted` mood is real data rather than a
|
|
// permanently empty column; a turn with no mood tracking stores an empty mood. It
|
|
// is a no-op when no history store is wired or the turn produced no text
|
|
// (interrupted/errored turns leave res nil). The write runs under a fresh
|
|
// background context so a canceled turn context never aborts it.
|
|
func (o *Orchestrator) persistAssistantReply(sessionID string, res *loop.Result, deviceID, mode, personaID string) {
|
|
if o.history == nil || res == nil || res.Text == "" {
|
|
return
|
|
}
|
|
full, err := o.history.AppendFull(context.Background(), history.Message{SessionID: sessionID, Role: history.RoleAssistant, Content: res.Text, Mood: res.Mood, DeviceID: deviceID, Mode: modeOrDefault(mode), PersonaID: personaID})
|
|
if err != nil {
|
|
o.log.Error("orchestrator persist assistant", "err", err, "session", sessionID, "device_id", deviceID)
|
|
return
|
|
}
|
|
o.notifyPersisted(full)
|
|
}
|
|
|
|
// messageTextImage returns the concatenated text and the first image URL of a
|
|
// message's content parts, for persistence into the chat_messages columns.
|
|
func messageTextImage(m model.Message) (text, image string) {
|
|
for _, c := range m.Content {
|
|
if c.Type == model.ContentTypeText {
|
|
text += c.Text
|
|
} else if c.Type == model.ContentTypeImage && image == "" {
|
|
image = c.ImageURL
|
|
}
|
|
}
|
|
return text, image
|
|
}
|