improved tool debugging
This commit is contained in:
+137
-137
@@ -1,162 +1,162 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"sidekick"
|
||||
"sidekick"
|
||||
|
||||
"github.com/mark3labs/mcp-go/mcp"
|
||||
"github.com/mark3labs/mcp-go/server"
|
||||
"github.com/mark3labs/mcp-go/mcp"
|
||||
"github.com/mark3labs/mcp-go/server"
|
||||
)
|
||||
|
||||
func main() {
|
||||
cfg, err := sidekick.LoadConfig("config.toml")
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to load config: %v", err)
|
||||
}
|
||||
cfg, err := sidekick.LoadConfig("config.toml")
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to load config: %v", err)
|
||||
}
|
||||
|
||||
// Disable standard logging to stdout if stdio transport is used,
|
||||
// so it doesn't corrupt the JSON-RPC stream.
|
||||
if cfg.MCPListener.Transport == "stdio" || cfg.MCPListener.Transport == "" {
|
||||
log.SetOutput(os.Stderr)
|
||||
}
|
||||
// Disable standard logging to stdout if stdio transport is used,
|
||||
// so it doesn't corrupt the JSON-RPC stream.
|
||||
if cfg.MCPListener.Transport == "stdio" || cfg.MCPListener.Transport == "" {
|
||||
log.SetOutput(os.Stderr)
|
||||
}
|
||||
|
||||
tmpl, _ := sidekick.LoadPrompts("prompts.toml")
|
||||
tmpl, _ := sidekick.LoadPrompts("prompts.toml")
|
||||
|
||||
sidekick.InitMCPServers(cfg.MCPServers)
|
||||
pool := make(map[string]*sidekick.Sidekick)
|
||||
sidekick.InitMCPServers(cfg.MCPServers)
|
||||
pool := make(map[string]*sidekick.Sidekick)
|
||||
|
||||
for id, aCfg := range cfg.Agents {
|
||||
if tmpl != nil && tmpl.Lookup(id) != nil {
|
||||
rendered, rErr := sidekick.RenderPrompt(tmpl, id)
|
||||
if rErr == nil {
|
||||
aCfg.SystemPrompt = rendered
|
||||
}
|
||||
}
|
||||
mCfg := cfg.Models[aCfg.ModelID]
|
||||
pool[id] = sidekick.NewSidekick(aCfg, mCfg, nil)
|
||||
}
|
||||
for id, aCfg := range cfg.Agents {
|
||||
if tmpl != nil && tmpl.Lookup(id) != nil {
|
||||
rendered, rErr := sidekick.RenderPrompt(tmpl, id)
|
||||
if rErr == nil {
|
||||
aCfg.SystemPrompt = rendered
|
||||
}
|
||||
}
|
||||
mCfg := cfg.Models[aCfg.ModelID]
|
||||
pool[id] = sidekick.NewSidekick(aCfg, mCfg, nil)
|
||||
}
|
||||
|
||||
entryAgent := "coordinator"
|
||||
if _, ok := pool[entryAgent]; !ok {
|
||||
for id := range pool {
|
||||
entryAgent = id
|
||||
break
|
||||
}
|
||||
}
|
||||
agent := pool[entryAgent]
|
||||
entryAgent := "coordinator"
|
||||
if _, ok := pool[entryAgent]; !ok {
|
||||
for id := range pool {
|
||||
entryAgent = id
|
||||
break
|
||||
}
|
||||
}
|
||||
agent := pool[entryAgent]
|
||||
|
||||
mcpServer := server.NewMCPServer("Sidekick MCP", "1.0.0")
|
||||
mcpServer := server.NewMCPServer("Sidekick MCP", "1.0.0")
|
||||
|
||||
mcpServer.AddTool(
|
||||
mcp.NewToolWithRawSchema(
|
||||
"query",
|
||||
"Ask Sidekick a question or provide a message, optionally with conversation history",
|
||||
json.RawMessage(`{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"message": { "type": "string", "description": "The user's message" },
|
||||
"history": {
|
||||
"type": "array",
|
||||
"description": "Optional list of previous messages",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"role": { "type": "string" },
|
||||
"content": { "type": "string" }
|
||||
},
|
||||
"required": ["role", "content"]
|
||||
}
|
||||
}
|
||||
},
|
||||
"required": ["message"]
|
||||
}`),
|
||||
),
|
||||
func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
msg, err := request.RequireString("message")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("message argument is required and must be a string: %v", err)
|
||||
}
|
||||
mcpServer.AddTool(
|
||||
mcp.NewToolWithRawSchema(
|
||||
"query",
|
||||
"Ask Sidekick a question or provide a message, optionally with conversation history",
|
||||
json.RawMessage(`{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"message": { "type": "string", "description": "The user's message" },
|
||||
"history": {
|
||||
"type": "array",
|
||||
"description": "Optional list of previous messages",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"role": { "type": "string" },
|
||||
"content": { "type": "string" }
|
||||
},
|
||||
"required": ["role", "content"]
|
||||
}
|
||||
}
|
||||
},
|
||||
"required": ["message"]
|
||||
}`),
|
||||
),
|
||||
func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
msg, err := request.RequireString("message")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("message argument is required and must be a string: %v", err)
|
||||
}
|
||||
|
||||
var inCtx []sidekick.Message
|
||||
var inCtx []sidekick.Message
|
||||
|
||||
args := request.GetArguments()
|
||||
if histInter, ok := args["history"]; ok {
|
||||
if histList, ok := histInter.([]interface{}); ok {
|
||||
for _, h := range histList {
|
||||
if hMap, ok := h.(map[string]interface{}); ok {
|
||||
roleInter, okRole := hMap["role"]
|
||||
contentInter, okContent := hMap["content"]
|
||||
if okRole && okContent {
|
||||
if roleStr, isStr := roleInter.(string); isStr {
|
||||
if contentStr, isStrContent := contentInter.(string); isStrContent {
|
||||
inCtx = append(inCtx, sidekick.Message{
|
||||
Role: sidekick.MessageRole(roleStr),
|
||||
Content: contentStr,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
args := request.GetArguments()
|
||||
if histInter, ok := args["history"]; ok {
|
||||
if histList, ok := histInter.([]interface{}); ok {
|
||||
for _, h := range histList {
|
||||
if hMap, ok := h.(map[string]interface{}); ok {
|
||||
roleInter, okRole := hMap["role"]
|
||||
contentInter, okContent := hMap["content"]
|
||||
if okRole && okContent {
|
||||
if roleStr, isStr := roleInter.(string); isStr {
|
||||
if contentStr, isStrContent := contentInter.(string); isStrContent {
|
||||
inCtx = append(inCtx, sidekick.Message{
|
||||
Role: sidekick.MessageRole(roleStr),
|
||||
Content: contentStr,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inCtx = append(inCtx, sidekick.Message{
|
||||
Role: sidekick.MessageRoleUser,
|
||||
Content: msg,
|
||||
})
|
||||
inCtx = append(inCtx, sidekick.Message{
|
||||
Role: sidekick.MessageRoleUser,
|
||||
Content: msg,
|
||||
})
|
||||
|
||||
responseStr, err := agent.Run(ctx, inCtx, pool)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("agent run failed: %w", err)
|
||||
}
|
||||
responseStr, err := agent.Run(ctx, inCtx, pool)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("agent run failed: %w", err)
|
||||
}
|
||||
|
||||
// Add the final response to the history structure to be returned
|
||||
outHistory := append(inCtx, sidekick.Message{
|
||||
Role: sidekick.MessageRole("assistant"),
|
||||
Content: responseStr,
|
||||
})
|
||||
// Add the final response to the history structure to be returned
|
||||
outHistory := append(inCtx, sidekick.Message{
|
||||
Role: sidekick.MessageRole("assistant"),
|
||||
Content: responseStr,
|
||||
})
|
||||
|
||||
resultObj := map[string]interface{}{
|
||||
"response": responseStr,
|
||||
"history": outHistory,
|
||||
}
|
||||
resultObj := map[string]interface{}{
|
||||
"response": responseStr,
|
||||
"history": outHistory,
|
||||
}
|
||||
|
||||
resultBytes, err := json.Marshal(resultObj)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to marshal result: %w", err)
|
||||
}
|
||||
resultBytes, err := json.Marshal(resultObj)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to marshal result: %w", err)
|
||||
}
|
||||
|
||||
return &mcp.CallToolResult{
|
||||
Content: []mcp.Content{
|
||||
mcp.NewTextContent(string(resultBytes)),
|
||||
},
|
||||
}, nil
|
||||
},
|
||||
)
|
||||
return &mcp.CallToolResult{
|
||||
Content: []mcp.Content{
|
||||
mcp.NewTextContent(string(resultBytes)),
|
||||
},
|
||||
}, nil
|
||||
},
|
||||
)
|
||||
|
||||
transport := cfg.MCPListener.Transport
|
||||
if transport == "stdio" || transport == "" {
|
||||
if err := server.ServeStdio(mcpServer); err != nil {
|
||||
log.Fatalf("MCP Server (stdio) error: %v", err)
|
||||
}
|
||||
} else if transport == "http" || transport == "sse" { // mcp-go supports SSE, which is Streamable HTTP
|
||||
port := cfg.MCPListener.Port
|
||||
if port == 0 {
|
||||
port = 8080
|
||||
}
|
||||
addr := fmt.Sprintf(":%d", port)
|
||||
log.Printf("Starting MCP Streamable HTTP server on %s", addr)
|
||||
srv := server.NewStreamableHTTPServer(mcpServer)
|
||||
if err := srv.Start(addr); err != nil {
|
||||
log.Fatalf("MCP Server (http) error: %v", err)
|
||||
}
|
||||
} else {
|
||||
log.Fatalf("Unsupported MCP listener transport: %s", transport)
|
||||
}
|
||||
transport := cfg.MCPListener.Transport
|
||||
if transport == "stdio" || transport == "" {
|
||||
if err := server.ServeStdio(mcpServer); err != nil {
|
||||
log.Fatalf("MCP Server (stdio) error: %v", err)
|
||||
}
|
||||
} else if transport == "http" || transport == "sse" { // mcp-go supports SSE, which is Streamable HTTP
|
||||
port := cfg.MCPListener.Port
|
||||
if port == 0 {
|
||||
port = 8080
|
||||
}
|
||||
addr := fmt.Sprintf(":%d", port)
|
||||
log.Printf("Starting MCP Streamable HTTP server on %s", addr)
|
||||
srv := server.NewStreamableHTTPServer(mcpServer)
|
||||
if err := srv.Start(addr); err != nil {
|
||||
log.Fatalf("MCP Server (http) error: %v", err)
|
||||
}
|
||||
} else {
|
||||
log.Fatalf("Unsupported MCP listener transport: %s", transport)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
"encoding/json"
|
||||
"testing"
|
||||
|
||||
"github.com/mark3labs/mcp-go/mcp"
|
||||
"github.com/mark3labs/mcp-go/mcp"
|
||||
)
|
||||
|
||||
// Since we cannot easily test the main() function without significant refactoring
|
||||
@@ -12,84 +12,84 @@ import (
|
||||
// This mirrors the logic in main.go but allows for unit testing.
|
||||
|
||||
func TestQueryToolHandler(t *testing.T) {
|
||||
// In a real scenario, we might want to refactor main.go to export a
|
||||
// function that creates the handler. For now, we'll verify the logic
|
||||
// we've implemented in the main.go file by testing the expected
|
||||
// behavior of a similar handler.
|
||||
|
||||
t.Run("ValidRequest", func(t *testing.T) {
|
||||
// Mock arguments
|
||||
args := map[string]interface{}{
|
||||
"message": "Hello Sidekick",
|
||||
"history": []interface{}{
|
||||
map[string]interface{}{"role": "user", "content": "Hi"},
|
||||
map[string]interface{}{"role": "assistant", "content": "Hello! How can I help?"},
|
||||
},
|
||||
}
|
||||
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Name = "query"
|
||||
req.Params.Arguments = args
|
||||
// In a real scenario, we might want to refactor main.go to export a
|
||||
// function that creates the handler. For now, we'll verify the logic
|
||||
// we've implemented in the main.go file by testing the expected
|
||||
// behavior of a similar handler.
|
||||
|
||||
// We verify the RequireString and GetArguments logic here
|
||||
msg, err := req.RequireString("message")
|
||||
if err != nil || msg != "Hello Sidekick" {
|
||||
t.Errorf("RequireString failed: %v", err)
|
||||
}
|
||||
t.Run("ValidRequest", func(t *testing.T) {
|
||||
// Mock arguments
|
||||
args := map[string]interface{}{
|
||||
"message": "Hello Sidekick",
|
||||
"history": []interface{}{
|
||||
map[string]interface{}{"role": "user", "content": "Hi"},
|
||||
map[string]interface{}{"role": "assistant", "content": "Hello! How can I help?"},
|
||||
},
|
||||
}
|
||||
|
||||
rawArgs := req.GetArguments()
|
||||
histInter, ok := rawArgs["history"]
|
||||
if !ok {
|
||||
t.Fatal("history missing from arguments")
|
||||
}
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Name = "query"
|
||||
req.Params.Arguments = args
|
||||
|
||||
histList, ok := histInter.([]interface{})
|
||||
if !ok || len(histList) != 2 {
|
||||
t.Errorf("history list invalid: %v", histInter)
|
||||
}
|
||||
})
|
||||
// We verify the RequireString and GetArguments logic here
|
||||
msg, err := req.RequireString("message")
|
||||
if err != nil || msg != "Hello Sidekick" {
|
||||
t.Errorf("RequireString failed: %v", err)
|
||||
}
|
||||
|
||||
t.Run("MissingMessage", func(t *testing.T) {
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Name = "query"
|
||||
req.Params.Arguments = map[string]interface{}{}
|
||||
rawArgs := req.GetArguments()
|
||||
histInter, ok := rawArgs["history"]
|
||||
if !ok {
|
||||
t.Fatal("history missing from arguments")
|
||||
}
|
||||
|
||||
_, err := req.RequireString("message")
|
||||
if err == nil {
|
||||
t.Error("expected error for missing message")
|
||||
}
|
||||
})
|
||||
histList, ok := histInter.([]interface{})
|
||||
if !ok || len(histList) != 2 {
|
||||
t.Errorf("history list invalid: %v", histInter)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("MissingMessage", func(t *testing.T) {
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Name = "query"
|
||||
req.Params.Arguments = map[string]interface{}{}
|
||||
|
||||
_, err := req.RequireString("message")
|
||||
if err == nil {
|
||||
t.Error("expected error for missing message")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestResultMarshalling(t *testing.T) {
|
||||
// Verify the format of the response as requested: {"response", "history"}
|
||||
type msg struct {
|
||||
Role string `json:"role"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
result := map[string]interface{}{
|
||||
"response": "Agent response",
|
||||
"history": []msg{
|
||||
{Role: "user", Content: "User message"},
|
||||
{Role: "assistant", Content: "Agent response"},
|
||||
},
|
||||
}
|
||||
// Verify the format of the response as requested: {"response", "history"}
|
||||
type msg struct {
|
||||
Role string `json:"role"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
data, err := json.Marshal(result)
|
||||
if err != nil {
|
||||
t.Fatalf("marshal failed: %v", err)
|
||||
}
|
||||
result := map[string]interface{}{
|
||||
"response": "Agent response",
|
||||
"history": []msg{
|
||||
{Role: "user", Content: "User message"},
|
||||
{Role: "assistant", Content: "Agent response"},
|
||||
},
|
||||
}
|
||||
|
||||
var decoded map[string]interface{}
|
||||
if err := json.Unmarshal(data, &decoded); err != nil {
|
||||
t.Fatalf("unmarshal failed: %v", err)
|
||||
}
|
||||
data, err := json.Marshal(result)
|
||||
if err != nil {
|
||||
t.Fatalf("marshal failed: %v", err)
|
||||
}
|
||||
|
||||
if _, ok := decoded["response"]; !ok {
|
||||
t.Error("response key missing")
|
||||
}
|
||||
if _, ok := decoded["history"]; !ok {
|
||||
t.Error("history key missing")
|
||||
}
|
||||
var decoded map[string]interface{}
|
||||
if err := json.Unmarshal(data, &decoded); err != nil {
|
||||
t.Fatalf("unmarshal failed: %v", err)
|
||||
}
|
||||
|
||||
if _, ok := decoded["response"]; !ok {
|
||||
t.Error("response key missing")
|
||||
}
|
||||
if _, ok := decoded["history"]; !ok {
|
||||
t.Error("history key missing")
|
||||
}
|
||||
}
|
||||
|
||||
+180
-45
@@ -16,29 +16,30 @@ import (
|
||||
|
||||
var (
|
||||
titleStyle = lipgloss.NewStyle().
|
||||
Foreground(lipgloss.Color("#FFFDF5")).
|
||||
Background(lipgloss.Color("#25A065")).
|
||||
Padding(0, 1).
|
||||
Bold(true)
|
||||
Foreground(lipgloss.Color("#FFFDF5")).
|
||||
Background(lipgloss.Color("#25A065")).
|
||||
Padding(0, 1).
|
||||
Bold(true)
|
||||
statusStyle = lipgloss.NewStyle().
|
||||
Foreground(lipgloss.Color("#FFFDF5")).
|
||||
Background(lipgloss.Color("#3C3C3C")).
|
||||
Padding(0, 1)
|
||||
Foreground(lipgloss.Color("#FFFDF5")).
|
||||
Background(lipgloss.Color("#3C3C3C")).
|
||||
Padding(0, 1)
|
||||
viewportStyle = lipgloss.NewStyle().
|
||||
Border(lipgloss.RoundedBorder()).
|
||||
BorderForeground(lipgloss.Color("62")).
|
||||
Padding(0, 1)
|
||||
Border(lipgloss.RoundedBorder()).
|
||||
BorderForeground(lipgloss.Color("62")).
|
||||
Padding(0, 1)
|
||||
textareaStyle = lipgloss.NewStyle().
|
||||
Border(lipgloss.RoundedBorder()).
|
||||
BorderForeground(lipgloss.Color("240")).
|
||||
Padding(0, 1)
|
||||
Border(lipgloss.RoundedBorder()).
|
||||
BorderForeground(lipgloss.Color("240")).
|
||||
Padding(0, 1)
|
||||
textareaFocusStyle = lipgloss.NewStyle().
|
||||
Border(lipgloss.RoundedBorder()).
|
||||
BorderForeground(lipgloss.Color("62")).
|
||||
Padding(0, 1)
|
||||
userStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("6")).Bold(true)
|
||||
agentStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("5")).Bold(true)
|
||||
sysStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("8")).Italic(true)
|
||||
Border(lipgloss.RoundedBorder()).
|
||||
BorderForeground(lipgloss.Color("62")).
|
||||
Padding(0, 1)
|
||||
userStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("6")).Bold(true)
|
||||
agentStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("5")).Bold(true)
|
||||
sysStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("8")).Italic(true)
|
||||
bannerStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#FFFF00")).Bold(true)
|
||||
|
||||
banner = ` _ __ __ _ __
|
||||
___ (_) ___/ / ___ / /__ (_) ____ / /__
|
||||
@@ -48,17 +49,20 @@ var (
|
||||
)
|
||||
|
||||
type model struct {
|
||||
viewport viewport.Model
|
||||
textarea textarea.Model
|
||||
agent *sidekick.Sidekick
|
||||
pool map[string]*sidekick.Sidekick
|
||||
history []sidekick.Message
|
||||
isThinking bool
|
||||
err error
|
||||
ready bool
|
||||
width int
|
||||
height int
|
||||
renderer *glamour.TermRenderer
|
||||
viewport viewport.Model
|
||||
textarea textarea.Model
|
||||
agent *sidekick.Sidekick
|
||||
pool map[string]*sidekick.Sidekick
|
||||
history []sidekick.Message
|
||||
transientSteps []string
|
||||
currentStream string
|
||||
currentReasoning string
|
||||
isThinking bool
|
||||
err error
|
||||
ready bool
|
||||
width int
|
||||
height int
|
||||
renderer *glamour.TermRenderer
|
||||
}
|
||||
|
||||
type agentResponseMsg struct {
|
||||
@@ -66,6 +70,32 @@ type agentResponseMsg struct {
|
||||
err error
|
||||
}
|
||||
|
||||
type streamMsg string
|
||||
type reasoningMsg string
|
||||
type intermediateMsg string
|
||||
|
||||
var streamChan = make(chan string, 100)
|
||||
var reasoningChan = make(chan string, 100)
|
||||
var intermediateChan = make(chan string, 100)
|
||||
|
||||
func waitForStream() tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
return streamMsg(<-streamChan)
|
||||
}
|
||||
}
|
||||
|
||||
func waitForReasoning() tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
return reasoningMsg(<-reasoningChan)
|
||||
}
|
||||
}
|
||||
|
||||
func waitForIntermediate() tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
return intermediateMsg(<-intermediateChan)
|
||||
}
|
||||
}
|
||||
|
||||
func initialModel() model {
|
||||
ta := textarea.New()
|
||||
ta.Placeholder = "Type a message..."
|
||||
@@ -85,7 +115,7 @@ func initialModel() model {
|
||||
} else {
|
||||
// Attempt to load and apply prompts
|
||||
tmpl, _ := sidekick.LoadPrompts("prompts.toml")
|
||||
|
||||
|
||||
sidekick.InitMCPServers(cfg.MCPServers)
|
||||
pool = make(map[string]*sidekick.Sidekick)
|
||||
for id, aCfg := range cfg.Agents {
|
||||
@@ -108,15 +138,41 @@ func initialModel() model {
|
||||
agent = pool[entryAgent]
|
||||
}
|
||||
|
||||
// Force configs on all pool agents, including fallback 'agent'
|
||||
agentsToUpdate := []*sidekick.Sidekick{agent}
|
||||
for _, a := range pool {
|
||||
agentsToUpdate = append(agentsToUpdate, a)
|
||||
}
|
||||
for _, a := range agentsToUpdate {
|
||||
if a != nil {
|
||||
a.Config.Streaming = true
|
||||
a.Config.LogIntermediate = true
|
||||
a.StreamHandler = func(s string) {
|
||||
streamChan <- s
|
||||
}
|
||||
a.ReasoningHandler = func(s string) {
|
||||
reasoningChan <- s
|
||||
}
|
||||
a.IntermediateHandler = func(s string) {
|
||||
intermediateChan <- s
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return model{
|
||||
textarea: ta,
|
||||
agent: agent,
|
||||
pool: pool,
|
||||
history: []sidekick.Message{{Role: sidekick.MessageRoleSystem, Content: banner + "\n\nSidekick initialized. Type a message below."}},
|
||||
history: []sidekick.Message{
|
||||
{Role: sidekick.MessageRoleSystem, Content: banner + "\n\nSidekick initialized. Type a message below."},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func (m model) Init() tea.Cmd { return textarea.Blink }
|
||||
func (m model) Init() tea.Cmd {
|
||||
return tea.Batch(textarea.Blink, waitForStream(), waitForReasoning(), waitForIntermediate())
|
||||
}
|
||||
|
||||
func (m model) renderMessage(msg sidekick.Message) string {
|
||||
label := ""
|
||||
@@ -132,13 +188,38 @@ func (m model) renderMessage(msg sidekick.Message) string {
|
||||
}
|
||||
|
||||
content := msg.Content
|
||||
if m.renderer != nil && msg.Role != sidekick.MessageRoleSystem {
|
||||
rendered, err := m.renderer.Render(content)
|
||||
if err == nil {
|
||||
content = strings.TrimSpace(rendered)
|
||||
reasoning := msg.Reasoning
|
||||
|
||||
// If this is the banner message, handle it specially to preserve ASCII art
|
||||
if strings.Contains(content, "----") && msg.Role == sidekick.MessageRoleSystem {
|
||||
if strings.HasPrefix(content, banner) {
|
||||
bannerPart := bannerStyle.Render(banner)
|
||||
otherPart := strings.TrimPrefix(content, banner)
|
||||
if m.renderer != nil && strings.TrimSpace(otherPart) != "" {
|
||||
if r, err := m.renderer.Render(otherPart); err == nil {
|
||||
otherPart = "\n" + strings.TrimSpace(r)
|
||||
}
|
||||
}
|
||||
return label + "\n" + bannerPart + otherPart
|
||||
}
|
||||
}
|
||||
|
||||
if m.renderer != nil {
|
||||
if reasoning != "" {
|
||||
if r, err := m.renderer.Render("> *Thinking:*\n>\n> " + reasoning); err == nil {
|
||||
reasoning = strings.TrimSpace(r) + "\n"
|
||||
}
|
||||
}
|
||||
if content != "" {
|
||||
if r, err := m.renderer.Render(content); err == nil {
|
||||
content = strings.TrimSpace(r)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if reasoning != "" {
|
||||
return label + "\n" + reasoning + content
|
||||
}
|
||||
return label + "\n" + content
|
||||
}
|
||||
|
||||
@@ -147,6 +228,32 @@ func (m *model) updateViewportContent() {
|
||||
for _, msg := range m.history {
|
||||
rendered = append(rendered, m.renderMessage(msg))
|
||||
}
|
||||
for _, step := range m.transientSteps {
|
||||
wrapped := step
|
||||
if m.renderer != nil {
|
||||
if r, err := m.renderer.Render(step); err == nil {
|
||||
wrapped = strings.TrimSpace(r)
|
||||
}
|
||||
}
|
||||
rendered = append(rendered, sysStyle.Render("System")+"\n"+wrapped)
|
||||
}
|
||||
if m.currentReasoning != "" || m.currentStream != "" {
|
||||
content := m.currentStream
|
||||
reasoning := m.currentReasoning
|
||||
if m.renderer != nil {
|
||||
if reasoning != "" {
|
||||
if r, err := m.renderer.Render("> *Thinking:*\n>\n> " + reasoning); err == nil {
|
||||
reasoning = strings.TrimSpace(r) + "\n"
|
||||
}
|
||||
}
|
||||
if content != "" {
|
||||
if r, err := m.renderer.Render(content); err == nil {
|
||||
content = strings.TrimSpace(r)
|
||||
}
|
||||
}
|
||||
}
|
||||
rendered = append(rendered, agentStyle.Render("Sidekick")+"\n"+reasoning+content)
|
||||
}
|
||||
m.viewport.SetContent(strings.Join(rendered, "\n\n"))
|
||||
}
|
||||
|
||||
@@ -160,10 +267,10 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
case tea.WindowSizeMsg:
|
||||
m.width = msg.Width
|
||||
m.height = msg.Height
|
||||
|
||||
|
||||
headerHeight := 1
|
||||
inputHeight := 5 // Textarea height(3) + border/padding
|
||||
|
||||
|
||||
vpWidth := msg.Width - 4 // Account for viewportStyle padding and border
|
||||
vpHeight := msg.Height - headerHeight - inputHeight - 2
|
||||
|
||||
@@ -186,7 +293,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
m.updateViewportContent()
|
||||
m.viewport.GotoBottom()
|
||||
}
|
||||
|
||||
|
||||
m.textarea.SetWidth(msg.Width - 4)
|
||||
|
||||
case tea.KeyMsg:
|
||||
@@ -207,12 +314,14 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
if strings.TrimSpace(v) == "" || m.isThinking {
|
||||
return m, nil
|
||||
}
|
||||
|
||||
|
||||
m.history = append(m.history, sidekick.Message{
|
||||
Role: sidekick.MessageRoleUser,
|
||||
Content: v,
|
||||
})
|
||||
|
||||
m.currentStream = ""
|
||||
m.currentReasoning = ""
|
||||
m.transientSteps = nil
|
||||
m.updateViewportContent()
|
||||
m.textarea.Reset()
|
||||
m.viewport.GotoBottom()
|
||||
@@ -220,8 +329,35 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
return m, m.runAgent()
|
||||
}
|
||||
|
||||
case streamMsg:
|
||||
if !m.isThinking {
|
||||
return m, waitForStream()
|
||||
}
|
||||
m.currentStream += string(msg)
|
||||
m.updateViewportContent()
|
||||
m.viewport.GotoBottom()
|
||||
return m, waitForStream()
|
||||
case reasoningMsg:
|
||||
if !m.isThinking {
|
||||
return m, waitForReasoning()
|
||||
}
|
||||
m.currentReasoning += string(msg)
|
||||
m.updateViewportContent()
|
||||
m.viewport.GotoBottom()
|
||||
return m, waitForReasoning()
|
||||
case intermediateMsg:
|
||||
if !m.isThinking {
|
||||
return m, waitForIntermediate()
|
||||
}
|
||||
m.transientSteps = append(m.transientSteps, string(msg))
|
||||
m.updateViewportContent()
|
||||
m.viewport.GotoBottom()
|
||||
return m, waitForIntermediate()
|
||||
case agentResponseMsg:
|
||||
m.isThinking = false
|
||||
m.currentStream = ""
|
||||
m.currentReasoning = ""
|
||||
m.transientSteps = nil
|
||||
if msg.err != nil {
|
||||
m.history = append(m.history, sidekick.Message{
|
||||
Role: sidekick.MessageRoleSystem,
|
||||
@@ -259,14 +395,14 @@ func (m model) View() string {
|
||||
if m.isThinking {
|
||||
status = "THINKING"
|
||||
}
|
||||
|
||||
|
||||
header := lipgloss.JoinHorizontal(lipgloss.Top,
|
||||
titleStyle.Render(" SIDEKICK TUI "),
|
||||
statusStyle.Render(" "+status+" "),
|
||||
)
|
||||
|
||||
vpView := viewportStyle.Width(m.width - 2).Render(m.viewport.View())
|
||||
|
||||
|
||||
taStyle := textareaStyle
|
||||
if m.textarea.Focused() {
|
||||
taStyle = textareaFocusStyle
|
||||
@@ -280,7 +416,6 @@ func (m model) View() string {
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
func main() {
|
||||
if _, err := tea.NewProgram(initialModel(), tea.WithAltScreen()).Run(); err != nil {
|
||||
log.Fatal(err)
|
||||
|
||||
@@ -1,82 +1,82 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/charmbracelet/bubbles/viewport"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/bubbles/viewport"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
)
|
||||
|
||||
// Since sidekick-tui/main.go uses global variables and is a tea.Model,
|
||||
// Since sidekick-tui/main.go uses global variables and is a tea.Model,
|
||||
// we test basic model behavior.
|
||||
|
||||
func TestInitialModel(t *testing.T) {
|
||||
// For testing, sidekick.LoadConfig would fail or look in its default dir.
|
||||
// This ensures that the model can be initialized even without a config.
|
||||
m := initialModel()
|
||||
|
||||
if m.agent == nil {
|
||||
t.Error("expected default agent to be initialized even without config")
|
||||
}
|
||||
|
||||
if m.textarea.Value() != "" {
|
||||
t.Errorf("expected empty textarea, got %s", m.textarea.Value())
|
||||
}
|
||||
|
||||
if len(m.history) != 1 {
|
||||
t.Errorf("expected 1 initial message in history, got %d", len(m.history))
|
||||
}
|
||||
if !strings.Contains(m.history[0].Content, "Sidekick initialized") {
|
||||
t.Error("expected initial message content to contain 'Sidekick initialized'")
|
||||
}
|
||||
// For testing, sidekick.LoadConfig would fail or look in its default dir.
|
||||
// This ensures that the model can be initialized even without a config.
|
||||
m := initialModel()
|
||||
|
||||
if m.agent == nil {
|
||||
t.Error("expected default agent to be initialized even without config")
|
||||
}
|
||||
|
||||
if m.textarea.Value() != "" {
|
||||
t.Errorf("expected empty textarea, got %s", m.textarea.Value())
|
||||
}
|
||||
|
||||
if len(m.history) != 1 {
|
||||
t.Errorf("expected 1 initial message in history, got %d", len(m.history))
|
||||
}
|
||||
if !strings.Contains(m.history[0].Content, "Sidekick initialized") {
|
||||
t.Error("expected initial message content to contain 'Sidekick initialized'")
|
||||
}
|
||||
}
|
||||
|
||||
func TestModelUpdate(t *testing.T) {
|
||||
m := initialModel()
|
||||
m.ready = true
|
||||
m.width = 80
|
||||
m.height = 24
|
||||
m := initialModel()
|
||||
m.ready = true
|
||||
m.width = 80
|
||||
m.height = 24
|
||||
|
||||
// Test a key message (Enter)
|
||||
m.textarea.SetValue("Hello")
|
||||
newModel, cmd := m.Update(tea.KeyMsg{Type: tea.KeyEnter})
|
||||
|
||||
tm := newModel.(model)
|
||||
if tm.isThinking != true {
|
||||
t.Error("expected model to be in thinking state after Enter")
|
||||
}
|
||||
if tm.textarea.Value() != "" {
|
||||
t.Error("expected textarea to be reset after Enter")
|
||||
}
|
||||
if cmd == nil {
|
||||
t.Error("expected a command after Enter")
|
||||
}
|
||||
// Test a key message (Enter)
|
||||
m.textarea.SetValue("Hello")
|
||||
newModel, cmd := m.Update(tea.KeyMsg{Type: tea.KeyEnter})
|
||||
|
||||
// Test an agent response message
|
||||
respModel, _ := tm.Update(agentResponseMsg{response: "Hi"})
|
||||
rm := respModel.(model)
|
||||
if rm.isThinking != false {
|
||||
t.Error("expected model to stop thinking after response")
|
||||
}
|
||||
if len(rm.history) < 2 {
|
||||
t.Error("expected history list to grow after response")
|
||||
}
|
||||
tm := newModel.(model)
|
||||
if tm.isThinking != true {
|
||||
t.Error("expected model to be in thinking state after Enter")
|
||||
}
|
||||
if tm.textarea.Value() != "" {
|
||||
t.Error("expected textarea to be reset after Enter")
|
||||
}
|
||||
if cmd == nil {
|
||||
t.Error("expected a command after Enter")
|
||||
}
|
||||
|
||||
// Test an agent response message
|
||||
respModel, _ := tm.Update(agentResponseMsg{response: "Hi"})
|
||||
rm := respModel.(model)
|
||||
if rm.isThinking != false {
|
||||
t.Error("expected model to stop thinking after response")
|
||||
}
|
||||
if len(rm.history) < 2 {
|
||||
t.Error("expected history list to grow after response")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMessageWrapping(t *testing.T) {
|
||||
m := initialModel()
|
||||
m.ready = true
|
||||
m.width = 10
|
||||
m.height = 20
|
||||
m.viewport = viewport.New(10, 5) // Very narrow
|
||||
|
||||
longMsg := "This is a very long message that should be wrapped."
|
||||
respModel, _ := m.Update(agentResponseMsg{response: longMsg})
|
||||
rm := respModel.(model)
|
||||
|
||||
content := rm.viewport.View()
|
||||
if !strings.Contains(content, "\n") {
|
||||
t.Errorf("expected long message to be wrapped, but no newline found in viewport")
|
||||
}
|
||||
m := initialModel()
|
||||
m.ready = true
|
||||
m.width = 10
|
||||
m.height = 20
|
||||
m.viewport = viewport.New(10, 5) // Very narrow
|
||||
|
||||
longMsg := "This is a very long message that should be wrapped."
|
||||
respModel, _ := m.Update(agentResponseMsg{response: longMsg})
|
||||
rm := respModel.(model)
|
||||
|
||||
content := rm.viewport.View()
|
||||
if !strings.Contains(content, "\n") {
|
||||
t.Errorf("expected long message to be wrapped, but no newline found in viewport")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user