feat: Phase 1+2 架构进化 — 连续思考链/主动消息决策/情感状态机/离线自主思考 (86文件)

Phase 1 (基础设施):
- ThinkChain 思考链连续性 + 差异化思考提示词 (persistent)
- AutonomousToolPolicy 工具安全策略 (safe/unsafe/conditional)
- MessageScheduler 自适应消息节奏 (Idle/Available/Busy)
- SessionEnrichmentStore 渐进式上下文丰富 (5层)
- ConversationBus 事件总线 + ResponseCache (dedup)
- pkg/logger 统一日志 + 所有 handler 替换 fmt.Printf
- NPE 守卫/链路优化/数据库表修复/Go workspace

Phase 2 (人格交互):
- EmotionState/EmotionTracker 情感状态机 (5种心情, 情绪衰减)
- ProactiveGuard 主动消息多维决策 (静默时段/紧急度/频率/校验)
- Gateway↔ai-core 在线状态感知链路 (presence notification)
- 离线思考频率控制 + 重连问候 + 离线消息排队

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
2026-05-23 15:25:12 +08:00
parent b123a36aae
commit 87214b9441
86 changed files with 3085 additions and 582 deletions
+11 -11
View File
@@ -1,7 +1,7 @@
package main
import (
"log"
"github.com/yourname/cyrene-ai/pkg/logger"
"net/http"
"os"
"os/signal"
@@ -15,18 +15,18 @@ import (
)
func main() {
log.SetFlags(log.LstdFlags | log.Lshortfile)
log.Println("🔧 Tool-Engine 启动中...")
logger.SetDefault(logger.New("tool-engine"))
logger.Println("🔧 Tool-Engine 启动中...")
// 加载配置
cfg := config.Load()
log.Printf("配置: 端口=%s, IoT服务=%s, 数据目录=%s, DB=%s", cfg.Port, cfg.IoTServiceURL, cfg.DataDir, cfg.DBUrl)
logger.Printf("配置: 端口=%s, IoT服务=%s, 数据目录=%s, DB=%s", cfg.Port, cfg.IoTServiceURL, cfg.DataDir, cfg.DBUrl)
// 初始化调用日志存储
callLogStore, err := store.NewCallLogStore(cfg.DBUrl)
if err != nil {
log.Printf("[main] 初始化调用日志存储失败: %v", err)
logger.Printf("[main] 初始化调用日志存储失败: %v", err)
callLogStore = nil
}
@@ -34,9 +34,9 @@ func main() {
var iotClient tools.IoTClientInterface
if cfg.IoTServiceURL != "" {
iotClient = tools.NewIoTClient(cfg.IoTServiceURL)
log.Printf("[main] IoT 客户端已初始化: %s", cfg.IoTServiceURL)
logger.Printf("[main] IoT 客户端已初始化: %s", cfg.IoTServiceURL)
} else {
log.Println("[main] IoT 服务 URL 未配置,IoT 工具将不可用")
logger.Println("[main] IoT 服务 URL 未配置,IoT 工具将不可用")
}
// 初始化服务层
@@ -62,9 +62,9 @@ func main() {
}
go func() {
log.Printf("🚀 Tool-Engine 已启动在端口 %s", cfg.Port)
logger.Printf("🚀 Tool-Engine 已启动在端口 %s", cfg.Port)
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Fatalf("服务启动失败: %v", err)
logger.Fatalf("服务启动失败: %v", err)
}
}()
@@ -72,11 +72,11 @@ func main() {
quit := make(chan os.Signal, 1)
signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
<-quit
log.Println("正在关闭 Tool-Engine...")
logger.Println("正在关闭 Tool-Engine...")
if callLogStore != nil {
callLogStore.Close()
}
srv.Close()
log.Println("Tool-Engine 已关闭")
logger.Println("Tool-Engine 已关闭")
}
+6 -1
View File
@@ -2,4 +2,9 @@ module github.com/yourname/cyrene-ai/tool-engine
go 1.26.2
require github.com/lib/pq v1.10.9
require (
github.com/lib/pq v1.10.9
github.com/yourname/cyrene-ai/pkg/logger v0.0.0
)
replace github.com/yourname/cyrene-ai/pkg/logger => ../pkg/logger
@@ -4,7 +4,7 @@ import (
"crypto/rand"
"encoding/json"
"fmt"
"log"
"github.com/yourname/cyrene-ai/pkg/logger"
"net/http"
"strconv"
"strings"
@@ -128,7 +128,7 @@ func (h *ToolHandler) executeTool(w http.ResponseWriter, r *http.Request, toolNa
durationMs := int(time.Since(startTime).Milliseconds())
if err != nil {
log.Printf("[tool-handler] 执行工具 %s 失败: %v", toolName, err)
logger.Printf("[tool-handler] 执行工具 %s 失败: %v", toolName, err)
h.logCall(toolName, req.Arguments, "", err.Error(), false, durationMs, r)
writeError(w, http.StatusInternalServerError, err.Error())
return
@@ -211,7 +211,7 @@ func (h *ToolHandler) logCall(toolName string, args map[string]interface{}, outp
CreatedAt: time.Now(),
}
if err := h.callLogStore.Insert(record); err != nil {
log.Printf("[tool-handler] 记录调用日志失败: %v", err)
logger.Printf("[tool-handler] 记录调用日志失败: %v", err)
}
}()
}
@@ -249,7 +249,7 @@ func (h *ToolHandler) handleCallLogs(w http.ResponseWriter, r *http.Request) {
result, err := h.callLogStore.Query(query)
if err != nil {
log.Printf("[tool-handler] 查询调用记录失败: %v", err)
logger.Printf("[tool-handler] 查询调用记录失败: %v", err)
writeError(w, http.StatusInternalServerError, "查询调用记录失败: "+err.Error())
return
}
@@ -273,7 +273,7 @@ func (h *ToolHandler) handleCallStats(w http.ResponseWriter, r *http.Request) {
stats, err := h.callLogStore.Stats()
if err != nil {
log.Printf("[tool-handler] 查询调用统计失败: %v", err)
logger.Printf("[tool-handler] 查询调用统计失败: %v", err)
writeError(w, http.StatusInternalServerError, "查询调用统计失败: "+err.Error())
return
}
@@ -286,7 +286,7 @@ func writeJSON(w http.ResponseWriter, status int, data interface{}) {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(status)
if err := json.NewEncoder(w).Encode(data); err != nil {
log.Printf("[tool-handler] JSON 编码失败: %v", err)
logger.Printf("[tool-handler] JSON 编码失败: %v", err)
}
}
@@ -3,7 +3,7 @@ package service
import (
"context"
"fmt"
"log"
"github.com/yourname/cyrene-ai/pkg/logger"
"github.com/yourname/cyrene-ai/tool-engine/internal/model"
"github.com/yourname/cyrene-ai/tool-engine/internal/tools"
@@ -38,7 +38,7 @@ func NewToolService(iotClient tools.IoTClientInterface, dataDir string) *ToolSer
svc.Register(tools.NewIoTQueryTool(iotClient))
svc.Register(tools.NewIoTControlTool(iotClient))
} else {
log.Println("[tool-service] IoT 客户端未配置,跳过 IoT 工具注册")
logger.Println("[tool-service] IoT 客户端未配置,跳过 IoT 工具注册")
}
return svc
@@ -48,7 +48,7 @@ func NewToolService(iotClient tools.IoTClientInterface, dataDir string) *ToolSer
func (s *ToolService) Register(tool tools.Tool) {
def := tool.Definition()
s.registry[def.Name] = tool
log.Printf("[tool-service] 已注册工具: %s", def.Name)
logger.Printf("[tool-service] 已注册工具: %s", def.Name)
}
// ListTools 获取所有工具定义
@@ -80,10 +80,10 @@ func (s *ToolService) Execute(ctx context.Context, name string, arguments map[st
}, nil
}
log.Printf("[tool-service] 执行工具: %s", name)
logger.Printf("[tool-service] 执行工具: %s", name)
result, err := tool.Execute(ctx, arguments)
if err != nil {
log.Printf("[tool-service] 工具 %s 执行错误: %v", name, err)
logger.Printf("[tool-service] 工具 %s 执行错误: %v", name, err)
return &model.ToolResult{
Output: "",
Error: fmt.Sprintf("执行工具 %s 失败: %v", name, err),
@@ -91,9 +91,9 @@ func (s *ToolService) Execute(ctx context.Context, name string, arguments map[st
}
if result.Error != "" {
log.Printf("[tool-service] 工具 %s 返回错误: %s", name, result.Error)
logger.Printf("[tool-service] 工具 %s 返回错误: %s", name, result.Error)
} else {
log.Printf("[tool-service] 工具 %s 执行成功", name)
logger.Printf("[tool-service] 工具 %s 执行成功", name)
}
return result, nil
@@ -4,7 +4,7 @@ import (
"database/sql"
"encoding/json"
"fmt"
"log"
"github.com/yourname/cyrene-ai/pkg/logger"
"os"
"time"
@@ -69,7 +69,7 @@ type CallLogStore struct {
// NewCallLogStore 创建调用日志存储并自动建表
func NewCallLogStore(dbURL string) (*CallLogStore, error) {
if dbURL == "" {
log.Println("[call-log-store] DB_URL 未设置,工具调用日志将不会持久化")
logger.Println("[call-log-store] DB_URL 未设置,工具调用日志将不会持久化")
return &CallLogStore{}, nil
}
@@ -83,16 +83,16 @@ func NewCallLogStore(dbURL string) (*CallLogStore, error) {
db.SetConnMaxLifetime(5 * time.Minute)
if err := db.Ping(); err != nil {
log.Printf("[call-log-store] 数据库连接失败: %v (将尝试继续运行)", err)
logger.Printf("[call-log-store] 数据库连接失败: %v (将尝试继续运行)", err)
return &CallLogStore{}, nil
}
store := &CallLogStore{db: db}
if err := store.migrate(); err != nil {
log.Printf("[call-log-store] 数据库迁移失败: %v", err)
logger.Printf("[call-log-store] 数据库迁移失败: %v", err)
}
log.Println("[call-log-store] 数据库连接成功,表已就绪")
logger.Println("[call-log-store] 数据库连接成功,表已就绪")
return store, nil
}
@@ -140,7 +140,7 @@ func (s *CallLogStore) Insert(record *CallLogRecord) error {
record.Success, record.DurationMs, record.UserID, record.SessionID, record.CreatedAt,
)
if err != nil {
log.Printf("[call-log-store] 插入记录失败: %v", err)
logger.Printf("[call-log-store] 插入记录失败: %v", err)
return err
}
return nil
@@ -196,7 +196,7 @@ func (s *CallLogStore) Query(q CallLogQuery) (*CallLogPageResult, error) {
var r CallLogRecord
var argsJSON []byte
if err := rows.Scan(&r.ID, &r.CallID, &r.ToolName, &argsJSON, &r.Output, &r.Error, &r.Success, &r.DurationMs, &r.UserID, &r.SessionID, &r.CreatedAt); err != nil {
log.Printf("[call-log-store] 扫描行失败: %v", err)
logger.Printf("[call-log-store] 扫描行失败: %v", err)
continue
}
r.Arguments = argsJSON
@@ -247,7 +247,7 @@ func (s *CallLogStore) Stats() (*CallLogStats, error) {
for rows.Next() {
var tc ToolCallCount
if err := rows.Scan(&tc.ToolName, &tc.Count, &tc.SuccessCount, &tc.FailCount, &tc.AvgDuration); err != nil {
log.Printf("[call-log-store] 扫描工具统计失败: %v", err)
logger.Printf("[call-log-store] 扫描工具统计失败: %v", err)
continue
}
stats.ByTool = append(stats.ByTool, tc)
@@ -324,7 +324,7 @@ func applyFunc(name string, arg float64) (float64, error) {
return math.Ceil(arg), nil
case "round":
return math.Round(arg), nil
case "log":
case "github.com/yourname/cyrene-ai/pkg/logger":
if arg <= 0 {
return 0, fmt.Errorf("log 参数必须大于0")
}
@@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"
"io"
"log"
"github.com/yourname/cyrene-ai/pkg/logger"
"net/http"
"sync"
"time"
@@ -49,7 +49,7 @@ func (c *IoTClient) GetAllDevices() ([]IoTDevice, error) {
// 请求 API
resp, err := c.client.Get(c.baseURL + "/api/v1/devices")
if err != nil {
log.Printf("[IoT客户端] 请求失败: %v", err)
logger.Printf("[IoT客户端] 请求失败: %v", err)
return nil, fmt.Errorf("获取设备列表失败: %w", err)
}
defer resp.Body.Close()
@@ -102,27 +102,27 @@ func (c *IoTClient) GetDevice(id string) (*IoTDevice, error) {
// ToggleDevice 切换设备开关状态
func (c *IoTClient) ToggleDevice(id string) error {
log.Printf("[tool-engine:IoT-client] 🔄 切换设备: id=%s, url=%s", id, c.baseURL+"/api/v1/devices/"+id+"/toggle")
logger.Printf("[tool-engine:IoT-client] 🔄 切换设备: id=%s, url=%s", id, c.baseURL+"/api/v1/devices/"+id+"/toggle")
req, err := http.NewRequest(http.MethodPost, c.baseURL+"/api/v1/devices/"+id+"/toggle", nil)
if err != nil {
log.Printf("[tool-engine:IoT-client] ❌ 创建切换请求失败: device=%s, err=%v", id, err)
logger.Printf("[tool-engine:IoT-client] ❌ 创建切换请求失败: device=%s, err=%v", id, err)
return fmt.Errorf("创建切换请求失败: %w", err)
}
resp, err := c.client.Do(req)
if err != nil {
log.Printf("[tool-engine:IoT-client] ❌ 切换设备 HTTP 失败: device=%s, err=%v", id, err)
logger.Printf("[tool-engine:IoT-client] ❌ 切换设备 HTTP 失败: device=%s, err=%v", id, err)
return fmt.Errorf("切换设备 %s 失败: %w", id, err)
}
defer resp.Body.Close()
if resp.StatusCode == http.StatusNotFound {
log.Printf("[tool-engine:IoT-client] ❌ 设备不存在: %s", id)
logger.Printf("[tool-engine:IoT-client] ❌ 设备不存在: %s", id)
return fmt.Errorf("设备 %s 不存在", id)
}
if resp.StatusCode != http.StatusOK {
log.Printf("[tool-engine:IoT-client] ❌ 切换设备返回非200: device=%s, status=%d", id, resp.StatusCode)
logger.Printf("[tool-engine:IoT-client] ❌ 切换设备返回非200: device=%s, status=%d", id, resp.StatusCode)
return fmt.Errorf("切换设备 %s 返回状态码 %d", id, resp.StatusCode)
}
@@ -131,26 +131,26 @@ func (c *IoTClient) ToggleDevice(id string) error {
c.cache = nil
c.mu.Unlock()
log.Printf("[tool-engine:IoT-client] ✅ 切换设备成功: %s", id)
logger.Printf("[tool-engine:IoT-client] ✅ 切换设备成功: %s", id)
return nil
}
// SetDeviceProperty 设置设备属性(温度、亮度、位置、模式、颜色等)
func (c *IoTClient) SetDeviceProperty(id string, field string, value interface{}) error {
log.Printf("[tool-engine:IoT-client] 🔧 设置设备属性: device=%s, field=%s, value=%v, url=%s", id, field, value, c.baseURL+"/api/v1/devices/"+id+"/set")
logger.Printf("[tool-engine:IoT-client] 🔧 设置设备属性: device=%s, field=%s, value=%v, url=%s", id, field, value, c.baseURL+"/api/v1/devices/"+id+"/set")
body, err := json.Marshal(map[string]interface{}{
"field": field,
"value": value,
})
if err != nil {
log.Printf("[tool-engine:IoT-client] ❌ 序列化请求失败: device=%s, err=%v", id, err)
logger.Printf("[tool-engine:IoT-client] ❌ 序列化请求失败: device=%s, err=%v", id, err)
return fmt.Errorf("序列化请求失败: %w", err)
}
req, err := http.NewRequest(http.MethodPost, c.baseURL+"/api/v1/devices/"+id+"/set", nil)
if err != nil {
log.Printf("[tool-engine:IoT-client] ❌ 创建设置请求失败: device=%s, err=%v", id, err)
logger.Printf("[tool-engine:IoT-client] ❌ 创建设置请求失败: device=%s, err=%v", id, err)
return fmt.Errorf("创建设置请求失败: %w", err)
}
req.Header.Set("Content-Type", "application/json")
@@ -158,13 +158,13 @@ func (c *IoTClient) SetDeviceProperty(id string, field string, value interface{}
resp, err := c.client.Do(req)
if err != nil {
log.Printf("[tool-engine:IoT-client] ❌ 设置设备属性 HTTP 失败: device=%s, field=%s, err=%v", id, field, err)
logger.Printf("[tool-engine:IoT-client] ❌ 设置设备属性 HTTP 失败: device=%s, field=%s, err=%v", id, field, err)
return fmt.Errorf("设置设备 %s 属性失败: %w", id, err)
}
defer resp.Body.Close()
if resp.StatusCode == http.StatusNotFound {
log.Printf("[tool-engine:IoT-client] ❌ 设备不存在: %s", id)
logger.Printf("[tool-engine:IoT-client] ❌ 设备不存在: %s", id)
return fmt.Errorf("设备 %s 不存在", id)
}
if resp.StatusCode != http.StatusOK {
@@ -173,10 +173,10 @@ func (c *IoTClient) SetDeviceProperty(id string, field string, value interface{}
}
json.NewDecoder(resp.Body).Decode(&errResp)
if errResp.Error != "" {
log.Printf("[tool-engine:IoT-client] ❌ 设置设备属性失败: device=%s, err=%s", id, errResp.Error)
logger.Printf("[tool-engine:IoT-client] ❌ 设置设备属性失败: device=%s, err=%s", id, errResp.Error)
return fmt.Errorf("设置设备 %s 属性失败: %s", id, errResp.Error)
}
log.Printf("[tool-engine:IoT-client] ❌ 设置设备属性返回非200: device=%s, status=%d", id, resp.StatusCode)
logger.Printf("[tool-engine:IoT-client] ❌ 设置设备属性返回非200: device=%s, status=%d", id, resp.StatusCode)
return fmt.Errorf("设置设备 %s 属性返回状态码 %d", id, resp.StatusCode)
}
@@ -185,7 +185,7 @@ func (c *IoTClient) SetDeviceProperty(id string, field string, value interface{}
c.cache = nil
c.mu.Unlock()
log.Printf("[tool-engine:IoT-client] ✅ 设置设备属性成功: device=%s, field=%s, value=%v", id, field, value)
logger.Printf("[tool-engine:IoT-client] ✅ 设置设备属性成功: device=%s, field=%s, value=%v", id, field, value)
return nil
}
@@ -193,7 +193,7 @@ func (c *IoTClient) SetDeviceProperty(id string, field string, value interface{}
func (c *IoTClient) GetDevicesForContext() []IoTDevice {
devices, err := c.GetAllDevices()
if err != nil {
log.Printf("[IoT客户端] 获取设备状态摘要失败: %v", err)
logger.Printf("[IoT客户端] 获取设备状态摘要失败: %v", err)
return nil
}
return devices