按 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)
187 lines
4.9 KiB
Go
187 lines
4.9 KiB
Go
package gateway
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"log/slog"
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/gorilla/websocket"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/bus"
|
|
)
|
|
|
|
// WebSocket tuning constants. The ping/pong cadence keeps intermediary proxies
|
|
// from dropping idle connections.
|
|
const (
|
|
wsEventsPattern = "ws.>"
|
|
wsPrefix = "ws."
|
|
wsChatSubject = "ws.chat"
|
|
wsStreamSubject = "ws.stream"
|
|
wsVoiceInput = "ws.voice_input"
|
|
wsVoiceOutput = "voice_output"
|
|
wsReadLimit = 4096
|
|
wsWriteWait = 10 * time.Second
|
|
wsPongWait = 60 * time.Second
|
|
wsPingPeriod = 54 * time.Second
|
|
wsSendBuffer = 32
|
|
)
|
|
|
|
// wsEvent is the outbound (server→client) frame. TurnID/Seq are optional and
|
|
// used by the streaming path so a client can correlate a burst of streamed
|
|
// events to one assistant turn and keep them in order.
|
|
type wsEvent struct {
|
|
Type string `json:"type"`
|
|
TurnID string `json:"turnId,omitempty"`
|
|
Seq int `json:"seq,omitempty"`
|
|
SessionID string `json:"sessionId,omitempty"`
|
|
Data any `json:"data,omitempty"`
|
|
}
|
|
|
|
// wsInbound is the client→server frame. Data carries the per-type payload.
|
|
type wsInbound struct {
|
|
Type string `json:"type"`
|
|
ReqID string `json:"reqId,omitempty"`
|
|
Data json.RawMessage `json:"data,omitempty"`
|
|
}
|
|
|
|
// hub owns the connection set and relays bus events to every client.
|
|
type hub struct {
|
|
mu sync.RWMutex
|
|
conns map[*wsConn]struct{}
|
|
bus bus.Bus
|
|
runner Chatter
|
|
auditor SubagentAuditor
|
|
taskOutputs TaskOutputStore
|
|
voice VoiceService
|
|
streaming bool
|
|
orchestrator *Orchestrator
|
|
history HistoryStore
|
|
// envResolver resolves each turn's role (design/22 §4.5); it mirrors the
|
|
// server's resolver so the WS path and the REST path never diverge.
|
|
envResolver turnEnvResolver
|
|
log *slog.Logger
|
|
upgrader websocket.Upgrader
|
|
origins map[string]bool
|
|
allowAll bool
|
|
cancel context.CancelFunc
|
|
streamSeq atomic.Uint64
|
|
}
|
|
|
|
// newHub builds a hub bound to the server's dependencies.
|
|
func newHub(s *Server) *hub {
|
|
origins, allowAll := s.allowedOrigins()
|
|
return &hub{
|
|
conns: make(map[*wsConn]struct{}),
|
|
bus: s.bus,
|
|
runner: s.runner,
|
|
auditor: s.auditor,
|
|
taskOutputs: s.taskOutputs,
|
|
voice: s.voice,
|
|
streaming: s.streaming,
|
|
history: s.history,
|
|
envResolver: s.envResolver,
|
|
log: s.log,
|
|
origins: origins,
|
|
allowAll: allowAll,
|
|
upgrader: websocket.Upgrader{
|
|
ReadBufferSize: 1024,
|
|
WriteBufferSize: 1024,
|
|
CheckOrigin: originChecker(origins, allowAll),
|
|
},
|
|
}
|
|
}
|
|
|
|
// start subscribes the hub to the bus event stream. Publishing to ws.> arrives
|
|
// here and is fanned out to clients; the producer bridge patterns (iot/task/
|
|
// automation/reminder/subagent-progress) are also subscribed and normalized into
|
|
// ws.* event types. Nothing happens when no bus is wired.
|
|
func (h *hub) start() {
|
|
if h.bus == nil {
|
|
return
|
|
}
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
h.cancel = cancel
|
|
patterns := append([]string{wsEventsPattern}, bridgePatterns...)
|
|
for _, p := range patterns {
|
|
if _, err := h.bus.Subscribe(ctx, p, h.relay); err != nil {
|
|
h.log.Warn("bus subscribe", "pattern", p, "err", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// close cancels the bus subscription, interrupts every orchestrator session (so
|
|
// no background turn outlives the hub), and shuts every live connection down.
|
|
func (h *hub) close() {
|
|
if h.cancel != nil {
|
|
h.cancel()
|
|
}
|
|
if h.orchestrator != nil {
|
|
h.orchestrator.InterruptAll()
|
|
}
|
|
h.mu.Lock()
|
|
conns := make([]*wsConn, 0, len(h.conns))
|
|
for c := range h.conns {
|
|
conns = append(conns, c)
|
|
}
|
|
h.conns = make(map[*wsConn]struct{})
|
|
h.mu.Unlock()
|
|
for _, c := range conns {
|
|
c.shutdown()
|
|
}
|
|
}
|
|
|
|
// register adds a connection to the set.
|
|
func (h *hub) register(c *wsConn) {
|
|
h.mu.Lock()
|
|
h.conns[c] = struct{}{}
|
|
h.mu.Unlock()
|
|
}
|
|
|
|
// unregister removes a connection from the set.
|
|
func (h *hub) unregister(c *wsConn) {
|
|
h.mu.Lock()
|
|
if _, ok := h.conns[c]; ok {
|
|
delete(h.conns, c)
|
|
}
|
|
h.mu.Unlock()
|
|
}
|
|
|
|
// connCount reports the number of live connections (observability/tests).
|
|
func (h *hub) connCount() int {
|
|
h.mu.RLock()
|
|
defer h.mu.RUnlock()
|
|
return len(h.conns)
|
|
}
|
|
|
|
// broadcast fans an event out to every registered connection without blocking on
|
|
// any single (possibly slow) client: a full send buffer drops the frame.
|
|
func (h *hub) broadcast(ev wsEvent) {
|
|
b, err := json.Marshal(ev)
|
|
if err != nil {
|
|
h.log.Warn("marshal broadcast", "err", err)
|
|
return
|
|
}
|
|
h.mu.RLock()
|
|
defer h.mu.RUnlock()
|
|
for c := range h.conns {
|
|
c.enqueue(b)
|
|
}
|
|
}
|
|
|
|
// eventType maps a bus subject to its outbound event type, dropping the ws. prefix.
|
|
func eventType(subject string) string {
|
|
return strings.TrimPrefix(subject, wsPrefix)
|
|
}
|
|
|
|
// rawData converts a possibly-empty raw payload into a value safe to publish.
|
|
func rawData(d json.RawMessage) any {
|
|
if len(d) == 0 {
|
|
return nil
|
|
}
|
|
return d
|
|
}
|