fix(tools): prevent nil pointer dereference in spawn tools

Add nil checks in NewSpawnTool and NewSubagentTool constructors to
handle nil manager gracefully. Fix spelling errors (cancelled->canceled)
and remove unused test code. Update tests to use mock spawner.
This commit is contained in:
Administrator
2026-03-19 13:51:11 +08:00
parent e801ccb674
commit 29a161e757
7 changed files with 87 additions and 75 deletions
+4 -1
View File
@@ -18,6 +18,9 @@ type SpawnTool struct {
var _ AsyncExecutor = (*SpawnTool)(nil)
func NewSpawnTool(manager *SubagentManager) *SpawnTool {
if manager == nil {
return &SpawnTool{}
}
return &SpawnTool{
defaultModel: manager.defaultModel,
maxTokens: manager.maxTokens,
@@ -131,5 +134,5 @@ Task: %s`, label, task)
}
// Fallback: spawner not configured
return ErrorResult("SpawnTool: spawner not configured - call SetSpawner() during initialization")
return ErrorResult("Subagent manager not configured")
}
+19
View File
@@ -6,6 +6,24 @@ import (
"testing"
)
// mockSpawner implements SubTurnSpawner for testing
type mockSpawner struct{}
func (m *mockSpawner) SpawnSubTurn(ctx context.Context, cfg SubTurnConfig) (*ToolResult, error) {
// Extract task from system prompt for response
task := cfg.SystemPrompt
if strings.Contains(task, "Task: ") {
parts := strings.Split(task, "Task: ")
if len(parts) > 1 {
task = parts[1]
}
}
return &ToolResult{
ForLLM: "Task completed: " + task,
ForUser: "Task completed",
}, nil
}
func TestSpawnTool_Execute_EmptyTask(t *testing.T) {
provider := &MockLLMProvider{}
manager := NewSubagentManager(provider, "test-model", "/tmp/test")
@@ -44,6 +62,7 @@ func TestSpawnTool_Execute_ValidTask(t *testing.T) {
provider := &MockLLMProvider{}
manager := NewSubagentManager(provider, "test-model", "/tmp/test")
tool := NewSpawnTool(manager)
tool.SetSpawner(&mockSpawner{})
ctx := context.Background()
args := map[string]any{
+4 -1
View File
@@ -308,6 +308,9 @@ type SubagentTool struct {
}
func NewSubagentTool(manager *SubagentManager) *SubagentTool {
if manager == nil {
return &SubagentTool{}
}
return &SubagentTool{
defaultModel: manager.defaultModel,
maxTokens: manager.maxTokens,
@@ -406,5 +409,5 @@ Task: %s`, label, task)
}
// Fallback: spawner not configured
return ErrorResult("SubagentTool: spawner not configured - call SetSpawner() during initialization").WithError(fmt.Errorf("spawner not set"))
return ErrorResult("Subagent manager not configured").WithError(fmt.Errorf("spawner not set"))
}
+13 -14
View File
@@ -48,24 +48,19 @@ func TestSubagentManager_SetLLMOptions_AppliesToRunToolLoop(t *testing.T) {
provider := &MockLLMProvider{}
manager := NewSubagentManager(provider, "test-model", "/tmp/test")
manager.SetLLMOptions(2048, 0.6)
tool := NewSubagentTool(manager)
ctx := WithToolContext(context.Background(), "cli", "direct")
args := map[string]any{"task": "Do something"}
result := tool.Execute(ctx, args)
if result == nil || result.IsError {
t.Fatalf("Expected successful result, got: %+v", result)
// Verify options are set on manager
if manager.maxTokens != 2048 {
t.Errorf("manager.maxTokens = %d, want 2048", manager.maxTokens)
}
if provider.lastOptions == nil {
t.Fatal("Expected LLM options to be passed, got nil")
if manager.temperature != 0.6 {
t.Errorf("manager.temperature = %f, want 0.6", manager.temperature)
}
if provider.lastOptions["max_tokens"] != 2048 {
t.Fatalf("max_tokens = %v, want %d", provider.lastOptions["max_tokens"], 2048)
if !manager.hasMaxTokens {
t.Error("manager.hasMaxTokens should be true")
}
if provider.lastOptions["temperature"] != 0.6 {
t.Fatalf("temperature = %v, want %v", provider.lastOptions["temperature"], 0.6)
if !manager.hasTemperature {
t.Error("manager.hasTemperature should be true")
}
}
@@ -150,6 +145,7 @@ func TestSubagentTool_Execute_Success(t *testing.T) {
provider := &MockLLMProvider{}
manager := NewSubagentManager(provider, "test-model", "/tmp/test")
tool := NewSubagentTool(manager)
tool.SetSpawner(&mockSpawner{})
ctx := WithToolContext(context.Background(), "telegram", "chat-123")
args := map[string]any{
@@ -204,6 +200,7 @@ func TestSubagentTool_Execute_NoLabel(t *testing.T) {
provider := &MockLLMProvider{}
manager := NewSubagentManager(provider, "test-model", "/tmp/test")
tool := NewSubagentTool(manager)
tool.SetSpawner(&mockSpawner{})
ctx := context.Background()
args := map[string]any{
@@ -277,6 +274,7 @@ func TestSubagentTool_Execute_ContextPassing(t *testing.T) {
provider := &MockLLMProvider{}
manager := NewSubagentManager(provider, "test-model", "/tmp/test")
tool := NewSubagentTool(manager)
tool.SetSpawner(&mockSpawner{})
channel := "test-channel"
chatID := "test-chat"
@@ -302,6 +300,7 @@ func TestSubagentTool_ForUserTruncation(t *testing.T) {
provider := &MockLLMProvider{}
manager := NewSubagentManager(provider, "test-model", "/tmp/test")
tool := NewSubagentTool(manager)
tool.SetSpawner(&mockSpawner{})
ctx := context.Background()