Skip to content

Commit ec8ccc2

Browse files
djthorpeCopilot
djthorpe
and
Copilot
authored
Refactor and upgrade codebase (#80)
* Refactor and update Co-authored-by: Copilot <copilot@github.com> * Upgrades * Updated * Updated mcp/server --------- Co-authored-by: Copilot <copilot@github.com>
1 parent c9335c0 commit ec8ccc2

50 files changed

Lines changed: 392 additions & 171 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/llm/main.go‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66

77
// Packages
8-
llmcmd "github.com/mutablelogic/go-llm/kernel/cmd"
8+
llm "github.com/mutablelogic/go-llm/kernel/cmd2"
99
mcpcmd "github.com/mutablelogic/go-llm/mcp/cmd"
1010
servercmd "github.com/mutablelogic/go-server/pkg/cmd"
1111
version "github.com/mutablelogic/go-server/pkg/version"
@@ -15,22 +15,23 @@ import (
1515
// TYPES
1616

1717
type CLI struct {
18-
llmcmd.SessionCommands
19-
llmcmd.ChatCommands
20-
llmcmd.ChannelCommands
21-
llmcmd.AskCommands
22-
llmcmd.EmbeddingCommands
23-
llmcmd.ConnectorCommands
24-
llmcmd.ProviderCommands
25-
llmcmd.ModelCommands
26-
llmcmd.ToolCommands
27-
llmcmd.AgentCommands
18+
/* llm.SessionCommands
19+
llm.ChatCommands
20+
llm.ChannelCommands
21+
llm.AskCommands
22+
llm.EmbeddingCommands
23+
llm.ConnectorCommands
24+
llm.ProviderCommands
25+
llm.ModelCommands
26+
llm.ToolCommands
27+
llm.AgentCommands
28+
*/
2829
MCP mcpcmd.Commands `cmd:"" name:"mcp" help:"Interact directly with an MCP server." group:"MCP"`
2930
ServerCommands
3031
}
3132

3233
type ServerCommands struct {
33-
RunServer llmcmd.RunServer `cmd:"" name:"run" help:"Run the server." group:"SERVER"`
34+
RunServer llm.RunServer `cmd:"" name:"run" help:"Run the server." group:"SERVER"`
3435
servercmd.OpenAPICommands
3536
}
3637

‎go.mod‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ require (
66
github.com/charmbracelet/bubbletea v1.3.10
77
github.com/charmbracelet/glamour v1.0.0
88
github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834
9-
github.com/djthorpe/go-auth v0.0.1
10-
github.com/google/jsonschema-go v0.4.2
9+
github.com/google/jsonschema-go v0.4.3
1110
github.com/google/uuid v1.6.0
12-
github.com/modelcontextprotocol/go-sdk v1.5.0
11+
github.com/modelcontextprotocol/go-sdk v1.6.0
1312
github.com/muesli/termenv v0.16.0
13+
github.com/mutablelogic/go-auth v0.0.14
1414
github.com/mutablelogic/go-client v1.4.9
15-
github.com/mutablelogic/go-pg v1.1.12
16-
github.com/mutablelogic/go-server v1.6.24
15+
github.com/mutablelogic/go-pg v1.1.15
16+
github.com/mutablelogic/go-server v1.6.36
1717
github.com/stretchr/testify v1.11.1
1818
go.opentelemetry.io/otel v1.43.0
1919
go.opentelemetry.io/otel/trace v1.43.0
@@ -27,18 +27,18 @@ require (
2727
dario.cat/mergo v1.0.2 // indirect
2828
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2929
github.com/Microsoft/go-winio v0.6.2 // indirect
30-
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
30+
github.com/alecthomas/chroma/v2 v2.24.1 // indirect
3131
github.com/alecthomas/kong v1.15.0
3232
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3333
github.com/aymerick/douceur v0.2.0 // indirect
3434
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3535
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3636
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3737
github.com/charmbracelet/colorprofile v0.4.3 // indirect
38-
github.com/charmbracelet/x/ansi v0.11.6 // indirect
38+
github.com/charmbracelet/x/ansi v0.11.7 // indirect
3939
github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
40-
github.com/charmbracelet/x/exp/golden v0.0.0-20260412004207-d48a6f9a4964 // indirect
41-
github.com/charmbracelet/x/exp/slice v0.0.0-20260412004207-d48a6f9a4964 // indirect
40+
github.com/charmbracelet/x/exp/golden v0.0.0-20260430013151-79116d1f37bd // indirect
41+
github.com/charmbracelet/x/exp/slice v0.0.0-20260430013151-79116d1f37bd // indirect
4242
github.com/charmbracelet/x/term v0.2.2 // indirect
4343
github.com/clipperhouse/displaywidth v0.11.0 // indirect
4444
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
@@ -51,8 +51,8 @@ require (
5151
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5252
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect
5353
github.com/distribution/reference v0.6.0 // indirect
54-
github.com/dlclark/regexp2 v1.11.5 // indirect
55-
github.com/docker/go-connections v0.6.0 // indirect
54+
github.com/dlclark/regexp2 v1.12.0 // indirect
55+
github.com/docker/go-connections v0.7.0 // indirect
5656
github.com/docker/go-units v0.5.0 // indirect
5757
github.com/ebitengine/purego v0.10.0 // indirect
5858
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
@@ -64,12 +64,12 @@ require (
6464
github.com/goccy/go-json v0.10.6 // indirect
6565
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
6666
github.com/gorilla/css v1.0.1 // indirect
67-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
67+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
6868
github.com/jackc/pgpassfile v1.0.0 // indirect
6969
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
70-
github.com/jackc/pgx/v5 v5.9.1 // indirect
70+
github.com/jackc/pgx/v5 v5.9.2 // indirect
7171
github.com/jackc/puddle/v2 v2.2.2 // indirect
72-
github.com/klauspost/compress v1.18.5 // indirect
72+
github.com/klauspost/compress v1.18.6 // indirect
7373
github.com/lestrrat-go/blackmagic v1.0.4 // indirect
7474
github.com/lestrrat-go/httpcc v1.0.1 // indirect
7575
github.com/lestrrat-go/httprc v1.0.6 // indirect
@@ -79,14 +79,14 @@ require (
7979
github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
8080
github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e // indirect
8181
github.com/magiconair/properties v1.8.10 // indirect
82-
github.com/mattn/go-isatty v0.0.21 // indirect
82+
github.com/mattn/go-isatty v0.0.22 // indirect
8383
github.com/mattn/go-localereader v0.0.1 // indirect
8484
github.com/mattn/go-runewidth v0.0.23 // indirect
8585
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
8686
github.com/moby/docker-image-spec v1.3.1 // indirect
8787
github.com/moby/go-archive v0.2.0 // indirect
88-
github.com/moby/moby/api v1.54.1 // indirect
89-
github.com/moby/moby/client v0.4.0 // indirect
88+
github.com/moby/moby/api v1.54.2 // indirect
89+
github.com/moby/moby/client v0.4.1 // indirect
9090
github.com/moby/patternmatcher v0.6.1 // indirect
9191
github.com/moby/sys/sequential v0.6.0 // indirect
9292
github.com/moby/sys/user v0.4.0 // indirect
@@ -95,6 +95,7 @@ require (
9595
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
9696
github.com/muesli/cancelreader v0.2.2 // indirect
9797
github.com/muesli/reflow v0.3.0 // indirect
98+
github.com/mutablelogic/go-tokenizer v0.0.3 // indirect
9899
github.com/opencontainers/go-digest v1.0.0 // indirect
99100
github.com/opencontainers/image-spec v1.1.1 // indirect
100101
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
@@ -103,13 +104,14 @@ require (
103104
github.com/rivo/uniseg v0.4.7 // indirect
104105
github.com/segmentio/asm v1.2.1 // indirect
105106
github.com/segmentio/encoding v0.5.4 // indirect
106-
github.com/shirou/gopsutil/v4 v4.26.3 // indirect
107+
github.com/shirou/gopsutil/v4 v4.26.4 // indirect
107108
github.com/sirupsen/logrus v1.9.4 // indirect
108109
github.com/testcontainers/testcontainers-go v0.42.0 // indirect
109110
github.com/tklauser/go-sysconf v0.3.16 // indirect
110111
github.com/tklauser/numcpus v0.11.0 // indirect
111112
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
112113
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
114+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
113115
github.com/yuin/goldmark v1.8.2 // indirect
114116
github.com/yuin/goldmark-emoji v1.0.6 // indirect
115117
github.com/yusufpapurcu/wmi v1.2.4 // indirect
@@ -133,8 +135,8 @@ require (
133135
golang.org/x/net v0.53.0 // indirect
134136
golang.org/x/sys v0.43.0 // indirect
135137
golang.org/x/text v0.36.0
136-
google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
138+
google.golang.org/genproto/googleapis/api v0.0.0-20260427160629-7cedc36a6bc4 // indirect
139+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 // indirect
138140
google.golang.org/grpc v1.80.0 // indirect
139141
google.golang.org/protobuf v1.36.11 // indirect
140142
)

0 commit comments

Comments
 (0)