Merge pull request #25 from kujtimiihoxha/cleanup-logs-status

Cleanup Logs and Status

2 files changed, 10 insertions, 22 deletions

diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go
index 78062d060..43ba0fc26 100644
--- a/internal/llm/agent/agent.go
+++ b/internal/llm/agent/agent.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log"
 	"strings"
 	"sync"
 
@@ -15,8 +14,6 @@ import (
 	"github.com/kujtimiihoxha/termai/internal/llm/provider"
 	"github.com/kujtimiihoxha/termai/internal/llm/tools"
 	"github.com/kujtimiihoxha/termai/internal/message"
-	"github.com/kujtimiihoxha/termai/internal/pubsub"
-	"github.com/kujtimiihoxha/termai/internal/tui/util"
 )
 
 type Agent interface {
@@ -94,24 +91,13 @@ func (c *agent) processEvent(
 		assistantMsg.AppendContent(event.Content)
 		return c.Messages.Update(*assistantMsg)
 	case provider.EventError:
-		// TODO: remove when realease
-		log.Println("error", event.Error)
-		c.App.Status.Publish(pubsub.UpdatedEvent, util.InfoMsg{
-			Type: util.InfoTypeError,
-			Msg:  event.Error.Error(),
-		})
+		c.App.Logger.PersistError(event.Error.Error())
 		return event.Error
 	case provider.EventWarning:
-		c.App.Status.Publish(pubsub.UpdatedEvent, util.InfoMsg{
-			Type: util.InfoTypeWarn,
-			Msg:  event.Info,
-		})
+		c.App.Logger.PersistWarn(event.Info)
 		return nil
 	case provider.EventInfo:
-		c.App.Status.Publish(pubsub.UpdatedEvent, util.InfoMsg{
-			Type: util.InfoTypeInfo,
-			Msg:  event.Info,
-		})
+		c.App.Logger.PersistInfo(event.Info)
 	case provider.EventComplete:
 		assistantMsg.SetToolCalls(event.Response.ToolCalls)
 		assistantMsg.AddFinish(event.Response.FinishReason)
diff --git a/internal/llm/agent/mcp-tools.go b/internal/llm/agent/mcp-tools.go
index 64b5f639b..dcf880fe7 100644
--- a/internal/llm/agent/mcp-tools.go
+++ b/internal/llm/agent/mcp-tools.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"log"
 
 	"github.com/kujtimiihoxha/termai/internal/config"
 	"github.com/kujtimiihoxha/termai/internal/llm/tools"
+	"github.com/kujtimiihoxha/termai/internal/logging"
 	"github.com/kujtimiihoxha/termai/internal/permission"
 	"github.com/kujtimiihoxha/termai/internal/version"
 
@@ -22,6 +22,8 @@ type mcpTool struct {
 	permissions permission.Service
 }
 
+var logger = logging.Get()
+
 type MCPClient interface {
 	Initialize(
 		ctx context.Context,
@@ -141,13 +143,13 @@ func getTools(ctx context.Context, name string, m config.MCPServer, permissions
 
 	_, err := c.Initialize(ctx, initRequest)
 	if err != nil {
-		log.Printf("error initializing mcp client: %s", err)
+		logger.Error("error initializing mcp client", "error", err)
 		return stdioTools
 	}
 	toolsRequest := mcp.ListToolsRequest{}
 	tools, err := c.ListTools(ctx, toolsRequest)
 	if err != nil {
-		log.Printf("error listing tools: %s", err)
+		logger.Error("error listing tools", "error", err)
 		return stdioTools
 	}
 	for _, t := range tools.Tools {
@@ -170,7 +172,7 @@ func GetMcpTools(ctx context.Context, permissions permission.Service) []tools.Ba
 				m.Args...,
 			)
 			if err != nil {
-				log.Printf("error creating mcp client: %s", err)
+				logger.Error("error creating mcp client", "error", err)
 				continue
 			}
 
@@ -181,7 +183,7 @@ func GetMcpTools(ctx context.Context, permissions permission.Service) []tools.Ba
 				client.WithHeaders(m.Headers),
 			)
 			if err != nil {
-				log.Printf("error creating mcp client: %s", err)
+				logger.Error("error creating mcp client", "error", err)
 				continue
 			}
 			mcpTools = append(mcpTools, getTools(ctx, name, m, permissions, c)...)