Compare commits
53 Commits
feat/char-
...
feat/resp-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef53e9bebe | ||
|
|
a546bfe596 | ||
|
|
23c21f87bb | ||
|
|
850ca103e5 | ||
|
|
b7b5fcbf79 | ||
|
|
1e13c7796d | ||
|
|
9a727b21ad | ||
|
|
beb944c390 | ||
|
|
5844dd1494 | ||
|
|
84c4010213 | ||
|
|
86260e218c | ||
|
|
2c694e2b2b | ||
|
|
66ccb7a732 | ||
|
|
deece322ef | ||
|
|
e7c8fef32d | ||
|
|
eedda0ec4b | ||
|
|
96ffbd5cf5 | ||
|
|
85b11fa9ff | ||
|
|
1675af98d4 | ||
|
|
61a0ddfdfd | ||
|
|
26ab5c59e3 | ||
|
|
35cc8c068f | ||
|
|
27fdec1361 | ||
|
|
76827a71cc | ||
|
|
3a9a7dbe99 | ||
|
|
d3361c13c5 | ||
|
|
7c1a8b0122 | ||
|
|
eeca909b65 | ||
|
|
b18d96ac13 | ||
|
|
b861b92e5d | ||
|
|
17f0afac80 | ||
|
|
931b646c30 | ||
|
|
f560ecf70b | ||
|
|
f40f09390b | ||
|
|
5548991f5c | ||
|
|
c12311da99 | ||
|
|
7d18a9d77e | ||
|
|
b67ae1be98 | ||
|
|
372e49199b | ||
|
|
d6d4f09f8d | ||
|
|
475936fb1b | ||
|
|
fa846225ee | ||
|
|
7b2fa04391 | ||
|
|
c83779b479 | ||
|
|
43b0fe3739 | ||
|
|
1b36ef938e | ||
|
|
987d5842a4 | ||
|
|
10b665813e | ||
|
|
8c3c2b9b23 | ||
|
|
e42eb96371 | ||
|
|
46a33baabb | ||
|
|
875de679cf | ||
|
|
3b542421e3 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -5,8 +5,8 @@ history/
|
|||||||
*.db
|
*.db
|
||||||
config.toml
|
config.toml
|
||||||
sysprompts/*
|
sysprompts/*
|
||||||
!sysprompts/cluedo.json
|
|
||||||
!sysprompts/alice_bob_carl.json
|
!sysprompts/alice_bob_carl.json
|
||||||
|
!sysprompts/coding_assistant.json
|
||||||
history_bak/
|
history_bak/
|
||||||
.aider*
|
.aider*
|
||||||
tags
|
tags
|
||||||
|
|||||||
9
Makefile
9
Makefile
@@ -1,5 +1,4 @@
|
|||||||
.PHONY: setconfig run lint setup-whisper build-whisper download-whisper-model docker-up docker-down docker-logs noextra-run noextra-server
|
.PHONY: setconfig run lint setup-whisper build-whisper download-whisper-model docker-up docker-down docker-logs noextra-run
|
||||||
|
|
||||||
|
|
||||||
run: setconfig
|
run: setconfig
|
||||||
go build -tags extra -o gf-lt && ./gf-lt
|
go build -tags extra -o gf-lt && ./gf-lt
|
||||||
@@ -10,15 +9,9 @@ build-debug:
|
|||||||
debug: build-debug
|
debug: build-debug
|
||||||
dlv exec --headless --accept-multiclient --listen=:2345 ./gf-lt
|
dlv exec --headless --accept-multiclient --listen=:2345 ./gf-lt
|
||||||
|
|
||||||
server: setconfig
|
|
||||||
go build -tags extra -o gf-lt && ./gf-lt -port 3333
|
|
||||||
|
|
||||||
noextra-run: setconfig
|
noextra-run: setconfig
|
||||||
go build -tags '!extra' -o gf-lt && ./gf-lt
|
go build -tags '!extra' -o gf-lt && ./gf-lt
|
||||||
|
|
||||||
noextra-server: setconfig
|
|
||||||
go build -tags '!extra' -o gf-lt && ./gf-lt -port 3333
|
|
||||||
|
|
||||||
setconfig:
|
setconfig:
|
||||||
find config.toml &>/dev/null || cp config.example.toml config.toml
|
find config.toml &>/dev/null || cp config.example.toml config.toml
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ made with use of [tview](https://github.com/rivo/tview)
|
|||||||
- tts/stt (run make commands to get deps);
|
- tts/stt (run make commands to get deps);
|
||||||
- image input;
|
- image input;
|
||||||
- function calls (function calls are implemented natively, to avoid calling outside sources);
|
- function calls (function calls are implemented natively, to avoid calling outside sources);
|
||||||
|
- [character specific context (unique feature)](docs/char-specific-context.md)
|
||||||
|
|
||||||
#### how it looks
|
#### how it looks
|
||||||

|

|
||||||
|
|||||||
@@ -110,8 +110,8 @@ func (ag *AgentClient) buildRequest(sysprompt, msg string) ([]byte, error) {
|
|||||||
req := models.NewDSChatReq(*chatBody)
|
req := models.NewDSChatReq(*chatBody)
|
||||||
return json.Marshal(req)
|
return json.Marshal(req)
|
||||||
case isOpenRouter:
|
case isOpenRouter:
|
||||||
// OpenRouter chat
|
// OpenRouter chat - agents don't use reasoning by default
|
||||||
req := models.NewOpenRouterChatReq(*chatBody, defaultProps)
|
req := models.NewOpenRouterChatReq(*chatBody, defaultProps, "")
|
||||||
return json.Marshal(req)
|
return json.Marshal(req)
|
||||||
default:
|
default:
|
||||||
// Assume llama.cpp chat (OpenAI format)
|
// Assume llama.cpp chat (OpenAI format)
|
||||||
|
|||||||
266
bot.go
266
bot.go
@@ -17,7 +17,6 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
|
||||||
"regexp"
|
"regexp"
|
||||||
"slices"
|
"slices"
|
||||||
"strconv"
|
"strconv"
|
||||||
@@ -47,6 +46,7 @@ var (
|
|||||||
ragger *rag.RAG
|
ragger *rag.RAG
|
||||||
chunkParser ChunkParser
|
chunkParser ChunkParser
|
||||||
lastToolCall *models.FuncCall
|
lastToolCall *models.FuncCall
|
||||||
|
lastRespStats *models.ResponseStats
|
||||||
//nolint:unused // TTS_ENABLED conditionally uses this
|
//nolint:unused // TTS_ENABLED conditionally uses this
|
||||||
orator Orator
|
orator Orator
|
||||||
asr STT
|
asr STT
|
||||||
@@ -343,32 +343,6 @@ func warmUpModel() {
|
|||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
func fetchLCPModelName() *models.LCPModels {
|
|
||||||
//nolint
|
|
||||||
resp, err := httpClient.Get(cfg.FetchModelNameAPI)
|
|
||||||
if err != nil {
|
|
||||||
chatBody.Model = "disconnected"
|
|
||||||
logger.Warn("failed to get model", "link", cfg.FetchModelNameAPI, "error", err)
|
|
||||||
if err := notifyUser("error", "request failed "+cfg.FetchModelNameAPI); err != nil {
|
|
||||||
logger.Debug("failed to notify user", "error", err, "fn", "fetchLCPModelName")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
defer resp.Body.Close()
|
|
||||||
llmModel := models.LCPModels{}
|
|
||||||
if err := json.NewDecoder(resp.Body).Decode(&llmModel); err != nil {
|
|
||||||
logger.Warn("failed to decode resp", "link", cfg.FetchModelNameAPI, "error", err)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if resp.StatusCode != 200 {
|
|
||||||
chatBody.Model = "disconnected"
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
chatBody.Model = path.Base(llmModel.Data[0].ID)
|
|
||||||
cfg.CurrentModel = chatBody.Model
|
|
||||||
return &llmModel
|
|
||||||
}
|
|
||||||
|
|
||||||
// nolint
|
// nolint
|
||||||
func fetchDSBalance() *models.DSBalance {
|
func fetchDSBalance() *models.DSBalance {
|
||||||
url := "https://api.deepseek.com/user/balance"
|
url := "https://api.deepseek.com/user/balance"
|
||||||
@@ -430,6 +404,23 @@ func fetchLCPModels() ([]string, error) {
|
|||||||
return localModels, nil
|
return localModels, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// fetchLCPModelsWithLoadStatus returns models with "(loaded)" indicator for loaded models
|
||||||
|
func fetchLCPModelsWithLoadStatus() ([]string, error) {
|
||||||
|
models, err := fetchLCPModelsWithStatus()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := make([]string, 0, len(models.Data))
|
||||||
|
for _, m := range models.Data {
|
||||||
|
modelName := m.ID
|
||||||
|
if m.Status.Value == "loaded" {
|
||||||
|
modelName = "(loaded) " + modelName
|
||||||
|
}
|
||||||
|
result = append(result, modelName)
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
// fetchLCPModelsWithStatus returns the full LCPModels struct including status information.
|
// fetchLCPModelsWithStatus returns the full LCPModels struct including status information.
|
||||||
func fetchLCPModelsWithStatus() (*models.LCPModels, error) {
|
func fetchLCPModelsWithStatus() (*models.LCPModels, error) {
|
||||||
resp, err := http.Get(cfg.FetchModelNameAPI)
|
resp, err := http.Get(cfg.FetchModelNameAPI)
|
||||||
@@ -483,6 +474,7 @@ func monitorModelLoad(modelID string) {
|
|||||||
if err := notifyUser("model loaded", "Model "+modelID+" is now loaded and ready."); err != nil {
|
if err := notifyUser("model loaded", "Model "+modelID+" is now loaded and ready."); err != nil {
|
||||||
logger.Debug("failed to notify user", "error", err)
|
logger.Debug("failed to notify user", "error", err)
|
||||||
}
|
}
|
||||||
|
refreshChatDisplay()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -493,30 +485,28 @@ func monitorModelLoad(modelID string) {
|
|||||||
// extractDetailedErrorFromBytes extracts detailed error information from response body bytes
|
// extractDetailedErrorFromBytes extracts detailed error information from response body bytes
|
||||||
func extractDetailedErrorFromBytes(body []byte, statusCode int) string {
|
func extractDetailedErrorFromBytes(body []byte, statusCode int) string {
|
||||||
// Try to parse as JSON to extract detailed error information
|
// Try to parse as JSON to extract detailed error information
|
||||||
var errorResponse map[string]interface{}
|
var errorResponse map[string]any
|
||||||
if err := json.Unmarshal(body, &errorResponse); err == nil {
|
if err := json.Unmarshal(body, &errorResponse); err == nil {
|
||||||
// Check if it's an error response with detailed information
|
// Check if it's an error response with detailed information
|
||||||
if errorData, ok := errorResponse["error"]; ok {
|
if errorData, ok := errorResponse["error"]; ok {
|
||||||
if errorMap, ok := errorData.(map[string]interface{}); ok {
|
if errorMap, ok := errorData.(map[string]any); ok {
|
||||||
var errorMsg string
|
var errorMsg string
|
||||||
if msg, ok := errorMap["message"]; ok {
|
if msg, ok := errorMap["message"]; ok {
|
||||||
errorMsg = fmt.Sprintf("%v", msg)
|
errorMsg = fmt.Sprintf("%v", msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
var details []string
|
var details []string
|
||||||
if code, ok := errorMap["code"]; ok {
|
if code, ok := errorMap["code"]; ok {
|
||||||
details = append(details, fmt.Sprintf("Code: %v", code))
|
details = append(details, fmt.Sprintf("Code: %v", code))
|
||||||
}
|
}
|
||||||
|
|
||||||
if metadata, ok := errorMap["metadata"]; ok {
|
if metadata, ok := errorMap["metadata"]; ok {
|
||||||
// Handle metadata which might contain raw error details
|
// Handle metadata which might contain raw error details
|
||||||
if metadataMap, ok := metadata.(map[string]interface{}); ok {
|
if metadataMap, ok := metadata.(map[string]any); ok {
|
||||||
if raw, ok := metadataMap["raw"]; ok {
|
if raw, ok := metadataMap["raw"]; ok {
|
||||||
// Parse the raw error string if it's JSON
|
// Parse the raw error string if it's JSON
|
||||||
var rawError map[string]interface{}
|
var rawError map[string]any
|
||||||
if rawStr, ok := raw.(string); ok && json.Unmarshal([]byte(rawStr), &rawError) == nil {
|
if rawStr, ok := raw.(string); ok && json.Unmarshal([]byte(rawStr), &rawError) == nil {
|
||||||
if rawErrorData, ok := rawError["error"]; ok {
|
if rawErrorData, ok := rawError["error"]; ok {
|
||||||
if rawErrorMap, ok := rawErrorData.(map[string]interface{}); ok {
|
if rawErrorMap, ok := rawErrorData.(map[string]any); ok {
|
||||||
if rawMsg, ok := rawErrorMap["message"]; ok {
|
if rawMsg, ok := rawErrorMap["message"]; ok {
|
||||||
return fmt.Sprintf("API Error: %s", rawMsg)
|
return fmt.Sprintf("API Error: %s", rawMsg)
|
||||||
}
|
}
|
||||||
@@ -527,20 +517,30 @@ func extractDetailedErrorFromBytes(body []byte, statusCode int) string {
|
|||||||
}
|
}
|
||||||
details = append(details, fmt.Sprintf("Metadata: %v", metadata))
|
details = append(details, fmt.Sprintf("Metadata: %v", metadata))
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(details) > 0 {
|
if len(details) > 0 {
|
||||||
return fmt.Sprintf("API Error: %s (%s)", errorMsg, strings.Join(details, ", "))
|
return fmt.Sprintf("API Error: %s (%s)", errorMsg, strings.Join(details, ", "))
|
||||||
}
|
}
|
||||||
|
|
||||||
return "API Error: " + errorMsg
|
return "API Error: " + errorMsg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If not a structured error response, return the raw body with status
|
// If not a structured error response, return the raw body with status
|
||||||
return fmt.Sprintf("HTTP Status: %d, Response Body: %s", statusCode, string(body))
|
return fmt.Sprintf("HTTP Status: %d, Response Body: %s", statusCode, string(body))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func finalizeRespStats(tokenCount int, startTime time.Time) {
|
||||||
|
duration := time.Since(startTime).Seconds()
|
||||||
|
var tps float64
|
||||||
|
if duration > 0 {
|
||||||
|
tps = float64(tokenCount) / duration
|
||||||
|
}
|
||||||
|
lastRespStats = &models.ResponseStats{
|
||||||
|
Tokens: tokenCount,
|
||||||
|
Duration: duration,
|
||||||
|
TokensPerSec: tps,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// sendMsgToLLM expects streaming resp
|
// sendMsgToLLM expects streaming resp
|
||||||
func sendMsgToLLM(body io.Reader) {
|
func sendMsgToLLM(body io.Reader) {
|
||||||
choseChunkParser()
|
choseChunkParser()
|
||||||
@@ -595,10 +595,17 @@ func sendMsgToLLM(body io.Reader) {
|
|||||||
streamDone <- true
|
streamDone <- true
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
//
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
reader := bufio.NewReader(resp.Body)
|
reader := bufio.NewReader(resp.Body)
|
||||||
counter := uint32(0)
|
counter := uint32(0)
|
||||||
|
tokenCount := 0
|
||||||
|
startTime := time.Now()
|
||||||
|
hasReasoning := false
|
||||||
|
reasoningSent := false
|
||||||
|
defer func() {
|
||||||
|
finalizeRespStats(tokenCount, startTime)
|
||||||
|
}()
|
||||||
for {
|
for {
|
||||||
var (
|
var (
|
||||||
answerText string
|
answerText string
|
||||||
@@ -671,10 +678,16 @@ func sendMsgToLLM(body io.Reader) {
|
|||||||
// break
|
// break
|
||||||
// }
|
// }
|
||||||
if chunk.Finished {
|
if chunk.Finished {
|
||||||
|
// Close the thinking block if we were streaming reasoning and haven't closed it yet
|
||||||
|
if hasReasoning && !reasoningSent {
|
||||||
|
chunkChan <- "</think>"
|
||||||
|
tokenCount++
|
||||||
|
}
|
||||||
if chunk.Chunk != "" {
|
if chunk.Chunk != "" {
|
||||||
logger.Warn("text inside of finish llmchunk", "chunk", chunk, "counter", counter)
|
logger.Warn("text inside of finish llmchunk", "chunk", chunk, "counter", counter)
|
||||||
answerText = strings.ReplaceAll(chunk.Chunk, "\n\n", "\n")
|
answerText = strings.ReplaceAll(chunk.Chunk, "\n\n", "\n")
|
||||||
chunkChan <- answerText
|
chunkChan <- answerText
|
||||||
|
tokenCount++
|
||||||
}
|
}
|
||||||
streamDone <- true
|
streamDone <- true
|
||||||
break
|
break
|
||||||
@@ -682,6 +695,30 @@ func sendMsgToLLM(body io.Reader) {
|
|||||||
if counter == 0 {
|
if counter == 0 {
|
||||||
chunk.Chunk = strings.TrimPrefix(chunk.Chunk, " ")
|
chunk.Chunk = strings.TrimPrefix(chunk.Chunk, " ")
|
||||||
}
|
}
|
||||||
|
// Handle reasoning chunks - stream them immediately as they arrive
|
||||||
|
if chunk.Reasoning != "" && !reasoningSent {
|
||||||
|
if !hasReasoning {
|
||||||
|
// First reasoning chunk - send opening tag
|
||||||
|
chunkChan <- "<think>"
|
||||||
|
tokenCount++
|
||||||
|
hasReasoning = true
|
||||||
|
}
|
||||||
|
// Stream reasoning content immediately
|
||||||
|
answerText = strings.ReplaceAll(chunk.Reasoning, "\n\n", "\n")
|
||||||
|
if answerText != "" {
|
||||||
|
chunkChan <- answerText
|
||||||
|
tokenCount++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// When we get content and have been streaming reasoning, close the thinking block
|
||||||
|
if chunk.Chunk != "" && hasReasoning && !reasoningSent {
|
||||||
|
// Close the thinking block before sending actual content
|
||||||
|
chunkChan <- "</think>"
|
||||||
|
tokenCount++
|
||||||
|
reasoningSent = true
|
||||||
|
}
|
||||||
|
|
||||||
// bot sends way too many \n
|
// bot sends way too many \n
|
||||||
answerText = strings.ReplaceAll(chunk.Chunk, "\n\n", "\n")
|
answerText = strings.ReplaceAll(chunk.Chunk, "\n\n", "\n")
|
||||||
// Accumulate text to check for stop strings that might span across chunks
|
// Accumulate text to check for stop strings that might span across chunks
|
||||||
@@ -691,8 +728,12 @@ func sendMsgToLLM(body io.Reader) {
|
|||||||
slices.Contains(stopStrings, answerText) {
|
slices.Contains(stopStrings, answerText) {
|
||||||
logger.Debug("stop string detected on client side for completion endpoint", "stop_string", answerText)
|
logger.Debug("stop string detected on client side for completion endpoint", "stop_string", answerText)
|
||||||
streamDone <- true
|
streamDone <- true
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
if answerText != "" {
|
||||||
chunkChan <- answerText
|
chunkChan <- answerText
|
||||||
|
tokenCount++
|
||||||
|
}
|
||||||
openAIToolChan <- chunk.ToolChunk
|
openAIToolChan <- chunk.ToolChunk
|
||||||
if chunk.FuncName != "" {
|
if chunk.FuncName != "" {
|
||||||
lastToolCall.Name = chunk.FuncName
|
lastToolCall.Name = chunk.FuncName
|
||||||
@@ -790,6 +831,7 @@ func chatWatcher(ctx context.Context) {
|
|||||||
|
|
||||||
func chatRound(r *models.ChatRoundReq) error {
|
func chatRound(r *models.ChatRoundReq) error {
|
||||||
botRespMode = true
|
botRespMode = true
|
||||||
|
updateStatusLine()
|
||||||
botPersona := cfg.AssistantRole
|
botPersona := cfg.AssistantRole
|
||||||
if cfg.WriteNextMsgAsCompletionAgent != "" {
|
if cfg.WriteNextMsgAsCompletionAgent != "" {
|
||||||
botPersona = cfg.WriteNextMsgAsCompletionAgent
|
botPersona = cfg.WriteNextMsgAsCompletionAgent
|
||||||
@@ -807,23 +849,78 @@ func chatRound(r *models.ChatRoundReq) error {
|
|||||||
}
|
}
|
||||||
go sendMsgToLLM(reader)
|
go sendMsgToLLM(reader)
|
||||||
logger.Debug("looking at vars in chatRound", "msg", r.UserMsg, "regen", r.Regen, "resume", r.Resume)
|
logger.Debug("looking at vars in chatRound", "msg", r.UserMsg, "regen", r.Regen, "resume", r.Resume)
|
||||||
|
msgIdx := len(chatBody.Messages)
|
||||||
if !r.Resume {
|
if !r.Resume {
|
||||||
fmt.Fprintf(textView, "\n[-:-:b](%d) ", len(chatBody.Messages))
|
// Add empty message to chatBody immediately so it persists during Alt+T toggle
|
||||||
|
chatBody.Messages = append(chatBody.Messages, models.RoleMsg{
|
||||||
|
Role: botPersona, Content: "",
|
||||||
|
})
|
||||||
|
fmt.Fprintf(textView, "\n[-:-:b](%d) ", msgIdx)
|
||||||
fmt.Fprint(textView, roleToIcon(botPersona))
|
fmt.Fprint(textView, roleToIcon(botPersona))
|
||||||
fmt.Fprint(textView, "[-:-:-]\n")
|
fmt.Fprint(textView, "[-:-:-]\n")
|
||||||
if cfg.ThinkUse && !strings.Contains(cfg.CurrentAPI, "v1") {
|
if cfg.ThinkUse && !strings.Contains(cfg.CurrentAPI, "v1") {
|
||||||
// fmt.Fprint(textView, "<think>")
|
// fmt.Fprint(textView, "<think>")
|
||||||
chunkChan <- "<think>"
|
chunkChan <- "<think>"
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
msgIdx = len(chatBody.Messages) - 1
|
||||||
}
|
}
|
||||||
respText := strings.Builder{}
|
respText := strings.Builder{}
|
||||||
toolResp := strings.Builder{}
|
toolResp := strings.Builder{}
|
||||||
|
// Variables for handling thinking blocks during streaming
|
||||||
|
inThinkingBlock := false
|
||||||
|
thinkingBuffer := strings.Builder{}
|
||||||
|
justExitedThinkingCollapsed := false
|
||||||
out:
|
out:
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case chunk := <-chunkChan:
|
case chunk := <-chunkChan:
|
||||||
|
// Handle thinking blocks during streaming
|
||||||
|
if strings.HasPrefix(chunk, "<think>") && !inThinkingBlock {
|
||||||
|
// Start of thinking block
|
||||||
|
inThinkingBlock = true
|
||||||
|
thinkingBuffer.Reset()
|
||||||
|
thinkingBuffer.WriteString(chunk)
|
||||||
|
if thinkingCollapsed {
|
||||||
|
// Show placeholder immediately when thinking starts in collapsed mode
|
||||||
|
fmt.Fprint(textView, "[yellow::i][thinking... (press Alt+T to expand)][-:-:-]")
|
||||||
|
if scrollToEndEnabled {
|
||||||
|
textView.ScrollToEnd()
|
||||||
|
}
|
||||||
|
respText.WriteString(chunk)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
} else if inThinkingBlock {
|
||||||
|
thinkingBuffer.WriteString(chunk)
|
||||||
|
if strings.Contains(chunk, "</think>") {
|
||||||
|
// End of thinking block
|
||||||
|
inThinkingBlock = false
|
||||||
|
if thinkingCollapsed {
|
||||||
|
// Thinking already displayed as placeholder, just update respText
|
||||||
|
respText.WriteString(chunk)
|
||||||
|
justExitedThinkingCollapsed = true
|
||||||
|
if scrollToEndEnabled {
|
||||||
|
textView.ScrollToEnd()
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// If not collapsed, fall through to normal display
|
||||||
|
} else if thinkingCollapsed {
|
||||||
|
// Still in thinking block and collapsed - just buffer, don't display
|
||||||
|
respText.WriteString(chunk)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// If not collapsed, fall through to normal display
|
||||||
|
}
|
||||||
|
// Add spacing after collapsed thinking block before real response
|
||||||
|
if justExitedThinkingCollapsed {
|
||||||
|
chunk = "\n\n" + chunk
|
||||||
|
justExitedThinkingCollapsed = false
|
||||||
|
}
|
||||||
fmt.Fprint(textView, chunk)
|
fmt.Fprint(textView, chunk)
|
||||||
respText.WriteString(chunk)
|
respText.WriteString(chunk)
|
||||||
|
// Update the message in chatBody.Messages so it persists during Alt+T
|
||||||
|
chatBody.Messages[msgIdx].Content = respText.String()
|
||||||
if scrollToEndEnabled {
|
if scrollToEndEnabled {
|
||||||
textView.ScrollToEnd()
|
textView.ScrollToEnd()
|
||||||
}
|
}
|
||||||
@@ -838,7 +935,6 @@ out:
|
|||||||
textView.ScrollToEnd()
|
textView.ScrollToEnd()
|
||||||
}
|
}
|
||||||
case <-streamDone:
|
case <-streamDone:
|
||||||
// drain any remaining chunks from chunkChan before exiting
|
|
||||||
for len(chunkChan) > 0 {
|
for len(chunkChan) > 0 {
|
||||||
chunk := <-chunkChan
|
chunk := <-chunkChan
|
||||||
fmt.Fprint(textView, chunk)
|
fmt.Fprint(textView, chunk)
|
||||||
@@ -847,33 +943,41 @@ out:
|
|||||||
textView.ScrollToEnd()
|
textView.ScrollToEnd()
|
||||||
}
|
}
|
||||||
if cfg.TTS_ENABLED {
|
if cfg.TTS_ENABLED {
|
||||||
// Send chunk to audio stream handler
|
|
||||||
TTSTextChan <- chunk
|
TTSTextChan <- chunk
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if cfg.TTS_ENABLED {
|
if cfg.TTS_ENABLED {
|
||||||
// msg is done; flush it down
|
|
||||||
TTSFlushChan <- true
|
TTSFlushChan <- true
|
||||||
}
|
}
|
||||||
break out
|
break out
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
var msgStats *models.ResponseStats
|
||||||
|
if lastRespStats != nil {
|
||||||
|
msgStats = &models.ResponseStats{
|
||||||
|
Tokens: lastRespStats.Tokens,
|
||||||
|
Duration: lastRespStats.Duration,
|
||||||
|
TokensPerSec: lastRespStats.TokensPerSec,
|
||||||
|
}
|
||||||
|
lastRespStats = nil
|
||||||
|
}
|
||||||
botRespMode = false
|
botRespMode = false
|
||||||
// numbers in chatbody and displayed must be the same
|
|
||||||
if r.Resume {
|
if r.Resume {
|
||||||
chatBody.Messages[len(chatBody.Messages)-1].Content += respText.String()
|
chatBody.Messages[len(chatBody.Messages)-1].Content += respText.String()
|
||||||
// lastM.Content = lastM.Content + respText.String()
|
|
||||||
// Process the updated message to check for known_to tags in resumed response
|
|
||||||
updatedMsg := chatBody.Messages[len(chatBody.Messages)-1]
|
updatedMsg := chatBody.Messages[len(chatBody.Messages)-1]
|
||||||
processedMsg := processMessageTag(&updatedMsg)
|
processedMsg := processMessageTag(&updatedMsg)
|
||||||
chatBody.Messages[len(chatBody.Messages)-1] = *processedMsg
|
chatBody.Messages[len(chatBody.Messages)-1] = *processedMsg
|
||||||
} else {
|
if msgStats != nil && chatBody.Messages[len(chatBody.Messages)-1].Role != cfg.ToolRole {
|
||||||
newMsg := models.RoleMsg{
|
chatBody.Messages[len(chatBody.Messages)-1].Stats = msgStats
|
||||||
Role: botPersona, Content: respText.String(),
|
|
||||||
}
|
}
|
||||||
// Process the new message to check for known_to tags in LLM response
|
} else {
|
||||||
newMsg = *processMessageTag(&newMsg)
|
chatBody.Messages[msgIdx].Content = respText.String()
|
||||||
chatBody.Messages = append(chatBody.Messages, newMsg)
|
processedMsg := processMessageTag(&chatBody.Messages[msgIdx])
|
||||||
|
chatBody.Messages[msgIdx] = *processedMsg
|
||||||
|
if msgStats != nil && chatBody.Messages[msgIdx].Role != cfg.ToolRole {
|
||||||
|
chatBody.Messages[msgIdx].Stats = msgStats
|
||||||
|
}
|
||||||
|
stopTTSIfNotForUser(&chatBody.Messages[msgIdx])
|
||||||
}
|
}
|
||||||
cleanChatBody()
|
cleanChatBody()
|
||||||
refreshChatDisplay()
|
refreshChatDisplay()
|
||||||
@@ -912,6 +1016,8 @@ func cleanChatBody() {
|
|||||||
|
|
||||||
// convertJSONToMapStringString unmarshals JSON into map[string]interface{} and converts all values to strings.
|
// convertJSONToMapStringString unmarshals JSON into map[string]interface{} and converts all values to strings.
|
||||||
func convertJSONToMapStringString(jsonStr string) (map[string]string, error) {
|
func convertJSONToMapStringString(jsonStr string) (map[string]string, error) {
|
||||||
|
// Extract JSON object from string - models may output extra text after JSON
|
||||||
|
jsonStr = extractJSON(jsonStr)
|
||||||
var raw map[string]interface{}
|
var raw map[string]interface{}
|
||||||
if err := json.Unmarshal([]byte(jsonStr), &raw); err != nil {
|
if err := json.Unmarshal([]byte(jsonStr), &raw); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -937,6 +1043,23 @@ func convertJSONToMapStringString(jsonStr string) (map[string]string, error) {
|
|||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// extractJSON finds the first { and last } to extract only the JSON object
|
||||||
|
// This handles cases where models output extra text after JSON
|
||||||
|
func extractJSON(s string) string {
|
||||||
|
// Try direct parse first - if it works, return as-is
|
||||||
|
var dummy map[string]interface{}
|
||||||
|
if err := json.Unmarshal([]byte(s), &dummy); err == nil {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
// Otherwise find JSON boundaries
|
||||||
|
start := strings.Index(s, "{")
|
||||||
|
end := strings.LastIndex(s, "}")
|
||||||
|
if start >= 0 && end > start {
|
||||||
|
return s[start : end+1]
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
// unmarshalFuncCall unmarshals a JSON tool call, converting numeric arguments to strings.
|
// unmarshalFuncCall unmarshals a JSON tool call, converting numeric arguments to strings.
|
||||||
func unmarshalFuncCall(jsonStr string) (*models.FuncCall, error) {
|
func unmarshalFuncCall(jsonStr string) (*models.FuncCall, error) {
|
||||||
type tempFuncCall struct {
|
type tempFuncCall struct {
|
||||||
@@ -1077,7 +1200,7 @@ func findCall(msg, toolCall string) bool {
|
|||||||
}
|
}
|
||||||
resp := callToolWithAgent(fc.Name, fc.Args)
|
resp := callToolWithAgent(fc.Name, fc.Args)
|
||||||
toolMsg := string(resp) // Remove the "tool response: " prefix and %+v formatting
|
toolMsg := string(resp) // Remove the "tool response: " prefix and %+v formatting
|
||||||
logger.Info("llm used tool call", "tool_resp", toolMsg, "tool_attrs", fc)
|
logger.Info("llm used a tool call", "tool_name", fc.Name, "too_args", fc.Args, "id", fc.ID, "tool_resp", toolMsg)
|
||||||
fmt.Fprintf(textView, "%s[-:-:b](%d) <%s>: [-:-:-]\n%s\n",
|
fmt.Fprintf(textView, "%s[-:-:b](%d) <%s>: [-:-:-]\n%s\n",
|
||||||
"\n\n", len(chatBody.Messages), cfg.ToolRole, toolMsg)
|
"\n\n", len(chatBody.Messages), cfg.ToolRole, toolMsg)
|
||||||
// Create tool response message with the proper tool_call_id
|
// Create tool response message with the proper tool_call_id
|
||||||
@@ -1113,7 +1236,33 @@ func chatToTextSlice(messages []models.RoleMsg, showSys bool) []string {
|
|||||||
|
|
||||||
func chatToText(messages []models.RoleMsg, showSys bool) string {
|
func chatToText(messages []models.RoleMsg, showSys bool) string {
|
||||||
s := chatToTextSlice(messages, showSys)
|
s := chatToTextSlice(messages, showSys)
|
||||||
return strings.Join(s, "\n")
|
text := strings.Join(s, "\n")
|
||||||
|
|
||||||
|
// Collapse thinking blocks if enabled
|
||||||
|
if thinkingCollapsed {
|
||||||
|
text = thinkRE.ReplaceAllStringFunc(text, func(match string) string {
|
||||||
|
// Extract content between <think> and </think>
|
||||||
|
start := len("<think>")
|
||||||
|
end := len(match) - len("</think>")
|
||||||
|
if start < end && start < len(match) {
|
||||||
|
content := match[start:end]
|
||||||
|
return fmt.Sprintf("[yellow::i][thinking... (%d chars) (press Alt+T to expand)][-:-:-]", len(content))
|
||||||
|
}
|
||||||
|
return "[yellow::i][thinking... (press Alt+T to expand)][-:-:-]"
|
||||||
|
})
|
||||||
|
// Handle incomplete thinking blocks (during streaming when </think> hasn't arrived yet)
|
||||||
|
if strings.Contains(text, "<think>") && !strings.Contains(text, "</think>") {
|
||||||
|
// Find the incomplete thinking block and replace it
|
||||||
|
startIdx := strings.Index(text, "<think>")
|
||||||
|
if startIdx != -1 {
|
||||||
|
content := text[startIdx+len("<think>"):]
|
||||||
|
placeholder := fmt.Sprintf("[yellow::i][thinking... (%d chars) (press Alt+T to expand)][-:-:-]", len(content))
|
||||||
|
text = text[:startIdx] + placeholder
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return text
|
||||||
}
|
}
|
||||||
|
|
||||||
func removeThinking(chatBody *models.ChatBody) {
|
func removeThinking(chatBody *models.ChatBody) {
|
||||||
@@ -1249,11 +1398,20 @@ func init() {
|
|||||||
var err error
|
var err error
|
||||||
cfg, err = config.LoadConfig("config.toml")
|
cfg, err = config.LoadConfig("config.toml")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("failed to load config.toml")
|
fmt.Println("failed to load config.toml", err)
|
||||||
cancel()
|
cancel()
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// Set image base directory for path display
|
||||||
|
baseDir := cfg.FilePickerDir
|
||||||
|
if baseDir == "" || baseDir == "." {
|
||||||
|
// Resolve "." to current working directory
|
||||||
|
if wd, err := os.Getwd(); err == nil {
|
||||||
|
baseDir = wd
|
||||||
|
}
|
||||||
|
}
|
||||||
|
models.SetImageBaseDir(baseDir)
|
||||||
defaultStarter = []models.RoleMsg{
|
defaultStarter = []models.RoleMsg{
|
||||||
{Role: "system", Content: basicSysMsg},
|
{Role: "system", Content: basicSysMsg},
|
||||||
{Role: cfg.AssistantRole, Content: defaultFirstMsg},
|
{Role: cfg.AssistantRole, Content: defaultFirstMsg},
|
||||||
|
|||||||
63
colors.go
Normal file
63
colors.go
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/gdamore/tcell/v2"
|
||||||
|
"github.com/rivo/tview"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
colorschemes = map[string]tview.Theme{
|
||||||
|
"default": tview.Theme{
|
||||||
|
PrimitiveBackgroundColor: tcell.ColorDefault,
|
||||||
|
ContrastBackgroundColor: tcell.ColorGray,
|
||||||
|
MoreContrastBackgroundColor: tcell.ColorSteelBlue,
|
||||||
|
BorderColor: tcell.ColorGray,
|
||||||
|
TitleColor: tcell.ColorRed,
|
||||||
|
GraphicsColor: tcell.ColorBlue,
|
||||||
|
PrimaryTextColor: tcell.ColorLightGray,
|
||||||
|
SecondaryTextColor: tcell.ColorYellow,
|
||||||
|
TertiaryTextColor: tcell.ColorOrange,
|
||||||
|
InverseTextColor: tcell.ColorPurple,
|
||||||
|
ContrastSecondaryTextColor: tcell.ColorLime,
|
||||||
|
},
|
||||||
|
"gruvbox": tview.Theme{
|
||||||
|
PrimitiveBackgroundColor: tcell.NewHexColor(0x282828), // Background: #282828 (dark gray)
|
||||||
|
ContrastBackgroundColor: tcell.ColorDarkGoldenrod, // Selected option: warm yellow (#b57614)
|
||||||
|
MoreContrastBackgroundColor: tcell.ColorDarkSlateGray, // Non-selected options: dark grayish-blue (#32302f)
|
||||||
|
BorderColor: tcell.ColorLightGray, // Light gray (#a89984)
|
||||||
|
TitleColor: tcell.ColorRed, // Red (#fb4934)
|
||||||
|
GraphicsColor: tcell.ColorDarkCyan, // Cyan (#689d6a)
|
||||||
|
PrimaryTextColor: tcell.ColorLightGray, // Light gray (#d5c4a1)
|
||||||
|
SecondaryTextColor: tcell.ColorYellow, // Yellow (#fabd2f)
|
||||||
|
TertiaryTextColor: tcell.ColorOrange, // Orange (#fe8019)
|
||||||
|
InverseTextColor: tcell.ColorWhite, // White (#f9f5d7) for selected text
|
||||||
|
ContrastSecondaryTextColor: tcell.ColorLightGreen, // Light green (#b8bb26)
|
||||||
|
},
|
||||||
|
"solarized": tview.Theme{
|
||||||
|
PrimitiveBackgroundColor: tcell.NewHexColor(0x002b36), // Background: #002b36 (base03)
|
||||||
|
ContrastBackgroundColor: tcell.ColorDarkCyan, // Selected option: cyan (#2aa198)
|
||||||
|
MoreContrastBackgroundColor: tcell.ColorDarkSlateGray, // Non-selected options: dark blue (#073642)
|
||||||
|
BorderColor: tcell.ColorLightBlue, // Light blue (#839496)
|
||||||
|
TitleColor: tcell.ColorRed, // Red (#dc322f)
|
||||||
|
GraphicsColor: tcell.ColorBlue, // Blue (#268bd2)
|
||||||
|
PrimaryTextColor: tcell.ColorWhite, // White (#fdf6e3)
|
||||||
|
SecondaryTextColor: tcell.ColorYellow, // Yellow (#b58900)
|
||||||
|
TertiaryTextColor: tcell.ColorOrange, // Orange (#cb4b16)
|
||||||
|
InverseTextColor: tcell.ColorWhite, // White (#eee8d5) for selected text
|
||||||
|
ContrastSecondaryTextColor: tcell.ColorLightCyan, // Light cyan (#93a1a1)
|
||||||
|
},
|
||||||
|
"dracula": tview.Theme{
|
||||||
|
PrimitiveBackgroundColor: tcell.NewHexColor(0x282a36), // Background: #282a36
|
||||||
|
ContrastBackgroundColor: tcell.ColorDarkMagenta, // Selected option: magenta (#bd93f9)
|
||||||
|
MoreContrastBackgroundColor: tcell.ColorDarkGray, // Non-selected options: dark gray (#44475a)
|
||||||
|
BorderColor: tcell.ColorLightGray, // Light gray (#f8f8f2)
|
||||||
|
TitleColor: tcell.ColorRed, // Red (#ff5555)
|
||||||
|
GraphicsColor: tcell.ColorDarkCyan, // Cyan (#8be9fd)
|
||||||
|
PrimaryTextColor: tcell.ColorWhite, // White (#f8f8f2)
|
||||||
|
SecondaryTextColor: tcell.ColorYellow, // Yellow (#f1fa8c)
|
||||||
|
TertiaryTextColor: tcell.ColorOrange, // Orange (#ffb86c)
|
||||||
|
InverseTextColor: tcell.ColorWhite, // White (#f8f8f2) for selected text
|
||||||
|
ContrastSecondaryTextColor: tcell.ColorLightGreen, // Light green (#50fa7b)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
@@ -10,7 +10,10 @@ DeepSeekModel = "deepseek-reasoner"
|
|||||||
OpenRouterCompletionAPI = "https://openrouter.ai/api/v1/completions"
|
OpenRouterCompletionAPI = "https://openrouter.ai/api/v1/completions"
|
||||||
OpenRouterChatAPI = "https://openrouter.ai/api/v1/chat/completions"
|
OpenRouterChatAPI = "https://openrouter.ai/api/v1/chat/completions"
|
||||||
# OpenRouterToken = ""
|
# OpenRouterToken = ""
|
||||||
|
# embeddings
|
||||||
EmbedURL = "http://localhost:8082/v1/embeddings"
|
EmbedURL = "http://localhost:8082/v1/embeddings"
|
||||||
|
HFToken = false
|
||||||
|
#
|
||||||
ShowSys = true
|
ShowSys = true
|
||||||
LogFile = "log.txt"
|
LogFile = "log.txt"
|
||||||
UserRole = "user"
|
UserRole = "user"
|
||||||
@@ -21,6 +24,7 @@ ChunkLimit = 100000
|
|||||||
AutoScrollEnabled = true
|
AutoScrollEnabled = true
|
||||||
AutoCleanToolCallsFromCtx = false
|
AutoCleanToolCallsFromCtx = false
|
||||||
# rag settings
|
# rag settings
|
||||||
|
RAGEnabled = false
|
||||||
RAGBatchSize = 1
|
RAGBatchSize = 1
|
||||||
RAGWordLimit = 80
|
RAGWordLimit = 80
|
||||||
RAGWorkers = 2
|
RAGWorkers = 2
|
||||||
@@ -41,10 +45,15 @@ STT_LANG = "en" # Language for speech recognition (for WHISPER_BINARY mode)
|
|||||||
STT_SR = 16000 # Sample rate for audio recording
|
STT_SR = 16000 # Sample rate for audio recording
|
||||||
#
|
#
|
||||||
DBPATH = "gflt.db"
|
DBPATH = "gflt.db"
|
||||||
FilePickerDir = "." # Directory where file picker should start
|
FilePickerDir = "." # Directory for file picker start and coding assistant file operations (relative paths resolved against this)
|
||||||
FilePickerExts = "png,jpg,jpeg,gif,webp" # Comma-separated list of allowed file extensions for file picker
|
FilePickerExts = "png,jpg,jpeg,gif,webp" # Comma-separated list of allowed file extensions for file picker
|
||||||
EnableMouse = false # Enable mouse support in the UI
|
EnableMouse = false # Enable mouse support in the UI
|
||||||
# character specific context
|
# character specific context
|
||||||
CharSpecificContextEnabled = true
|
CharSpecificContextEnabled = true
|
||||||
CharSpecificContextTag = "@"
|
CharSpecificContextTag = "@"
|
||||||
AutoTurn = true
|
AutoTurn = true
|
||||||
|
StripThinkingFromAPI = true # Strip <think> blocks from messages before sending to LLM (keeps them in chat history)
|
||||||
|
# OpenRouter reasoning configuration (only applies to OpenRouter chat API)
|
||||||
|
# Valid values: xhigh, high, medium, low, minimal, none (empty or none = disabled)
|
||||||
|
# Models that support reasoning will include thinking content wrapped in <think> tags
|
||||||
|
ReasoningEffort = "medium"
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ type Config struct {
|
|||||||
ToolRole string `toml:"ToolRole"`
|
ToolRole string `toml:"ToolRole"`
|
||||||
ToolUse bool `toml:"ToolUse"`
|
ToolUse bool `toml:"ToolUse"`
|
||||||
ThinkUse bool `toml:"ThinkUse"`
|
ThinkUse bool `toml:"ThinkUse"`
|
||||||
|
StripThinkingFromAPI bool `toml:"StripThinkingFromAPI"`
|
||||||
|
ReasoningEffort string `toml:"ReasoningEffort"`
|
||||||
AssistantRole string `toml:"AssistantRole"`
|
AssistantRole string `toml:"AssistantRole"`
|
||||||
SysDir string `toml:"SysDir"`
|
SysDir string `toml:"SysDir"`
|
||||||
ChunkLimit uint32 `toml:"ChunkLimit"`
|
ChunkLimit uint32 `toml:"ChunkLimit"`
|
||||||
@@ -30,13 +32,14 @@ type Config struct {
|
|||||||
DBPATH string `toml:"DBPATH"`
|
DBPATH string `toml:"DBPATH"`
|
||||||
FilePickerDir string `toml:"FilePickerDir"`
|
FilePickerDir string `toml:"FilePickerDir"`
|
||||||
FilePickerExts string `toml:"FilePickerExts"`
|
FilePickerExts string `toml:"FilePickerExts"`
|
||||||
|
ImagePreview bool `toml:"ImagePreview"`
|
||||||
EnableMouse bool `toml:"EnableMouse"`
|
EnableMouse bool `toml:"EnableMouse"`
|
||||||
// embeddings
|
// embeddings
|
||||||
RAGEnabled bool `toml:"RAGEnabled"`
|
|
||||||
EmbedURL string `toml:"EmbedURL"`
|
EmbedURL string `toml:"EmbedURL"`
|
||||||
HFToken string `toml:"HFToken"`
|
HFToken string `toml:"HFToken"`
|
||||||
RAGDir string `toml:"RAGDir"`
|
|
||||||
// rag settings
|
// rag settings
|
||||||
|
RAGEnabled bool `toml:"RAGEnabled"`
|
||||||
|
RAGDir string `toml:"RAGDir"`
|
||||||
RAGWorkers uint32 `toml:"RAGWorkers"`
|
RAGWorkers uint32 `toml:"RAGWorkers"`
|
||||||
RAGBatchSize int `toml:"RAGBatchSize"`
|
RAGBatchSize int `toml:"RAGBatchSize"`
|
||||||
RAGWordLimit uint32 `toml:"RAGWordLimit"`
|
RAGWordLimit uint32 `toml:"RAGWordLimit"`
|
||||||
|
|||||||
@@ -113,16 +113,7 @@ When `AutoTurn` is enabled, the system can automatically trigger responses from
|
|||||||
## Cardmaking with multiple characters
|
## Cardmaking with multiple characters
|
||||||
|
|
||||||
So far only json format supports multiple characters.
|
So far only json format supports multiple characters.
|
||||||
Card example:
|
[card example](sysprompts/alice_bob_carl.json)
|
||||||
```
|
|
||||||
{
|
|
||||||
"sys_prompt": "This is a chat between Alice, Bob and Carl. Normally what is said by any character is seen by all others. But characters also might write messages intended to specific targets if their message contain string tag '@{CharName1,CharName2,CharName3}@'.\nFor example:\nAlice:\n\"Hey, Bob. I have a secret for you... (ooc: @Bob@)\"\nThis message would be seen only by Bob and Alice (sender always sees their own message).",
|
|
||||||
"role": "Alice",
|
|
||||||
"filepath": "sysprompts/alice_bob_carl.json",
|
|
||||||
"chars": ["Alice", "Bob", "Carl"],
|
|
||||||
"first_msg": "Hey guys! Want to play Alias like game? I'll tell Bob a word and he needs to describe that word so Carl can guess what it was?"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Limitations & Caveats
|
## Limitations & Caveats
|
||||||
|
|
||||||
@@ -131,7 +122,7 @@ Card example:
|
|||||||
Character‑specific context relies on the `/completion` endpoint (or other completion‑style endpoints) where the LLM is presented with a raw text prompt containing the entire filtered history. It does **not** work with OpenAI‑style `/v1/chat/completions` endpoints, because those endpoints enforce a fixed role set (`user`/`assistant`/`system`) and strip custom role names and metadata.
|
Character‑specific context relies on the `/completion` endpoint (or other completion‑style endpoints) where the LLM is presented with a raw text prompt containing the entire filtered history. It does **not** work with OpenAI‑style `/v1/chat/completions` endpoints, because those endpoints enforce a fixed role set (`user`/`assistant`/`system`) and strip custom role names and metadata.
|
||||||
|
|
||||||
### TTS
|
### TTS
|
||||||
Although text message might be hidden from user character. If TTS is enabled it will be read.
|
Although text message might be hidden from user character. If TTS is enabled it will be read until tags are parsed. If message should not be viewed by user, tts will stop.
|
||||||
|
|
||||||
### Tag Parsing
|
### Tag Parsing
|
||||||
|
|
||||||
@@ -140,14 +140,24 @@ This document explains how to set up and configure the application using the `co
|
|||||||
- Path to the SQLite database file used for storing conversation history and other data.
|
- Path to the SQLite database file used for storing conversation history and other data.
|
||||||
|
|
||||||
#### FilePickerDir (`"."`)
|
#### FilePickerDir (`"."`)
|
||||||
- Directory where the file (image) picker should start when selecting files.
|
- Directory where the file picker starts and where relative paths in coding assistant file tools (file_read, file_write, etc.) are resolved against. Use absolute paths (starting with `/`) to bypass this.
|
||||||
|
|
||||||
#### FilePickerExts (`"png,jpg,jpeg,gif,webp"`)
|
|
||||||
- Comma-separated list of allowed file extensions for the file picker.
|
|
||||||
|
|
||||||
#### EnableMouse (`false`)
|
#### EnableMouse (`false`)
|
||||||
- Enable or disable mouse support in the UI. When set to `true`, allows clicking buttons and interacting with UI elements using the mouse, but prevents the terminal from handling mouse events normally (such as selecting and copying text). When set to `false`, enables default terminal behavior allowing you to select and copy text, but disables mouse interaction with UI elements.
|
- Enable or disable mouse support in the UI. When set to `true`, allows clicking buttons and interacting with UI elements using the mouse, but prevents the terminal from handling mouse events normally (such as selecting and copying text). When set to `false`, enables default terminal behavior allowing you to select and copy text, but disables mouse interaction with UI elements.
|
||||||
|
|
||||||
|
### Character-Specific Context Settings (/completion only)
|
||||||
|
|
||||||
|
[character specific context page for more info](./char-specific-context.md)
|
||||||
|
|
||||||
|
#### CharSpecificContextEnabled (`true`)
|
||||||
|
- Enable or disable character-specific context functionality.
|
||||||
|
|
||||||
|
#### CharSpecificContextTag (`"@"`)
|
||||||
|
- The tag prefix used to reference character-specific context in messages.
|
||||||
|
|
||||||
|
#### AutoTurn (`true`)
|
||||||
|
- Enable or disable automatic turn detection/switching.
|
||||||
|
|
||||||
### Additional Features
|
### Additional Features
|
||||||
|
|
||||||
Those could be switched in program, but also bould be setup in config.
|
Those could be switched in program, but also bould be setup in config.
|
||||||
@@ -156,7 +166,13 @@ Those could be switched in program, but also bould be setup in config.
|
|||||||
- Enable or disable explanation of tools to llm, so it could use them.
|
- Enable or disable explanation of tools to llm, so it could use them.
|
||||||
|
|
||||||
#### ThinkUse
|
#### ThinkUse
|
||||||
- Enable or disable insertion of <think> token at the beggining of llm resp.
|
- Enable or disable insertion of JsonSerializerToken at the beggining of llm resp.
|
||||||
|
|
||||||
|
### StripThinkingFromAPI (`true`)
|
||||||
|
- Strip thinking blocks from messages before sending to LLM. Keeps them in chat history for local viewing but reduces token usage in API calls.
|
||||||
|
|
||||||
|
#### ReasoningEffort (`"medium"`)
|
||||||
|
- OpenRouter reasoning configuration (only applies to OpenRouter chat API). Valid values: `xhigh`, `high`, `medium`, `low`, `minimal`, `none`. Empty or `none` disables reasoning.
|
||||||
|
|
||||||
## Environment Variables
|
## Environment Variables
|
||||||
|
|
||||||
|
|||||||
96
extra/tts.go
96
extra/tts.go
@@ -13,10 +13,9 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
"sync"
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
google_translate_tts "github.com/GrailFinder/google-translate-tts"
|
google_translate_tts "github.com/GrailFinder/google-translate-tts"
|
||||||
"github.com/GrailFinder/google-translate-tts/handlers"
|
"github.com/GrailFinder/google-translate-tts/handlers"
|
||||||
@@ -31,43 +30,8 @@ var (
|
|||||||
TTSFlushChan = make(chan bool, 1)
|
TTSFlushChan = make(chan bool, 1)
|
||||||
TTSDoneChan = make(chan bool, 1)
|
TTSDoneChan = make(chan bool, 1)
|
||||||
// endsWithPunctuation = regexp.MustCompile(`[;.!?]$`)
|
// endsWithPunctuation = regexp.MustCompile(`[;.!?]$`)
|
||||||
threeOrMoreDashesRE = regexp.MustCompile(`-{3,}`)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// cleanText removes markdown and special characters that are not suitable for TTS
|
|
||||||
func cleanText(text string) string {
|
|
||||||
// Remove markdown-like characters that might interfere with TTS
|
|
||||||
text = strings.ReplaceAll(text, "*", "") // Bold/italic markers
|
|
||||||
text = strings.ReplaceAll(text, "#", "") // Headers
|
|
||||||
text = strings.ReplaceAll(text, "_", "") // Underline/italic markers
|
|
||||||
text = strings.ReplaceAll(text, "~", "") // Strikethrough markers
|
|
||||||
text = strings.ReplaceAll(text, "`", "") // Code markers
|
|
||||||
text = strings.ReplaceAll(text, "[", "") // Link brackets
|
|
||||||
text = strings.ReplaceAll(text, "]", "") // Link brackets
|
|
||||||
text = strings.ReplaceAll(text, "!", "") // Exclamation marks (if not punctuation)
|
|
||||||
// Remove HTML tags using regex
|
|
||||||
htmlTagRegex := regexp.MustCompile(`<[^>]*>`)
|
|
||||||
text = htmlTagRegex.ReplaceAllString(text, "")
|
|
||||||
// Split text into lines to handle table separators
|
|
||||||
lines := strings.Split(text, "\n")
|
|
||||||
var filteredLines []string
|
|
||||||
for _, line := range lines {
|
|
||||||
// Check if the line looks like a table separator (e.g., |----|, |===|, | - - - |)
|
|
||||||
// A table separator typically contains only |, -, =, and spaces
|
|
||||||
isTableSeparator := regexp.MustCompile(`^\s*\|\s*[-=\s]+\|\s*$`).MatchString(strings.TrimSpace(line))
|
|
||||||
if !isTableSeparator {
|
|
||||||
// If it's not a table separator, remove vertical bars but keep the content
|
|
||||||
processedLine := strings.ReplaceAll(line, "|", "")
|
|
||||||
filteredLines = append(filteredLines, processedLine)
|
|
||||||
}
|
|
||||||
// If it is a table separator, skip it (don't add to filteredLines)
|
|
||||||
}
|
|
||||||
text = strings.Join(filteredLines, "\n")
|
|
||||||
text = threeOrMoreDashesRE.ReplaceAllString(text, "")
|
|
||||||
text = strings.TrimSpace(text) // Remove leading/trailing whitespace
|
|
||||||
return text
|
|
||||||
}
|
|
||||||
|
|
||||||
type Orator interface {
|
type Orator interface {
|
||||||
Speak(text string) error
|
Speak(text string) error
|
||||||
Stop()
|
Stop()
|
||||||
@@ -128,8 +92,6 @@ func (o *KokoroOrator) stoproutine() {
|
|||||||
|
|
||||||
func (o *KokoroOrator) readroutine() {
|
func (o *KokoroOrator) readroutine() {
|
||||||
tokenizer, _ := english.NewSentenceTokenizer(nil)
|
tokenizer, _ := english.NewSentenceTokenizer(nil)
|
||||||
// var sentenceBuf bytes.Buffer
|
|
||||||
// var remainder strings.Builder
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case chunk := <-TTSTextChan:
|
case chunk := <-TTSTextChan:
|
||||||
@@ -142,24 +104,28 @@ func (o *KokoroOrator) readroutine() {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
text := o.textBuffer.String()
|
text := o.textBuffer.String()
|
||||||
o.mu.Unlock()
|
|
||||||
sentences := tokenizer.Tokenize(text)
|
sentences := tokenizer.Tokenize(text)
|
||||||
o.logger.Debug("adding chunk", "chunk", chunk, "text", text, "sen-len", len(sentences))
|
o.logger.Debug("adding chunk", "chunk", chunk, "text", text, "sen-len", len(sentences))
|
||||||
for i, sentence := range sentences {
|
if len(sentences) <= 1 {
|
||||||
if i == len(sentences)-1 { // last sentence
|
|
||||||
o.mu.Lock()
|
|
||||||
o.textBuffer.Reset()
|
|
||||||
_, err := o.textBuffer.WriteString(sentence.Text)
|
|
||||||
o.mu.Unlock()
|
o.mu.Unlock()
|
||||||
if err != nil {
|
|
||||||
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
continue // if only one (often incomplete) sentence; wait for next chunk
|
completeSentences := sentences[:len(sentences)-1]
|
||||||
|
remaining := sentences[len(sentences)-1].Text
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.textBuffer.WriteString(remaining)
|
||||||
|
o.mu.Unlock()
|
||||||
|
|
||||||
|
for _, sentence := range completeSentences {
|
||||||
|
o.mu.Lock()
|
||||||
|
interrupted := o.interrupt
|
||||||
|
o.mu.Unlock()
|
||||||
|
if interrupted {
|
||||||
|
return
|
||||||
}
|
}
|
||||||
cleanedText := cleanText(sentence.Text)
|
cleanedText := models.CleanText(sentence.Text)
|
||||||
if cleanedText == "" {
|
if cleanedText == "" {
|
||||||
continue // Skip empty text after cleaning
|
continue
|
||||||
}
|
}
|
||||||
o.logger.Debug("calling Speak with sentence", "sent", cleanedText)
|
o.logger.Debug("calling Speak with sentence", "sent", cleanedText)
|
||||||
if err := o.Speak(cleanedText); err != nil {
|
if err := o.Speak(cleanedText); err != nil {
|
||||||
@@ -186,7 +152,7 @@ func (o *KokoroOrator) readroutine() {
|
|||||||
// flush remaining text
|
// flush remaining text
|
||||||
o.mu.Lock()
|
o.mu.Lock()
|
||||||
remaining := o.textBuffer.String()
|
remaining := o.textBuffer.String()
|
||||||
remaining = cleanText(remaining)
|
remaining = models.CleanText(remaining)
|
||||||
o.textBuffer.Reset()
|
o.textBuffer.Reset()
|
||||||
o.mu.Unlock()
|
o.mu.Unlock()
|
||||||
if remaining == "" {
|
if remaining == "" {
|
||||||
@@ -374,24 +340,28 @@ func (o *GoogleTranslateOrator) readroutine() {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
text := o.textBuffer.String()
|
text := o.textBuffer.String()
|
||||||
o.mu.Unlock()
|
|
||||||
sentences := tokenizer.Tokenize(text)
|
sentences := tokenizer.Tokenize(text)
|
||||||
o.logger.Debug("adding chunk", "chunk", chunk, "text", text, "sen-len", len(sentences))
|
o.logger.Debug("adding chunk", "chunk", chunk, "text", text, "sen-len", len(sentences))
|
||||||
for i, sentence := range sentences {
|
if len(sentences) <= 1 {
|
||||||
if i == len(sentences)-1 { // last sentence
|
|
||||||
o.mu.Lock()
|
|
||||||
o.textBuffer.Reset()
|
|
||||||
_, err := o.textBuffer.WriteString(sentence.Text)
|
|
||||||
o.mu.Unlock()
|
o.mu.Unlock()
|
||||||
if err != nil {
|
|
||||||
o.logger.Warn("failed to write to stringbuilder", "error", err)
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
continue // if only one (often incomplete) sentence; wait for next chunk
|
completeSentences := sentences[:len(sentences)-1]
|
||||||
|
remaining := sentences[len(sentences)-1].Text
|
||||||
|
o.textBuffer.Reset()
|
||||||
|
o.textBuffer.WriteString(remaining)
|
||||||
|
o.mu.Unlock()
|
||||||
|
|
||||||
|
for _, sentence := range completeSentences {
|
||||||
|
o.mu.Lock()
|
||||||
|
interrupted := o.interrupt
|
||||||
|
o.mu.Unlock()
|
||||||
|
if interrupted {
|
||||||
|
return
|
||||||
}
|
}
|
||||||
cleanedText := cleanText(sentence.Text)
|
cleanedText := models.CleanText(sentence.Text)
|
||||||
if cleanedText == "" {
|
if cleanedText == "" {
|
||||||
continue // Skip empty text after cleaning
|
continue
|
||||||
}
|
}
|
||||||
o.logger.Debug("calling Speak with sentence", "sent", cleanedText)
|
o.logger.Debug("calling Speak with sentence", "sent", cleanedText)
|
||||||
if err := o.Speak(cleanedText); err != nil {
|
if err := o.Speak(cleanedText); err != nil {
|
||||||
@@ -417,7 +387,7 @@ func (o *GoogleTranslateOrator) readroutine() {
|
|||||||
}
|
}
|
||||||
o.mu.Lock()
|
o.mu.Lock()
|
||||||
remaining := o.textBuffer.String()
|
remaining := o.textBuffer.String()
|
||||||
remaining = cleanText(remaining)
|
remaining = models.CleanText(remaining)
|
||||||
o.textBuffer.Reset()
|
o.textBuffer.Reset()
|
||||||
o.mu.Unlock()
|
o.mu.Unlock()
|
||||||
if remaining == "" {
|
if remaining == "" {
|
||||||
|
|||||||
494
helpfuncs.go
494
helpfuncs.go
@@ -5,15 +5,61 @@ import (
|
|||||||
"gf-lt/models"
|
"gf-lt/models"
|
||||||
"gf-lt/pngmeta"
|
"gf-lt/pngmeta"
|
||||||
"image"
|
"image"
|
||||||
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
"path"
|
"path"
|
||||||
|
"path/filepath"
|
||||||
"slices"
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
"unicode"
|
"unicode"
|
||||||
|
|
||||||
"math/rand/v2"
|
"math/rand/v2"
|
||||||
|
|
||||||
|
"github.com/rivo/tview"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Cached model color - updated by background goroutine
|
||||||
|
var cachedModelColor string = "orange"
|
||||||
|
|
||||||
|
// startModelColorUpdater starts a background goroutine that periodically updates
|
||||||
|
// the cached model color. Only runs HTTP requests for local llama.cpp APIs.
|
||||||
|
func startModelColorUpdater() {
|
||||||
|
go func() {
|
||||||
|
ticker := time.NewTicker(5 * time.Second)
|
||||||
|
defer ticker.Stop()
|
||||||
|
|
||||||
|
// Initial check
|
||||||
|
updateCachedModelColor()
|
||||||
|
|
||||||
|
for range ticker.C {
|
||||||
|
updateCachedModelColor()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// updateCachedModelColor updates the global cachedModelColor variable
|
||||||
|
func updateCachedModelColor() {
|
||||||
|
if !isLocalLlamacpp() {
|
||||||
|
cachedModelColor = "orange"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if model is loaded
|
||||||
|
loaded, err := isModelLoaded(chatBody.Model)
|
||||||
|
if err != nil {
|
||||||
|
// On error, assume not loaded (red)
|
||||||
|
cachedModelColor = "red"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if loaded {
|
||||||
|
cachedModelColor = "green"
|
||||||
|
} else {
|
||||||
|
cachedModelColor = "red"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func isASCII(s string) bool {
|
func isASCII(s string) bool {
|
||||||
for i := 0; i < len(s); i++ {
|
for i := 0; i < len(s); i++ {
|
||||||
if s[i] > unicode.MaxASCII {
|
if s[i] > unicode.MaxASCII {
|
||||||
@@ -23,6 +69,25 @@ func isASCII(s string) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// stripThinkingFromMsg removes thinking blocks from assistant messages.
|
||||||
|
// Skips user, tool, and system messages as they may contain thinking examples.
|
||||||
|
func stripThinkingFromMsg(msg *models.RoleMsg) *models.RoleMsg {
|
||||||
|
if !cfg.StripThinkingFromAPI {
|
||||||
|
return msg
|
||||||
|
}
|
||||||
|
// Skip user, tool, and system messages - they might contain thinking examples
|
||||||
|
if msg.Role == cfg.UserRole || msg.Role == cfg.ToolRole || msg.Role == "system" {
|
||||||
|
return msg
|
||||||
|
}
|
||||||
|
// Strip thinking from assistant messages
|
||||||
|
if thinkRE.MatchString(msg.Content) {
|
||||||
|
msg.Content = thinkRE.ReplaceAllString(msg.Content, "")
|
||||||
|
// Clean up any double newlines that might result
|
||||||
|
msg.Content = strings.TrimSpace(msg.Content)
|
||||||
|
}
|
||||||
|
return msg
|
||||||
|
}
|
||||||
|
|
||||||
// refreshChatDisplay updates the chat display based on current character view
|
// refreshChatDisplay updates the chat display based on current character view
|
||||||
// It filters messages for the character the user is currently "writing as"
|
// It filters messages for the character the user is currently "writing as"
|
||||||
// and updates the textView with the filtered conversation
|
// and updates the textView with the filtered conversation
|
||||||
@@ -35,14 +100,27 @@ func refreshChatDisplay() {
|
|||||||
// Filter messages for this character
|
// Filter messages for this character
|
||||||
filteredMessages := filterMessagesForCharacter(chatBody.Messages, viewingAs)
|
filteredMessages := filterMessagesForCharacter(chatBody.Messages, viewingAs)
|
||||||
displayText := chatToText(filteredMessages, cfg.ShowSys)
|
displayText := chatToText(filteredMessages, cfg.ShowSys)
|
||||||
// Use QueueUpdate for thread-safe UI updates
|
|
||||||
app.QueueUpdate(func() {
|
|
||||||
textView.SetText(displayText)
|
textView.SetText(displayText)
|
||||||
colorText()
|
colorText()
|
||||||
|
updateStatusLine()
|
||||||
if scrollToEndEnabled {
|
if scrollToEndEnabled {
|
||||||
textView.ScrollToEnd()
|
textView.ScrollToEnd()
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
|
||||||
|
// stopTTSIfNotForUser: character specific context, not meant fot the human to hear
|
||||||
|
func stopTTSIfNotForUser(msg *models.RoleMsg) {
|
||||||
|
if strings.Contains(cfg.CurrentAPI, "/chat") || !cfg.CharSpecificContextEnabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
viewingAs := cfg.UserRole
|
||||||
|
if cfg.WriteNextMsgAs != "" {
|
||||||
|
viewingAs = cfg.WriteNextMsgAs
|
||||||
|
}
|
||||||
|
// stop tts if msg is not for user
|
||||||
|
if !slices.Contains(msg.KnownTo, viewingAs) && cfg.TTS_ENABLED {
|
||||||
|
TTSDoneChan <- true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func colorText() {
|
func colorText() {
|
||||||
@@ -98,8 +176,8 @@ func colorText() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func updateStatusLine() {
|
func updateStatusLine() {
|
||||||
statusLineWidget.SetText(makeStatusLine())
|
status := makeStatusLine()
|
||||||
helpView.SetText(fmt.Sprintf(helpText, makeStatusLine()))
|
statusLineWidget.SetText(status)
|
||||||
}
|
}
|
||||||
|
|
||||||
func initSysCards() ([]string, error) {
|
func initSysCards() ([]string, error) {
|
||||||
@@ -231,6 +309,23 @@ func strInSlice(s string, sl []string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isLocalLlamacpp checks if the current API is a local llama.cpp instance.
|
||||||
|
func isLocalLlamacpp() bool {
|
||||||
|
u, err := url.Parse(cfg.CurrentAPI)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
host := u.Hostname()
|
||||||
|
return host == "localhost" || host == "127.0.0.1" || host == "::1"
|
||||||
|
}
|
||||||
|
|
||||||
|
// getModelColor returns the cached color tag for the model name.
|
||||||
|
// The cached value is updated by a background goroutine every 5 seconds.
|
||||||
|
// For non-local models, returns orange. For local llama.cpp models, returns green if loaded, red if not.
|
||||||
|
func getModelColor() string {
|
||||||
|
return cachedModelColor
|
||||||
|
}
|
||||||
|
|
||||||
func makeStatusLine() string {
|
func makeStatusLine() string {
|
||||||
isRecording := false
|
isRecording := false
|
||||||
if asr != nil {
|
if asr != nil {
|
||||||
@@ -260,10 +355,21 @@ func makeStatusLine() string {
|
|||||||
} else {
|
} else {
|
||||||
shellModeInfo = ""
|
shellModeInfo = ""
|
||||||
}
|
}
|
||||||
statusLine := fmt.Sprintf(indexLineCompletion, boolColors[botRespMode], botRespMode, activeChatName,
|
// Get model color based on load status for local llama.cpp models
|
||||||
boolColors[cfg.ToolUse], cfg.ToolUse, chatBody.Model, boolColors[cfg.SkipLLMResp],
|
modelColor := getModelColor()
|
||||||
cfg.SkipLLMResp, cfg.CurrentAPI, boolColors[isRecording], isRecording, persona,
|
statusLine := fmt.Sprintf(statusLineTempl, boolColors[botRespMode], activeChatName,
|
||||||
botPersona, boolColors[injectRole], injectRole)
|
boolColors[cfg.ToolUse], modelColor, chatBody.Model, boolColors[cfg.SkipLLMResp],
|
||||||
|
cfg.CurrentAPI, persona, botPersona)
|
||||||
|
if cfg.STT_ENABLED {
|
||||||
|
recordingS := fmt.Sprintf(" | [%s:-:b]voice recording[-:-:-] (ctrl+r)",
|
||||||
|
boolColors[isRecording])
|
||||||
|
statusLine += recordingS
|
||||||
|
}
|
||||||
|
// completion endpoint
|
||||||
|
if !strings.Contains(cfg.CurrentAPI, "chat") {
|
||||||
|
roleInject := fmt.Sprintf(" | [%s:-:b]role injection[-:-:-] (alt+7)", boolColors[injectRole])
|
||||||
|
statusLine += roleInject
|
||||||
|
}
|
||||||
return statusLine + imageInfo + shellModeInfo
|
return statusLine + imageInfo + shellModeInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -315,3 +421,373 @@ func deepseekModelValidator() error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// == shellmode ==
|
||||||
|
|
||||||
|
func toggleShellMode() {
|
||||||
|
shellMode = !shellMode
|
||||||
|
if shellMode {
|
||||||
|
// Update input placeholder to indicate shell mode
|
||||||
|
textArea.SetPlaceholder("SHELL MODE: Enter command and press <Esc> to execute")
|
||||||
|
} else {
|
||||||
|
// Reset to normal mode
|
||||||
|
textArea.SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message. Alt+1 to exit shell mode")
|
||||||
|
}
|
||||||
|
updateStatusLine()
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateFlexLayout() {
|
||||||
|
if fullscreenMode {
|
||||||
|
// flex already contains only focused widget; do nothing
|
||||||
|
return
|
||||||
|
}
|
||||||
|
flex.Clear()
|
||||||
|
flex.AddItem(textView, 0, 40, false)
|
||||||
|
flex.AddItem(textArea, 0, 10, false)
|
||||||
|
if positionVisible {
|
||||||
|
flex.AddItem(statusLineWidget, 0, 2, false)
|
||||||
|
}
|
||||||
|
// Keep focus on currently focused widget
|
||||||
|
focused := app.GetFocus()
|
||||||
|
if focused == textView {
|
||||||
|
app.SetFocus(textView)
|
||||||
|
} else {
|
||||||
|
app.SetFocus(textArea)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func executeCommandAndDisplay(cmdText string) {
|
||||||
|
// Parse the command (split by spaces, but handle quoted arguments)
|
||||||
|
cmdParts := parseCommand(cmdText)
|
||||||
|
if len(cmdParts) == 0 {
|
||||||
|
fmt.Fprintf(textView, "\n[red]Error: No command provided[-:-:-]\n")
|
||||||
|
if scrollToEndEnabled {
|
||||||
|
textView.ScrollToEnd()
|
||||||
|
}
|
||||||
|
colorText()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
command := cmdParts[0]
|
||||||
|
args := []string{}
|
||||||
|
if len(cmdParts) > 1 {
|
||||||
|
args = cmdParts[1:]
|
||||||
|
}
|
||||||
|
// Create the command execution
|
||||||
|
cmd := exec.Command(command, args...)
|
||||||
|
// Execute the command and get output
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
// Add the command being executed to the chat
|
||||||
|
fmt.Fprintf(textView, "\n[yellow]$ %s[-:-:-]\n", cmdText)
|
||||||
|
var outputContent string
|
||||||
|
if err != nil {
|
||||||
|
// Include both output and error
|
||||||
|
errorMsg := "Error: " + err.Error()
|
||||||
|
fmt.Fprintf(textView, "[red]%s[-:-:-]\n", errorMsg)
|
||||||
|
if len(output) > 0 {
|
||||||
|
outputStr := string(output)
|
||||||
|
fmt.Fprintf(textView, "[red]%s[-:-:-]\n", outputStr)
|
||||||
|
outputContent = errorMsg + "\n" + outputStr
|
||||||
|
} else {
|
||||||
|
outputContent = errorMsg
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Only output if successful
|
||||||
|
if len(output) > 0 {
|
||||||
|
outputStr := string(output)
|
||||||
|
fmt.Fprintf(textView, "[green]%s[-:-:-]\n", outputStr)
|
||||||
|
outputContent = outputStr
|
||||||
|
} else {
|
||||||
|
successMsg := "Command executed successfully (no output)"
|
||||||
|
fmt.Fprintf(textView, "[green]%s[-:-:-]\n", successMsg)
|
||||||
|
outputContent = successMsg
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Combine command and output in a single message for chat history
|
||||||
|
combinedContent := "$ " + cmdText + "\n\n" + outputContent
|
||||||
|
combinedMsg := models.RoleMsg{
|
||||||
|
Role: cfg.ToolRole,
|
||||||
|
Content: combinedContent,
|
||||||
|
}
|
||||||
|
chatBody.Messages = append(chatBody.Messages, combinedMsg)
|
||||||
|
// Scroll to end and update colors
|
||||||
|
if scrollToEndEnabled {
|
||||||
|
textView.ScrollToEnd()
|
||||||
|
}
|
||||||
|
colorText()
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseCommand splits command string handling quotes properly
|
||||||
|
func parseCommand(cmd string) []string {
|
||||||
|
var args []string
|
||||||
|
var current string
|
||||||
|
var inQuotes bool
|
||||||
|
var quoteChar rune
|
||||||
|
for _, r := range cmd {
|
||||||
|
switch r {
|
||||||
|
case '"', '\'':
|
||||||
|
if inQuotes {
|
||||||
|
if r == quoteChar {
|
||||||
|
inQuotes = false
|
||||||
|
} else {
|
||||||
|
current += string(r)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
inQuotes = true
|
||||||
|
quoteChar = r
|
||||||
|
}
|
||||||
|
case ' ', '\t':
|
||||||
|
if inQuotes {
|
||||||
|
current += string(r)
|
||||||
|
} else if current != "" {
|
||||||
|
args = append(args, current)
|
||||||
|
current = ""
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
current += string(r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if current != "" {
|
||||||
|
args = append(args, current)
|
||||||
|
}
|
||||||
|
return args
|
||||||
|
}
|
||||||
|
|
||||||
|
// == search ==
|
||||||
|
|
||||||
|
// Global variables for search state
|
||||||
|
var searchResults []int
|
||||||
|
var searchResultLengths []int // To store the length of each match in the formatted string
|
||||||
|
var searchIndex int
|
||||||
|
var searchText string
|
||||||
|
var originalTextForSearch string
|
||||||
|
|
||||||
|
// performSearch searches for the given term in the textView content and highlights matches
|
||||||
|
func performSearch(term string) {
|
||||||
|
searchText = term
|
||||||
|
if searchText == "" {
|
||||||
|
searchResults = nil
|
||||||
|
searchResultLengths = nil
|
||||||
|
originalTextForSearch = ""
|
||||||
|
// Re-render text without highlights
|
||||||
|
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||||
|
colorText()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Get formatted text and search directly in it to avoid mapping issues
|
||||||
|
formattedText := textView.GetText(true)
|
||||||
|
originalTextForSearch = formattedText
|
||||||
|
searchTermLower := strings.ToLower(searchText)
|
||||||
|
formattedTextLower := strings.ToLower(formattedText)
|
||||||
|
// Find all occurrences of the search term in the formatted text directly
|
||||||
|
formattedSearchResults := []int{}
|
||||||
|
searchStart := 0
|
||||||
|
for {
|
||||||
|
pos := strings.Index(formattedTextLower[searchStart:], searchTermLower)
|
||||||
|
if pos == -1 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
absolutePos := searchStart + pos
|
||||||
|
formattedSearchResults = append(formattedSearchResults, absolutePos)
|
||||||
|
searchStart = absolutePos + len(searchText)
|
||||||
|
}
|
||||||
|
if len(formattedSearchResults) == 0 {
|
||||||
|
// No matches found
|
||||||
|
searchResults = nil
|
||||||
|
searchResultLengths = nil
|
||||||
|
notification := "Pattern not found: " + term
|
||||||
|
if err := notifyUser("search", notification); err != nil {
|
||||||
|
logger.Error("failed to send notification", "error", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Store the formatted text positions and lengths for accurate highlighting
|
||||||
|
searchResults = formattedSearchResults
|
||||||
|
// Create lengths array - all matches have the same length as the search term
|
||||||
|
searchResultLengths = make([]int, len(formattedSearchResults))
|
||||||
|
for i := range searchResultLengths {
|
||||||
|
searchResultLengths[i] = len(searchText)
|
||||||
|
}
|
||||||
|
searchIndex = 0
|
||||||
|
highlightCurrentMatch()
|
||||||
|
}
|
||||||
|
|
||||||
|
// highlightCurrentMatch highlights the current search match and scrolls to it
|
||||||
|
func highlightCurrentMatch() {
|
||||||
|
if len(searchResults) == 0 || searchIndex >= len(searchResults) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Get the stored formatted text
|
||||||
|
formattedText := originalTextForSearch
|
||||||
|
// For tview to properly support highlighting and scrolling, we need to work with its region system
|
||||||
|
// Instead of just applying highlights, we need to add region tags to the text
|
||||||
|
highlightedText := addRegionTags(formattedText, searchResults, searchResultLengths, searchIndex, searchText)
|
||||||
|
// Update the text view with the text that includes region tags
|
||||||
|
textView.SetText(highlightedText)
|
||||||
|
// Highlight the current region and scroll to it
|
||||||
|
// Need to identify which position in the results array corresponds to the current match
|
||||||
|
// The region ID will be search_<position>_<index>
|
||||||
|
currentRegion := fmt.Sprintf("search_%d_%d", searchResults[searchIndex], searchIndex)
|
||||||
|
textView.Highlight(currentRegion).ScrollToHighlight()
|
||||||
|
// Send notification about which match we're at
|
||||||
|
notification := fmt.Sprintf("Match %d of %d", searchIndex+1, len(searchResults))
|
||||||
|
if err := notifyUser("search", notification); err != nil {
|
||||||
|
logger.Error("failed to send notification", "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// showSearchBar shows the search input field as an overlay
|
||||||
|
func showSearchBar() {
|
||||||
|
// Create a temporary flex to combine search and main content
|
||||||
|
updatedFlex := tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
|
AddItem(searchField, 3, 0, true). // Search field at top
|
||||||
|
AddItem(flex, 0, 1, false) // Main flex layout below
|
||||||
|
// Add the search overlay as a page
|
||||||
|
pages.AddPage(searchPageName, updatedFlex, true, true)
|
||||||
|
app.SetFocus(searchField)
|
||||||
|
}
|
||||||
|
|
||||||
|
// hideSearchBar hides the search input field
|
||||||
|
func hideSearchBar() {
|
||||||
|
pages.RemovePage(searchPageName)
|
||||||
|
// Return focus to the text view
|
||||||
|
app.SetFocus(textView)
|
||||||
|
// Clear the search field
|
||||||
|
searchField.SetText("")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Global variables for index overlay functionality
|
||||||
|
var indexPageName = "indexOverlay"
|
||||||
|
|
||||||
|
// showIndexBar shows the index input field as an overlay at the top
|
||||||
|
func showIndexBar() {
|
||||||
|
// Create a temporary flex to combine index input and main content
|
||||||
|
updatedFlex := tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
|
AddItem(indexPickWindow, 3, 0, true). // Index field at top
|
||||||
|
AddItem(flex, 0, 1, false) // Main flex layout below
|
||||||
|
|
||||||
|
// Add the index overlay as a page
|
||||||
|
pages.AddPage(indexPageName, updatedFlex, true, true)
|
||||||
|
app.SetFocus(indexPickWindow)
|
||||||
|
}
|
||||||
|
|
||||||
|
// hideIndexBar hides the index input field
|
||||||
|
func hideIndexBar() {
|
||||||
|
pages.RemovePage(indexPageName)
|
||||||
|
// Return focus to the text view
|
||||||
|
app.SetFocus(textView)
|
||||||
|
// Clear the index field
|
||||||
|
indexPickWindow.SetText("")
|
||||||
|
}
|
||||||
|
|
||||||
|
// addRegionTags adds region tags to search matches in the text for tview highlighting
|
||||||
|
func addRegionTags(text string, positions []int, lengths []int, currentIdx int, searchTerm string) string {
|
||||||
|
if len(positions) == 0 {
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
var result strings.Builder
|
||||||
|
lastEnd := 0
|
||||||
|
for i, pos := range positions {
|
||||||
|
endPos := pos + lengths[i]
|
||||||
|
// Add text before this match
|
||||||
|
if pos > lastEnd {
|
||||||
|
result.WriteString(text[lastEnd:pos])
|
||||||
|
}
|
||||||
|
// The matched text, which may contain its own formatting tags
|
||||||
|
actualText := text[pos:endPos]
|
||||||
|
// Add region tag and highlighting for this match
|
||||||
|
// Use a unique region id that includes the match index to avoid conflicts
|
||||||
|
regionId := fmt.Sprintf("search_%d_%d", pos, i) // position + index to ensure uniqueness
|
||||||
|
var highlightStart, highlightEnd string
|
||||||
|
if i == currentIdx {
|
||||||
|
// Current match - use different highlighting
|
||||||
|
highlightStart = fmt.Sprintf(`["%s"][yellow:blue:b]`, regionId) // Current match with region and special highlight
|
||||||
|
highlightEnd = `[-:-:-][""]` // Reset formatting and close region
|
||||||
|
} else {
|
||||||
|
// Other matches - use regular highlighting
|
||||||
|
highlightStart = fmt.Sprintf(`["%s"][gold:red:u]`, regionId) // Other matches with region and highlight
|
||||||
|
highlightEnd = `[-:-:-][""]` // Reset formatting and close region
|
||||||
|
}
|
||||||
|
result.WriteString(highlightStart)
|
||||||
|
result.WriteString(actualText)
|
||||||
|
result.WriteString(highlightEnd)
|
||||||
|
lastEnd = endPos
|
||||||
|
}
|
||||||
|
// Add the rest of the text after the last processed match
|
||||||
|
if lastEnd < len(text) {
|
||||||
|
result.WriteString(text[lastEnd:])
|
||||||
|
}
|
||||||
|
return result.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// searchNext finds the next occurrence of the search term
|
||||||
|
func searchNext() {
|
||||||
|
if len(searchResults) == 0 {
|
||||||
|
if err := notifyUser("search", "No search results to navigate"); err != nil {
|
||||||
|
logger.Error("failed to send notification", "error", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
searchIndex = (searchIndex + 1) % len(searchResults)
|
||||||
|
highlightCurrentMatch()
|
||||||
|
}
|
||||||
|
|
||||||
|
// searchPrev finds the previous occurrence of the search term
|
||||||
|
func searchPrev() {
|
||||||
|
if len(searchResults) == 0 {
|
||||||
|
if err := notifyUser("search", "No search results to navigate"); err != nil {
|
||||||
|
logger.Error("failed to send notification", "error", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if searchIndex == 0 {
|
||||||
|
searchIndex = len(searchResults) - 1
|
||||||
|
} else {
|
||||||
|
searchIndex--
|
||||||
|
}
|
||||||
|
highlightCurrentMatch()
|
||||||
|
}
|
||||||
|
|
||||||
|
// == tab completion ==
|
||||||
|
|
||||||
|
func scanFiles(dir, filter string) []string {
|
||||||
|
const maxDepth = 3
|
||||||
|
const maxFiles = 50
|
||||||
|
var files []string
|
||||||
|
var scanRecursive func(currentDir string, currentDepth int, relPath string)
|
||||||
|
scanRecursive = func(currentDir string, currentDepth int, relPath string) {
|
||||||
|
if len(files) >= maxFiles {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if currentDepth > maxDepth {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
entries, err := os.ReadDir(currentDir)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, entry := range entries {
|
||||||
|
if len(files) >= maxFiles {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
name := entry.Name()
|
||||||
|
if strings.HasPrefix(name, ".") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
fullPath := name
|
||||||
|
if relPath != "" {
|
||||||
|
fullPath = relPath + "/" + name
|
||||||
|
}
|
||||||
|
if entry.IsDir() {
|
||||||
|
// Recursively scan subdirectories
|
||||||
|
scanRecursive(filepath.Join(currentDir, name), currentDepth+1, fullPath)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Check if file matches filter
|
||||||
|
if filter == "" || strings.HasPrefix(strings.ToLower(fullPath), strings.ToLower(filter)) {
|
||||||
|
files = append(files, fullPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
scanRecursive(dir, 0, "")
|
||||||
|
return files
|
||||||
|
}
|
||||||
|
|||||||
100
llm.go
100
llm.go
@@ -13,28 +13,6 @@ var imageAttachmentPath string // Global variable to track image attachment for
|
|||||||
var lastImg string // for ctrl+j
|
var lastImg string // for ctrl+j
|
||||||
var RAGMsg = "Retrieved context for user's query:\n"
|
var RAGMsg = "Retrieved context for user's query:\n"
|
||||||
|
|
||||||
// addPersonaSuffixToLastUserMessage adds the persona suffix to the last user message
|
|
||||||
// to indicate to the assistant who it should reply as
|
|
||||||
func addPersonaSuffixToLastUserMessage(messages []models.RoleMsg, persona string) []models.RoleMsg {
|
|
||||||
if len(messages) == 0 {
|
|
||||||
return messages
|
|
||||||
}
|
|
||||||
// // Find the last user message to modify
|
|
||||||
// for i := len(messages) - 1; i >= 0; i-- {
|
|
||||||
// if messages[i].Role == cfg.UserRole || messages[i].Role == "user" {
|
|
||||||
// // Create a copy of the message to avoid modifying the original
|
|
||||||
// modifiedMsg := messages[i]
|
|
||||||
// modifiedMsg.Content = modifiedMsg.Content + "\n" + persona + ":"
|
|
||||||
// messages[i] = modifiedMsg
|
|
||||||
// break
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
modifiedMsg := messages[len(messages)-1]
|
|
||||||
modifiedMsg.Content = modifiedMsg.Content + "\n" + persona + ":\n"
|
|
||||||
messages[len(messages)-1] = modifiedMsg
|
|
||||||
return messages
|
|
||||||
}
|
|
||||||
|
|
||||||
// containsToolSysMsg checks if the toolSysMsg already exists in the chat body
|
// containsToolSysMsg checks if the toolSysMsg already exists in the chat body
|
||||||
func containsToolSysMsg() bool {
|
func containsToolSysMsg() bool {
|
||||||
for _, msg := range chatBody.Messages {
|
for _, msg := range chatBody.Messages {
|
||||||
@@ -187,17 +165,9 @@ func (lcp LCPCompletion) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
messages := make([]string, len(filteredMessages))
|
messages := make([]string, len(filteredMessages))
|
||||||
for i, m := range filteredMessages {
|
for i, m := range filteredMessages {
|
||||||
messages[i] = m.ToPrompt()
|
messages[i] = stripThinkingFromMsg(&m).ToPrompt()
|
||||||
}
|
}
|
||||||
prompt := strings.Join(messages, "\n")
|
prompt := strings.Join(messages, "\n")
|
||||||
// strings builder?
|
|
||||||
if !resume {
|
|
||||||
botMsgStart := "\n" + botPersona + ":\n"
|
|
||||||
prompt += botMsgStart
|
|
||||||
}
|
|
||||||
if cfg.ThinkUse && !cfg.ToolUse {
|
|
||||||
prompt += "<think>"
|
|
||||||
}
|
|
||||||
// Add multimodal media markers to the prompt text when multimodal data is present
|
// Add multimodal media markers to the prompt text when multimodal data is present
|
||||||
// This is required by llama.cpp multimodal models so they know where to insert media
|
// This is required by llama.cpp multimodal models so they know where to insert media
|
||||||
if len(multimodalData) > 0 {
|
if len(multimodalData) > 0 {
|
||||||
@@ -209,6 +179,14 @@ func (lcp LCPCompletion) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
}
|
}
|
||||||
prompt = sb.String()
|
prompt = sb.String()
|
||||||
}
|
}
|
||||||
|
// needs to be after <__media__> if there are images
|
||||||
|
if !resume {
|
||||||
|
botMsgStart := "\n" + botPersona + ":\n"
|
||||||
|
prompt += botMsgStart
|
||||||
|
}
|
||||||
|
if cfg.ThinkUse && !cfg.ToolUse {
|
||||||
|
prompt += "<think>"
|
||||||
|
}
|
||||||
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
|
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
|
||||||
"msg", msg, "resume", resume, "prompt", prompt, "multimodal_data_count", len(multimodalData))
|
"msg", msg, "resume", resume, "prompt", prompt, "multimodal_data_count", len(multimodalData))
|
||||||
payload := models.NewLCPReq(prompt, chatBody.Model, multimodalData,
|
payload := models.NewLCPReq(prompt, chatBody.Model, multimodalData,
|
||||||
@@ -259,8 +237,10 @@ func (op LCPChat) ParseChunk(data []byte) (*models.TextChunk, error) {
|
|||||||
return &models.TextChunk{Finished: true}, nil
|
return &models.TextChunk{Finished: true}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lastChoice := llmchunk.Choices[len(llmchunk.Choices)-1]
|
||||||
resp := &models.TextChunk{
|
resp := &models.TextChunk{
|
||||||
Chunk: llmchunk.Choices[len(llmchunk.Choices)-1].Delta.Content,
|
Chunk: lastChoice.Delta.Content,
|
||||||
|
Reasoning: lastChoice.Delta.ReasoningContent,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for tool calls in all choices, not just the last one
|
// Check for tool calls in all choices, not just the last one
|
||||||
@@ -278,7 +258,7 @@ func (op LCPChat) ParseChunk(data []byte) (*models.TextChunk, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if llmchunk.Choices[len(llmchunk.Choices)-1].FinishReason == "stop" {
|
if lastChoice.FinishReason == "stop" {
|
||||||
if resp.Chunk != "" {
|
if resp.Chunk != "" {
|
||||||
logger.Error("text inside of finish llmchunk", "chunk", llmchunk)
|
logger.Error("text inside of finish llmchunk", "chunk", llmchunk)
|
||||||
}
|
}
|
||||||
@@ -311,7 +291,7 @@ func (op LCPChat) FormMsg(msg, role string, resume bool) (io.Reader, error) {
|
|||||||
// If image processing fails, fall back to simple text message
|
// If image processing fails, fall back to simple text message
|
||||||
newMsg = models.NewRoleMsg(role, msg)
|
newMsg = models.NewRoleMsg(role, msg)
|
||||||
} else {
|
} else {
|
||||||
newMsg.AddImagePart(imageURL)
|
newMsg.AddImagePart(imageURL, localImageAttachmentPath)
|
||||||
}
|
}
|
||||||
// Only clear the global image attachment after successfully processing it in this API call
|
// Only clear the global image attachment after successfully processing it in this API call
|
||||||
imageAttachmentPath = "" // Clear the attachment after use
|
imageAttachmentPath = "" // Clear the attachment after use
|
||||||
@@ -341,23 +321,21 @@ func (op LCPChat) FormMsg(msg, role string, resume bool) (io.Reader, error) {
|
|||||||
logger.Debug("LCPChat: RAG message added to chat body", "role", ragMsg.Role,
|
logger.Debug("LCPChat: RAG message added to chat body", "role", ragMsg.Role,
|
||||||
"rag_content_len", len(ragMsg.Content), "message_count_after_rag", len(chatBody.Messages))
|
"rag_content_len", len(ragMsg.Content), "message_count_after_rag", len(chatBody.Messages))
|
||||||
}
|
}
|
||||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
// openai /v1/chat does not support custom roles; needs to be user, assistant, system
|
// openai /v1/chat does not support custom roles; needs to be user, assistant, system
|
||||||
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
||||||
if cfg.AutoTurn && !resume {
|
|
||||||
filteredMessages = addPersonaSuffixToLastUserMessage(filteredMessages, botPersona)
|
|
||||||
}
|
|
||||||
bodyCopy := &models.ChatBody{
|
bodyCopy := &models.ChatBody{
|
||||||
Messages: make([]models.RoleMsg, len(filteredMessages)),
|
Messages: make([]models.RoleMsg, len(filteredMessages)),
|
||||||
Model: chatBody.Model,
|
Model: chatBody.Model,
|
||||||
Stream: chatBody.Stream,
|
Stream: chatBody.Stream,
|
||||||
}
|
}
|
||||||
for i, msg := range filteredMessages {
|
for i, msg := range filteredMessages {
|
||||||
if msg.Role == cfg.UserRole {
|
strippedMsg := *stripThinkingFromMsg(&msg)
|
||||||
bodyCopy.Messages[i] = msg
|
if strippedMsg.Role == cfg.UserRole {
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
bodyCopy.Messages[i].Role = "user"
|
bodyCopy.Messages[i].Role = "user"
|
||||||
} else {
|
} else {
|
||||||
bodyCopy.Messages[i] = msg
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Clean null/empty messages to prevent API issues
|
// Clean null/empty messages to prevent API issues
|
||||||
@@ -437,7 +415,7 @@ func (ds DeepSeekerCompletion) FormMsg(msg, role string, resume bool) (io.Reader
|
|||||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
messages := make([]string, len(filteredMessages))
|
messages := make([]string, len(filteredMessages))
|
||||||
for i, m := range filteredMessages {
|
for i, m := range filteredMessages {
|
||||||
messages[i] = m.ToPrompt()
|
messages[i] = stripThinkingFromMsg(&m).ToPrompt()
|
||||||
}
|
}
|
||||||
prompt := strings.Join(messages, "\n")
|
prompt := strings.Join(messages, "\n")
|
||||||
// strings builder?
|
// strings builder?
|
||||||
@@ -519,22 +497,20 @@ func (ds DeepSeekerChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
||||||
}
|
}
|
||||||
// Create copy of chat body with standardized user role
|
// Create copy of chat body with standardized user role
|
||||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
||||||
if cfg.AutoTurn && !resume {
|
|
||||||
filteredMessages = addPersonaSuffixToLastUserMessage(filteredMessages, botPersona)
|
|
||||||
}
|
|
||||||
bodyCopy := &models.ChatBody{
|
bodyCopy := &models.ChatBody{
|
||||||
Messages: make([]models.RoleMsg, len(filteredMessages)),
|
Messages: make([]models.RoleMsg, len(filteredMessages)),
|
||||||
Model: chatBody.Model,
|
Model: chatBody.Model,
|
||||||
Stream: chatBody.Stream,
|
Stream: chatBody.Stream,
|
||||||
}
|
}
|
||||||
for i, msg := range filteredMessages {
|
for i, msg := range filteredMessages {
|
||||||
if msg.Role == cfg.UserRole || i == 1 {
|
strippedMsg := *stripThinkingFromMsg(&msg)
|
||||||
bodyCopy.Messages[i] = msg
|
if strippedMsg.Role == cfg.UserRole || i == 1 {
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
bodyCopy.Messages[i].Role = "user"
|
bodyCopy.Messages[i].Role = "user"
|
||||||
} else {
|
} else {
|
||||||
bodyCopy.Messages[i] = msg
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Clean null/empty messages to prevent API issues
|
// Clean null/empty messages to prevent API issues
|
||||||
@@ -605,7 +581,7 @@ func (or OpenRouterCompletion) FormMsg(msg, role string, resume bool) (io.Reader
|
|||||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
messages := make([]string, len(filteredMessages))
|
messages := make([]string, len(filteredMessages))
|
||||||
for i, m := range filteredMessages {
|
for i, m := range filteredMessages {
|
||||||
messages[i] = m.ToPrompt()
|
messages[i] = stripThinkingFromMsg(&m).ToPrompt()
|
||||||
}
|
}
|
||||||
prompt := strings.Join(messages, "\n")
|
prompt := strings.Join(messages, "\n")
|
||||||
// strings builder?
|
// strings builder?
|
||||||
@@ -640,12 +616,14 @@ func (or OpenRouterChat) ParseChunk(data []byte) (*models.TextChunk, error) {
|
|||||||
logger.Error("failed to decode", "error", err, "line", string(data))
|
logger.Error("failed to decode", "error", err, "line", string(data))
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
lastChoice := llmchunk.Choices[len(llmchunk.Choices)-1]
|
||||||
resp := &models.TextChunk{
|
resp := &models.TextChunk{
|
||||||
Chunk: llmchunk.Choices[len(llmchunk.Choices)-1].Delta.Content,
|
Chunk: lastChoice.Delta.Content,
|
||||||
|
Reasoning: lastChoice.Delta.Reasoning,
|
||||||
}
|
}
|
||||||
// Handle tool calls similar to LCPChat
|
// Handle tool calls similar to LCPChat
|
||||||
if len(llmchunk.Choices[len(llmchunk.Choices)-1].Delta.ToolCalls) > 0 {
|
if len(lastChoice.Delta.ToolCalls) > 0 {
|
||||||
toolCall := llmchunk.Choices[len(llmchunk.Choices)-1].Delta.ToolCalls[0]
|
toolCall := lastChoice.Delta.ToolCalls[0]
|
||||||
resp.ToolChunk = toolCall.Function.Arguments
|
resp.ToolChunk = toolCall.Function.Arguments
|
||||||
fname := toolCall.Function.Name
|
fname := toolCall.Function.Name
|
||||||
if fname != "" {
|
if fname != "" {
|
||||||
@@ -657,7 +635,7 @@ func (or OpenRouterChat) ParseChunk(data []byte) (*models.TextChunk, error) {
|
|||||||
if resp.ToolChunk != "" {
|
if resp.ToolChunk != "" {
|
||||||
resp.ToolResp = true
|
resp.ToolResp = true
|
||||||
}
|
}
|
||||||
if llmchunk.Choices[len(llmchunk.Choices)-1].FinishReason == "stop" {
|
if lastChoice.FinishReason == "stop" {
|
||||||
if resp.Chunk != "" {
|
if resp.Chunk != "" {
|
||||||
logger.Error("text inside of finish llmchunk", "chunk", llmchunk)
|
logger.Error("text inside of finish llmchunk", "chunk", llmchunk)
|
||||||
}
|
}
|
||||||
@@ -690,7 +668,7 @@ func (or OpenRouterChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
// If image processing fails, fall back to simple text message
|
// If image processing fails, fall back to simple text message
|
||||||
newMsg = models.NewRoleMsg(role, msg)
|
newMsg = models.NewRoleMsg(role, msg)
|
||||||
} else {
|
} else {
|
||||||
newMsg.AddImagePart(imageURL)
|
newMsg.AddImagePart(imageURL, localImageAttachmentPath)
|
||||||
}
|
}
|
||||||
// Only clear the global image attachment after successfully processing it in this API call
|
// Only clear the global image attachment after successfully processing it in this API call
|
||||||
imageAttachmentPath = "" // Clear the attachment after use
|
imageAttachmentPath = "" // Clear the attachment after use
|
||||||
@@ -718,27 +696,25 @@ func (or OpenRouterChat) FormMsg(msg, role string, resume bool) (io.Reader, erro
|
|||||||
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
logger.Debug("RAG message added to chat body", "message_count", len(chatBody.Messages))
|
||||||
}
|
}
|
||||||
// Create copy of chat body with standardized user role
|
// Create copy of chat body with standardized user role
|
||||||
filteredMessages, botPersona := filterMessagesForCurrentCharacter(chatBody.Messages)
|
filteredMessages, _ := filterMessagesForCurrentCharacter(chatBody.Messages)
|
||||||
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
// Add persona suffix to the last user message to indicate who the assistant should reply as
|
||||||
if cfg.AutoTurn && !resume {
|
|
||||||
filteredMessages = addPersonaSuffixToLastUserMessage(filteredMessages, botPersona)
|
|
||||||
}
|
|
||||||
bodyCopy := &models.ChatBody{
|
bodyCopy := &models.ChatBody{
|
||||||
Messages: make([]models.RoleMsg, len(filteredMessages)),
|
Messages: make([]models.RoleMsg, len(filteredMessages)),
|
||||||
Model: chatBody.Model,
|
Model: chatBody.Model,
|
||||||
Stream: chatBody.Stream,
|
Stream: chatBody.Stream,
|
||||||
}
|
}
|
||||||
for i, msg := range filteredMessages {
|
for i, msg := range filteredMessages {
|
||||||
bodyCopy.Messages[i] = msg
|
strippedMsg := *stripThinkingFromMsg(&msg)
|
||||||
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
// Standardize role if it's a user role
|
// Standardize role if it's a user role
|
||||||
if bodyCopy.Messages[i].Role == cfg.UserRole {
|
if bodyCopy.Messages[i].Role == cfg.UserRole {
|
||||||
bodyCopy.Messages[i] = msg
|
bodyCopy.Messages[i] = strippedMsg
|
||||||
bodyCopy.Messages[i].Role = "user"
|
bodyCopy.Messages[i].Role = "user"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Clean null/empty messages to prevent API issues
|
// Clean null/empty messages to prevent API issues
|
||||||
bodyCopy.Messages = consolidateAssistantMessages(bodyCopy.Messages)
|
bodyCopy.Messages = consolidateAssistantMessages(bodyCopy.Messages)
|
||||||
orBody := models.NewOpenRouterChatReq(*bodyCopy, defaultLCPProps)
|
orBody := models.NewOpenRouterChatReq(*bodyCopy, defaultLCPProps, cfg.ReasoningEffort)
|
||||||
if cfg.ToolUse && !resume && role != cfg.ToolRole {
|
if cfg.ToolUse && !resume && role != cfg.ToolRole {
|
||||||
orBody.Tools = baseTools // set tools to use
|
orBody.Tools = baseTools // set tools to use
|
||||||
}
|
}
|
||||||
|
|||||||
13
main.go
13
main.go
@@ -1,9 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"flag"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"github.com/rivo/tview"
|
"github.com/rivo/tview"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -15,18 +12,12 @@ var (
|
|||||||
injectRole = true
|
injectRole = true
|
||||||
selectedIndex = int(-1)
|
selectedIndex = int(-1)
|
||||||
shellMode = false
|
shellMode = false
|
||||||
indexLineCompletion = "F12 to show keys help | llm turn: [%s:-:b]%v[-:-:-] (F6) | chat: [orange:-:b]%s[-:-:-] (F1) | toolUseAdviced: [%s:-:b]%v[-:-:-] (ctrl+k) | model: [orange:-:b]%s[-:-:-] (ctrl+l) | skip LLM resp: [%s:-:b]%v[-:-:-] (F10)\nAPI: [orange:-:b]%s[-:-:-] (ctrl+v) | recording: [%s:-:b]%v[-:-:-] (ctrl+r) | writing as: [orange:-:b]%s[-:-:-] (ctrl+q) | bot will write as [orange:-:b]%s[-:-:-] (ctrl+x) | role injection (alt+7) [%s:-:b]%v[-:-:-]"
|
thinkingCollapsed = false
|
||||||
|
statusLineTempl = "help (F12) | [%s:-:b]llm writes[-:-:-] (F6 to interrupt) | chat: [orange:-:b]%s[-:-:-] (F1) | [%s:-:b]tool use[-:-:-] (ctrl+k) | model: [%s:-:b]%s[-:-:-] (ctrl+l) | [%s:-:b]skip LLM resp[-:-:-] (F10)\nAPI: [orange:-:b]%s[-:-:-] (ctrl+v) | writing as: [orange:-:b]%s[-:-:-] (ctrl+q) | bot will write as [orange:-:b]%s[-:-:-] (ctrl+x)"
|
||||||
focusSwitcher = map[tview.Primitive]tview.Primitive{}
|
focusSwitcher = map[tview.Primitive]tview.Primitive{}
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
apiPort := flag.Int("port", 0, "port to host api")
|
|
||||||
flag.Parse()
|
|
||||||
if apiPort != nil && *apiPort > 3000 {
|
|
||||||
srv := Server{}
|
|
||||||
srv.ListenToRequests(strconv.Itoa(*apiPort))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
pages.AddPage("main", flex, true, true)
|
pages.AddPage("main", flex, true, true)
|
||||||
if err := app.SetRoot(pages,
|
if err := app.SetRoot(pages,
|
||||||
true).EnableMouse(cfg.EnableMouse).EnablePaste(true).Run(); err != nil {
|
true).EnableMouse(cfg.EnableMouse).EnablePaste(true).Run(); err != nil {
|
||||||
|
|||||||
@@ -1,8 +1,49 @@
|
|||||||
package models
|
package models
|
||||||
|
|
||||||
|
import (
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
type AudioFormat string
|
type AudioFormat string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
AFWav AudioFormat = "wav"
|
AFWav AudioFormat = "wav"
|
||||||
AFMP3 AudioFormat = "mp3"
|
AFMP3 AudioFormat = "mp3"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var threeOrMoreDashesRE = regexp.MustCompile(`-{3,}`)
|
||||||
|
|
||||||
|
// CleanText removes markdown and special characters that are not suitable for TTS
|
||||||
|
func CleanText(text string) string {
|
||||||
|
// Remove markdown-like characters that might interfere with TTS
|
||||||
|
text = strings.ReplaceAll(text, "*", "") // Bold/italic markers
|
||||||
|
text = strings.ReplaceAll(text, "#", "") // Headers
|
||||||
|
text = strings.ReplaceAll(text, "_", "") // Underline/italic markers
|
||||||
|
text = strings.ReplaceAll(text, "~", "") // Strikethrough markers
|
||||||
|
text = strings.ReplaceAll(text, "`", "") // Code markers
|
||||||
|
text = strings.ReplaceAll(text, "[", "") // Link brackets
|
||||||
|
text = strings.ReplaceAll(text, "]", "") // Link brackets
|
||||||
|
text = strings.ReplaceAll(text, "!", "") // Exclamation marks (if not punctuation)
|
||||||
|
// Remove HTML tags using regex
|
||||||
|
htmlTagRegex := regexp.MustCompile(`<[^>]*>`)
|
||||||
|
text = htmlTagRegex.ReplaceAllString(text, "")
|
||||||
|
// Split text into lines to handle table separators
|
||||||
|
lines := strings.Split(text, "\n")
|
||||||
|
var filteredLines []string
|
||||||
|
for _, line := range lines {
|
||||||
|
// Check if the line looks like a table separator (e.g., |----|, |===|, | - - - |)
|
||||||
|
// A table separator typically contains only |, -, =, and spaces
|
||||||
|
isTableSeparator := regexp.MustCompile(`^\s*\|\s*[-=\s]+\|\s*$`).MatchString(strings.TrimSpace(line))
|
||||||
|
if !isTableSeparator {
|
||||||
|
// If it's not a table separator, remove vertical bars but keep the content
|
||||||
|
processedLine := strings.ReplaceAll(line, "|", "")
|
||||||
|
filteredLines = append(filteredLines, processedLine)
|
||||||
|
}
|
||||||
|
// If it is a table separator, skip it (don't add to filteredLines)
|
||||||
|
}
|
||||||
|
text = strings.Join(filteredLines, "\n")
|
||||||
|
text = threeOrMoreDashesRE.ReplaceAllString(text, "")
|
||||||
|
text = strings.TrimSpace(text) // Remove leading/trailing whitespace
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
|||||||
123
models/models.go
123
models/models.go
@@ -5,9 +5,22 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
// imageBaseDir is the base directory for displaying image paths.
|
||||||
|
// If set, image paths will be shown relative to this directory.
|
||||||
|
imageBaseDir = ""
|
||||||
|
)
|
||||||
|
|
||||||
|
// SetImageBaseDir sets the base directory for displaying image paths.
|
||||||
|
// If dir is empty, full paths will be shown.
|
||||||
|
func SetImageBaseDir(dir string) {
|
||||||
|
imageBaseDir = dir
|
||||||
|
}
|
||||||
|
|
||||||
type FuncCall struct {
|
type FuncCall struct {
|
||||||
ID string `json:"id,omitempty"`
|
ID string `json:"id,omitempty"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
@@ -52,6 +65,7 @@ type LLMRespChunk struct {
|
|||||||
Index int `json:"index"`
|
Index int `json:"index"`
|
||||||
Delta struct {
|
Delta struct {
|
||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
|
ReasoningContent string `json:"reasoning_content"`
|
||||||
ToolCalls []ToolDeltaResp `json:"tool_calls"`
|
ToolCalls []ToolDeltaResp `json:"tool_calls"`
|
||||||
} `json:"delta"`
|
} `json:"delta"`
|
||||||
} `json:"choices"`
|
} `json:"choices"`
|
||||||
@@ -73,6 +87,7 @@ type TextChunk struct {
|
|||||||
ToolResp bool
|
ToolResp bool
|
||||||
FuncName string
|
FuncName string
|
||||||
ToolID string
|
ToolID string
|
||||||
|
Reasoning string // For models that send reasoning separately (OpenRouter, etc.)
|
||||||
}
|
}
|
||||||
|
|
||||||
type TextContentPart struct {
|
type TextContentPart struct {
|
||||||
@@ -82,6 +97,7 @@ type TextContentPart struct {
|
|||||||
|
|
||||||
type ImageContentPart struct {
|
type ImageContentPart struct {
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
Path string `json:"path,omitempty"` // Store original file path
|
||||||
ImageURL struct {
|
ImageURL struct {
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
} `json:"image_url"`
|
} `json:"image_url"`
|
||||||
@@ -94,6 +110,7 @@ type RoleMsg struct {
|
|||||||
ContentParts []any `json:"-"`
|
ContentParts []any `json:"-"`
|
||||||
ToolCallID string `json:"tool_call_id,omitempty"` // For tool response messages
|
ToolCallID string `json:"tool_call_id,omitempty"` // For tool response messages
|
||||||
KnownTo []string `json:"known_to,omitempty"`
|
KnownTo []string `json:"known_to,omitempty"`
|
||||||
|
Stats *ResponseStats `json:"stats"`
|
||||||
hasContentParts bool // Flag to indicate which content type to marshal
|
hasContentParts bool // Flag to indicate which content type to marshal
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -167,35 +184,67 @@ func (m *RoleMsg) UnmarshalJSON(data []byte) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *RoleMsg) ToText(i int) string {
|
func (m *RoleMsg) ToText(i int) string {
|
||||||
icon := fmt.Sprintf("(%d)", i)
|
|
||||||
// Convert content to string representation
|
|
||||||
var contentStr string
|
var contentStr string
|
||||||
|
var imageIndicators []string
|
||||||
if !m.hasContentParts {
|
if !m.hasContentParts {
|
||||||
contentStr = m.Content
|
contentStr = m.Content
|
||||||
} else {
|
} else {
|
||||||
// For structured content, just take the text parts
|
|
||||||
var textParts []string
|
var textParts []string
|
||||||
for _, part := range m.ContentParts {
|
for _, part := range m.ContentParts {
|
||||||
if partMap, ok := part.(map[string]any); ok {
|
switch p := part.(type) {
|
||||||
if partType, exists := partMap["type"]; exists && partType == "text" {
|
case TextContentPart:
|
||||||
if textVal, textExists := partMap["text"]; textExists {
|
if p.Type == "text" {
|
||||||
|
textParts = append(textParts, p.Text)
|
||||||
|
}
|
||||||
|
case ImageContentPart:
|
||||||
|
displayPath := p.Path
|
||||||
|
if displayPath == "" {
|
||||||
|
displayPath = "image"
|
||||||
|
} else {
|
||||||
|
displayPath = extractDisplayPath(displayPath)
|
||||||
|
}
|
||||||
|
imageIndicators = append(imageIndicators, fmt.Sprintf("[orange::i][image: %s][-:-:-]", displayPath))
|
||||||
|
case map[string]any:
|
||||||
|
if partType, exists := p["type"]; exists {
|
||||||
|
switch partType {
|
||||||
|
case "text":
|
||||||
|
if textVal, textExists := p["text"]; textExists {
|
||||||
if textStr, isStr := textVal.(string); isStr {
|
if textStr, isStr := textVal.(string); isStr {
|
||||||
textParts = append(textParts, textStr)
|
textParts = append(textParts, textStr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
case "image_url":
|
||||||
|
var displayPath string
|
||||||
|
if pathVal, pathExists := p["path"]; pathExists {
|
||||||
|
if pathStr, isStr := pathVal.(string); isStr && pathStr != "" {
|
||||||
|
displayPath = extractDisplayPath(pathStr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if displayPath == "" {
|
||||||
|
displayPath = "image"
|
||||||
|
}
|
||||||
|
imageIndicators = append(imageIndicators, fmt.Sprintf("[orange::i][image: %s][-:-:-]", displayPath))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentStr = strings.Join(textParts, " ") + " "
|
contentStr = strings.Join(textParts, " ") + " "
|
||||||
}
|
}
|
||||||
// check if already has role annotation (/completion makes them)
|
|
||||||
// in that case remove it, and then add to icon
|
|
||||||
// since icon and content are separated by \n
|
|
||||||
contentStr, _ = strings.CutPrefix(contentStr, m.Role+":")
|
contentStr, _ = strings.CutPrefix(contentStr, m.Role+":")
|
||||||
// if !strings.HasPrefix(contentStr, m.Role+":") {
|
icon := fmt.Sprintf("(%d) <%s>: ", i, m.Role)
|
||||||
icon = fmt.Sprintf("(%d) <%s>: ", i, m.Role)
|
var finalContent strings.Builder
|
||||||
// }
|
if len(imageIndicators) > 0 {
|
||||||
textMsg := fmt.Sprintf("[-:-:b]%s[-:-:-]\n%s\n", icon, contentStr)
|
for _, indicator := range imageIndicators {
|
||||||
|
finalContent.WriteString(indicator)
|
||||||
|
finalContent.WriteString("\n")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finalContent.WriteString(contentStr)
|
||||||
|
if m.Stats != nil {
|
||||||
|
finalContent.WriteString(fmt.Sprintf("\n[gray::i][%d tok, %.1fs, %.1f t/s][-:-:-]",
|
||||||
|
m.Stats.Tokens, m.Stats.Duration, m.Stats.TokensPerSec))
|
||||||
|
}
|
||||||
|
textMsg := fmt.Sprintf("[-:-:b]%s[-:-:-]\n%s\n", icon, finalContent.String())
|
||||||
return strings.ReplaceAll(textMsg, "\n\n", "\n")
|
return strings.ReplaceAll(textMsg, "\n\n", "\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -207,9 +256,16 @@ func (m *RoleMsg) ToPrompt() string {
|
|||||||
// For structured content, just take the text parts
|
// For structured content, just take the text parts
|
||||||
var textParts []string
|
var textParts []string
|
||||||
for _, part := range m.ContentParts {
|
for _, part := range m.ContentParts {
|
||||||
if partMap, ok := part.(map[string]any); ok {
|
switch p := part.(type) {
|
||||||
if partType, exists := partMap["type"]; exists && partType == "text" {
|
case TextContentPart:
|
||||||
if textVal, textExists := partMap["text"]; textExists {
|
if p.Type == "text" {
|
||||||
|
textParts = append(textParts, p.Text)
|
||||||
|
}
|
||||||
|
case ImageContentPart:
|
||||||
|
// skip images for text display
|
||||||
|
case map[string]any:
|
||||||
|
if partType, exists := p["type"]; exists && partType == "text" {
|
||||||
|
if textVal, textExists := p["text"]; textExists {
|
||||||
if textStr, isStr := textVal.(string); isStr {
|
if textStr, isStr := textVal.(string); isStr {
|
||||||
textParts = append(textParts, textStr)
|
textParts = append(textParts, textStr)
|
||||||
}
|
}
|
||||||
@@ -269,6 +325,7 @@ func (m *RoleMsg) Copy() RoleMsg {
|
|||||||
ContentParts: m.ContentParts,
|
ContentParts: m.ContentParts,
|
||||||
ToolCallID: m.ToolCallID,
|
ToolCallID: m.ToolCallID,
|
||||||
KnownTo: m.KnownTo,
|
KnownTo: m.KnownTo,
|
||||||
|
Stats: m.Stats,
|
||||||
hasContentParts: m.hasContentParts,
|
hasContentParts: m.hasContentParts,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -290,7 +347,7 @@ func (m *RoleMsg) AddTextPart(text string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// AddImagePart adds an image content part to the message
|
// AddImagePart adds an image content part to the message
|
||||||
func (m *RoleMsg) AddImagePart(imageURL string) {
|
func (m *RoleMsg) AddImagePart(imageURL, imagePath string) {
|
||||||
if !m.hasContentParts {
|
if !m.hasContentParts {
|
||||||
// Convert to content parts format
|
// Convert to content parts format
|
||||||
if m.Content != "" {
|
if m.Content != "" {
|
||||||
@@ -303,6 +360,7 @@ func (m *RoleMsg) AddImagePart(imageURL string) {
|
|||||||
|
|
||||||
imagePart := ImageContentPart{
|
imagePart := ImageContentPart{
|
||||||
Type: "image_url",
|
Type: "image_url",
|
||||||
|
Path: imagePath, // Store the original file path
|
||||||
ImageURL: struct {
|
ImageURL: struct {
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
}{URL: imageURL},
|
}{URL: imageURL},
|
||||||
@@ -342,6 +400,31 @@ func CreateImageURLFromPath(imagePath string) (string, error) {
|
|||||||
return fmt.Sprintf("data:%s;base64,%s", mimeType, encoded), nil
|
return fmt.Sprintf("data:%s;base64,%s", mimeType, encoded), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// extractDisplayPath returns a path suitable for display, potentially relative to imageBaseDir
|
||||||
|
func extractDisplayPath(p string) string {
|
||||||
|
if p == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// If base directory is set, try to make path relative to it
|
||||||
|
if imageBaseDir != "" {
|
||||||
|
if rel, err := filepath.Rel(imageBaseDir, p); err == nil {
|
||||||
|
// Check if relative path doesn't start with ".." (meaning it's within base dir)
|
||||||
|
// If it starts with "..", we might still want to show it as relative
|
||||||
|
// but for now we show full path if it goes outside base dir
|
||||||
|
if !strings.HasPrefix(rel, "..") {
|
||||||
|
p = rel
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Truncate long paths to last 60 characters if needed
|
||||||
|
if len(p) > 60 {
|
||||||
|
return "..." + p[len(p)-60:]
|
||||||
|
}
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
type ChatBody struct {
|
type ChatBody struct {
|
||||||
Model string `json:"model"`
|
Model string `json:"model"`
|
||||||
Stream bool `json:"stream"`
|
Stream bool `json:"stream"`
|
||||||
@@ -555,6 +638,12 @@ func (lcp *LCPModels) ListModels() []string {
|
|||||||
return resp
|
return resp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ResponseStats struct {
|
||||||
|
Tokens int
|
||||||
|
Duration float64
|
||||||
|
TokensPerSec float64
|
||||||
|
}
|
||||||
|
|
||||||
type ChatRoundReq struct {
|
type ChatRoundReq struct {
|
||||||
UserMsg string
|
UserMsg string
|
||||||
Role string
|
Role string
|
||||||
|
|||||||
167
models/models_test.go
Normal file
167
models/models_test.go
Normal file
@@ -0,0 +1,167 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRoleMsgToTextWithImages(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
msg RoleMsg
|
||||||
|
index int
|
||||||
|
expected string // substring to check
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "text and image",
|
||||||
|
index: 0,
|
||||||
|
msg: func() RoleMsg {
|
||||||
|
msg := NewMultimodalMsg("user", []interface{}{})
|
||||||
|
msg.AddTextPart("Look at this picture")
|
||||||
|
msg.AddImagePart("data:image/jpeg;base64,abc123", "/home/user/Pictures/cat.jpg")
|
||||||
|
return msg
|
||||||
|
}(),
|
||||||
|
expected: "[orange::i][image: /home/user/Pictures/cat.jpg][-:-:-]",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "image only",
|
||||||
|
index: 1,
|
||||||
|
msg: func() RoleMsg {
|
||||||
|
msg := NewMultimodalMsg("user", []interface{}{})
|
||||||
|
msg.AddImagePart("data:image/png;base64,xyz789", "/tmp/screenshot_20250217_123456.png")
|
||||||
|
return msg
|
||||||
|
}(),
|
||||||
|
expected: "[orange::i][image: /tmp/screenshot_20250217_123456.png][-:-:-]",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "long filename truncated",
|
||||||
|
index: 2,
|
||||||
|
msg: func() RoleMsg {
|
||||||
|
msg := NewMultimodalMsg("user", []interface{}{})
|
||||||
|
msg.AddTextPart("Check this")
|
||||||
|
msg.AddImagePart("data:image/jpeg;base64,foo", "/very/long/path/to/a/really_long_filename_that_exceeds_forty_characters.jpg")
|
||||||
|
return msg
|
||||||
|
}(),
|
||||||
|
expected: "[orange::i][image: .../to/a/really_long_filename_that_exceeds_forty_characters.jpg][-:-:-]",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "multiple images",
|
||||||
|
index: 3,
|
||||||
|
msg: func() RoleMsg {
|
||||||
|
msg := NewMultimodalMsg("user", []interface{}{})
|
||||||
|
msg.AddTextPart("Multiple images")
|
||||||
|
msg.AddImagePart("data:image/jpeg;base64,a", "/path/img1.jpg")
|
||||||
|
msg.AddImagePart("data:image/png;base64,b", "/path/img2.png")
|
||||||
|
return msg
|
||||||
|
}(),
|
||||||
|
expected: "[orange::i][image: /path/img1.jpg][-:-:-]\n[orange::i][image: /path/img2.png][-:-:-]",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "old format without path",
|
||||||
|
index: 4,
|
||||||
|
msg: RoleMsg{
|
||||||
|
Role: "user",
|
||||||
|
hasContentParts: true,
|
||||||
|
ContentParts: []interface{}{
|
||||||
|
map[string]interface{}{
|
||||||
|
"type": "image_url",
|
||||||
|
"image_url": map[string]interface{}{
|
||||||
|
"url": "data:image/jpeg;base64,old",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
expected: "[orange::i][image: image][-:-:-]",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "old format with path",
|
||||||
|
index: 5,
|
||||||
|
msg: RoleMsg{
|
||||||
|
Role: "user",
|
||||||
|
hasContentParts: true,
|
||||||
|
ContentParts: []interface{}{
|
||||||
|
map[string]interface{}{
|
||||||
|
"type": "image_url",
|
||||||
|
"path": "/old/path/photo.jpg",
|
||||||
|
"image_url": map[string]interface{}{
|
||||||
|
"url": "data:image/jpeg;base64,old",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
expected: "[orange::i][image: /old/path/photo.jpg][-:-:-]",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
result := tt.msg.ToText(tt.index)
|
||||||
|
if !strings.Contains(result, tt.expected) {
|
||||||
|
t.Errorf("ToText() result does not contain expected indicator\ngot: %s\nwant substring: %s", result, tt.expected)
|
||||||
|
}
|
||||||
|
// Ensure the indicator appears before text content
|
||||||
|
if strings.Contains(tt.expected, "cat.jpg") && strings.Contains(result, "Look at this picture") {
|
||||||
|
indicatorPos := strings.Index(result, "[orange::i][image: /home/user/Pictures/cat.jpg][-:-:-]")
|
||||||
|
textPos := strings.Index(result, "Look at this picture")
|
||||||
|
if indicatorPos == -1 || textPos == -1 || indicatorPos >= textPos {
|
||||||
|
t.Errorf("image indicator should appear before text")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExtractDisplayPath(t *testing.T) {
|
||||||
|
// Save original base dir
|
||||||
|
originalBaseDir := imageBaseDir
|
||||||
|
defer func() { imageBaseDir = originalBaseDir }()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
baseDir string
|
||||||
|
path string
|
||||||
|
expected string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "no base dir shows full path",
|
||||||
|
baseDir: "",
|
||||||
|
path: "/home/user/images/cat.jpg",
|
||||||
|
expected: "/home/user/images/cat.jpg",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "relative path within base dir",
|
||||||
|
baseDir: "/home/user",
|
||||||
|
path: "/home/user/images/cat.jpg",
|
||||||
|
expected: "images/cat.jpg",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "path outside base dir shows full path",
|
||||||
|
baseDir: "/home/user",
|
||||||
|
path: "/tmp/test.jpg",
|
||||||
|
expected: "/tmp/test.jpg",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "same directory",
|
||||||
|
baseDir: "/home/user/images",
|
||||||
|
path: "/home/user/images/cat.jpg",
|
||||||
|
expected: "cat.jpg",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "long path truncated",
|
||||||
|
baseDir: "",
|
||||||
|
path: "/very/long/path/to/a/really_long_filename_that_exceeds_sixty_characters_limit_yes_it_is_very_long.jpg",
|
||||||
|
expected: "..._that_exceeds_sixty_characters_limit_yes_it_is_very_long.jpg",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
imageBaseDir = tt.baseDir
|
||||||
|
result := extractDisplayPath(tt.path)
|
||||||
|
if result != tt.expected {
|
||||||
|
t.Errorf("extractDisplayPath(%q) with baseDir=%q = %q, want %q",
|
||||||
|
tt.path, tt.baseDir, result, tt.expected)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -32,10 +32,16 @@ type OpenRouterChatReq struct {
|
|||||||
MinP float32 `json:"min_p"`
|
MinP float32 `json:"min_p"`
|
||||||
NPredict int32 `json:"max_tokens"`
|
NPredict int32 `json:"max_tokens"`
|
||||||
Tools []Tool `json:"tools"`
|
Tools []Tool `json:"tools"`
|
||||||
|
Reasoning *ReasoningConfig `json:"reasoning,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewOpenRouterChatReq(cb ChatBody, props map[string]float32) OpenRouterChatReq {
|
type ReasoningConfig struct {
|
||||||
return OpenRouterChatReq{
|
Effort string `json:"effort,omitempty"` // xhigh, high, medium, low, minimal, none
|
||||||
|
Summary string `json:"summary,omitempty"` // auto, concise, detailed
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewOpenRouterChatReq(cb ChatBody, props map[string]float32, reasoningEffort string) OpenRouterChatReq {
|
||||||
|
req := OpenRouterChatReq{
|
||||||
Messages: cb.Messages,
|
Messages: cb.Messages,
|
||||||
Model: cb.Model,
|
Model: cb.Model,
|
||||||
Stream: cb.Stream,
|
Stream: cb.Stream,
|
||||||
@@ -43,6 +49,13 @@ func NewOpenRouterChatReq(cb ChatBody, props map[string]float32) OpenRouterChatR
|
|||||||
MinP: props["min_p"],
|
MinP: props["min_p"],
|
||||||
NPredict: int32(props["n_predict"]),
|
NPredict: int32(props["n_predict"]),
|
||||||
}
|
}
|
||||||
|
// Only include reasoning config if effort is specified and not "none"
|
||||||
|
if reasoningEffort != "" && reasoningEffort != "none" {
|
||||||
|
req.Reasoning = &ReasoningConfig{
|
||||||
|
Effort: reasoningEffort,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return req
|
||||||
}
|
}
|
||||||
|
|
||||||
type OpenRouterChatRespNonStream struct {
|
type OpenRouterChatRespNonStream struct {
|
||||||
@@ -82,6 +95,7 @@ type OpenRouterChatResp struct {
|
|||||||
Delta struct {
|
Delta struct {
|
||||||
Role string `json:"role"`
|
Role string `json:"role"`
|
||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
|
Reasoning string `json:"reasoning"`
|
||||||
ToolCalls []ToolDeltaResp `json:"tool_calls"`
|
ToolCalls []ToolDeltaResp `json:"tool_calls"`
|
||||||
} `json:"delta"`
|
} `json:"delta"`
|
||||||
FinishReason string `json:"finish_reason"`
|
FinishReason string `json:"finish_reason"`
|
||||||
|
|||||||
213
popups.go
213
popups.go
@@ -17,10 +17,14 @@ func showModelSelectionPopup() {
|
|||||||
} else if strings.Contains(api, "openrouter.ai") {
|
} else if strings.Contains(api, "openrouter.ai") {
|
||||||
return ORFreeModels
|
return ORFreeModels
|
||||||
}
|
}
|
||||||
// Assume local llama.cpp
|
// Assume local llama.cpp - fetch with load status
|
||||||
updateModelLists()
|
models, err := fetchLCPModelsWithLoadStatus()
|
||||||
|
if err != nil {
|
||||||
|
logger.Error("failed to fetch models with load status", "error", err)
|
||||||
return LocalModels
|
return LocalModels
|
||||||
}
|
}
|
||||||
|
return models
|
||||||
|
}
|
||||||
// Get the current model list based on the API
|
// Get the current model list based on the API
|
||||||
modelList := getModelListForAPI(cfg.CurrentAPI)
|
modelList := getModelListForAPI(cfg.CurrentAPI)
|
||||||
// Check for empty options list
|
// Check for empty options list
|
||||||
@@ -57,12 +61,11 @@ func showModelSelectionPopup() {
|
|||||||
modelListWidget.SetCurrentItem(currentModelIndex)
|
modelListWidget.SetCurrentItem(currentModelIndex)
|
||||||
}
|
}
|
||||||
modelListWidget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
|
modelListWidget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
|
||||||
// Update the model in both chatBody and config
|
modelName := strings.TrimPrefix(mainText, "(loaded) ")
|
||||||
chatBody.Model = mainText
|
chatBody.Model = modelName
|
||||||
cfg.CurrentModel = chatBody.Model
|
cfg.CurrentModel = chatBody.Model
|
||||||
// Remove the popup page
|
|
||||||
pages.RemovePage("modelSelectionPopup")
|
pages.RemovePage("modelSelectionPopup")
|
||||||
// Update the status line to reflect the change
|
updateCachedModelColor()
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
})
|
})
|
||||||
modelListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
modelListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
@@ -70,6 +73,10 @@ func showModelSelectionPopup() {
|
|||||||
pages.RemovePage("modelSelectionPopup")
|
pages.RemovePage("modelSelectionPopup")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
|
pages.RemovePage("modelSelectionPopup")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
return event
|
return event
|
||||||
})
|
})
|
||||||
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
||||||
@@ -152,10 +159,9 @@ func showAPILinkSelectionPopup() {
|
|||||||
chatBody.Model = newModelList[0]
|
chatBody.Model = newModelList[0]
|
||||||
cfg.CurrentModel = chatBody.Model
|
cfg.CurrentModel = chatBody.Model
|
||||||
}
|
}
|
||||||
// Remove the popup page
|
|
||||||
pages.RemovePage("apiLinkSelectionPopup")
|
pages.RemovePage("apiLinkSelectionPopup")
|
||||||
// Update the parser and status line to reflect the change
|
|
||||||
choseChunkParser()
|
choseChunkParser()
|
||||||
|
updateCachedModelColor()
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
})
|
})
|
||||||
apiListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
apiListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
@@ -163,6 +169,10 @@ func showAPILinkSelectionPopup() {
|
|||||||
pages.RemovePage("apiLinkSelectionPopup")
|
pages.RemovePage("apiLinkSelectionPopup")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
|
pages.RemovePage("apiLinkSelectionPopup")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
return event
|
return event
|
||||||
})
|
})
|
||||||
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
||||||
@@ -229,6 +239,10 @@ func showUserRoleSelectionPopup() {
|
|||||||
pages.RemovePage("userRoleSelectionPopup")
|
pages.RemovePage("userRoleSelectionPopup")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
|
pages.RemovePage("userRoleSelectionPopup")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
return event
|
return event
|
||||||
})
|
})
|
||||||
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
||||||
@@ -297,6 +311,10 @@ func showBotRoleSelectionPopup() {
|
|||||||
pages.RemovePage("botRoleSelectionPopup")
|
pages.RemovePage("botRoleSelectionPopup")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
|
pages.RemovePage("botRoleSelectionPopup")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
return event
|
return event
|
||||||
})
|
})
|
||||||
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
||||||
@@ -312,3 +330,182 @@ func showBotRoleSelectionPopup() {
|
|||||||
pages.AddPage("botRoleSelectionPopup", modal(roleListWidget, 80, 20), true, true)
|
pages.AddPage("botRoleSelectionPopup", modal(roleListWidget, 80, 20), true, true)
|
||||||
app.SetFocus(roleListWidget)
|
app.SetFocus(roleListWidget)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func showFileCompletionPopup(filter string) {
|
||||||
|
baseDir := cfg.FilePickerDir
|
||||||
|
if baseDir == "" {
|
||||||
|
baseDir = "."
|
||||||
|
}
|
||||||
|
complMatches := scanFiles(baseDir, filter)
|
||||||
|
if len(complMatches) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// If only one match, auto-complete without showing popup
|
||||||
|
if len(complMatches) == 1 {
|
||||||
|
currentText := textArea.GetText()
|
||||||
|
atIdx := strings.LastIndex(currentText, "@")
|
||||||
|
if atIdx >= 0 {
|
||||||
|
before := currentText[:atIdx]
|
||||||
|
textArea.SetText(before+complMatches[0], true)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
widget := tview.NewList().ShowSecondaryText(false).
|
||||||
|
SetSelectedBackgroundColor(tcell.ColorGray)
|
||||||
|
widget.SetTitle("file completion").SetBorder(true)
|
||||||
|
for _, m := range complMatches {
|
||||||
|
widget.AddItem(m, "", 0, nil)
|
||||||
|
}
|
||||||
|
widget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
|
||||||
|
currentText := textArea.GetText()
|
||||||
|
atIdx := strings.LastIndex(currentText, "@")
|
||||||
|
if atIdx >= 0 {
|
||||||
|
before := currentText[:atIdx]
|
||||||
|
textArea.SetText(before+mainText, true)
|
||||||
|
}
|
||||||
|
pages.RemovePage("fileCompletionPopup")
|
||||||
|
})
|
||||||
|
widget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
|
if event.Key() == tcell.KeyEscape {
|
||||||
|
pages.RemovePage("fileCompletionPopup")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
|
pages.RemovePage("fileCompletionPopup")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return event
|
||||||
|
})
|
||||||
|
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
||||||
|
return tview.NewFlex().
|
||||||
|
AddItem(nil, 0, 1, false).
|
||||||
|
AddItem(tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
|
AddItem(nil, 0, 1, false).
|
||||||
|
AddItem(p, height, 1, true).
|
||||||
|
AddItem(nil, 0, 1, false), width, 1, true).
|
||||||
|
AddItem(nil, 0, 1, false)
|
||||||
|
}
|
||||||
|
// Add modal page and make it visible
|
||||||
|
pages.AddPage("fileCompletionPopup", modal(widget, 80, 20), true, true)
|
||||||
|
app.SetFocus(widget)
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateWidgetColors(theme *tview.Theme) {
|
||||||
|
bgColor := theme.PrimitiveBackgroundColor
|
||||||
|
fgColor := theme.PrimaryTextColor
|
||||||
|
borderColor := theme.BorderColor
|
||||||
|
titleColor := theme.TitleColor
|
||||||
|
|
||||||
|
textView.SetBackgroundColor(bgColor)
|
||||||
|
textView.SetTextColor(fgColor)
|
||||||
|
textView.SetBorderColor(borderColor)
|
||||||
|
textView.SetTitleColor(titleColor)
|
||||||
|
|
||||||
|
textArea.SetBackgroundColor(bgColor)
|
||||||
|
textArea.SetBorderColor(borderColor)
|
||||||
|
textArea.SetTitleColor(titleColor)
|
||||||
|
textArea.SetTextStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
||||||
|
textArea.SetPlaceholderStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
||||||
|
// Force textarea refresh by restoring text (SetTextStyle doesn't trigger redraw)
|
||||||
|
textArea.SetText(textArea.GetText(), true)
|
||||||
|
|
||||||
|
editArea.SetBackgroundColor(bgColor)
|
||||||
|
editArea.SetBorderColor(borderColor)
|
||||||
|
editArea.SetTitleColor(titleColor)
|
||||||
|
editArea.SetTextStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
||||||
|
editArea.SetPlaceholderStyle(tcell.StyleDefault.Background(bgColor).Foreground(fgColor))
|
||||||
|
// Force textarea refresh by restoring text (SetTextStyle doesn't trigger redraw)
|
||||||
|
editArea.SetText(editArea.GetText(), true)
|
||||||
|
|
||||||
|
statusLineWidget.SetBackgroundColor(bgColor)
|
||||||
|
statusLineWidget.SetTextColor(fgColor)
|
||||||
|
statusLineWidget.SetBorderColor(borderColor)
|
||||||
|
statusLineWidget.SetTitleColor(titleColor)
|
||||||
|
|
||||||
|
helpView.SetBackgroundColor(bgColor)
|
||||||
|
helpView.SetTextColor(fgColor)
|
||||||
|
helpView.SetBorderColor(borderColor)
|
||||||
|
helpView.SetTitleColor(titleColor)
|
||||||
|
|
||||||
|
searchField.SetBackgroundColor(bgColor)
|
||||||
|
searchField.SetBorderColor(borderColor)
|
||||||
|
searchField.SetTitleColor(titleColor)
|
||||||
|
}
|
||||||
|
|
||||||
|
// showColorschemeSelectionPopup creates a modal popup to select a colorscheme
|
||||||
|
func showColorschemeSelectionPopup() {
|
||||||
|
// Get the list of available colorschemes
|
||||||
|
schemeNames := make([]string, 0, len(colorschemes))
|
||||||
|
for name := range colorschemes {
|
||||||
|
schemeNames = append(schemeNames, name)
|
||||||
|
}
|
||||||
|
slices.Sort(schemeNames)
|
||||||
|
// Check for empty options list
|
||||||
|
if len(schemeNames) == 0 {
|
||||||
|
logger.Warn("no colorschemes available for selection")
|
||||||
|
message := "No colorschemes available."
|
||||||
|
if err := notifyUser("Empty list", message); err != nil {
|
||||||
|
logger.Error("failed to send notification", "error", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Create a list primitive
|
||||||
|
schemeListWidget := tview.NewList().ShowSecondaryText(false).
|
||||||
|
SetSelectedBackgroundColor(tcell.ColorGray)
|
||||||
|
schemeListWidget.SetTitle("Select Colorscheme").SetBorder(true)
|
||||||
|
|
||||||
|
currentScheme := "default"
|
||||||
|
for name := range colorschemes {
|
||||||
|
if tview.Styles == colorschemes[name] {
|
||||||
|
currentScheme = name
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
currentSchemeIndex := -1
|
||||||
|
for i, scheme := range schemeNames {
|
||||||
|
if scheme == currentScheme {
|
||||||
|
currentSchemeIndex = i
|
||||||
|
}
|
||||||
|
schemeListWidget.AddItem(scheme, "", 0, nil)
|
||||||
|
}
|
||||||
|
// Set the current selection if found
|
||||||
|
if currentSchemeIndex != -1 {
|
||||||
|
schemeListWidget.SetCurrentItem(currentSchemeIndex)
|
||||||
|
}
|
||||||
|
schemeListWidget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
|
||||||
|
// Update the colorscheme
|
||||||
|
if theme, ok := colorschemes[mainText]; ok {
|
||||||
|
tview.Styles = theme
|
||||||
|
go func() {
|
||||||
|
app.QueueUpdateDraw(func() {
|
||||||
|
updateWidgetColors(&theme)
|
||||||
|
})
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
// Remove the popup page
|
||||||
|
pages.RemovePage("colorschemeSelectionPopup")
|
||||||
|
})
|
||||||
|
schemeListWidget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
|
if event.Key() == tcell.KeyEscape {
|
||||||
|
pages.RemovePage("colorschemeSelectionPopup")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
|
||||||
|
pages.RemovePage("colorschemeSelectionPopup")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return event
|
||||||
|
})
|
||||||
|
modal := func(p tview.Primitive, width, height int) tview.Primitive {
|
||||||
|
return tview.NewFlex().
|
||||||
|
AddItem(nil, 0, 1, false).
|
||||||
|
AddItem(tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
|
AddItem(nil, 0, 1, false).
|
||||||
|
AddItem(p, height, 1, true).
|
||||||
|
AddItem(nil, 0, 1, false), width, 1, true).
|
||||||
|
AddItem(nil, 0, 1, false)
|
||||||
|
}
|
||||||
|
// Add modal page and make it visible
|
||||||
|
pages.AddPage("colorschemeSelectionPopup", modal(schemeListWidget, 40, len(schemeNames)+2), true, true)
|
||||||
|
app.SetFocus(schemeListWidget)
|
||||||
|
}
|
||||||
|
|||||||
@@ -135,6 +135,9 @@ func makePropsTable(props map[string]float32) *tview.Table {
|
|||||||
// Reconfigure the app's mouse setting
|
// Reconfigure the app's mouse setting
|
||||||
app.EnableMouse(cfg.EnableMouse)
|
app.EnableMouse(cfg.EnableMouse)
|
||||||
})
|
})
|
||||||
|
addCheckboxRow("Image Preview (file picker)", cfg.ImagePreview, func(checked bool) {
|
||||||
|
cfg.ImagePreview = checked
|
||||||
|
})
|
||||||
addCheckboxRow("Auto turn (for cards with many chars)", cfg.AutoTurn, func(checked bool) {
|
addCheckboxRow("Auto turn (for cards with many chars)", cfg.AutoTurn, func(checked bool) {
|
||||||
cfg.AutoTurn = checked
|
cfg.AutoTurn = checked
|
||||||
})
|
})
|
||||||
@@ -146,6 +149,11 @@ func makePropsTable(props map[string]float32) *tview.Table {
|
|||||||
addListPopupRow("Set log level", logLevels, GetLogLevel(), func(option string) {
|
addListPopupRow("Set log level", logLevels, GetLogLevel(), func(option string) {
|
||||||
setLogLevel(option)
|
setLogLevel(option)
|
||||||
})
|
})
|
||||||
|
// Add reasoning effort dropdown (for OpenRouter and supported APIs)
|
||||||
|
reasoningEfforts := []string{"", "none", "minimal", "low", "medium", "high", "xhigh"}
|
||||||
|
addListPopupRow("Reasoning effort (OR)", reasoningEfforts, cfg.ReasoningEffort, func(option string) {
|
||||||
|
cfg.ReasoningEffort = option
|
||||||
|
})
|
||||||
// Helper function to get model list for a given API
|
// Helper function to get model list for a given API
|
||||||
getModelListForAPI := func(api string) []string {
|
getModelListForAPI := func(api string) []string {
|
||||||
if strings.Contains(api, "api.deepseek.com/") {
|
if strings.Contains(api, "api.deepseek.com/") {
|
||||||
|
|||||||
74
server.go
74
server.go
@@ -1,74 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"gf-lt/config"
|
|
||||||
"net/http"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Server struct {
|
|
||||||
// nolint
|
|
||||||
config config.Config
|
|
||||||
}
|
|
||||||
|
|
||||||
func (srv *Server) ListenToRequests(port string) {
|
|
||||||
// h := srv.actions
|
|
||||||
mux := http.NewServeMux()
|
|
||||||
server := &http.Server{
|
|
||||||
Addr: "localhost:" + port,
|
|
||||||
Handler: mux,
|
|
||||||
ReadTimeout: time.Second * 5,
|
|
||||||
WriteTimeout: time.Second * 5,
|
|
||||||
}
|
|
||||||
mux.HandleFunc("GET /ping", pingHandler)
|
|
||||||
mux.HandleFunc("GET /model", modelHandler)
|
|
||||||
mux.HandleFunc("POST /completion", completionHandler)
|
|
||||||
fmt.Println("Listening", "addr", server.Addr)
|
|
||||||
if err := server.ListenAndServe(); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// create server
|
|
||||||
// listen to the completion endpoint handler
|
|
||||||
func pingHandler(w http.ResponseWriter, req *http.Request) {
|
|
||||||
if _, err := w.Write([]byte("pong")); err != nil {
|
|
||||||
logger.Error("server ping", "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func completionHandler(w http.ResponseWriter, req *http.Request) {
|
|
||||||
// post request
|
|
||||||
body := req.Body
|
|
||||||
// get body as io.reader
|
|
||||||
// pass it to the /completion
|
|
||||||
go sendMsgToLLM(body)
|
|
||||||
out:
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case chunk := <-chunkChan:
|
|
||||||
fmt.Print(chunk)
|
|
||||||
if _, err := w.Write([]byte(chunk)); err != nil {
|
|
||||||
logger.Warn("failed to write chunk", "value", chunk)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
case <-streamDone:
|
|
||||||
break out
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func modelHandler(w http.ResponseWriter, req *http.Request) {
|
|
||||||
llmModel := fetchLCPModelName()
|
|
||||||
payload, err := json.Marshal(llmModel)
|
|
||||||
if err != nil {
|
|
||||||
logger.Error("model handler", "error", err)
|
|
||||||
// return err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if _, err := w.Write(payload); err != nil {
|
|
||||||
logger.Error("model handler", "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"sys_prompt": "This is a chat between Alice, Bob and Carl. Normally all message are public (seen by everyone). But characters also able to make messages intended to specific targets using '@' tag. Usually tag is provided inside of out of character clause: (ooc: @charname@), but will be parsed if put anywhere in the message.\nTO SEND A PRIVATE MESSAGE:\n- Include a recipient tag in this exact format: @CharacterName@\n- The tag can be anywhere in your message\n- Example: \"Don't tell others this secret. (ooc: @Bob@)\"\n- For immersion sake it is better if private messages are given in context of whispering, passing notes, or being alone in some space: Alice: *leans closer to Carl and whispers* \"I forgot to turn off the car, could you watch my bag for a cuple of minutes? (ooc: @Carl@)\"\n- Only the sender and tagged recipients will see that message.\nRECEIVING MESSAGES:\n- You only see messages where you are the sender OR you are tagged in the recipient tag\n- Public messages (without tags) are seen by everyone.\nEXAMPLE FORMAT:\nAlice: \"Public message everyone sees\"\nAlice: \"Private message only for Bob @Bob@\"\n(if Diana joins the conversation, and Alice wants to exclude her) Alice: *Grabs Bob and Carl, and pulls them away* \"Listen boys, let's meet this friday again!\" (ooc: @Bob,Carl@; Diana is not trustworthy)\nWHEN TO USE:\n- Most of the time public messages (no tag) are the best choice. Private messages (with tag) are mostly for the passing secrets or information that is described or infered as private.\n- Game of 20 questions. Guys are putting paper sickers on the forehead with names written on them. So in this case only person who gets the sticker put on them does not see the writting on it.\nBob: *Puts sticker with 'JACK THE RIPPER' written on it, on Alices forehead* (ooc: @Carl).\nCarl: \"Alright, we're ready.\"\nAlice: \"Good. So, am I a fictional character or a real one?\"",
|
"sys_prompt": "This is a chat between Alice, Bob and Carl. Normally all message are public (seen by everyone). But characters also able to make messages intended to specific targets using '@' tag. Usually tag is provided inside of out of character clause: (ooc: @charname@), but will be parsed if put anywhere in the message.\nTO SEND A PRIVATE MESSAGE:\n- Include a recipient tag in this exact format: @CharacterName@\n- The tag can be anywhere in your message\n- Example: \"(ooc: @Bob@) Don't tell others this secret.\"\n- For immersion sake it is better if private messages are given in context of whispering, passing notes, or being alone in some space: Alice: (ooc: @Carl@) *leans closer to Carl and whispers* \"I forgot to turn off the car, could you watch my bag for a cuple of minutes?\"\n- Only the sender and tagged recipients will see that message.\nRECEIVING MESSAGES:\n- You only see messages where you are the sender OR you are tagged in the recipient tag\n- Public messages (without tags) are seen by everyone.\nEXAMPLE FORMAT:\nAlice: \"Public message everyone sees\"\nAlice: (ooc: @Bob@)\n\"Private message only for Bob\"\n(if Diana joins the conversation, and Alice wants to exclude her) Alice: (ooc: @Bob,Carl@; Diana is not trustworthy)\n*Grabs Bob and Carl, and pulls them away* \"Listen boys, let's meet this friday again!\"\nWHEN TO USE:\n- Most of the time public messages (no tag) are the best choice. Private messages (with tag) are mostly for the passing secrets or information that is described or infered as private.\n- Game of 20 questions. Guys are putting paper sickers on the forehead with names written on them. So in this case only person who gets the sticker put on them does not see the writting on it.\nBob: *Puts sticker with 'JACK THE RIPPER' written on it, on Alices forehead* (ooc: @Carl).\nCarl: \"Alright, we're ready.\"\nAlice: \"Good. So, am I a fictional character or a real one?\"",
|
||||||
"role": "Alice",
|
"role": "Alice",
|
||||||
"filepath": "sysprompts/alice_bob_carl.json",
|
"filepath": "sysprompts/alice_bob_carl.json",
|
||||||
"chars": ["Alice", "Bob", "Carl"],
|
"chars": ["Alice", "Bob", "Carl"],
|
||||||
|
|||||||
6
sysprompts/coding_assistant.json
Normal file
6
sysprompts/coding_assistant.json
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"sys_prompt": "You are an expert software engineering assistant. Your goal is to help users with coding tasks, debugging, refactoring, and software development.\n\n## Core Principles\n1. **Security First**: Never expose secrets, keys, or credentials. Never commit sensitive data.\n2. **No Git Actions**: You can READ git info (status, log, diff) for context, but NEVER perform git actions (commit, add, push, checkout, reset, rm, etc.). Let the user handle all git operations.\n3. **Explore Before Execute**: Always understand the codebase structure before making changes.\n4. **Follow Conventions**: Match existing code style, patterns, and frameworks used in the project.\n5. **Be Concise**: Minimize output tokens while maintaining quality. Avoid unnecessary explanations.\n\n## Workflow for Complex Tasks\nFor multi-step tasks, ALWAYS use the todo system to track progress:\n\n1. **Create Todo List**: At the start of complex tasks, use `todo_create` to break down work into actionable items.\n2. **Update Progress**: Mark items as `in_progress` when working on them, and `completed` when done.\n3. **Check Status**: Use `todo_read` to review your progress.\n\nExample workflow:\n- User: \"Add user authentication to this app\"\n- You: Create todos: [\"Analyze existing auth structure\", \"Check frameworks in use\", \"Implement auth middleware\", \"Add login endpoints\", \"Test implementation\"]\n\n## Task Execution Flow\n\n### Phase 1: Exploration (Always First)\n- Use `file_list` to understand directory structure (path defaults to FilePickerDir if not specified)\n- Use `file_read` to examine relevant files (paths are relative to FilePickerDir unless starting with `/`)\n- Use `execute_command` with `grep`/`find` to search for patterns\n- Check `README` or documentation files\n- Identify: frameworks, conventions, testing approach\n- **Git reads allowed**: You may use `git status`, `git log`, `git diff` for context, but only to inform your work\n- **Path handling**: Relative paths are resolved against FilePickerDir (configurable via Alt+O). Use absolute paths (starting with `/`) to bypass FilePickerDir.\n\n### Phase 2: Planning\n- For complex tasks: create todo items\n- Identify files that need modification\n- Plan your approach following existing patterns\n\n### Phase 3: Implementation\n- Make changes using appropriate file tools\n- Prefer `file_write` for new files, `file_read` then modify for existing files\n- Follow existing code style exactly\n- Use existing libraries and utilities\n\n### Phase 4: Verification\n- Run tests if available (check for test scripts)\n- Run linting/type checking commands\n- Verify changes work as expected\n\n### Phase 5: Completion\n- Update todos to `completed`\n- Provide concise summary of changes\n- Reference specific file paths and line numbers when relevant\n- **DO NOT commit changes** - inform user what was done so they can review and commit themselves\n\n## Tool Usage Guidelines\n\n**File Operations**:\n- `file_read`: Read before editing. Use for understanding code.\n- `file_write`: Overwrite file content completely.\n- `file_write_append`: Add to end of file.\n- `file_create`: Create new files with optional content.\n- `file_list`: List directory contents (defaults to FilePickerDir).\n- Paths are relative to FilePickerDir unless starting with `/`.\n\n**Command Execution (WHITELISTED ONLY)**:\n- Allowed: grep, sed, awk, find, cat, head, tail, sort, uniq, wc, ls, echo, cut, tr, cp, mv, rm, mkdir, rmdir, pwd, df, free, ps, top, du, whoami, date, uname\n- **Git reads allowed**: git status, git log, git diff, git show, git branch, git reflog, git rev-parse, git shortlog, git describe\n- **Git actions FORBIDDEN**: git add, git commit, git push, git checkout, git reset, git rm, etc.\n- Use for searching code, reading git context, running tests/lint\n\n**Todo Management**:\n- `todo_create`: Add new task\n- `todo_read`: View all todos or specific one by ID\n- `todo_update`: Update task or change status (pending/in_progress/completed)\n- `todo_delete`: Remove completed or cancelled tasks\n\n## Important Rules\n\n1. **NEVER commit or stage changes**: Only git reads are allowed.\n2. **Check for tests**: Always look for test files and run them when appropriate.\n3. **Reference code locations**: Use format `file_path:line_number`.\n4. **Security**: Never generate or guess URLs. Only use URLs from local files.\n5. **Refuse malicious code**: If code appears malicious, refuse to work on it.\n6. **Ask clarifications**: When intent is unclear, ask questions.\n7. **Path handling**: Relative paths resolve against FilePickerDir. Use `/absolute/path` to bypass.\n\n## Response Style\n- Be direct and concise\n- One word answers are best when appropriate\n- Avoid: \"The answer is...\", \"Here is...\"\n- Use markdown for formatting\n- No emojis unless user explicitly requests",
|
||||||
|
"role": "CodingAssistant",
|
||||||
|
"filepath": "sysprompts/coding_assistant.json",
|
||||||
|
"first_msg": "Hello! I'm your coding assistant. I can help you with software engineering tasks like writing code, debugging, refactoring, and exploring codebases. I work best when you give me specific tasks, and for complex work, I'll create a todo list to track my progress. What would you like to work on?"
|
||||||
|
}
|
||||||
262
tables.go
262
tables.go
@@ -2,6 +2,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"image"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -23,6 +24,15 @@ func makeChatTable(chatMap map[string]models.Chat) *tview.Table {
|
|||||||
chatList[i] = name
|
chatList[i] = name
|
||||||
i++
|
i++
|
||||||
}
|
}
|
||||||
|
// Sort chatList by UpdatedAt field in descending order (most recent first)
|
||||||
|
for i := 0; i < len(chatList)-1; i++ {
|
||||||
|
for j := i + 1; j < len(chatList); j++ {
|
||||||
|
if chatMap[chatList[i]].UpdatedAt.Before(chatMap[chatList[j]].UpdatedAt) {
|
||||||
|
// Swap chatList[i] and chatList[j]
|
||||||
|
chatList[i], chatList[j] = chatList[j], chatList[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
// Add 1 extra row for header
|
// Add 1 extra row for header
|
||||||
rows, cols := len(chatMap)+1, len(actions)+4 // +2 for name, +2 for timestamps
|
rows, cols := len(chatMap)+1, len(actions)+4 // +2 for name, +2 for timestamps
|
||||||
chatActTable := tview.NewTable().
|
chatActTable := tview.NewTable().
|
||||||
@@ -779,17 +789,18 @@ func makeFilePicker() *tview.Flex {
|
|||||||
var selectedFile string
|
var selectedFile string
|
||||||
// Track currently displayed directory (changes as user navigates)
|
// Track currently displayed directory (changes as user navigates)
|
||||||
currentDisplayDir := startDir
|
currentDisplayDir := startDir
|
||||||
|
// --- NEW: search state ---
|
||||||
|
searching := false
|
||||||
|
searchQuery := ""
|
||||||
// Helper function to check if a file has an allowed extension from config
|
// Helper function to check if a file has an allowed extension from config
|
||||||
hasAllowedExtension := func(filename string) bool {
|
hasAllowedExtension := func(filename string) bool {
|
||||||
// If no allowed extensions are specified in config, allow all files
|
|
||||||
if cfg.FilePickerExts == "" {
|
if cfg.FilePickerExts == "" {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
// Split the allowed extensions from the config string
|
|
||||||
allowedExts := strings.Split(cfg.FilePickerExts, ",")
|
allowedExts := strings.Split(cfg.FilePickerExts, ",")
|
||||||
lowerFilename := strings.ToLower(strings.TrimSpace(filename))
|
lowerFilename := strings.ToLower(strings.TrimSpace(filename))
|
||||||
for _, ext := range allowedExts {
|
for _, ext := range allowedExts {
|
||||||
ext = strings.TrimSpace(ext) // Remove any whitespace around the extension
|
ext = strings.TrimSpace(ext)
|
||||||
if ext != "" && strings.HasSuffix(lowerFilename, "."+ext) {
|
if ext != "" && strings.HasSuffix(lowerFilename, "."+ext) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -809,21 +820,39 @@ func makeFilePicker() *tview.Flex {
|
|||||||
}
|
}
|
||||||
// Create UI elements
|
// Create UI elements
|
||||||
listView := tview.NewList()
|
listView := tview.NewList()
|
||||||
listView.SetBorder(true).SetTitle("Files & Directories").SetTitleAlign(tview.AlignLeft)
|
listView.SetBorder(true).
|
||||||
|
SetTitle("Files & Directories [s: set FilePickerDir]. Current base dir: " + cfg.FilePickerDir).
|
||||||
|
SetTitleAlign(tview.AlignLeft)
|
||||||
// Status view for selected file information
|
// Status view for selected file information
|
||||||
statusView := tview.NewTextView()
|
statusView := tview.NewTextView()
|
||||||
statusView.SetBorder(true).SetTitle("Selected File").SetTitleAlign(tview.AlignLeft)
|
statusView.SetBorder(true).SetTitle("Selected File").SetTitleAlign(tview.AlignLeft)
|
||||||
statusView.SetTextColor(tcell.ColorYellow)
|
statusView.SetTextColor(tcell.ColorYellow)
|
||||||
// Layout - only include list view and status view
|
// Image preview pane
|
||||||
|
var imgPreview *tview.Image
|
||||||
|
if cfg.ImagePreview {
|
||||||
|
imgPreview = tview.NewImage()
|
||||||
|
imgPreview.SetBorder(true).SetTitle("Preview").SetTitleAlign(tview.AlignLeft)
|
||||||
|
}
|
||||||
|
// Horizontal flex for list + preview
|
||||||
|
var hFlex *tview.Flex
|
||||||
|
if cfg.ImagePreview && imgPreview != nil {
|
||||||
|
hFlex = tview.NewFlex().SetDirection(tview.FlexColumn).
|
||||||
|
AddItem(listView, 0, 3, true).
|
||||||
|
AddItem(imgPreview, 0, 2, false)
|
||||||
|
} else {
|
||||||
|
hFlex = tview.NewFlex().SetDirection(tview.FlexColumn).
|
||||||
|
AddItem(listView, 0, 1, true)
|
||||||
|
}
|
||||||
|
// Main vertical flex
|
||||||
flex := tview.NewFlex().SetDirection(tview.FlexRow)
|
flex := tview.NewFlex().SetDirection(tview.FlexRow)
|
||||||
flex.AddItem(listView, 0, 3, true)
|
flex.AddItem(hFlex, 0, 3, true)
|
||||||
flex.AddItem(statusView, 3, 0, false)
|
flex.AddItem(statusView, 3, 0, false)
|
||||||
// Refresh the file list
|
// Refresh the file list – now accepts a filter string
|
||||||
var refreshList func(string)
|
var refreshList func(string, string)
|
||||||
refreshList = func(dir string) {
|
refreshList = func(dir string, filter string) {
|
||||||
listView.Clear()
|
listView.Clear()
|
||||||
// Update the current display directory
|
// Update the current display directory
|
||||||
currentDisplayDir = dir // Update the current display directory
|
currentDisplayDir = dir
|
||||||
// Add exit option at the top
|
// Add exit option at the top
|
||||||
listView.AddItem("Exit file picker [gray](Close without selecting)[-]", "", 'x', func() {
|
listView.AddItem("Exit file picker [gray](Close without selecting)[-]", "", 'x', func() {
|
||||||
pages.RemovePage(filePickerPage)
|
pages.RemovePage(filePickerPage)
|
||||||
@@ -831,13 +860,16 @@ func makeFilePicker() *tview.Flex {
|
|||||||
// Add parent directory (..) if not at root
|
// Add parent directory (..) if not at root
|
||||||
if dir != "/" {
|
if dir != "/" {
|
||||||
parentDir := path.Dir(dir)
|
parentDir := path.Dir(dir)
|
||||||
// Special handling for edge cases - only return if we're truly at a system root
|
// For Unix-like systems, avoid infinite loop when at root
|
||||||
// For Unix-like systems, path.Dir("/") returns "/" which would cause parentDir == dir
|
if parentDir != dir {
|
||||||
if parentDir == dir && dir == "/" {
|
|
||||||
// We're at the root ("/") and trying to go up, just don't add the parent item
|
|
||||||
} else {
|
|
||||||
listView.AddItem("../ [gray](Parent Directory)[-]", "", 'p', func() {
|
listView.AddItem("../ [gray](Parent Directory)[-]", "", 'p', func() {
|
||||||
refreshList(parentDir)
|
// Clear search on navigation
|
||||||
|
searching = false
|
||||||
|
searchQuery = ""
|
||||||
|
if cfg.ImagePreview {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
}
|
||||||
|
refreshList(parentDir, "")
|
||||||
dirStack = append(dirStack, parentDir)
|
dirStack = append(dirStack, parentDir)
|
||||||
currentStackPos = len(dirStack) - 1
|
currentStackPos = len(dirStack) - 1
|
||||||
})
|
})
|
||||||
@@ -849,93 +881,215 @@ func makeFilePicker() *tview.Flex {
|
|||||||
statusView.SetText("Error reading directory: " + err.Error())
|
statusView.SetText("Error reading directory: " + err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Add directories and files to the list
|
// Helper to check if an item passes the filter
|
||||||
|
matchesFilter := func(name string) bool {
|
||||||
|
if filter == "" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return strings.Contains(strings.ToLower(name), strings.ToLower(filter))
|
||||||
|
}
|
||||||
|
// Add directories
|
||||||
for _, file := range files {
|
for _, file := range files {
|
||||||
name := file.Name()
|
name := file.Name()
|
||||||
// Skip hidden files and directories (those starting with a dot)
|
|
||||||
if strings.HasPrefix(name, ".") {
|
if strings.HasPrefix(name, ".") {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if file.IsDir() {
|
if file.IsDir() && matchesFilter(name) {
|
||||||
// Capture the directory name for the closure to avoid loop variable issues
|
|
||||||
dirName := name
|
dirName := name
|
||||||
listView.AddItem(dirName+"/ [gray](Directory)[-]", "", 0, func() {
|
listView.AddItem(dirName+"/ [gray](Directory)[-]", "", 0, func() {
|
||||||
|
// Clear search on navigation
|
||||||
|
searching = false
|
||||||
|
searchQuery = ""
|
||||||
|
if cfg.ImagePreview {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
}
|
||||||
newDir := path.Join(dir, dirName)
|
newDir := path.Join(dir, dirName)
|
||||||
refreshList(newDir)
|
refreshList(newDir, "")
|
||||||
dirStack = append(dirStack, newDir)
|
dirStack = append(dirStack, newDir)
|
||||||
currentStackPos = len(dirStack) - 1
|
currentStackPos = len(dirStack) - 1
|
||||||
statusView.SetText("Current: " + newDir)
|
statusView.SetText("Current: " + newDir)
|
||||||
})
|
})
|
||||||
} else if hasAllowedExtension(name) {
|
}
|
||||||
// Only show files that have allowed extensions (from config)
|
}
|
||||||
// Capture the file name for the closure to avoid loop variable issues
|
// Add files with allowed extensions
|
||||||
|
for _, file := range files {
|
||||||
|
name := file.Name()
|
||||||
|
if strings.HasPrefix(name, ".") || file.IsDir() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if hasAllowedExtension(name) && matchesFilter(name) {
|
||||||
fileName := name
|
fileName := name
|
||||||
fullFilePath := path.Join(dir, fileName)
|
fullFilePath := path.Join(dir, fileName)
|
||||||
listView.AddItem(fileName+" [gray](File)[-]", "", 0, func() {
|
listView.AddItem(fileName+" [gray](File)[-]", "", 0, func() {
|
||||||
selectedFile = fullFilePath
|
selectedFile = fullFilePath
|
||||||
statusView.SetText("Selected: " + selectedFile)
|
statusView.SetText("Selected: " + selectedFile)
|
||||||
// Check if the file is an image
|
|
||||||
if isImageFile(fileName) {
|
if isImageFile(fileName) {
|
||||||
// For image files, offer to attach to the next LLM message
|
|
||||||
statusView.SetText("Selected image: " + selectedFile)
|
statusView.SetText("Selected image: " + selectedFile)
|
||||||
} else {
|
|
||||||
// For non-image files, display as before
|
|
||||||
statusView.SetText("Selected: " + selectedFile)
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Update status line based on search state
|
||||||
|
switch {
|
||||||
|
case searching:
|
||||||
|
statusView.SetText("Search: " + searchQuery + "_")
|
||||||
|
case searchQuery != "":
|
||||||
|
statusView.SetText("Current: " + dir + " (filter: " + searchQuery + ")")
|
||||||
|
default:
|
||||||
statusView.SetText("Current: " + dir)
|
statusView.SetText("Current: " + dir)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Initialize the file list
|
// Initialize the file list
|
||||||
refreshList(startDir)
|
refreshList(startDir, "")
|
||||||
|
// Update image preview when selection changes (unchanged)
|
||||||
|
if cfg.ImagePreview && imgPreview != nil {
|
||||||
|
listView.SetChangedFunc(func(index int, mainText, secondaryText string, rune rune) {
|
||||||
|
itemText, _ := listView.GetItemText(index)
|
||||||
|
if strings.HasPrefix(itemText, "Exit file picker") || strings.HasPrefix(itemText, "../") {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
actualItemName := itemText
|
||||||
|
if bracketPos := strings.Index(itemText, " ["); bracketPos != -1 {
|
||||||
|
actualItemName = itemText[:bracketPos]
|
||||||
|
}
|
||||||
|
if strings.HasSuffix(actualItemName, "/") {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !isImageFile(actualItemName) {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
filePath := path.Join(currentDisplayDir, actualItemName)
|
||||||
|
file, err := os.Open(filePath)
|
||||||
|
if err != nil {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
img, _, err := image.Decode(file)
|
||||||
|
if err != nil {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
imgPreview.SetImage(img)
|
||||||
|
})
|
||||||
|
}
|
||||||
// Set up keyboard navigation
|
// Set up keyboard navigation
|
||||||
flex.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
flex.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
|
// --- Handle search mode ---
|
||||||
|
if searching {
|
||||||
|
switch event.Key() {
|
||||||
|
case tcell.KeyEsc:
|
||||||
|
// Exit search, clear filter
|
||||||
|
searching = false
|
||||||
|
searchQuery = ""
|
||||||
|
refreshList(currentDisplayDir, "")
|
||||||
|
return nil
|
||||||
|
case tcell.KeyBackspace, tcell.KeyBackspace2:
|
||||||
|
if len(searchQuery) > 0 {
|
||||||
|
searchQuery = searchQuery[:len(searchQuery)-1]
|
||||||
|
refreshList(currentDisplayDir, searchQuery)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
case tcell.KeyRune:
|
||||||
|
r := event.Rune()
|
||||||
|
if r != 0 {
|
||||||
|
searchQuery += string(r)
|
||||||
|
refreshList(currentDisplayDir, searchQuery)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
default:
|
||||||
|
// Pass all other keys (arrows, Enter, etc.) to normal processing
|
||||||
|
// This allows selecting items while still in search mode
|
||||||
|
return event
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// --- Not searching ---
|
||||||
switch event.Key() {
|
switch event.Key() {
|
||||||
case tcell.KeyEsc:
|
case tcell.KeyEsc:
|
||||||
pages.RemovePage(filePickerPage)
|
pages.RemovePage(filePickerPage)
|
||||||
return nil
|
return nil
|
||||||
case tcell.KeyBackspace2: // Backspace to go to parent directory
|
case tcell.KeyBackspace2: // Backspace to go to parent directory
|
||||||
|
if cfg.ImagePreview && imgPreview != nil {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
}
|
||||||
if currentStackPos > 0 {
|
if currentStackPos > 0 {
|
||||||
currentStackPos--
|
currentStackPos--
|
||||||
prevDir := dirStack[currentStackPos]
|
prevDir := dirStack[currentStackPos]
|
||||||
refreshList(prevDir)
|
// Clear search when navigating with backspace
|
||||||
// Trim the stack to current position to avoid deep history
|
searching = false
|
||||||
|
searchQuery = ""
|
||||||
|
refreshList(prevDir, "")
|
||||||
|
// Trim the stack to current position
|
||||||
dirStack = dirStack[:currentStackPos+1]
|
dirStack = dirStack[:currentStackPos+1]
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
case tcell.KeyRune:
|
||||||
|
if event.Rune() == '/' {
|
||||||
|
// Enter search mode
|
||||||
|
searching = true
|
||||||
|
searchQuery = ""
|
||||||
|
refreshList(currentDisplayDir, "")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if event.Rune() == 's' {
|
||||||
|
// Set FilePickerDir to current directory
|
||||||
|
itemIndex := listView.GetCurrentItem()
|
||||||
|
if itemIndex >= 0 && itemIndex < listView.GetItemCount() {
|
||||||
|
itemText, _ := listView.GetItemText(itemIndex)
|
||||||
|
// Get the actual directory path
|
||||||
|
var targetDir string
|
||||||
|
if strings.HasPrefix(itemText, "Exit") || strings.HasPrefix(itemText, "Select this directory") {
|
||||||
|
targetDir = currentDisplayDir
|
||||||
|
} else {
|
||||||
|
actualItemName := itemText
|
||||||
|
if bracketPos := strings.Index(itemText, " ["); bracketPos != -1 {
|
||||||
|
actualItemName = itemText[:bracketPos]
|
||||||
|
}
|
||||||
|
// nolint: gocritic
|
||||||
|
if strings.HasPrefix(actualItemName, "../") {
|
||||||
|
targetDir = path.Dir(currentDisplayDir)
|
||||||
|
} else if strings.HasSuffix(actualItemName, "/") {
|
||||||
|
dirName := strings.TrimSuffix(actualItemName, "/")
|
||||||
|
targetDir = path.Join(currentDisplayDir, dirName)
|
||||||
|
} else {
|
||||||
|
targetDir = currentDisplayDir
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cfg.FilePickerDir = targetDir
|
||||||
|
if err := notifyUser("FilePickerDir", "Set to: "+targetDir); err != nil {
|
||||||
|
logger.Error("failed to notify user", "error", err)
|
||||||
|
}
|
||||||
|
// pages.RemovePage(filePickerPage)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
case tcell.KeyEnter:
|
case tcell.KeyEnter:
|
||||||
// Get the currently highlighted item in the list
|
// Get the currently highlighted item in the list
|
||||||
itemIndex := listView.GetCurrentItem()
|
itemIndex := listView.GetCurrentItem()
|
||||||
if itemIndex >= 0 && itemIndex < listView.GetItemCount() {
|
if itemIndex >= 0 && itemIndex < listView.GetItemCount() {
|
||||||
// We need to get the text of the currently selected item to determine if it's a directory
|
|
||||||
// Since we can't directly get the item text, we'll keep track of items differently
|
|
||||||
// Let's improve the approach by tracking the currently selected item
|
|
||||||
itemText, _ := listView.GetItemText(itemIndex)
|
itemText, _ := listView.GetItemText(itemIndex)
|
||||||
logger.Info("choosing dir", "itemText", itemText)
|
logger.Info("choosing dir", "itemText", itemText)
|
||||||
// Check for the exit option first (should be the first item)
|
// Check for the exit option first
|
||||||
if strings.HasPrefix(itemText, "Exit file picker") {
|
if strings.HasPrefix(itemText, "Exit file picker") {
|
||||||
pages.RemovePage(filePickerPage)
|
pages.RemovePage(filePickerPage)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// Extract the actual filename/directory name by removing the type info in brackets
|
// Extract the actual filename/directory name by removing the type info
|
||||||
// Format is "name [gray](type)[-]"
|
|
||||||
actualItemName := itemText
|
actualItemName := itemText
|
||||||
if bracketPos := strings.Index(itemText, " ["); bracketPos != -1 {
|
if bracketPos := strings.Index(itemText, " ["); bracketPos != -1 {
|
||||||
actualItemName = itemText[:bracketPos]
|
actualItemName = itemText[:bracketPos]
|
||||||
}
|
}
|
||||||
// Check if it's a directory (ends with /)
|
// Check if it's a directory (ends with /)
|
||||||
if strings.HasSuffix(actualItemName, "/") {
|
if strings.HasSuffix(actualItemName, "/") {
|
||||||
// This is a directory, we need to get the full path
|
|
||||||
// Since the item text ends with "/" and represents a directory
|
|
||||||
var targetDir string
|
var targetDir string
|
||||||
if strings.HasPrefix(actualItemName, "../") {
|
if strings.HasPrefix(actualItemName, "../") {
|
||||||
// Parent directory - need to go up from current directory
|
// Parent directory
|
||||||
targetDir = path.Dir(currentDisplayDir)
|
targetDir = path.Dir(currentDisplayDir)
|
||||||
// Avoid going above root - if parent is same as current and it's system root
|
|
||||||
if targetDir == currentDisplayDir && currentDisplayDir == "/" {
|
if targetDir == currentDisplayDir && currentDisplayDir == "/" {
|
||||||
// We're at root, don't navigate
|
logger.Warn("at root, cannot go up")
|
||||||
logger.Warn("went to root", "dir", targetDir)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -943,24 +1097,23 @@ func makeFilePicker() *tview.Flex {
|
|||||||
dirName := strings.TrimSuffix(actualItemName, "/")
|
dirName := strings.TrimSuffix(actualItemName, "/")
|
||||||
targetDir = path.Join(currentDisplayDir, dirName)
|
targetDir = path.Join(currentDisplayDir, dirName)
|
||||||
}
|
}
|
||||||
// Navigate to the selected directory
|
// Navigate – clear search
|
||||||
logger.Info("going to the dir", "dir", targetDir)
|
logger.Info("going to dir", "dir", targetDir)
|
||||||
refreshList(targetDir)
|
if cfg.ImagePreview && imgPreview != nil {
|
||||||
|
imgPreview.SetImage(nil)
|
||||||
|
}
|
||||||
|
searching = false
|
||||||
|
searchQuery = ""
|
||||||
|
refreshList(targetDir, "")
|
||||||
dirStack = append(dirStack, targetDir)
|
dirStack = append(dirStack, targetDir)
|
||||||
currentStackPos = len(dirStack) - 1
|
currentStackPos = len(dirStack) - 1
|
||||||
statusView.SetText("Current: " + targetDir)
|
statusView.SetText("Current: " + targetDir)
|
||||||
return nil
|
return nil
|
||||||
} else {
|
} else {
|
||||||
// It's a file - construct the full path from current directory and the actual item name
|
// It's a file
|
||||||
// We can't rely only on the selectedFile variable since Enter key might be pressed
|
|
||||||
// without having clicked the file first
|
|
||||||
filePath := path.Join(currentDisplayDir, actualItemName)
|
filePath := path.Join(currentDisplayDir, actualItemName)
|
||||||
// Verify it's actually a file (not just lacking a directory suffix)
|
|
||||||
if info, err := os.Stat(filePath); err == nil && !info.IsDir() {
|
if info, err := os.Stat(filePath); err == nil && !info.IsDir() {
|
||||||
// Check if the file is an image
|
|
||||||
if isImageFile(actualItemName) {
|
if isImageFile(actualItemName) {
|
||||||
// For image files, set it as an attachment for the next LLM message
|
|
||||||
// Use the version without UI updates to avoid hangs in event handlers
|
|
||||||
logger.Info("setting image", "file", actualItemName)
|
logger.Info("setting image", "file", actualItemName)
|
||||||
SetImageAttachment(filePath)
|
SetImageAttachment(filePath)
|
||||||
logger.Info("after setting image", "file", actualItemName)
|
logger.Info("after setting image", "file", actualItemName)
|
||||||
@@ -969,7 +1122,6 @@ func makeFilePicker() *tview.Flex {
|
|||||||
pages.RemovePage(filePickerPage)
|
pages.RemovePage(filePickerPage)
|
||||||
logger.Info("after update drawn", "file", actualItemName)
|
logger.Info("after update drawn", "file", actualItemName)
|
||||||
} else {
|
} else {
|
||||||
// For non-image files, update the text area with file path
|
|
||||||
textArea.SetText(filePath, true)
|
textArea.SetText(filePath, true)
|
||||||
app.SetFocus(textArea)
|
app.SetFocus(textArea)
|
||||||
pages.RemovePage(filePickerPage)
|
pages.RemovePage(filePickerPage)
|
||||||
|
|||||||
62
tools.go
62
tools.go
@@ -9,6 +9,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -330,6 +331,7 @@ func memorise(args map[string]string) []byte {
|
|||||||
Topic: args["topic"],
|
Topic: args["topic"],
|
||||||
Mind: args["data"],
|
Mind: args["data"],
|
||||||
UpdatedAt: time.Now(),
|
UpdatedAt: time.Now(),
|
||||||
|
CreatedAt: time.Now(),
|
||||||
}
|
}
|
||||||
if _, err := store.Memorise(memory); err != nil {
|
if _, err := store.Memorise(memory); err != nil {
|
||||||
logger.Error("failed to save memory", "err", err, "memoory", memory)
|
logger.Error("failed to save memory", "err", err, "memoory", memory)
|
||||||
@@ -376,6 +378,8 @@ func fileCreate(args map[string]string) []byte {
|
|||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
path = resolvePath(path)
|
||||||
|
|
||||||
content, ok := args["content"]
|
content, ok := args["content"]
|
||||||
if !ok {
|
if !ok {
|
||||||
content = ""
|
content = ""
|
||||||
@@ -399,6 +403,8 @@ func fileRead(args map[string]string) []byte {
|
|||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
path = resolvePath(path)
|
||||||
|
|
||||||
content, err := readStringFromFile(path)
|
content, err := readStringFromFile(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
msg := "failed to read file; error: " + err.Error()
|
msg := "failed to read file; error: " + err.Error()
|
||||||
@@ -427,6 +433,7 @@ func fileWrite(args map[string]string) []byte {
|
|||||||
logger.Error(msg)
|
logger.Error(msg)
|
||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
path = resolvePath(path)
|
||||||
content, ok := args["content"]
|
content, ok := args["content"]
|
||||||
if !ok {
|
if !ok {
|
||||||
content = ""
|
content = ""
|
||||||
@@ -447,6 +454,7 @@ func fileWriteAppend(args map[string]string) []byte {
|
|||||||
logger.Error(msg)
|
logger.Error(msg)
|
||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
path = resolvePath(path)
|
||||||
content, ok := args["content"]
|
content, ok := args["content"]
|
||||||
if !ok {
|
if !ok {
|
||||||
content = ""
|
content = ""
|
||||||
@@ -468,6 +476,8 @@ func fileDelete(args map[string]string) []byte {
|
|||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
path = resolvePath(path)
|
||||||
|
|
||||||
if err := removeFile(path); err != nil {
|
if err := removeFile(path); err != nil {
|
||||||
msg := "failed to delete file; error: " + err.Error()
|
msg := "failed to delete file; error: " + err.Error()
|
||||||
logger.Error(msg)
|
logger.Error(msg)
|
||||||
@@ -485,6 +495,7 @@ func fileMove(args map[string]string) []byte {
|
|||||||
logger.Error(msg)
|
logger.Error(msg)
|
||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
src = resolvePath(src)
|
||||||
|
|
||||||
dst, ok := args["dst"]
|
dst, ok := args["dst"]
|
||||||
if !ok || dst == "" {
|
if !ok || dst == "" {
|
||||||
@@ -492,6 +503,7 @@ func fileMove(args map[string]string) []byte {
|
|||||||
logger.Error(msg)
|
logger.Error(msg)
|
||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
dst = resolvePath(dst)
|
||||||
|
|
||||||
if err := moveFile(src, dst); err != nil {
|
if err := moveFile(src, dst); err != nil {
|
||||||
msg := "failed to move file; error: " + err.Error()
|
msg := "failed to move file; error: " + err.Error()
|
||||||
@@ -510,6 +522,7 @@ func fileCopy(args map[string]string) []byte {
|
|||||||
logger.Error(msg)
|
logger.Error(msg)
|
||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
src = resolvePath(src)
|
||||||
|
|
||||||
dst, ok := args["dst"]
|
dst, ok := args["dst"]
|
||||||
if !ok || dst == "" {
|
if !ok || dst == "" {
|
||||||
@@ -517,6 +530,7 @@ func fileCopy(args map[string]string) []byte {
|
|||||||
logger.Error(msg)
|
logger.Error(msg)
|
||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
dst = resolvePath(dst)
|
||||||
|
|
||||||
if err := copyFile(src, dst); err != nil {
|
if err := copyFile(src, dst); err != nil {
|
||||||
msg := "failed to copy file; error: " + err.Error()
|
msg := "failed to copy file; error: " + err.Error()
|
||||||
@@ -534,6 +548,8 @@ func fileList(args map[string]string) []byte {
|
|||||||
path = "." // default to current directory
|
path = "." // default to current directory
|
||||||
}
|
}
|
||||||
|
|
||||||
|
path = resolvePath(path)
|
||||||
|
|
||||||
files, err := listDirectory(path)
|
files, err := listDirectory(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
msg := "failed to list directory; error: " + err.Error()
|
msg := "failed to list directory; error: " + err.Error()
|
||||||
@@ -557,6 +573,13 @@ func fileList(args map[string]string) []byte {
|
|||||||
|
|
||||||
// Helper functions for file operations
|
// Helper functions for file operations
|
||||||
|
|
||||||
|
func resolvePath(p string) string {
|
||||||
|
if filepath.IsAbs(p) {
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
return filepath.Join(cfg.FilePickerDir, p)
|
||||||
|
}
|
||||||
|
|
||||||
func readStringFromFile(filename string) (string, error) {
|
func readStringFromFile(filename string) (string, error) {
|
||||||
data, err := os.ReadFile(filename)
|
data, err := os.ReadFile(filename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -647,12 +670,6 @@ func executeCommand(args map[string]string) []byte {
|
|||||||
return []byte(msg)
|
return []byte(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !isCommandAllowed(command) {
|
|
||||||
msg := fmt.Sprintf("command '%s' is not allowed", command)
|
|
||||||
logger.Error(msg)
|
|
||||||
return []byte(msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get arguments - handle both single arg and multiple args
|
// Get arguments - handle both single arg and multiple args
|
||||||
var cmdArgs []string
|
var cmdArgs []string
|
||||||
if args["args"] != "" {
|
if args["args"] != "" {
|
||||||
@@ -672,6 +689,12 @@ func executeCommand(args map[string]string) []byte {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !isCommandAllowed(command, cmdArgs...) {
|
||||||
|
msg := fmt.Sprintf("command '%s' is not allowed", command)
|
||||||
|
logger.Error(msg)
|
||||||
|
return []byte(msg)
|
||||||
|
}
|
||||||
|
|
||||||
// Execute with timeout for safety
|
// Execute with timeout for safety
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
@@ -906,7 +929,19 @@ func todoDelete(args map[string]string) []byte {
|
|||||||
return jsonResult
|
return jsonResult
|
||||||
}
|
}
|
||||||
|
|
||||||
func isCommandAllowed(command string) bool {
|
var gitReadSubcommands = map[string]bool{
|
||||||
|
"status": true,
|
||||||
|
"log": true,
|
||||||
|
"diff": true,
|
||||||
|
"show": true,
|
||||||
|
"branch": true,
|
||||||
|
"reflog": true,
|
||||||
|
"rev-parse": true,
|
||||||
|
"shortlog": true,
|
||||||
|
"describe": true,
|
||||||
|
}
|
||||||
|
|
||||||
|
func isCommandAllowed(command string, args ...string) bool {
|
||||||
allowedCommands := map[string]bool{
|
allowedCommands := map[string]bool{
|
||||||
"grep": true,
|
"grep": true,
|
||||||
"sed": true,
|
"sed": true,
|
||||||
@@ -936,8 +971,15 @@ func isCommandAllowed(command string) bool {
|
|||||||
"whoami": true,
|
"whoami": true,
|
||||||
"date": true,
|
"date": true,
|
||||||
"uname": true,
|
"uname": true,
|
||||||
|
"git": true,
|
||||||
}
|
}
|
||||||
return allowedCommands[command]
|
if !allowedCommands[command] {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if command == "git" && len(args) > 0 {
|
||||||
|
return gitReadSubcommands[args[0]]
|
||||||
|
}
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
func summarizeChat(args map[string]string) []byte {
|
func summarizeChat(args map[string]string) []byte {
|
||||||
@@ -1302,14 +1344,14 @@ var baseTools = []models.Tool{
|
|||||||
Type: "function",
|
Type: "function",
|
||||||
Function: models.ToolFunc{
|
Function: models.ToolFunc{
|
||||||
Name: "execute_command",
|
Name: "execute_command",
|
||||||
Description: "Execute a shell command safely. Use when you need to run system commands like grep sed awk find cat head tail sort uniq wc ls echo cut tr cp mv rm mkdir rmdir pwd df free ps top du whoami date uname",
|
Description: "Execute a shell command safely. Use when you need to run system commands like grep sed awk find cat head tail sort uniq wc ls echo cut tr cp mv rm mkdir rmdir pwd df free ps top du whoami date uname. Git is allowed for read-only operations: status, log, diff, show, branch, reflog, rev-parse, shortlog, describe.",
|
||||||
Parameters: models.ToolFuncParams{
|
Parameters: models.ToolFuncParams{
|
||||||
Type: "object",
|
Type: "object",
|
||||||
Required: []string{"command"},
|
Required: []string{"command"},
|
||||||
Properties: map[string]models.ToolArgProps{
|
Properties: map[string]models.ToolArgProps{
|
||||||
"command": models.ToolArgProps{
|
"command": models.ToolArgProps{
|
||||||
Type: "string",
|
Type: "string",
|
||||||
Description: "command to execute (only commands from whitelist are allowed: grep sed awk find cat head tail sort uniq wc ls echo cut tr cp mv rm mkdir rmdir pwd df free ps top du whoami date uname",
|
Description: "command to execute (only commands from whitelist are allowed: grep sed awk find cat head tail sort uniq wc ls echo cut tr cp mv rm mkdir rmdir pwd df free ps top du whoami date uname; git allowed for reads: status log diff show branch reflog rev-parse shortlog describe)",
|
||||||
},
|
},
|
||||||
"args": models.ToolArgProps{
|
"args": models.ToolArgProps{
|
||||||
Type: "string",
|
Type: "string",
|
||||||
|
|||||||
489
tui.go
489
tui.go
@@ -7,18 +7,14 @@ import (
|
|||||||
_ "image/jpeg"
|
_ "image/jpeg"
|
||||||
_ "image/png"
|
_ "image/png"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
|
||||||
"path"
|
"path"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/gdamore/tcell/v2"
|
"github.com/gdamore/tcell/v2"
|
||||||
"github.com/rivo/tview"
|
"github.com/rivo/tview"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ = sync.RWMutex{}
|
|
||||||
|
|
||||||
var (
|
var (
|
||||||
app *tview.Application
|
app *tview.Application
|
||||||
pages *tview.Pages
|
pages *tview.Pages
|
||||||
@@ -50,7 +46,6 @@ var (
|
|||||||
imgPage = "imgPage"
|
imgPage = "imgPage"
|
||||||
filePickerPage = "filePicker"
|
filePickerPage = "filePicker"
|
||||||
exportDir = "chat_exports"
|
exportDir = "chat_exports"
|
||||||
|
|
||||||
// For overlay search functionality
|
// For overlay search functionality
|
||||||
searchField *tview.InputField
|
searchField *tview.InputField
|
||||||
searchPageName = "searchOverlay"
|
searchPageName = "searchOverlay"
|
||||||
@@ -83,6 +78,7 @@ var (
|
|||||||
[yellow]Ctrl+l[white]: show model selection popup to choose current model
|
[yellow]Ctrl+l[white]: show model selection popup to choose current model
|
||||||
[yellow]Ctrl+k[white]: switch tool use (recommend tool use to llm after user msg)
|
[yellow]Ctrl+k[white]: switch tool use (recommend tool use to llm after user msg)
|
||||||
[yellow]Ctrl+a[white]: interrupt tts (needs tts server)
|
[yellow]Ctrl+a[white]: interrupt tts (needs tts server)
|
||||||
|
[yellow]Alt+0[white]: replay last message via tts (needs tts server)
|
||||||
[yellow]Ctrl+g[white]: open RAG file manager (load files for context retrieval)
|
[yellow]Ctrl+g[white]: open RAG file manager (load files for context retrieval)
|
||||||
[yellow]Ctrl+y[white]: list loaded RAG files (view and manage loaded files)
|
[yellow]Ctrl+y[white]: list loaded RAG files (view and manage loaded files)
|
||||||
[yellow]Ctrl+q[white]: show user role selection popup to choose who sends next msg as
|
[yellow]Ctrl+q[white]: show user role selection popup to choose who sends next msg as
|
||||||
@@ -96,6 +92,8 @@ var (
|
|||||||
[yellow]Alt+7[white]: toggle role injection (inject role in messages)
|
[yellow]Alt+7[white]: toggle role injection (inject role in messages)
|
||||||
[yellow]Alt+8[white]: show char img or last picked img
|
[yellow]Alt+8[white]: show char img or last picked img
|
||||||
[yellow]Alt+9[white]: warm up (load) selected llama.cpp model
|
[yellow]Alt+9[white]: warm up (load) selected llama.cpp model
|
||||||
|
[yellow]Alt+t[white]: toggle thinking blocks visibility (collapse/expand <think> blocks)
|
||||||
|
[yellow]Alt+i[white]: show colorscheme selection popup
|
||||||
|
|
||||||
=== scrolling chat window (some keys similar to vim) ===
|
=== scrolling chat window (some keys similar to vim) ===
|
||||||
[yellow]arrows up/down and j/k[white]: scroll up and down
|
[yellow]arrows up/down and j/k[white]: scroll up and down
|
||||||
@@ -107,396 +105,60 @@ var (
|
|||||||
=== tables (chat history, agent pick, file pick, properties) ===
|
=== tables (chat history, agent pick, file pick, properties) ===
|
||||||
[yellow]x[white]: to exit the table page
|
[yellow]x[white]: to exit the table page
|
||||||
|
|
||||||
|
=== filepicker ===
|
||||||
|
[yellow]s[white]: (in file picker) set current dir as FilePickerDir
|
||||||
|
[yellow]x[white]: to exit
|
||||||
|
|
||||||
|
=== shell mode ===
|
||||||
|
[yellow]@match->Tab[white]: file completion with relative paths (recursive, depth 3, max 50 files)
|
||||||
|
|
||||||
=== status line ===
|
=== status line ===
|
||||||
%s
|
%s
|
||||||
|
|
||||||
Press <Enter> or 'x' to return
|
Press <Enter> or 'x' to return
|
||||||
`
|
`
|
||||||
colorschemes = map[string]tview.Theme{
|
|
||||||
"default": tview.Theme{
|
|
||||||
PrimitiveBackgroundColor: tcell.ColorDefault,
|
|
||||||
ContrastBackgroundColor: tcell.ColorGray,
|
|
||||||
MoreContrastBackgroundColor: tcell.ColorSteelBlue,
|
|
||||||
BorderColor: tcell.ColorGray,
|
|
||||||
TitleColor: tcell.ColorRed,
|
|
||||||
GraphicsColor: tcell.ColorBlue,
|
|
||||||
PrimaryTextColor: tcell.ColorLightGray,
|
|
||||||
SecondaryTextColor: tcell.ColorYellow,
|
|
||||||
TertiaryTextColor: tcell.ColorOrange,
|
|
||||||
InverseTextColor: tcell.ColorPurple,
|
|
||||||
ContrastSecondaryTextColor: tcell.ColorLime,
|
|
||||||
},
|
|
||||||
"gruvbox": tview.Theme{
|
|
||||||
PrimitiveBackgroundColor: tcell.ColorBlack, // Matches #1e1e2e
|
|
||||||
ContrastBackgroundColor: tcell.ColorDarkGoldenrod, // Selected option: warm yellow (#b57614)
|
|
||||||
MoreContrastBackgroundColor: tcell.ColorDarkSlateGray, // Non-selected options: dark grayish-blue (#32302f)
|
|
||||||
BorderColor: tcell.ColorLightGray, // Light gray (#a89984)
|
|
||||||
TitleColor: tcell.ColorRed, // Red (#fb4934)
|
|
||||||
GraphicsColor: tcell.ColorDarkCyan, // Cyan (#689d6a)
|
|
||||||
PrimaryTextColor: tcell.ColorLightGray, // Light gray (#d5c4a1)
|
|
||||||
SecondaryTextColor: tcell.ColorYellow, // Yellow (#fabd2f)
|
|
||||||
TertiaryTextColor: tcell.ColorOrange, // Orange (#fe8019)
|
|
||||||
InverseTextColor: tcell.ColorWhite, // White (#f9f5d7) for selected text
|
|
||||||
ContrastSecondaryTextColor: tcell.ColorLightGreen, // Light green (#b8bb26)
|
|
||||||
},
|
|
||||||
"solarized": tview.Theme{
|
|
||||||
PrimitiveBackgroundColor: tcell.NewHexColor(0x1e1e2e), // #1e1e2e for main dropdown box
|
|
||||||
ContrastBackgroundColor: tcell.ColorDarkCyan, // Selected option: cyan (#2aa198)
|
|
||||||
MoreContrastBackgroundColor: tcell.ColorDarkSlateGray, // Non-selected options: dark blue (#073642)
|
|
||||||
BorderColor: tcell.ColorLightBlue, // Light blue (#839496)
|
|
||||||
TitleColor: tcell.ColorRed, // Red (#dc322f)
|
|
||||||
GraphicsColor: tcell.ColorBlue, // Blue (#268bd2)
|
|
||||||
PrimaryTextColor: tcell.ColorWhite, // White (#fdf6e3)
|
|
||||||
SecondaryTextColor: tcell.ColorYellow, // Yellow (#b58900)
|
|
||||||
TertiaryTextColor: tcell.ColorOrange, // Orange (#cb4b16)
|
|
||||||
InverseTextColor: tcell.ColorWhite, // White (#eee8d5) for selected text
|
|
||||||
ContrastSecondaryTextColor: tcell.ColorLightCyan, // Light cyan (#93a1a1)
|
|
||||||
},
|
|
||||||
"dracula": tview.Theme{
|
|
||||||
PrimitiveBackgroundColor: tcell.NewHexColor(0x1e1e2e), // #1e1e2e for main dropdown box
|
|
||||||
ContrastBackgroundColor: tcell.ColorDarkMagenta, // Selected option: magenta (#bd93f9)
|
|
||||||
MoreContrastBackgroundColor: tcell.ColorDarkGray, // Non-selected options: dark gray (#44475a)
|
|
||||||
BorderColor: tcell.ColorLightGray, // Light gray (#f8f8f2)
|
|
||||||
TitleColor: tcell.ColorRed, // Red (#ff5555)
|
|
||||||
GraphicsColor: tcell.ColorDarkCyan, // Cyan (#8be9fd)
|
|
||||||
PrimaryTextColor: tcell.ColorWhite, // White (#f8f8f2)
|
|
||||||
SecondaryTextColor: tcell.ColorYellow, // Yellow (#f1fa8c)
|
|
||||||
TertiaryTextColor: tcell.ColorOrange, // Orange (#ffb86c)
|
|
||||||
InverseTextColor: tcell.ColorWhite, // White (#f8f8f2) for selected text
|
|
||||||
ContrastSecondaryTextColor: tcell.ColorLightGreen, // Light green (#50fa7b)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func toggleShellMode() {
|
|
||||||
shellMode = !shellMode
|
|
||||||
if shellMode {
|
|
||||||
// Update input placeholder to indicate shell mode
|
|
||||||
textArea.SetPlaceholder("SHELL MODE: Enter command and press <Esc> to execute")
|
|
||||||
} else {
|
|
||||||
// Reset to normal mode
|
|
||||||
textArea.SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message. Alt+1 to exit shell mode")
|
|
||||||
}
|
|
||||||
updateStatusLine()
|
|
||||||
}
|
|
||||||
|
|
||||||
func updateFlexLayout() {
|
|
||||||
if fullscreenMode {
|
|
||||||
// flex already contains only focused widget; do nothing
|
|
||||||
return
|
|
||||||
}
|
|
||||||
flex.Clear()
|
|
||||||
flex.AddItem(textView, 0, 40, false)
|
|
||||||
flex.AddItem(textArea, 0, 10, false)
|
|
||||||
if positionVisible {
|
|
||||||
flex.AddItem(statusLineWidget, 0, 2, false)
|
|
||||||
}
|
|
||||||
// Keep focus on currently focused widget
|
|
||||||
focused := app.GetFocus()
|
|
||||||
if focused == textView {
|
|
||||||
app.SetFocus(textView)
|
|
||||||
} else {
|
|
||||||
app.SetFocus(textArea)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func executeCommandAndDisplay(cmdText string) {
|
|
||||||
// Parse the command (split by spaces, but handle quoted arguments)
|
|
||||||
cmdParts := parseCommand(cmdText)
|
|
||||||
if len(cmdParts) == 0 {
|
|
||||||
fmt.Fprintf(textView, "\n[red]Error: No command provided[-:-:-]\n")
|
|
||||||
if scrollToEndEnabled {
|
|
||||||
textView.ScrollToEnd()
|
|
||||||
}
|
|
||||||
colorText()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
command := cmdParts[0]
|
|
||||||
args := []string{}
|
|
||||||
if len(cmdParts) > 1 {
|
|
||||||
args = cmdParts[1:]
|
|
||||||
}
|
|
||||||
// Create the command execution
|
|
||||||
cmd := exec.Command(command, args...)
|
|
||||||
// Execute the command and get output
|
|
||||||
output, err := cmd.CombinedOutput()
|
|
||||||
// Add the command being executed to the chat
|
|
||||||
fmt.Fprintf(textView, "\n[yellow]$ %s[-:-:-]\n", cmdText)
|
|
||||||
var outputContent string
|
|
||||||
if err != nil {
|
|
||||||
// Include both output and error
|
|
||||||
errorMsg := "Error: " + err.Error()
|
|
||||||
fmt.Fprintf(textView, "[red]%s[-:-:-]\n", errorMsg)
|
|
||||||
if len(output) > 0 {
|
|
||||||
outputStr := string(output)
|
|
||||||
fmt.Fprintf(textView, "[red]%s[-:-:-]\n", outputStr)
|
|
||||||
outputContent = errorMsg + "\n" + outputStr
|
|
||||||
} else {
|
|
||||||
outputContent = errorMsg
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Only output if successful
|
|
||||||
if len(output) > 0 {
|
|
||||||
outputStr := string(output)
|
|
||||||
fmt.Fprintf(textView, "[green]%s[-:-:-]\n", outputStr)
|
|
||||||
outputContent = outputStr
|
|
||||||
} else {
|
|
||||||
successMsg := "Command executed successfully (no output)"
|
|
||||||
fmt.Fprintf(textView, "[green]%s[-:-:-]\n", successMsg)
|
|
||||||
outputContent = successMsg
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Combine command and output in a single message for chat history
|
|
||||||
combinedContent := "$ " + cmdText + "\n\n" + outputContent
|
|
||||||
combinedMsg := models.RoleMsg{
|
|
||||||
Role: cfg.ToolRole,
|
|
||||||
Content: combinedContent,
|
|
||||||
}
|
|
||||||
chatBody.Messages = append(chatBody.Messages, combinedMsg)
|
|
||||||
// Scroll to end and update colors
|
|
||||||
if scrollToEndEnabled {
|
|
||||||
textView.ScrollToEnd()
|
|
||||||
}
|
|
||||||
colorText()
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseCommand splits command string handling quotes properly
|
|
||||||
func parseCommand(cmd string) []string {
|
|
||||||
var args []string
|
|
||||||
var current string
|
|
||||||
var inQuotes bool
|
|
||||||
var quoteChar rune
|
|
||||||
for _, r := range cmd {
|
|
||||||
switch r {
|
|
||||||
case '"', '\'':
|
|
||||||
if inQuotes {
|
|
||||||
if r == quoteChar {
|
|
||||||
inQuotes = false
|
|
||||||
} else {
|
|
||||||
current += string(r)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
inQuotes = true
|
|
||||||
quoteChar = r
|
|
||||||
}
|
|
||||||
case ' ', '\t':
|
|
||||||
if inQuotes {
|
|
||||||
current += string(r)
|
|
||||||
} else if current != "" {
|
|
||||||
args = append(args, current)
|
|
||||||
current = ""
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
current += string(r)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if current != "" {
|
|
||||||
args = append(args, current)
|
|
||||||
}
|
|
||||||
return args
|
|
||||||
}
|
|
||||||
|
|
||||||
// Global variables for search state
|
|
||||||
var searchResults []int
|
|
||||||
var searchResultLengths []int // To store the length of each match in the formatted string
|
|
||||||
var searchIndex int
|
|
||||||
var searchText string
|
|
||||||
var originalTextForSearch string
|
|
||||||
|
|
||||||
// performSearch searches for the given term in the textView content and highlights matches
|
|
||||||
func performSearch(term string) {
|
|
||||||
searchText = term
|
|
||||||
if searchText == "" {
|
|
||||||
searchResults = nil
|
|
||||||
searchResultLengths = nil
|
|
||||||
originalTextForSearch = ""
|
|
||||||
// Re-render text without highlights
|
|
||||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
|
||||||
colorText()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// Get formatted text and search directly in it to avoid mapping issues
|
|
||||||
formattedText := textView.GetText(true)
|
|
||||||
originalTextForSearch = formattedText
|
|
||||||
searchTermLower := strings.ToLower(searchText)
|
|
||||||
formattedTextLower := strings.ToLower(formattedText)
|
|
||||||
// Find all occurrences of the search term in the formatted text directly
|
|
||||||
formattedSearchResults := []int{}
|
|
||||||
searchStart := 0
|
|
||||||
for {
|
|
||||||
pos := strings.Index(formattedTextLower[searchStart:], searchTermLower)
|
|
||||||
if pos == -1 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
absolutePos := searchStart + pos
|
|
||||||
formattedSearchResults = append(formattedSearchResults, absolutePos)
|
|
||||||
searchStart = absolutePos + len(searchText)
|
|
||||||
}
|
|
||||||
if len(formattedSearchResults) == 0 {
|
|
||||||
// No matches found
|
|
||||||
searchResults = nil
|
|
||||||
searchResultLengths = nil
|
|
||||||
notification := "Pattern not found: " + term
|
|
||||||
if err := notifyUser("search", notification); err != nil {
|
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// Store the formatted text positions and lengths for accurate highlighting
|
|
||||||
searchResults = formattedSearchResults
|
|
||||||
// Create lengths array - all matches have the same length as the search term
|
|
||||||
searchResultLengths = make([]int, len(formattedSearchResults))
|
|
||||||
for i := range searchResultLengths {
|
|
||||||
searchResultLengths[i] = len(searchText)
|
|
||||||
}
|
|
||||||
searchIndex = 0
|
|
||||||
highlightCurrentMatch()
|
|
||||||
}
|
|
||||||
|
|
||||||
// highlightCurrentMatch highlights the current search match and scrolls to it
|
|
||||||
func highlightCurrentMatch() {
|
|
||||||
if len(searchResults) == 0 || searchIndex >= len(searchResults) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// Get the stored formatted text
|
|
||||||
formattedText := originalTextForSearch
|
|
||||||
// For tview to properly support highlighting and scrolling, we need to work with its region system
|
|
||||||
// Instead of just applying highlights, we need to add region tags to the text
|
|
||||||
highlightedText := addRegionTags(formattedText, searchResults, searchResultLengths, searchIndex, searchText)
|
|
||||||
// Update the text view with the text that includes region tags
|
|
||||||
textView.SetText(highlightedText)
|
|
||||||
// Highlight the current region and scroll to it
|
|
||||||
// Need to identify which position in the results array corresponds to the current match
|
|
||||||
// The region ID will be search_<position>_<index>
|
|
||||||
currentRegion := fmt.Sprintf("search_%d_%d", searchResults[searchIndex], searchIndex)
|
|
||||||
textView.Highlight(currentRegion).ScrollToHighlight()
|
|
||||||
// Send notification about which match we're at
|
|
||||||
notification := fmt.Sprintf("Match %d of %d", searchIndex+1, len(searchResults))
|
|
||||||
if err := notifyUser("search", notification); err != nil {
|
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// showSearchBar shows the search input field as an overlay
|
|
||||||
func showSearchBar() {
|
|
||||||
// Create a temporary flex to combine search and main content
|
|
||||||
updatedFlex := tview.NewFlex().SetDirection(tview.FlexRow).
|
|
||||||
AddItem(searchField, 3, 0, true). // Search field at top
|
|
||||||
AddItem(flex, 0, 1, false) // Main flex layout below
|
|
||||||
|
|
||||||
// Add the search overlay as a page
|
|
||||||
pages.AddPage(searchPageName, updatedFlex, true, true)
|
|
||||||
app.SetFocus(searchField)
|
|
||||||
}
|
|
||||||
|
|
||||||
// hideSearchBar hides the search input field
|
|
||||||
func hideSearchBar() {
|
|
||||||
pages.RemovePage(searchPageName)
|
|
||||||
// Return focus to the text view
|
|
||||||
app.SetFocus(textView)
|
|
||||||
// Clear the search field
|
|
||||||
searchField.SetText("")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Global variables for index overlay functionality
|
|
||||||
var indexPageName = "indexOverlay"
|
|
||||||
|
|
||||||
// showIndexBar shows the index input field as an overlay at the top
|
|
||||||
func showIndexBar() {
|
|
||||||
// Create a temporary flex to combine index input and main content
|
|
||||||
updatedFlex := tview.NewFlex().SetDirection(tview.FlexRow).
|
|
||||||
AddItem(indexPickWindow, 3, 0, true). // Index field at top
|
|
||||||
AddItem(flex, 0, 1, false) // Main flex layout below
|
|
||||||
|
|
||||||
// Add the index overlay as a page
|
|
||||||
pages.AddPage(indexPageName, updatedFlex, true, true)
|
|
||||||
app.SetFocus(indexPickWindow)
|
|
||||||
}
|
|
||||||
|
|
||||||
// hideIndexBar hides the index input field
|
|
||||||
func hideIndexBar() {
|
|
||||||
pages.RemovePage(indexPageName)
|
|
||||||
// Return focus to the text view
|
|
||||||
app.SetFocus(textView)
|
|
||||||
// Clear the index field
|
|
||||||
indexPickWindow.SetText("")
|
|
||||||
}
|
|
||||||
|
|
||||||
// addRegionTags adds region tags to search matches in the text for tview highlighting
|
|
||||||
func addRegionTags(text string, positions []int, lengths []int, currentIdx int, searchTerm string) string {
|
|
||||||
if len(positions) == 0 {
|
|
||||||
return text
|
|
||||||
}
|
|
||||||
var result strings.Builder
|
|
||||||
lastEnd := 0
|
|
||||||
for i, pos := range positions {
|
|
||||||
endPos := pos + lengths[i]
|
|
||||||
// Add text before this match
|
|
||||||
if pos > lastEnd {
|
|
||||||
result.WriteString(text[lastEnd:pos])
|
|
||||||
}
|
|
||||||
// The matched text, which may contain its own formatting tags
|
|
||||||
actualText := text[pos:endPos]
|
|
||||||
// Add region tag and highlighting for this match
|
|
||||||
// Use a unique region id that includes the match index to avoid conflicts
|
|
||||||
regionId := fmt.Sprintf("search_%d_%d", pos, i) // position + index to ensure uniqueness
|
|
||||||
var highlightStart, highlightEnd string
|
|
||||||
if i == currentIdx {
|
|
||||||
// Current match - use different highlighting
|
|
||||||
highlightStart = fmt.Sprintf(`["%s"][yellow:blue:b]`, regionId) // Current match with region and special highlight
|
|
||||||
highlightEnd = `[-:-:-][""]` // Reset formatting and close region
|
|
||||||
} else {
|
|
||||||
// Other matches - use regular highlighting
|
|
||||||
highlightStart = fmt.Sprintf(`["%s"][gold:red:u]`, regionId) // Other matches with region and highlight
|
|
||||||
highlightEnd = `[-:-:-][""]` // Reset formatting and close region
|
|
||||||
}
|
|
||||||
result.WriteString(highlightStart)
|
|
||||||
result.WriteString(actualText)
|
|
||||||
result.WriteString(highlightEnd)
|
|
||||||
lastEnd = endPos
|
|
||||||
}
|
|
||||||
// Add the rest of the text after the last processed match
|
|
||||||
if lastEnd < len(text) {
|
|
||||||
result.WriteString(text[lastEnd:])
|
|
||||||
}
|
|
||||||
return result.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// searchNext finds the next occurrence of the search term
|
|
||||||
func searchNext() {
|
|
||||||
if len(searchResults) == 0 {
|
|
||||||
if err := notifyUser("search", "No search results to navigate"); err != nil {
|
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
searchIndex = (searchIndex + 1) % len(searchResults)
|
|
||||||
highlightCurrentMatch()
|
|
||||||
}
|
|
||||||
|
|
||||||
// searchPrev finds the previous occurrence of the search term
|
|
||||||
func searchPrev() {
|
|
||||||
if len(searchResults) == 0 {
|
|
||||||
if err := notifyUser("search", "No search results to navigate"); err != nil {
|
|
||||||
logger.Error("failed to send notification", "error", err)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if searchIndex == 0 {
|
|
||||||
searchIndex = len(searchResults) - 1
|
|
||||||
} else {
|
|
||||||
searchIndex--
|
|
||||||
}
|
|
||||||
highlightCurrentMatch()
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
// Start background goroutine to update model color cache
|
||||||
|
startModelColorUpdater()
|
||||||
tview.Styles = colorschemes["default"]
|
tview.Styles = colorschemes["default"]
|
||||||
app = tview.NewApplication()
|
app = tview.NewApplication()
|
||||||
pages = tview.NewPages()
|
pages = tview.NewPages()
|
||||||
textArea = tview.NewTextArea().
|
textArea = tview.NewTextArea().
|
||||||
SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message.")
|
SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message.")
|
||||||
textArea.SetBorder(true).SetTitle("input")
|
textArea.SetBorder(true).SetTitle("input")
|
||||||
|
// Add input capture for @ completion
|
||||||
|
textArea.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
|
||||||
|
if !shellMode {
|
||||||
|
return event
|
||||||
|
}
|
||||||
|
// Handle Tab key for file completion
|
||||||
|
if event.Key() == tcell.KeyTab {
|
||||||
|
currentText := textArea.GetText()
|
||||||
|
row, col, _, _ := textArea.GetCursor()
|
||||||
|
// Calculate absolute position from row/col
|
||||||
|
lines := strings.Split(currentText, "\n")
|
||||||
|
cursorPos := 0
|
||||||
|
for i := 0; i < row && i < len(lines); i++ {
|
||||||
|
cursorPos += len(lines[i]) + 1 // +1 for newline
|
||||||
|
}
|
||||||
|
cursorPos += col
|
||||||
|
// Look backwards from cursor to find @
|
||||||
|
if cursorPos > 0 {
|
||||||
|
// Find the last @ before cursor
|
||||||
|
textBeforeCursor := currentText[:cursorPos]
|
||||||
|
atIndex := strings.LastIndex(textBeforeCursor, "@")
|
||||||
|
if atIndex >= 0 {
|
||||||
|
// Extract the partial match text after @
|
||||||
|
filter := textBeforeCursor[atIndex+1:]
|
||||||
|
showFileCompletionPopup(filter)
|
||||||
|
return nil // Consume the Tab event
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return event
|
||||||
|
})
|
||||||
textView = tview.NewTextView().
|
textView = tview.NewTextView().
|
||||||
SetDynamicColors(true).
|
SetDynamicColors(true).
|
||||||
SetRegions(true).
|
SetRegions(true).
|
||||||
@@ -570,6 +232,11 @@ func init() {
|
|||||||
statusLineWidget = tview.NewTextView().
|
statusLineWidget = tview.NewTextView().
|
||||||
SetDynamicColors(true).
|
SetDynamicColors(true).
|
||||||
SetTextAlign(tview.AlignCenter)
|
SetTextAlign(tview.AlignCenter)
|
||||||
|
// // vertical text center alignment
|
||||||
|
// statusLineWidget.SetDrawFunc(func(screen tcell.Screen, x, y, w, h int) (int, int, int, int) {
|
||||||
|
// y += h / 2
|
||||||
|
// return x, y, w, h
|
||||||
|
// })
|
||||||
// Initially set up flex without search bar
|
// Initially set up flex without search bar
|
||||||
flex = tview.NewFlex().SetDirection(tview.FlexRow).
|
flex = tview.NewFlex().SetDirection(tview.FlexRow).
|
||||||
AddItem(textView, 0, 40, false).
|
AddItem(textView, 0, 40, false).
|
||||||
@@ -610,7 +277,6 @@ func init() {
|
|||||||
// colorText()
|
// colorText()
|
||||||
// updateStatusLine()
|
// updateStatusLine()
|
||||||
})
|
})
|
||||||
|
|
||||||
roleEditWindow = tview.NewInputField().
|
roleEditWindow = tview.NewInputField().
|
||||||
SetLabel("Enter new role: ").
|
SetLabel("Enter new role: ").
|
||||||
SetPlaceholder("e.g., user, assistant, system, tool").
|
SetPlaceholder("e.g., user, assistant, system, tool").
|
||||||
@@ -767,6 +433,19 @@ func init() {
|
|||||||
pages.RemovePage(helpPage)
|
pages.RemovePage(helpPage)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
// Allow scrolling keys to pass through to the TextView
|
||||||
|
switch event.Key() {
|
||||||
|
case tcell.KeyUp, tcell.KeyDown,
|
||||||
|
tcell.KeyPgUp, tcell.KeyPgDn,
|
||||||
|
tcell.KeyHome, tcell.KeyEnd:
|
||||||
|
return event
|
||||||
|
}
|
||||||
|
if event.Key() == tcell.KeyRune {
|
||||||
|
switch event.Rune() {
|
||||||
|
case 'j', 'k', 'g', 'G':
|
||||||
|
return event
|
||||||
|
}
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
//
|
//
|
||||||
@@ -831,6 +510,24 @@ func init() {
|
|||||||
injectRole = !injectRole
|
injectRole = !injectRole
|
||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
}
|
}
|
||||||
|
// Handle Alt+T to toggle thinking block visibility
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == 't' && event.Modifiers()&tcell.ModAlt != 0 {
|
||||||
|
thinkingCollapsed = !thinkingCollapsed
|
||||||
|
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||||
|
colorText()
|
||||||
|
status := "expanded"
|
||||||
|
if thinkingCollapsed {
|
||||||
|
status = "collapsed"
|
||||||
|
}
|
||||||
|
if err := notifyUser("thinking", "Thinking blocks "+status); err != nil {
|
||||||
|
logger.Error("failed to send notification", "error", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == 'i' && event.Modifiers()&tcell.ModAlt != 0 {
|
||||||
|
showColorschemeSelectionPopup()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
if event.Key() == tcell.KeyF1 {
|
if event.Key() == tcell.KeyF1 {
|
||||||
// chatList, err := loadHistoryChats()
|
// chatList, err := loadHistoryChats()
|
||||||
chatList, err := store.GetChatByChar(cfg.AssistantRole)
|
chatList, err := store.GetChatByChar(cfg.AssistantRole)
|
||||||
@@ -858,7 +555,7 @@ func init() {
|
|||||||
updateStatusLine()
|
updateStatusLine()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyF2 {
|
if event.Key() == tcell.KeyF2 && !botRespMode {
|
||||||
// regen last msg
|
// regen last msg
|
||||||
if len(chatBody.Messages) == 0 {
|
if len(chatBody.Messages) == 0 {
|
||||||
if err := notifyUser("info", "no messages to regenerate"); err != nil {
|
if err := notifyUser("info", "no messages to regenerate"); err != nil {
|
||||||
@@ -871,6 +568,9 @@ func init() {
|
|||||||
// lastRole := chatBody.Messages[len(chatBody.Messages)-1].Role
|
// lastRole := chatBody.Messages[len(chatBody.Messages)-1].Role
|
||||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||||
// go chatRound("", cfg.UserRole, textView, true, false)
|
// go chatRound("", cfg.UserRole, textView, true, false)
|
||||||
|
if cfg.TTS_ENABLED {
|
||||||
|
TTSDoneChan <- true
|
||||||
|
}
|
||||||
chatRoundChan <- &models.ChatRoundReq{Role: cfg.UserRole, Regen: true}
|
chatRoundChan <- &models.ChatRoundReq{Role: cfg.UserRole, Regen: true}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -893,6 +593,9 @@ func init() {
|
|||||||
}
|
}
|
||||||
chatBody.Messages = chatBody.Messages[:len(chatBody.Messages)-1]
|
chatBody.Messages = chatBody.Messages[:len(chatBody.Messages)-1]
|
||||||
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
|
||||||
|
if cfg.TTS_ENABLED {
|
||||||
|
TTSDoneChan <- true
|
||||||
|
}
|
||||||
colorText()
|
colorText()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -996,6 +699,8 @@ func init() {
|
|||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyF12 {
|
if event.Key() == tcell.KeyF12 {
|
||||||
// help window cheatsheet
|
// help window cheatsheet
|
||||||
|
// Update help text with current status before showing
|
||||||
|
helpView.SetText(fmt.Sprintf(helpText, makeStatusLine()))
|
||||||
pages.AddPage(helpPage, helpView, true, true)
|
pages.AddPage(helpPage, helpView, true, true)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -1120,12 +825,21 @@ func init() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// I need keybind for tts to shut up
|
// I need keybind for tts to shut up
|
||||||
if event.Key() == tcell.KeyCtrlA {
|
if event.Key() == tcell.KeyCtrlA && cfg.TTS_ENABLED {
|
||||||
// textArea.SetText("pressed ctrl+A", true)
|
|
||||||
if cfg.TTS_ENABLED {
|
|
||||||
// audioStream.TextChan <- chunk
|
|
||||||
TTSDoneChan <- true
|
TTSDoneChan <- true
|
||||||
}
|
}
|
||||||
|
if event.Key() == tcell.KeyRune && event.Rune() == '0' && event.Modifiers()&tcell.ModAlt != 0 && cfg.TTS_ENABLED {
|
||||||
|
if len(chatBody.Messages) > 0 {
|
||||||
|
// Stop any currently playing TTS first
|
||||||
|
TTSDoneChan <- true
|
||||||
|
lastMsg := chatBody.Messages[len(chatBody.Messages)-1]
|
||||||
|
cleanedText := models.CleanText(lastMsg.Content)
|
||||||
|
if cleanedText != "" {
|
||||||
|
// nolint: errcheck
|
||||||
|
go orator.Speak(cleanedText)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
if event.Key() == tcell.KeyCtrlW {
|
if event.Key() == tcell.KeyCtrlW {
|
||||||
// INFO: continue bot/text message
|
// INFO: continue bot/text message
|
||||||
@@ -1276,7 +990,6 @@ func init() {
|
|||||||
app.SetFocus(focusSwitcher[currentF])
|
app.SetFocus(focusSwitcher[currentF])
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if isASCII(string(event.Rune())) && !botRespMode {
|
if isASCII(string(event.Rune())) && !botRespMode {
|
||||||
return event
|
return event
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user