mirror of
https://github.com/YspCoder/clawgo.git
synced 2026-05-03 05:57:30 +08:00
externalize more agent/tool strings and compaction note templates
This commit is contained in:
@@ -19,12 +19,14 @@ type SessionInfo struct {
|
||||
}
|
||||
|
||||
type SessionsTool struct {
|
||||
listFn func(limit int) []SessionInfo
|
||||
historyFn func(key string, limit int) []providers.Message
|
||||
listFn func(limit int) []SessionInfo
|
||||
historyFn func(key string, limit int) []providers.Message
|
||||
noSessionsText string
|
||||
unsupportedAction string
|
||||
}
|
||||
|
||||
func NewSessionsTool(listFn func(limit int) []SessionInfo, historyFn func(key string, limit int) []providers.Message) *SessionsTool {
|
||||
return &SessionsTool{listFn: listFn, historyFn: historyFn}
|
||||
func NewSessionsTool(listFn func(limit int) []SessionInfo, historyFn func(key string, limit int) []providers.Message, noSessionsText, unsupportedAction string) *SessionsTool {
|
||||
return &SessionsTool{listFn: listFn, historyFn: historyFn, noSessionsText: noSessionsText, unsupportedAction: unsupportedAction}
|
||||
}
|
||||
|
||||
func (t *SessionsTool) Name() string { return "sessions" }
|
||||
@@ -111,7 +113,7 @@ func (t *SessionsTool) Execute(ctx context.Context, args map[string]interface{})
|
||||
}
|
||||
items := t.listFn(limit * 3)
|
||||
if len(items) == 0 {
|
||||
return "No sessions.", nil
|
||||
return firstNonEmpty(t.noSessionsText, "No sessions."), nil
|
||||
}
|
||||
if len(kindFilter) > 0 {
|
||||
filtered := make([]SessionInfo, 0, len(items))
|
||||
@@ -283,6 +285,13 @@ func (t *SessionsTool) Execute(ctx context.Context, args map[string]interface{})
|
||||
}
|
||||
return strings.TrimSpace(sb.String()), nil
|
||||
default:
|
||||
return "unsupported action", nil
|
||||
return firstNonEmpty(t.unsupportedAction, "unsupported action"), nil
|
||||
}
|
||||
}
|
||||
|
||||
func firstNonEmpty(v, fallback string) string {
|
||||
if strings.TrimSpace(v) != "" {
|
||||
return v
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ func TestSessionsToolListWithKindsAndQuery(t *testing.T) {
|
||||
{Key: "telegram:1", Kind: "main", Summary: "project alpha", UpdatedAt: time.Now()},
|
||||
{Key: "cron:1", Kind: "cron", Summary: "nightly sync", UpdatedAt: time.Now()},
|
||||
}
|
||||
}, nil)
|
||||
}, nil, "", "")
|
||||
|
||||
out, err := tool.Execute(context.Background(), map[string]interface{}{
|
||||
"action": "list",
|
||||
@@ -37,7 +37,7 @@ func TestSessionsToolHistoryWithoutTools(t *testing.T) {
|
||||
{Role: "tool", Content: "tool output"},
|
||||
{Role: "assistant", Content: "ok"},
|
||||
}
|
||||
})
|
||||
}, "", "")
|
||||
|
||||
out, err := tool.Execute(context.Background(), map[string]interface{}{
|
||||
"action": "history",
|
||||
@@ -58,7 +58,7 @@ func TestSessionsToolHistoryFromMe(t *testing.T) {
|
||||
{Role: "assistant", Content: "a1"},
|
||||
{Role: "assistant", Content: "a2"},
|
||||
}
|
||||
})
|
||||
}, "", "")
|
||||
|
||||
out, err := tool.Execute(context.Background(), map[string]interface{}{
|
||||
"action": "history",
|
||||
|
||||
@@ -10,11 +10,13 @@ import (
|
||||
)
|
||||
|
||||
type SubagentsTool struct {
|
||||
manager *SubagentManager
|
||||
manager *SubagentManager
|
||||
noSubagentsText string
|
||||
unsupportedAction string
|
||||
}
|
||||
|
||||
func NewSubagentsTool(m *SubagentManager) *SubagentsTool {
|
||||
return &SubagentsTool{manager: m}
|
||||
func NewSubagentsTool(m *SubagentManager, noSubagentsText, unsupportedAction string) *SubagentsTool {
|
||||
return &SubagentsTool{manager: m, noSubagentsText: noSubagentsText, unsupportedAction: unsupportedAction}
|
||||
}
|
||||
|
||||
func (t *SubagentsTool) Name() string { return "subagents" }
|
||||
@@ -56,7 +58,7 @@ func (t *SubagentsTool) Execute(ctx context.Context, args map[string]interface{}
|
||||
case "list":
|
||||
tasks := t.filterRecent(t.manager.ListTasks(), recentMinutes)
|
||||
if len(tasks) == 0 {
|
||||
return "No subagents.", nil
|
||||
return firstNonEmpty(t.noSubagentsText, "No subagents."), nil
|
||||
}
|
||||
var sb strings.Builder
|
||||
sb.WriteString("Subagents:\n")
|
||||
@@ -69,7 +71,7 @@ func (t *SubagentsTool) Execute(ctx context.Context, args map[string]interface{}
|
||||
if strings.EqualFold(strings.TrimSpace(id), "all") {
|
||||
tasks := t.filterRecent(t.manager.ListTasks(), recentMinutes)
|
||||
if len(tasks) == 0 {
|
||||
return "No subagents.", nil
|
||||
return firstNonEmpty(t.noSubagentsText, "No subagents."), nil
|
||||
}
|
||||
sort.Slice(tasks, func(i, j int) bool { return tasks[i].Created > tasks[j].Created })
|
||||
var sb strings.Builder
|
||||
@@ -92,7 +94,7 @@ func (t *SubagentsTool) Execute(ctx context.Context, args map[string]interface{}
|
||||
if strings.EqualFold(strings.TrimSpace(id), "all") {
|
||||
tasks := t.filterRecent(t.manager.ListTasks(), recentMinutes)
|
||||
if len(tasks) == 0 {
|
||||
return "No subagents.", nil
|
||||
return firstNonEmpty(t.noSubagentsText, "No subagents."), nil
|
||||
}
|
||||
killed := 0
|
||||
for _, task := range tasks {
|
||||
@@ -159,7 +161,7 @@ func (t *SubagentsTool) Execute(ctx context.Context, args map[string]interface{}
|
||||
}
|
||||
return fmt.Sprintf("subagent resumed as %s", label), nil
|
||||
default:
|
||||
return "unsupported action", nil
|
||||
return firstNonEmpty(t.unsupportedAction, "unsupported action"), nil
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ func TestSubagentsInfoAll(t *testing.T) {
|
||||
m.tasks["subagent-1"] = &SubagentTask{ID: "subagent-1", Status: "completed", Label: "a", Created: 2}
|
||||
m.tasks["subagent-2"] = &SubagentTask{ID: "subagent-2", Status: "running", Label: "b", Created: 3}
|
||||
|
||||
tool := NewSubagentsTool(m)
|
||||
tool := NewSubagentsTool(m, "", "")
|
||||
out, err := tool.Execute(context.Background(), map[string]interface{}{"action": "info", "id": "all"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -26,7 +26,7 @@ func TestSubagentsKillAll(t *testing.T) {
|
||||
m.tasks["subagent-1"] = &SubagentTask{ID: "subagent-1", Status: "running", Label: "a", Created: 2}
|
||||
m.tasks["subagent-2"] = &SubagentTask{ID: "subagent-2", Status: "running", Label: "b", Created: 3}
|
||||
|
||||
tool := NewSubagentsTool(m)
|
||||
tool := NewSubagentsTool(m, "", "")
|
||||
out, err := tool.Execute(context.Background(), map[string]interface{}{"action": "kill", "id": "all"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
||||
Reference in New Issue
Block a user