diff options
Diffstat (limited to 'internal/llm/agent')
| -rw-r--r-- | internal/llm/agent/agent.go | 8 | ||||
| -rw-r--r-- | internal/llm/agent/mcp-tools.go | 10 | ||||
| -rw-r--r-- | internal/llm/agent/tools.go | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go index 695826cdf..295ac4654 100644 --- a/internal/llm/agent/agent.go +++ b/internal/llm/agent/agent.go @@ -8,6 +8,8 @@ import ( "sync" "time" + "log/slog" + "github.com/opencode-ai/opencode/internal/config" "github.com/opencode-ai/opencode/internal/llm/models" "github.com/opencode-ai/opencode/internal/llm/prompt" @@ -177,7 +179,7 @@ func (a *agent) Run(ctx context.Context, sessionID string, content string, attac a.activeRequests.Store(sessionID, cancel) go func() { - logging.Debug("Request started", "sessionID", sessionID) + slog.Debug("Request started", "sessionID", sessionID) defer logging.RecoverPanic("agent.Run", func() { events <- a.err(fmt.Errorf("panic while running the agent")) }) @@ -189,7 +191,7 @@ func (a *agent) Run(ctx context.Context, sessionID string, content string, attac if result.Err() != nil && !errors.Is(result.Err(), ErrRequestCancelled) && !errors.Is(result.Err(), context.Canceled) { status.Error(result.Err().Error()) } - logging.Debug("Request completed", "sessionID", sessionID) + slog.Debug("Request completed", "sessionID", sessionID) a.activeRequests.Delete(sessionID) cancel() events <- result @@ -276,7 +278,7 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string } return a.err(fmt.Errorf("failed to process events: %w", err)) } - logging.Info("Result", "message", agentMessage.FinishReason(), "toolResults", toolResults) + slog.Info("Result", "message", agentMessage.FinishReason(), "toolResults", toolResults) if (agentMessage.FinishReason() == message.FinishReasonToolUse) && toolResults != nil { // We are not done, we need to respond with the tool response messages = append(messages, agentMessage, *toolResults) diff --git a/internal/llm/agent/mcp-tools.go b/internal/llm/agent/mcp-tools.go index 237560641..9966b99d9 100644 --- a/internal/llm/agent/mcp-tools.go +++ b/internal/llm/agent/mcp-tools.go @@ -7,9 +7,9 @@ import ( "github.com/opencode-ai/opencode/internal/config" "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/logging" "github.com/opencode-ai/opencode/internal/permission" "github.com/opencode-ai/opencode/internal/version" + "log/slog" "github.com/mark3labs/mcp-go/client" "github.com/mark3labs/mcp-go/mcp" @@ -146,13 +146,13 @@ func getTools(ctx context.Context, name string, m config.MCPServer, permissions _, err := c.Initialize(ctx, initRequest) if err != nil { - logging.Error("error initializing mcp client", "error", err) + slog.Error("error initializing mcp client", "error", err) return stdioTools } toolsRequest := mcp.ListToolsRequest{} tools, err := c.ListTools(ctx, toolsRequest) if err != nil { - logging.Error("error listing tools", "error", err) + slog.Error("error listing tools", "error", err) return stdioTools } for _, t := range tools.Tools { @@ -175,7 +175,7 @@ func GetMcpTools(ctx context.Context, permissions permission.Service) []tools.Ba m.Args..., ) if err != nil { - logging.Error("error creating mcp client", "error", err) + slog.Error("error creating mcp client", "error", err) continue } @@ -186,7 +186,7 @@ func GetMcpTools(ctx context.Context, permissions permission.Service) []tools.Ba client.WithHeaders(m.Headers), ) if err != nil { - logging.Error("error creating mcp client", "error", err) + slog.Error("error creating mcp client", "error", err) continue } mcpTools = append(mcpTools, getTools(ctx, name, m, permissions, c)...) diff --git a/internal/llm/agent/tools.go b/internal/llm/agent/tools.go index 43e5978e4..b337efb59 100644 --- a/internal/llm/agent/tools.go +++ b/internal/llm/agent/tools.go @@ -33,7 +33,7 @@ func CoderAgentTools( tools.NewGlobTool(), tools.NewGrepTool(), tools.NewLsTool(), - tools.NewSourcegraphTool(), + // tools.NewSourcegraphTool(), tools.NewViewTool(lspClients), tools.NewPatchTool(lspClients, permissions, history), tools.NewWriteTool(lspClients, permissions, history), |