feat: admin 端点补齐 + 视觉真推理 + 语音链路 + wire.go 收口(A+B+第3步)
CI / Backend (build / vet / test / cross-compile) (push) Has been cancelled
CI / Frontend (tsc + vite build) (push) Has been cancelled

批次A admin 端点(原本 404 变 200 真实数据):
- GET /admin/llm:读 s.cfg.LLM 组 openai+anthropic 两 provider(enabled=当前 Provider、multimodal=配 VisionModel),APIKey 不进 wire 零泄露。
- GET /admin/automations:*automations.Service.List()(reminders+event rules+cron schedules,cron 加只读登记)。
- GET /admin/users:cfg.AdminUser + *auth.APIKey.List()(密钥掩码);无用户存储,恒先返回当前 admin 账号。
- GET /admin/backthink:*backthink.Backthink.List(ctx,50)。均只读、owner/admin RBAC、{data} 信封。

批次B 视觉真推理 + 语音:
- rest.go chatRequest 加 Image?;流式 publishChatStream 带 image;userChatMessages 构造 ImageMessage(model.go:71)。
- loop/vision.go:ImageResolver 可注入(MVP 先看图再对话);run.go Run 开头 resolveImages,无 resolver 透传直交主模型。
- vision/resolver.go:MessageResolver 调 vision.Router.Route——KindMain 保留图片交主模型多模态、KindVisionTool/OCRTool 经 dispatcher.Invoke 折叠成 [图片内容] 文本、KindUnsupported 记日志保留原图不崩。
- gateway/voice.go:VoiceService 接口 + SetVoice 注入点 + handleVoiceInput(未注入回 error 不崩)+ runVoiceTurn 异步 STT→loop chat→TTS→定向 voice_output 帧。
- ws_hub/ws_route:voice_input 接 handleVoiceInput;前端 ws.ts decodeBase64/playVoiceAudio/case voice_output。

第3步 wire.go 收口(唯一碰 wire.go 的一步):
- Deps 补传 Automations:a.automation / Backthink:a.backthink / Users:auth.NewAPIKey(a.cfg.Auth)(*auth.APIKey 原生满足 UserStore,避免 admin 重复的复合类型)。
- gw.SetVoice(a.voice);loop.Options.Vision = vision.NewMessageResolver(router, info, dispatcher.Invoke)(router=NewRouter(WithVisionTool/WithOCRTool)、info=cfg.LLM.VisionModel)。

实机验证:四 admin 端点 200 真实数据(llm 双 provider 脱敏、users=admin,yeij0942,owner);WS 握手正常。go build/vet/test 全绿 + 前端 tsc。wire.go 557 行。
This commit is contained in:
Aska committed 2026-09-06 18:54:05 +08:00
1 parent 648292d035
commit 518bd0a230
21 files changed
+976 -38

No files matched your search

@@ -140,6 +140,20 @@ func (d Deps) pipeline() Pipeline {
return nil
}
// AutomationRecord is the read-only summary of one automation or reminder,
// returned by Service.List for the admin panel. Kind is "cron", "event" or
// "reminder"; Cron carries the cron expression for the cron kind; LastRun and
// NextRun are zero times when the value is unknown (typically before Start).
type AutomationRecord struct {
ID string
Name string
Kind string
Cron string
Enabled bool
LastRun time.Time
NextRun time.Time
}
// Result is the structured outcome of an executed automation, published to
// SubjectResult. Upper layers subscribe to it to react or push notifications.
type Result struct {
+49
View File
@@ -22,6 +22,7 @@ type Service struct {
mu sync.RWMutex
cronRules map[string]ScheduleID // rule id -> schedule id
cronMeta map[string]Rule // rule id -> cron rule (name/expression for listing)
}
// NewService builds an automation engine from cfg and deps. The bus in deps is
@@ -50,6 +51,7 @@ func NewService(cfg Config, deps Deps) (*Service, error) {
engine: engine,
remind: remind,
cronRules: make(map[string]ScheduleID),
cronMeta: make(map[string]Rule),
}, nil
}
@@ -87,6 +89,7 @@ func (s *Service) AddRule(ctx context.Context, r Rule) error {
}
s.mu.Lock()
s.cronRules[r.ID] = id
s.cronMeta[r.ID] = r
s.mu.Unlock()
return nil
default:
@@ -100,6 +103,7 @@ func (s *Service) RemoveRule(ctx context.Context, id string) error {
s.mu.Lock()
if schedID, ok := s.cronRules[id]; ok {
delete(s.cronRules, id)
delete(s.cronMeta, id)
s.mu.Unlock()
s.sched.RemoveSchedule(schedID)
return nil
@@ -116,6 +120,51 @@ func (s *Service) AddReminder(ctx context.Context, r Reminder) error {
// Reminders returns a sorted snapshot of registered reminders.
func (s *Service) Reminders() []Reminder { return s.remind.List() }
// List returns a read-only snapshot of every registered automation and reminder
// for the admin panel, composing the reminder store, the event rules and the
// cron schedules. It never mutates state and is safe for concurrent use. Cron
// entries' LastRun/NextRun are zero until the scheduler has run.
func (s *Service) List() []AutomationRecord {
out := make([]AutomationRecord, 0)
for _, r := range s.remind.List() {
at := r.At
out = append(out, AutomationRecord{
ID: r.ID,
Name: r.Message,
Kind: "reminder",
Enabled: true,
NextRun: at,
})
}
for _, r := range s.engine.Rules() {
out = append(out, AutomationRecord{
ID: r.ID,
Name: r.Name,
Kind: string(r.Trigger),
Enabled: true,
})
}
s.mu.RLock()
for id, rule := range s.cronMeta {
entry := s.sched.Entry(s.cronRules[id])
out = append(out, AutomationRecord{
ID: id,
Name: rule.Name,
Kind: string(rule.Trigger),
Cron: rule.Expression,
Enabled: true,
LastRun: entry.Prev,
NextRun: entry.Next,
})
}
s.mu.RUnlock()
return out
}
// CancelReminder delegates to the ReminderStore.
func (s *Service) CancelReminder(ctx context.Context, id string) error {
return s.remind.Cancel(ctx, id)