Skip to content

Open source AI coding agent. Designed for large projects and real world tasks.

client side conversion of code blocks to markdown format

Dane Schneider59ce68f6a973
diff --git a/app/cli/cmd/convo.go b/app/cli/cmd/convo.go
index c41ca8da..c4bb5220 100644
--- a/app/cli/cmd/convo.go
+++ b/app/cli/cmd/convo.go
@@ -6,6 +6,7 @@ import (
"plandex/auth"
"plandex/lib"
"plandex/term"
+ "regexp"
"strings"
"time"
@@ -113,10 +114,12 @@ func convo(cmd *cobra.Command, args []string) {
header := fmt.Sprintf("#### %d | %s | %s | %d 🪙 ", i+1,
author, formattedTs, msg.Tokens)
+ txt := convertCodeBlocks(msg.Message)
+
if plainTextOutput {
- convo += header + "\n" + msg.Message + "\n\n"
+ convo += header + "\n" + txt + "\n\n"
} else {
- md, err := term.GetMarkdown(header + "\n" + msg.Message + "\n\n")
+ md, err := term.GetMarkdown(header + "\n" + txt + "\n\n")
if err != nil {
term.OutputErrorAndExit("Error creating markdown representation: %v", err)
}
@@ -155,3 +158,20 @@ func convo(cmd *cobra.Command, args []string) {
term.PrintCmds("", "convo 1", "convo 2-5", "convo --plain", "log")
}
}
+
+var codeBlockPattern = regexp.MustCompile(`<PlandexBlock\s+lang="(.+?)".*?>([\s\S]+?)</PlandexBlock>`)
+
+func convertCodeBlocks(msg string) string {
+ return codeBlockPattern.ReplaceAllStringFunc(msg, func(match string) string {
+ // Extract language and content from the match
+ submatches := codeBlockPattern.FindStringSubmatch(match)
+ lang := submatches[1]
+ content := submatches[2]
+
+ // Escape any backticks in the content
+ content = strings.ReplaceAll(content, "```", "\\`\\`\\`")
+
+ // Return markdown code block format
+ return fmt.Sprintf("```%s%s```", lang, content)
+ })
+}
diff --git a/app/server/handlers/plans_convo.go b/app/server/handlers/plans_convo.go
index 6f0905bc..ae2206d9 100644
--- a/app/server/handlers/plans_convo.go
+++ b/app/server/handlers/plans_convo.go
@@ -8,6 +8,7 @@ import (
"plandex-server/db"
"github.com/gorilla/mux"
+ "github.com/plandex/plandex/shared"
)
func ListConvoHandler(w http.ResponseWriter, r *http.Request) {
@@ -45,7 +46,12 @@ func ListConvoHandler(w http.ResponseWriter, r *http.Request) {
return
}
- bytes, err := json.Marshal(convoMessages)
+ apiConvoMessages := make([]*shared.ConvoMessage, len(convoMessages))
+ for i, convoMessage := range convoMessages {
+ apiConvoMessages[i] = convoMessage.ToApi()
+ }
+
+ bytes, err := json.Marshal(apiConvoMessages)
if err != nil {
log.Println("Error marshalling plan convo: ", err)