fix logs and add cancellation

Author: kujtimiihoxha

cmd/root.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"log/slog"
 	"os"
 	"sync"
 
@@ -10,6 +11,7 @@ import (
 	"github.com/kujtimiihoxha/termai/internal/config"
 	"github.com/kujtimiihoxha/termai/internal/db"
 	"github.com/kujtimiihoxha/termai/internal/llm/agent"
+	"github.com/kujtimiihoxha/termai/internal/logging"
 	"github.com/kujtimiihoxha/termai/internal/tui"
 	zone "github.com/lrstanley/bubblezone"
 	"github.com/spf13/cobra"
@@ -26,6 +28,16 @@ var rootCmd = &cobra.Command{
 		}
 		debug, _ := cmd.Flags().GetBool("debug")
 		err := config.Load(debug)
+		cfg := config.Get()
+		defaultLevel := slog.LevelInfo
+		if cfg.Debug {
+			defaultLevel = slog.LevelDebug
+		}
+		logger := slog.New(slog.NewTextHandler(logging.NewWriter(), &slog.HandlerOptions{
+			Level: defaultLevel,
+		}))
+		slog.SetDefault(logger)
+
 		if err != nil {
 			return err
 		}
@@ -37,14 +49,14 @@ var rootCmd = &cobra.Command{
 
 		app := app.New(ctx, conn)
 		defer app.Close()
-		app.Logger.Info("Starting termai...")
+		logging.Info("Starting termai...")
 		zone.NewGlobal()
 		tui := tea.NewProgram(
 			tui.New(app),
 			tea.WithAltScreen(),
 			tea.WithMouseCellMotion(),
 		)
-		app.Logger.Info("Setting up subscriptions...")
+		logging.Info("Setting up subscriptions...")
 		ch, unsub := setupSubscriptions(app)
 		defer unsub()
 
@@ -66,9 +78,8 @@ func setupSubscriptions(app *app.App) (chan tea.Msg, func()) {
 	ch := make(chan tea.Msg)
 	wg := sync.WaitGroup{}
 	ctx, cancel := context.WithCancel(app.Context)
-
 	{
-		sub := app.Logger.Subscribe(ctx)
+		sub := logging.Subscribe(ctx)
 		wg.Add(1)
 		go func() {
 			for ev := range sub {

go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/viper v1.20.0
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
+	golang.org/x/net v0.34.0
 	google.golang.org/api v0.215.0
 )
 
@@ -116,10 +116,10 @@ require (
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.design/x/clipboard v0.7.0 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
 	golang.org/x/exp/shiny v0.0.0-20250305212735-054e65f0b394 // indirect
 	golang.org/x/image v0.14.0 // indirect
 	golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect
-	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.25.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect

internal/app/services.go

@@ -3,6 +3,7 @@ package app
 import (
 	"context"
 	"database/sql"
+	"log/slog"
 
 	"github.com/kujtimiihoxha/termai/internal/config"
 	"github.com/kujtimiihoxha/termai/internal/db"
@@ -23,16 +24,14 @@ type App struct {
 
 	LSPClients map[string]*lsp.Client
 
-	Logger logging.Interface
-
 	ceanups []func()
 }
 
 func New(ctx context.Context, conn *sql.DB) *App {
 	cfg := config.Get()
+	logging.Info("Debug mode enabled")
+
 	q := db.New(conn)
-	log := logging.Get()
-	log.SetLevel(cfg.Log.Level)
 	sessions := session.NewService(ctx, q)
 	messages := message.NewService(ctx, q)
 
@@ -41,7 +40,6 @@ func New(ctx context.Context, conn *sql.DB) *App {
 		Sessions:    sessions,
 		Messages:    messages,
 		Permissions: permission.NewPermissionService(),
-		Logger:      log,
 		LSPClients:  make(map[string]*lsp.Client),
 	}
 
@@ -52,13 +50,13 @@ func New(ctx context.Context, conn *sql.DB) *App {
 		})
 		workspaceWatcher := watcher.NewWorkspaceWatcher(lspClient)
 		if err != nil {
-			log.Error("Failed to create LSP client for", name, err)
+			logging.Error("Failed to create LSP client for", name, err)
 			continue
 		}
 
 		_, err = lspClient.InitializeLSPClient(ctx, config.WorkingDirectory())
 		if err != nil {
-			log.Error("Initialize failed", "error", err)
+			logging.Error("Initialize failed", "error", err)
 			continue
 		}
 		go workspaceWatcher.WatchWorkspace(ctx, config.WorkingDirectory())
@@ -74,5 +72,5 @@ func (a *App) Close() {
 	for _, client := range a.LSPClients {
 		client.Close()
 	}
-	a.Logger.Info("App closed")
+	slog.Info("App closed")
 }

internal/db/connect.go

@@ -16,8 +16,6 @@ import (
 	"github.com/kujtimiihoxha/termai/internal/logging"
 )
 
-var log = logging.Get()
-
 func Connect() (*sql.DB, error) {
 	dataDir := config.Get().Data.Directory
 	if dataDir == "" {
@@ -50,43 +48,43 @@ func Connect() (*sql.DB, error) {
 
 	for _, pragma := range pragmas {
 		if _, err = db.Exec(pragma); err != nil {
-			log.Warn("Failed to set pragma", pragma, err)
+			logging.Warn("Failed to set pragma", pragma, err)
 		} else {
-			log.Warn("Set pragma", "pragma", pragma)
+			logging.Warn("Set pragma", "pragma", pragma)
 		}
 	}
 
 	// Initialize schema from embedded file
 	d, err := iofs.New(FS, "migrations")
 	if err != nil {
-		log.Error("Failed to open embedded migrations", "error", err)
+		logging.Error("Failed to open embedded migrations", "error", err)
 		db.Close()
 		return nil, fmt.Errorf("failed to open embedded migrations: %w", err)
 	}
 
 	driver, err := sqlite3.WithInstance(db, &sqlite3.Config{})
 	if err != nil {
-		log.Error("Failed to create SQLite driver", "error", err)
+		logging.Error("Failed to create SQLite driver", "error", err)
 		db.Close()
 		return nil, fmt.Errorf("failed to create SQLite driver: %w", err)
 	}
 
 	m, err := migrate.NewWithInstance("iofs", d, "ql", driver)
 	if err != nil {
-		log.Error("Failed to create migration instance", "error", err)
+		logging.Error("Failed to create migration instance", "error", err)
 		db.Close()
 		return nil, fmt.Errorf("failed to create migration instance: %w", err)
 	}
 
 	err = m.Up()
 	if err != nil && err != migrate.ErrNoChange {
-		log.Error("Migration failed", "error", err)
+		logging.Error("Migration failed", "error", err)
 		db.Close()
 		return nil, fmt.Errorf("failed to apply schema: %w", err)
 	} else if err == migrate.ErrNoChange {
-		log.Info("No schema changes to apply")
+		logging.Info("No schema changes to apply")
 	} else {
-		log.Info("Schema migration applied successfully")
+		logging.Info("Schema migration applied successfully")
 	}
 
 	return db, nil

internal/llm/agent/agent-tool.go

@@ -56,7 +56,7 @@ func (b *agentTool) Run(ctx context.Context, call tools.ToolCall) (tools.ToolRes
 		return tools.NewTextErrorResponse(fmt.Sprintf("error creating session: %s", err)), nil
 	}
 
-	err = agent.Generate(session.ID, params.Prompt)
+	err = agent.Generate(ctx, session.ID, params.Prompt)
 	if err != nil {
 		return tools.NewTextErrorResponse(fmt.Sprintf("error generating agent: %s", err)), nil
 	}