rework llm

Author: kujtimiihoxha

.gitignore

@@ -42,3 +42,5 @@ debug.log
 .env.local
 
 .termai
+
+.termai.json

README.md

@@ -1,13 +1,100 @@
 # TermAI
 
-**⚠️ WORK IN PROGRESS ⚠️**
+A powerful terminal-based AI assistant for developers, providing intelligent coding assistance directly in your terminal.
 
-This project is currently under active development.
+[![TermAI Demo](https://asciinema.org/a/dtc4nJyGSZX79HRUmFLY3gmoy.svg)](https://asciinema.org/a/dtc4nJyGSZX79HRUmFLY3gmoy)
 
-## Current Progress
+## Overview
 
-- Initial CLI setup
-- Basic functionality implementation
-- Working on core features
+TermAI is a Go-based CLI application that brings AI assistance to your terminal. It provides a TUI (Terminal User Interface) for interacting with various AI models to help with coding tasks, debugging, and more.
 
-More details coming soon.
+## Features
+
+- **Interactive TUI**: Built with [Bubble Tea](https://github.com/charmbracelet/bubbletea) for a smooth terminal experience
+- **Multiple AI Providers**: Support for OpenAI, Anthropic Claude, and Google Gemini models
+- **Session Management**: Save and manage multiple conversation sessions
+- **Tool Integration**: AI can execute commands, search files, and modify code
+- **Vim-like Editor**: Integrated editor with Vim keybindings for text input
+- **Persistent Storage**: SQLite database for storing conversations and sessions
+
+## Installation
+
+```bash
+# Coming soon
+go install github.com/kujtimiihoxha/termai@latest
+```
+
+## Configuration
+
+TermAI looks for configuration in the following locations:
+
+- `$HOME/.termai.json`
+- `$XDG_CONFIG_HOME/termai/.termai.json`
+- `./.termai.json` (local directory)
+
+You can also use environment variables:
+
+- `ANTHROPIC_API_KEY`: For Claude models
+- `OPENAI_API_KEY`: For OpenAI models
+- `GEMINI_API_KEY`: For Google Gemini models
+
+## Usage
+
+```bash
+# Start TermAI
+termai
+
+# Start with debug logging
+termai -d
+```
+
+### Keyboard Shortcuts
+
+- `L`: View logs
+- `N`: Create new session
+- `Esc`: Close current view
+- `Backspace`: Go back
+- `Ctrl+C` or `q`: Quit
+- `?`: Toggle help
+
+## Architecture
+
+TermAI is built with a modular architecture:
+
+- **cmd**: Command-line interface using Cobra
+- **internal/app**: Core application services
+- **internal/config**: Configuration management
+- **internal/db**: Database operations and migrations
+- **internal/llm**: LLM providers and tools integration
+- **internal/tui**: Terminal UI components and layouts
+- **internal/logging**: Logging infrastructure
+- **internal/message**: Message handling
+- **internal/session**: Session management
+
+## Development
+
+### Prerequisites
+
+- Go 1.23.5 or higher
+
+### Building from Source
+
+```bash
+# Clone the repository
+git clone https://github.com/kujtimiihoxha/termai.git
+cd termai
+
+# Build
+go build -o termai
+
+# Run
+./termai
+```
+
+## License
+
+[License information coming soon]
+
+## Contributing
+
+[Contribution guidelines coming soon]

cmd/root.go

@@ -7,12 +7,12 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/kujtimiihoxha/termai/internal/app"
+	"github.com/kujtimiihoxha/termai/internal/config"
 	"github.com/kujtimiihoxha/termai/internal/db"
-	"github.com/kujtimiihoxha/termai/internal/llm/models"
+	"github.com/kujtimiihoxha/termai/internal/llm/agent"
 	"github.com/kujtimiihoxha/termai/internal/tui"
 	zone "github.com/lrstanley/bubblezone"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 var rootCmd = &cobra.Command{
@@ -25,11 +25,10 @@ var rootCmd = &cobra.Command{
 			return nil
 		}
 		debug, _ := cmd.Flags().GetBool("debug")
-		viper.Set("debug", debug)
-		if debug {
-			viper.Set("log.level", "debug")
+		err := config.Load(debug)
+		if err != nil {
+			return err
 		}
-
 		conn, err := db.Connect()
 		if err != nil {
 			return err
@@ -49,6 +48,8 @@ var rootCmd = &cobra.Command{
 		defer unsub()
 
 		go func() {
+			// Set this up once
+			agent.GetMcpTools(ctx)
 			for msg := range ch {
 				tui.Send(msg)
 			}
@@ -95,16 +96,6 @@ func setupSubscriptions(app *app.App) (chan tea.Msg, func()) {
 			wg.Done()
 		}()
 	}
-	{
-		sub := app.LLM.Subscribe(ctx)
-		wg.Add(1)
-		go func() {
-			for ev := range sub {
-				ch <- ev
-			}
-			wg.Done()
-		}()
-	}
 	{
 		sub := app.Permissions.Subscribe(ctx)
 		wg.Add(1)
@@ -129,40 +120,7 @@ func Execute() {
 	}
 }
 
-func loadConfig() {
-	viper.SetConfigName(".termai")
-	viper.SetConfigType("yaml")
-	viper.AddConfigPath("$HOME")
-	viper.AddConfigPath("$XDG_CONFIG_HOME/termai")
-	viper.AddConfigPath(".")
-	viper.SetEnvPrefix("TERMAI")
-	// SET DEFAULTS
-	viper.SetDefault("log.level", "info")
-	viper.SetDefault("data.dir", ".termai")
-
-	// LLM
-	viper.SetDefault("models.big", string(models.DefaultBigModel))
-	viper.SetDefault("models.small", string(models.DefaultLittleModel))
-
-	viper.SetDefault("providers.openai.key", os.Getenv("OPENAI_API_KEY"))
-	viper.SetDefault("providers.anthropic.key", os.Getenv("ANTHROPIC_API_KEY"))
-	viper.SetDefault("providers.groq.key", os.Getenv("GROQ_API_KEY"))
-	viper.SetDefault("providers.common.max_tokens", 4000)
-
-	viper.SetDefault("agents.default", "coder")
-
-	viper.ReadInConfig()
-
-	workdir, err := os.Getwd()
-	if err != nil {
-		panic(err)
-	}
-	viper.Set("wd", workdir)
-}
-
 func init() {
-	loadConfig()
-
 	rootCmd.Flags().BoolP("help", "h", false, "Help")
 	rootCmd.Flags().BoolP("debug", "d", false, "Help")
 }

go.mod

@@ -3,99 +3,78 @@ module github.com/kujtimiihoxha/termai
 go 1.23.5
 
 require (
+	github.com/anthropics/anthropic-sdk-go v0.2.0-beta.2
 	github.com/bmatcuk/doublestar/v4 v4.8.1
 	github.com/catppuccin/go v0.3.0
 	github.com/charmbracelet/bubbles v0.20.0
 	github.com/charmbracelet/bubbletea v1.3.4
 	github.com/charmbracelet/glamour v0.9.1
 	github.com/charmbracelet/huh v0.6.0
 	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/cloudwego/eino v0.3.17
-	github.com/cloudwego/eino-ext/components/model/claude v0.0.0-20250320062631-616205c32186
-	github.com/cloudwego/eino-ext/components/model/openai v0.0.0-20250320062631-616205c32186
 	github.com/go-logfmt/logfmt v0.6.0
 	github.com/golang-migrate/migrate/v4 v4.18.2
+	github.com/google/generative-ai-go v0.19.0
 	github.com/google/uuid v1.6.0
-	github.com/kujtimiihoxha/vimtea v0.0.3-0.20250317175717-9d8ba9c69840
+	github.com/kujtimiihoxha/vimtea v0.0.3-0.20250329221256-a250e98498f9
 	github.com/lrstanley/bubblezone v0.0.0-20250315020633-c249a3fe1231
+	github.com/mark3labs/mcp-go v0.17.0
 	github.com/mattn/go-runewidth v0.0.16
 	github.com/mattn/go-sqlite3 v1.14.24
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6
 	github.com/muesli/reflow v0.3.0
 	github.com/muesli/termenv v0.16.0
+	github.com/openai/openai-go v0.1.0-beta.2
 	github.com/sergi/go-diff v1.3.1
 	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
+	google.golang.org/api v0.215.0
 )
 
 require (
+	cloud.google.com/go v0.116.0 // indirect
+	cloud.google.com/go/ai v0.8.0 // indirect
+	cloud.google.com/go/auth v0.13.0 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
+	cloud.google.com/go/compute/metadata v0.6.0 // indirect
+	cloud.google.com/go/longrunning v0.5.7 // indirect
 	github.com/alecthomas/chroma/v2 v2.15.0 // indirect
-	github.com/anthropics/anthropic-sdk-go v0.2.0-alpha.8 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.33.0 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.29.1 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.54 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.9 // indirect
-	github.com/aws/smithy-go v1.22.1 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
-	github.com/bytedance/sonic v1.12.2 // indirect
-	github.com/bytedance/sonic/loader v0.2.0 // indirect
 	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
 	github.com/charmbracelet/x/ansi v0.8.0 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
 	github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
-	github.com/cloudwego/eino-ext/libs/acl/openai v0.0.0-20250305023926-469de0301955 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/getkin/kin-openapi v0.118.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.19.5 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
-	github.com/goph/emperror v0.17.2 // indirect
+	github.com/google/s2a-go v0.1.8 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
 	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/nikolalohinski/gonja v1.5.3 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
-	github.com/perimeterx/marshmallow v1.1.4 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/sahilm/fuzzy v0.1.1 // indirect
-	github.com/sashabaranov/go-openai v1.32.5 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/slongfield/pyfmt v0.0.0-20220222012616-ea85ff4c361f // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.12.0 // indirect
 	github.com/spf13/cast v1.7.1 // indirect
@@ -105,19 +84,32 @@ require (
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
-	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	github.com/yargevad/filepathx v1.0.0 // indirect
+	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	github.com/yuin/goldmark v1.7.8 // indirect
 	github.com/yuin/goldmark-emoji v1.0.5 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
+	go.opentelemetry.io/otel v1.29.0 // indirect
+	go.opentelemetry.io/otel/metric v1.29.0 // indirect
+	go.opentelemetry.io/otel/trace v1.29.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/arch v0.11.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
+	golang.design/x/clipboard v0.7.0 // indirect
+	golang.org/x/crypto v0.33.0 // 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
 	golang.org/x/term v0.30.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	golang.org/x/time v0.8.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
+	google.golang.org/grpc v1.67.3 // indirect
+	google.golang.org/protobuf v1.36.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )