mirror of
https://github.com/YspCoder/clawgo.git
synced 2026-05-07 13:37:33 +08:00
autonomy notify: enforce notify allowlist from config and add guard test
This commit is contained in:
@@ -958,5 +958,6 @@ func buildAutonomyEngine(cfg *config.Config, msgBus *bus.MessageBus) *autonomy.E
|
|||||||
Workspace: cfg.WorkspacePath(),
|
Workspace: cfg.WorkspacePath(),
|
||||||
DefaultNotifyChannel: a.NotifyChannel,
|
DefaultNotifyChannel: a.NotifyChannel,
|
||||||
DefaultNotifyChatID: a.NotifyChatID,
|
DefaultNotifyChatID: a.NotifyChatID,
|
||||||
|
NotifyAllowChats: a.NotifyAllowChats,
|
||||||
}, msgBus)
|
}, msgBus)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,8 @@
|
|||||||
"user_idle_resume_sec": 20,
|
"user_idle_resume_sec": 20,
|
||||||
"waiting_resume_debounce_sec": 5,
|
"waiting_resume_debounce_sec": 5,
|
||||||
"notify_channel": "",
|
"notify_channel": "",
|
||||||
"notify_chat_id": ""
|
"notify_chat_id": "",
|
||||||
|
"notify_allow_chats": []
|
||||||
},
|
},
|
||||||
"texts": {
|
"texts": {
|
||||||
"no_response_fallback": "I've completed processing but have no response to give.",
|
"no_response_fallback": "I've completed processing but have no response to give.",
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ type Options struct {
|
|||||||
Workspace string
|
Workspace string
|
||||||
DefaultNotifyChannel string
|
DefaultNotifyChannel string
|
||||||
DefaultNotifyChatID string
|
DefaultNotifyChatID string
|
||||||
|
NotifyAllowChats []string
|
||||||
NotifyCooldownSec int
|
NotifyCooldownSec int
|
||||||
NotifySameReasonCooldownSec int
|
NotifySameReasonCooldownSec int
|
||||||
QuietHours string
|
QuietHours string
|
||||||
@@ -636,6 +637,18 @@ func (e *Engine) shouldNotify(key string, reason string) bool {
|
|||||||
if strings.TrimSpace(e.opts.DefaultNotifyChannel) == "" || strings.TrimSpace(e.opts.DefaultNotifyChatID) == "" {
|
if strings.TrimSpace(e.opts.DefaultNotifyChannel) == "" || strings.TrimSpace(e.opts.DefaultNotifyChatID) == "" {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
if len(e.opts.NotifyAllowChats) > 0 {
|
||||||
|
allowed := false
|
||||||
|
for _, c := range e.opts.NotifyAllowChats {
|
||||||
|
if c == e.opts.DefaultNotifyChatID {
|
||||||
|
allowed = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !allowed {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
if inQuietHours(now, e.opts.QuietHours) {
|
if inQuietHours(now, e.opts.QuietHours) {
|
||||||
return false
|
return false
|
||||||
|
|||||||
21
pkg/autonomy/engine_notify_allowlist_test.go
Normal file
21
pkg/autonomy/engine_notify_allowlist_test.go
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
package autonomy
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestShouldNotify_RespectsNotifyAllowChats(t *testing.T) {
|
||||||
|
e := &Engine{opts: Options{
|
||||||
|
DefaultNotifyChannel: "telegram",
|
||||||
|
DefaultNotifyChatID: "chat-1",
|
||||||
|
NotifyAllowChats: []string{"chat-2", "chat-3"},
|
||||||
|
NotifyCooldownSec: 1,
|
||||||
|
NotifySameReasonCooldownSec: 1,
|
||||||
|
}}
|
||||||
|
if e.shouldNotify("k1", "") {
|
||||||
|
t.Fatalf("expected notify to be blocked when chat not in allowlist")
|
||||||
|
}
|
||||||
|
|
||||||
|
e.opts.NotifyAllowChats = []string{"chat-1"}
|
||||||
|
if !e.shouldNotify("k2", "") {
|
||||||
|
t.Fatalf("expected notify to pass when chat in allowlist")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -58,8 +58,9 @@ type AutonomyConfig struct {
|
|||||||
MaxRoundsWithoutUser int `json:"max_rounds_without_user" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_MAX_ROUNDS_WITHOUT_USER"`
|
MaxRoundsWithoutUser int `json:"max_rounds_without_user" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_MAX_ROUNDS_WITHOUT_USER"`
|
||||||
WaitingResumeDebounceSec int `json:"waiting_resume_debounce_sec" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_WAITING_RESUME_DEBOUNCE_SEC"`
|
WaitingResumeDebounceSec int `json:"waiting_resume_debounce_sec" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_WAITING_RESUME_DEBOUNCE_SEC"`
|
||||||
AllowedTaskKeywords []string `json:"allowed_task_keywords" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_ALLOWED_TASK_KEYWORDS"`
|
AllowedTaskKeywords []string `json:"allowed_task_keywords" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_ALLOWED_TASK_KEYWORDS"`
|
||||||
NotifyChannel string `json:"notify_channel" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_NOTIFY_CHANNEL"`
|
NotifyChannel string `json:"notify_channel" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_NOTIFY_CHANNEL"`
|
||||||
NotifyChatID string `json:"notify_chat_id" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_NOTIFY_CHAT_ID"`
|
NotifyChatID string `json:"notify_chat_id" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_NOTIFY_CHAT_ID"`
|
||||||
|
NotifyAllowChats []string `json:"notify_allow_chats" env:"CLAWGO_AGENTS_DEFAULTS_AUTONOMY_NOTIFY_ALLOW_CHATS"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AgentTextConfig struct {
|
type AgentTextConfig struct {
|
||||||
@@ -330,6 +331,7 @@ func DefaultConfig() *Config {
|
|||||||
AllowedTaskKeywords: []string{},
|
AllowedTaskKeywords: []string{},
|
||||||
NotifyChannel: "",
|
NotifyChannel: "",
|
||||||
NotifyChatID: "",
|
NotifyChatID: "",
|
||||||
|
NotifyAllowChats: []string{},
|
||||||
},
|
},
|
||||||
Texts: AgentTextConfig{
|
Texts: AgentTextConfig{
|
||||||
NoResponseFallback: "I've completed processing but have no response to give.",
|
NoResponseFallback: "I've completed processing but have no response to give.",
|
||||||
|
|||||||
Reference in New Issue
Block a user