按 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)
87 lines
3.5 KiB
Go
87 lines
3.5 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/agent"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
)
|
|
|
|
// This file owns the loop's per-turn role resolution (DevDocs/design/22 §4.2):
|
|
// one process now hosts several roles at once, so everything that used to be read
|
|
// off the Loop's construction-time binding — the system prompt (via the agent),
|
|
// the memory namespace, the emotion machine and the reasoning knobs — is resolved
|
|
// from the turn's SessionEnv instead.
|
|
//
|
|
// The resolution is deliberately three tiny functions over ctx rather than a
|
|
// field on the Loop: the Loop is shared by every concurrent session, so storing a
|
|
// resolved role on it would race, while ctx already carries the per-turn env.
|
|
// Every role-scoped read must go through these helpers, so prompt, memory,
|
|
// emotion and thinking can never disagree about "who is answering".
|
|
|
|
// LoopKnobs are the per-role model/reasoning knobs injected into every request the
|
|
// loop builds. It mirrors the three construction-time options
|
|
// (Options.Thinking / Options.ReasoningEffort / Options.ThinkingShowToUser) so a
|
|
// caller can resolve them per role while the options keep their meaning as the
|
|
// default. A nil Thinking and an empty ReasoningEffort mean "do not intervene",
|
|
// and a nil ThinkingShowToUser means "broadcast thinking frames as usual".
|
|
type LoopKnobs struct {
|
|
// Thinking is the reasoning directive (budget / explicit switch) for the role.
|
|
Thinking *model.Thinking
|
|
// ReasoningEffort is the OpenAI-compatible strength knob for the role.
|
|
ReasoningEffort string
|
|
// ThinkingShowToUser gates the thinking frames broadcast for the role's turns.
|
|
ThinkingShowToUser *bool
|
|
}
|
|
|
|
// personaFor returns the role the current turn speaks as (design/22 §2): the
|
|
// session env's explicit role when the caller resolved one, otherwise the loop's
|
|
// configured role (Options.PersonaID, the global default). Both the prompt/memory
|
|
// and the emotion hook read it, so a turn can never mix two roles.
|
|
func (l *Loop) personaFor(ctx context.Context) string {
|
|
if pid := sessionEnvFrom(ctx).PersonaID; pid != "" {
|
|
return pid
|
|
}
|
|
return l.personaID
|
|
}
|
|
|
|
// agentFor returns the agent that carries the current turn's system prompt: the
|
|
// per-role agent pool entry when one exists, otherwise the loop's default agent
|
|
// (design/22 §4.2 方案 A). A session bound to a role that has no registered agent —
|
|
// an unknown/deleted persona, or a caller that wired no pool — falls back to the
|
|
// default agent rather than failing the turn, and its memory scope still follows
|
|
// personaFor, so the fallback can never silently re-scope memory.
|
|
func (l *Loop) agentFor(ctx context.Context) *agent.Agent {
|
|
if len(l.agents) > 0 {
|
|
if ag := l.agents[l.personaFor(ctx)]; ag != nil {
|
|
return ag
|
|
}
|
|
}
|
|
return l.agent
|
|
}
|
|
|
|
// knobsFor resolves the reasoning knobs for the current turn: the resolver's
|
|
// per-role values when it knows the role, otherwise the loop's configured
|
|
// defaults. A resolver that does not recognize the role (ok = false) deliberately
|
|
// keeps the defaults rather than zeroing the knobs, so an unregistered id behaves
|
|
// like the default role instead of silently disabling reasoning.
|
|
func (l *Loop) knobsFor(ctx context.Context) LoopKnobs {
|
|
def := LoopKnobs{
|
|
Thinking: l.thinking,
|
|
ReasoningEffort: l.reasoningEffort,
|
|
ThinkingShowToUser: l.thinkingShow,
|
|
}
|
|
if l.personaKnobs == nil {
|
|
return def
|
|
}
|
|
pid := l.personaFor(ctx)
|
|
if pid == "" {
|
|
return def
|
|
}
|
|
knobs, ok := l.personaKnobs(pid)
|
|
if !ok {
|
|
return def
|
|
}
|
|
return knobs
|
|
}
|