feat(backthink): 主动推送每次只发一个平台——决策渠道/最近活跃优先,平台含微信
CI / Backend (build / vet / test / cross-compile) (push) Has been cancelled
CI / Frontend (tsc + vite build) (push) Has been cancelled

主动推送目标不再取第一个白名单渠道(kook),也不再双目标 web+kook;改为每次只发一个平台,范围=全部已连接白名单渠道(含微信 weixin-ilink)。

backthink/push.go: pusher 单目标路由——web hint 一次 pushActive;im/auto/实体平台 hint 一次性 pushIM (msgs 置哨兵/实体平台),无 IM sink 时诚实降级 pushActive;保留 PushGate 降频与成功 RecordPush。
channelbridge/proactive.go: proactiveTarget 三级选择——①决策 [渠道:xxx] 实体平台且白名单+已连接优先;②最近活跃(主会话最近20条 newest-first 找白名单+已连接平台,web 会话自动跳过);③回退 NextConnectedAccount 用旋转游标避免永远 kook。微信不再排除、可被选中;决策 hint 指定非白名单渠道回退(不报错)。Bridge 新增 proactiveCursor 字段(mu 保护)。
context.go: guidancePrompt 描述改为每次挑一个合适渠道(含微信)。
测试: 决策优先/最近活跃/微信可选中/无信号回退旋转/单目标 等,go build/vet/test 全绿 + windows/darwin 交叉编译。stash@{0} 保留被取代的'web+kook双目标'WIP以备回滚。
This commit is contained in:
Aska committed 2026-09-08 13:34:22 +08:00
1 parent 12031bd13c
commit 3e4efa0e41
8 files changed
+419 -114

No files matched your search

@@ -179,6 +179,10 @@ type Bridge struct {
started bool
closed bool
factory PlatformFactory
// proactiveCursor is the rotation cursor for the proactive-push no-signal
// fallback (channelbridge/proactive.go), so the default channel is not always
// the first whitelisted owner channel. Guarded by mu.
proactiveCursor int
// gateMu guards the per-adapter flow gates (design/12 §6 策略三/四). They are
// built lazily on the first inbound message per account and are independent of
+152 -25
View File
@@ -7,6 +7,7 @@ import (
"git.yeij.top/AskaEth/Cyrene_v2/internal/channel/adapter"
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/history"
"git.yeij.top/AskaEth/Cyrene_v2/internal/user"
)
// proactiveTarget is the owner's IM address (platform + account id) resolved for
@@ -16,20 +17,30 @@ type proactiveTarget struct {
accountID string
}
// proactiveRecentCount is how many of the most recent main-session messages the
// proactive target selection scans to find "where the owner last talked", so a
// push lands on the channel she is actually using. Compile-time so no magic number
// appears in the run path.
const proactiveRecentCount = 20
// SendProactive pushes msg to the owner's IM channel via the registered adapter
// for that platform. It is the backthink IMAdapter seam (design/12 §3 fallback).
// The target account is chosen by msg.Platform when it names one of the owner's
// whitelisted channels, otherwise the first whitelisted owner channel is used.
// When the owner profile has no whitelisted account (or none carries an account
// id) it returns a clear error so the caller records the reason rather than
// for that platform. It is the backthink IMAdapter seam (design/12 §3 fallback) and
// delivers to exactly ONE owner channel, chosen by the single-target selection in
// proactiveTarget: her explicit [渠道:...] choice first, then the platform she last
// used, then the whitelist default (rotating so it is not always the same channel).
// WeChat is a first-class candidate (it is whitelisted and, when connected, the
// recent-active/fallback selection may pick it).
//
// When the owner profile has no whitelisted account that is backed by a connected
// adapter it returns a clear error so the caller records the reason rather than
// silently dropping the push.
func (b *Bridge) SendProactive(ctx context.Context, msg adapter.UnifiedMessage) error {
if err := ctx.Err(); err != nil {
return err
}
target, ok := b.proactiveTarget(msg)
target, ok := b.proactiveTarget(ctx, msg)
if !ok {
return fmt.Errorf("channelbridge: no owner IM channel for proactive push")
return fmt.Errorf("channelbridge: no connected owner IM channel for proactive push")
}
ad := b.adapterForPlatform(target.platform)
if ad == nil {
@@ -57,34 +68,150 @@ func (b *Bridge) SendProactive(ctx context.Context, msg adapter.UnifiedMessage)
return nil
}
// proactiveTarget resolves the owner account a proactive push should reach:
// msg.Platform, when it names one of the owner's whitelisted platforms, selects
// that account; otherwise the first whitelisted owner channel (with a non-empty
// account id) is used. A nil owner or an empty whitelist yields !ok.
func (b *Bridge) proactiveTarget(msg adapter.UnifiedMessage) (proactiveTarget, bool) {
if b.owner == nil {
return proactiveTarget{}, false
}
accounts := b.owner.Accounts
// proactiveTarget resolves the single owner account a proactive push should reach.
// The range is every whitelisted owner channel that is backed by a connected
// adapter (WeChat included), and the choice follows the backthink priority:
//
// 1. A concrete msg.Platform (her [渠道:...] choice) that is whitelisted AND
// connected selects that channel.
// 2. The channel she most recently used in the main session (an owner/dialog
// message on a whitelisted, connected platform) is preferred.
// 3. Otherwise the platform that the whitelist default selects, rotating from a
// cursor so the fallback is not always the same channel (e.g. always kook).
//
// A nil owner or an empty whitelist yields !ok, as does a whitelist with no
// connected adapter.
func (b *Bridge) proactiveTarget(ctx context.Context, msg adapter.UnifiedMessage) (proactiveTarget, bool) {
accounts := b.ownerAccounts()
if len(accounts) == 0 {
return proactiveTarget{}, false
}
platform := strings.ToLower(strings.TrimSpace(msg.Platform))
if platform != "" {
for _, acct := range accounts {
if acct.AccountID != "" && strings.EqualFold(acct.Platform, platform) {
return proactiveTarget{acct.Platform, acct.AccountID}, true
}
}
}
for _, acct := range accounts {
if acct.AccountID != "" {
if !isGenericProactivePlatform(platform) {
if acct, ok := matchOwnerAccount(accounts, platform); ok && b.hasConnectedAdapter(acct.Platform) {
return proactiveTarget{acct.Platform, acct.AccountID}, true
}
}
if acct, ok := b.recentActiveAccount(ctx, accounts); ok {
return proactiveTarget{acct.Platform, acct.AccountID}, true
}
if acct, ok := b.nextConnectedAccount(accounts); ok {
return proactiveTarget{acct.Platform, acct.AccountID}, true
}
return proactiveTarget{}, false
}
// ownerAccounts returns the owner's whitelisted accounts that carry an account id,
// in whitelist order. A nil owner or an empty whitelist yields nil.
func (b *Bridge) ownerAccounts() []user.OwnerAccount {
if b.owner == nil {
return nil
}
out := make([]user.OwnerAccount, 0, len(b.owner.Accounts))
for _, a := range b.owner.Accounts {
if a.AccountID != "" {
out = append(out, a)
}
}
if len(out) == 0 {
return nil
}
return out
}
// matchOwnerAccount returns the owner account whose platform equals platform,
// case-insensitively.
func matchOwnerAccount(accounts []user.OwnerAccount, platform string) (user.OwnerAccount, bool) {
for _, a := range accounts {
if strings.EqualFold(a.Platform, platform) {
return a, true
}
}
return user.OwnerAccount{}, false
}
// recentActiveAccount returns the owner account for the most recent main-session
// message whose platform is a whitelisted, connected owner channel — the "she is
// active there" signal. A nil history store, a failed read or an empty tail yields
// ok=false so selection falls through to the default rather than guessing.
func (b *Bridge) recentActiveAccount(ctx context.Context, accounts []user.OwnerAccount) (user.OwnerAccount, bool) {
if b.history == nil {
return user.OwnerAccount{}, false
}
recent, err := b.history.Recent(ctx, history.MainSessionID, proactiveRecentCount)
if err != nil || len(recent) == 0 {
return user.OwnerAccount{}, false
}
// Recent is oldest-first; walk newest-first so the most recent channel wins.
for i := len(recent) - 1; i >= 0; i-- {
p := strings.ToLower(strings.TrimSpace(recent[i].Platform))
if p == "" || isGenericProactivePlatform(p) {
continue
}
if acct, ok := matchOwnerAccount(accounts, p); ok && b.hasConnectedAdapter(acct.Platform) {
return acct, true
}
}
return user.OwnerAccount{}, false
}
// nextConnectedAccount returns the next whitelisted owner account with a connected
// adapter, advancing a cursor so the no-signal fallback rotates instead of always
// landing on the first whitelisted channel (e.g. always kook). It holds the bridge
// lock to read the adapter map and update the cursor atomically.
func (b *Bridge) nextConnectedAccount(accounts []user.OwnerAccount) (user.OwnerAccount, bool) {
b.mu.Lock()
defer b.mu.Unlock()
n := len(accounts)
for i := 0; i < n; i++ {
idx := (b.proactiveCursor + i) % n
a := accounts[idx]
if b.hasConnectedAdapterLocked(a.Platform) {
b.proactiveCursor = (idx + 1) % n
return a, true
}
}
return user.OwnerAccount{}, false
}
// hasConnectedAdapter reports whether a registered adapter with this base platform
// is currently connected, so a channel is only ever selected when it can actually
// deliver a message.
func (b *Bridge) hasConnectedAdapter(platform string) bool {
b.mu.RLock()
defer b.mu.RUnlock()
return b.hasConnectedAdapterLocked(platform)
}
// hasConnectedAdapterLocked is hasConnectedAdapter without taking the lock; the
// caller must hold b.mu (read or write).
func (b *Bridge) hasConnectedAdapterLocked(platform string) bool {
for name, a := range b.adapters {
if strings.EqualFold(basePlatform(name), platform) && a.IsConnected() {
return true
}
}
return false
}
// isGenericProactivePlatform reports whether platform is a routing keyword rather
// than a concrete channel id. Only these fall through to the recent-active / default
// selection; a concrete id must resolve to a whitelisted, connected channel before
// it is honored, so an explicit channel choice is never silently replaced by a
// different channel.
func isGenericProactivePlatform(platform string) bool {
switch platform {
case "", "cyrene-backthink":
return true
default:
return false
}
}
// adapterForPlatform returns a registered adapter whose base platform matches
// platform (multi-account names like "kook:3be..." resolve to their bare base),
// preferring a connected one so a dead account is only tried when it is the only
+169 -19
View File
@@ -8,26 +8,36 @@ import (
"git.yeij.top/AskaEth/Cyrene_v2/internal/channel/adapter"
"git.yeij.top/AskaEth/Cyrene_v2/internal/channel/session"
"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/user"
)
func newProactiveBridge(t *testing.T, owner *user.OwnerProfile, ad *fakeAdapter) *Bridge {
func newProactiveBridge(t *testing.T, owner *user.OwnerProfile, ads ...*fakeAdapter) *Bridge {
t.Helper()
return newProactiveBridgeHist(t, owner, nil, ads...)
}
// newProactiveBridgeHist is newProactiveBridge with a history store injected, so a
// test can supply a recent window for the "she was last active here" selection.
func newProactiveBridgeHist(t *testing.T, owner *user.OwnerProfile, hist history.HistoryStore, ads ...*fakeAdapter) *Bridge {
t.Helper()
chat := &stubChatter{res: &loop.Result{Text: "hi"}}
sess := &stubSessions{sess: session.Session{SessionID: "sess-1", Owner: true, MemWritable: true}}
b, err := New(Options{Loop: chat, Sessions: sess, Owner: owner})
b, err := New(Options{Loop: chat, Sessions: sess, Owner: owner, History: hist})
if err != nil {
t.Fatalf("new bridge: %v", err)
}
if ad != nil {
b.Add(ad)
for _, ad := range ads {
if ad != nil {
b.Add(ad)
}
}
return b
}
// proactiveMsg builds a minimal autonomous proactive message as backthink's
// buildProactiveMessage would (no channel targeting yet).
// buildProactiveMessage would for a no-channel decision (the generic sentinel).
func proactiveMsg(content string) adapter.UnifiedMessage {
return adapter.UnifiedMessage{
Platform: "cyrene-backthink",
@@ -38,9 +48,9 @@ func proactiveMsg(content string) adapter.UnifiedMessage {
}
}
// TestBridge_SendProactive_OwnerChannel verifies a proactive push lands on the
// owner's IM channel: the adapter for the owner's platform is selected and the
// owner account id is threaded as the DM peer.
// TestBridge_SendProactive_OwnerChannel verifies a proactive push with no signal
// falls back to a whitelisted owner channel: the adapter for the owner's platform
// is selected and the owner account id is threaded as the DM peer.
func TestBridge_SendProactive_OwnerChannel(t *testing.T) {
ad := &fakeAdapter{name: "telegram", connected: true}
owner := &user.OwnerProfile{Accounts: []user.OwnerAccount{{Platform: "telegram", AccountID: "100"}}}
@@ -68,7 +78,8 @@ func TestBridge_SendProactive_OwnerChannel(t *testing.T) {
}
// TestBridge_SendProactive_PlatformHintSelectsAccount verifies msg.Platform
// selects the matching owner account when one exists, rather than defaulting.
// selects the matching owner account when one exists and is connected, rather
// than defaulting to another channel.
func TestBridge_SendProactive_PlatformHintSelectsAccount(t *testing.T) {
ad := &fakeAdapter{name: "kook", connected: true}
owner := &user.OwnerProfile{Accounts: []user.OwnerAccount{
@@ -91,32 +102,171 @@ func TestBridge_SendProactive_PlatformHintSelectsAccount(t *testing.T) {
}
}
// TestBridge_SendProactive_NoOwnerChannel verifies a clearly-worded error when the
// owner profile has no whitelisted account, so the caller records the reason.
// TestBridge_SendProactive_DecisionHintPriority verifies a concrete [渠道:...]
// decision beats the recent-active platform: even though she last used WeChat, an
// explicit kook choice is honored (and still only one channel is used).
func TestBridge_SendProactive_DecisionHintPriority(t *testing.T) {
kook := &fakeAdapter{name: "kook", connected: true}
weixin := &fakeAdapter{name: "weixin-ilink", connected: true}
owner := &user.OwnerProfile{Accounts: []user.OwnerAccount{
{Platform: "telegram", AccountID: "100"},
{Platform: "weixin-ilink", AccountID: "o9cq802QPKPscBenJAp-SMZPBlnQ@im.wechat"},
{Platform: "kook", AccountID: "329284282"},
}}
hist := &contextHistory{recent: []history.Message{{Role: history.RoleUser, Platform: "weixin-ilink", Content: "hi", CreatedAt: 2}}}
b := newProactiveBridgeHist(t, owner, hist, kook, weixin)
msg := proactiveMsg("洗完了")
msg.Platform = "kook"
if err := b.SendProactive(context.Background(), msg); err != nil {
t.Fatalf("SendProactive err = %v", err)
}
if len(kook.sends) != 1 {
t.Fatalf("kook sends = %d, want 1 (explicit choice beats recent-active)", len(kook.sends))
}
if len(weixin.sends) != 0 {
t.Fatalf("weixin sends = %d, want 0 (only one channel per push)", len(weixin.sends))
}
if kook.sends[0].Platform != "kook" || kook.sends[0].SenderID != "329284282" {
t.Fatalf("target = %q/%q, want the kook owner account", kook.sends[0].Platform, kook.sends[0].SenderID)
}
}
// TestBridge_SendProactive_RecentActivePlatform verifies a no-decision push lands
// on the channel she used most recently, skipping the web session (web is not a
// whitelisted IM account) and honoring a whitelisted, connected IM channel.
func TestBridge_SendProactive_RecentActivePlatform(t *testing.T) {
kook := &fakeAdapter{name: "kook", connected: true}
weixin := &fakeAdapter{name: "weixin-ilink", connected: true}
owner := &user.OwnerProfile{Accounts: []user.OwnerAccount{
{Platform: "kook", AccountID: "329284282"},
{Platform: "weixin-ilink", AccountID: "o9cq802QPKPscBenJAp-SMZPBlnQ@im.wechat"},
}}
// Recent is oldest-first: the newest message is the web session, then WeChat,
// then kook. The web session is skipped (not whitelisted), so the most recent
// whitelisted, connected channel — WeChat — is chosen.
hist := &contextHistory{recent: []history.Message{
{Role: history.RoleUser, Platform: "kook", Content: "一早聊过", CreatedAt: 1},
{Role: history.RoleUser, Platform: "weixin-ilink", Content: "微信聊的", CreatedAt: 2},
{Role: history.RoleAssistant, Platform: "web", Content: "网页端", CreatedAt: 3},
}}
b := newProactiveBridgeHist(t, owner, hist, kook, weixin)
if err := b.SendProactive(context.Background(), proactiveMsg("记得喝水哦")); err != nil {
t.Fatalf("SendProactive err = %v", err)
}
if len(weixin.sends) != 1 {
t.Fatalf("weixin sends = %d, want 1 (recent-active picks WeChat)", len(weixin.sends))
}
if len(kook.sends) != 0 {
t.Fatalf("kook sends = %d, want 0", len(kook.sends))
}
if weixin.sends[0].Platform != "weixin-ilink" {
t.Fatalf("platform = %q, want weixin-ilink", weixin.sends[0].Platform)
}
}
// TestBridge_SendProactive_WeChatCanBeSelected verifies WeChat is a first-class
// proactive target: with a WeChat account whitelisted and its adapter connected, a
// no-signal push lands on it rather than always defaulting to kook.
func TestBridge_SendProactive_WeChatCanBeSelected(t *testing.T) {
weixin := &fakeAdapter{name: "weixin-ilink", connected: true}
owner := &user.OwnerProfile{Accounts: []user.OwnerAccount{{Platform: "weixin-ilink", AccountID: "o9cq802QPKPscBenJAp-SMZPBlnQ@im.wechat"}}}
b := newProactiveBridge(t, owner, weixin)
if err := b.SendProactive(context.Background(), proactiveMsg("记得喝水哦")); err != nil {
t.Fatalf("SendProactive err = %v", err)
}
if len(weixin.sends) != 1 {
t.Fatalf("sends = %d, want 1", len(weixin.sends))
}
if weixin.sends[0].Platform != "weixin-ilink" {
t.Fatalf("platform = %q, want weixin-ilink", weixin.sends[0].Platform)
}
if weixin.sends[0].Content != "记得喝水哦" {
t.Fatalf("content = %q, want the proactive text", weixin.sends[0].Content)
}
}
// TestBridge_SendProactive_NoSignalFallbackRotates verifies the no-signal fallback
// rotates across connected whitelisted channels (instead of always kook), and that
// each push reaches exactly one channel.
func TestBridge_SendProactive_NoSignalFallbackRotates(t *testing.T) {
kook := &fakeAdapter{name: "kook", connected: true}
weixin := &fakeAdapter{name: "weixin-ilink", connected: true}
owner := &user.OwnerProfile{Accounts: []user.OwnerAccount{
{Platform: "kook", AccountID: "329284282"},
{Platform: "weixin-ilink", AccountID: "o9cq802QPKPscBenJAp-SMZPBlnQ@im.wechat"},
}}
b := newProactiveBridge(t, owner, kook, weixin)
if err := b.SendProactive(context.Background(), proactiveMsg("第一次")); err != nil {
t.Fatalf("first SendProactive err = %v", err)
}
if err := b.SendProactive(context.Background(), proactiveMsg("第二次")); err != nil {
t.Fatalf("second SendProactive err = %v", err)
}
if len(kook.sends) != 1 || len(weixin.sends) != 1 {
t.Fatalf("sends = kook:%d weixin:%d, want 1 each (one channel per push, rotating)",
len(kook.sends), len(weixin.sends))
}
if kook.sends[0].Content != "第一次" {
t.Fatalf("kook content = %q, want '第一次'", kook.sends[0].Content)
}
if weixin.sends[0].Content != "第二次" {
t.Fatalf("weixin content = %q, want '第二次'", weixin.sends[0].Content)
}
}
// TestBridge_SendProactive_HintNotWhitelisted_FallsBackToWeChat verifies a concrete
// decision channel that is NOT whitelisted degrades to a whitelisted, connected
// owner channel rather than erroring or landing on a non-owner channel. This is
// how WeChat becomes reachable even though the old default never considered it.
func TestBridge_SendProactive_HintNotWhitelisted_FallsBackToWeChat(t *testing.T) {
weixin := &fakeAdapter{name: "weixin-ilink", connected: true}
owner := &user.OwnerProfile{Accounts: []user.OwnerAccount{{Platform: "weixin-ilink", AccountID: "o9cq802QPKPscBenJAp-SMZPBlnQ@im.wechat"}}}
b := newProactiveBridge(t, owner, weixin)
msg := proactiveMsg("记得喝水哦")
msg.Platform = "kook" // kook is not whitelisted for this owner
if err := b.SendProactive(context.Background(), msg); err != nil {
t.Fatalf("SendProactive err = %v (a non-whitelisted hint should fall back, not error)", err)
}
if len(weixin.sends) != 1 {
t.Fatalf("sends = %d, want 1 (fell back to the whitelisted WeChat channel)", len(weixin.sends))
}
if weixin.sends[0].Platform != "weixin-ilink" {
t.Fatalf("platform = %q, want weixin-ilink", weixin.sends[0].Platform)
}
}
// TestBridge_SendProactive_NoOwnerChannel verifies a clear error when the owner
// profile has no whitelisted account, so the caller records the reason.
func TestBridge_SendProactive_NoOwnerChannel(t *testing.T) {
b := newProactiveBridge(t, &user.OwnerProfile{}, nil)
b := newProactiveBridge(t, &user.OwnerProfile{})
err := b.SendProactive(context.Background(), proactiveMsg("hi"))
if err == nil {
t.Fatalf("expected an error for a missing owner channel, got nil")
}
if !strings.Contains(err.Error(), "no owner IM channel") {
t.Fatalf("error = %q, want a 'no owner IM channel' note", err)
if !strings.Contains(err.Error(), "no connected owner IM channel") {
t.Fatalf("error = %q, want a 'no connected owner IM channel' note", err)
}
}
// TestBridge_SendProactive_NoAdapter verifies the error names the platform when the
// owner has a whitelisted channel but no adapter is registered for it.
// TestBridge_SendProactive_NoAdapter verifies the error when the owner has a
// whitelisted channel but no adapter is registered/connected for it.
func TestBridge_SendProactive_NoAdapter(t *testing.T) {
owner := &user.OwnerProfile{Accounts: []user.OwnerAccount{{Platform: "kook", AccountID: "329284282"}}}
b := newProactiveBridge(t, owner, nil)
b := newProactiveBridge(t, owner)
err := b.SendProactive(context.Background(), proactiveMsg("hi"))
if err == nil {
t.Fatalf("expected an error for a missing adapter, got nil")
}
if !strings.Contains(err.Error(), "no adapter for owner platform") {
t.Fatalf("error = %q, want a 'no adapter for owner platform' note", err)
if !strings.Contains(err.Error(), "no connected owner IM channel") {
t.Fatalf("error = %q, want a 'no connected owner IM channel' note", err)
}
}