renderChatMessage, return ContextItem[] from tools, and other refactoring

Author: sestinj

core/commands/index.ts

@@ -1,6 +1,6 @@
 import { CustomCommand, SlashCommand, SlashCommandDescription } from "../";
-import { stripImages } from "../llm/images";
 import { renderTemplatedString } from "../promptFiles/v1/renderTemplatedString";
+import { renderChatMessage } from "../util/messageContent";
 
 import SlashCommands from "./slash";
 
@@ -29,7 +29,8 @@ export function slashFromCustomCommand(
       const messages = [...history];
       // Find the last chat message with this slash command and replace it with the user input
       for (let i = messages.length - 1; i >= 0; i--) {
-        const { role, content } = messages[i];
+        const message = messages[i];
+        const { role, content } = message;
         if (role !== "user") {
           continue;
         }
@@ -41,7 +42,7 @@ export function slashFromCustomCommand(
           )
         ) {
           messages[i] = {
-            ...messages[i],
+            ...message,
             content: content.map((part) => {
               return part.text?.startsWith(`/${customCommand.name}`)
                 ? { ...part, text: promptUserInput }
@@ -53,13 +54,16 @@ export function slashFromCustomCommand(
           typeof content === "string" &&
           content.startsWith(`/${customCommand.name}`)
         ) {
-          messages[i] = { ...messages[i], content: promptUserInput };
+          messages[i] = { ...message, content: promptUserInput };
           break;
         }
       }
 
-      for await (const chunk of llm.streamChat(messages, new AbortController().signal)) {
-        yield stripImages(chunk.content);
+      for await (const chunk of llm.streamChat(
+        messages,
+        new AbortController().signal,
+      )) {
+        yield renderChatMessage(chunk);
       }
     },
   };

core/commands/slash/comment.ts

@@ -1,5 +1,5 @@
 import { SlashCommand } from "../../index.js";
-import { stripImages } from "../../llm/images.js";
+import { renderChatMessage } from "../../util/messageContent.js";
 
 const CommitMessageCommand: SlashCommand = {
   name: "commit",
@@ -14,10 +14,11 @@ const CommitMessageCommand: SlashCommand = {
     }
 
     const prompt = `${diff}\n\nGenerate a commit message for the above set of changes. First, give a single sentence, no more than 80 characters. Then, after 2 line breaks, give a list of no more than 5 short bullet points, each no more than 40 characters. Output nothing except for the commit message, and don't surround it in quotes.`;
-    for await (const chunk of llm.streamChat([
-      { role: "user", content: prompt },
-    ], new AbortController().signal)) {
-      yield stripImages(chunk.content);
+    for await (const chunk of llm.streamChat(
+      [{ role: "user", content: prompt }],
+      new AbortController().signal,
+    )) {
+      yield renderChatMessage(chunk);
     }
   },
 };

core/commands/slash/commit.ts

@@ -1,6 +1,6 @@
 import { ChatMessage, SlashCommand } from "../../index.js";
-import { stripImages } from "../../llm/images.js";
 import { removeQuotesAndEscapes } from "../../util/index.js";
+import { renderChatMessage } from "../../util/messageContent.js";
 
 const PROMPT = (
   input: string,
@@ -30,7 +30,8 @@ const DraftIssueCommand: SlashCommand = {
       return;
     }
     let title = await llm.complete(
-      `Generate a title for the GitHub issue requested in this user input: '${input}'. Use no more than 20 words and output nothing other than the title. Do not surround it with quotes. The title is: `, new AbortController().signal,
+      `Generate a title for the GitHub issue requested in this user input: '${input}'. Use no more than 20 words and output nothing other than the title. Do not surround it with quotes. The title is: `,
+      new AbortController().signal,
       { maxTokens: 20 },
     );
 
@@ -43,9 +44,12 @@ const DraftIssueCommand: SlashCommand = {
       { role: "user", content: PROMPT(input, title) },
     ];
 
-    for await (const chunk of llm.streamChat(messages, new AbortController().signal)) {
+    for await (const chunk of llm.streamChat(
+      messages,
+      new AbortController().signal,
+    )) {
       body += chunk.content;
-      yield stripImages(chunk.content);
+      yield renderChatMessage(chunk);
     }
 
     const url = `${params.repositoryUrl}/issues/new?title=${encodeURIComponent(

core/commands/slash/draftIssue.ts

@@ -1,5 +1,5 @@
 import { SlashCommand } from "../..";
-import { stripImages } from "../../llm/images";
+import { renderChatMessage } from "../../util/messageContent";
 
 const MultiFileEditSlashCommand: SlashCommand = {
   name: "multifile-edit",
@@ -39,8 +39,11 @@ const MultiFileEditSlashCommand: SlashCommand = {
 
     const content = createPrompt(filesToEditStr, additionalContextStr, input);
 
-    for await (const chunk of llm.streamChat([{ role: "user", content }], new AbortController().signal)) {
-      yield stripImages(chunk.content);
+    for await (const chunk of llm.streamChat(
+      [{ role: "user", content }],
+      new AbortController().signal,
+    )) {
+      yield renderChatMessage(chunk);
     }
   },
 };

core/commands/slash/multifileEdit.ts

@@ -9,7 +9,7 @@ import {
   defaultIgnoreFile,
   gitIgArrayFromFile,
 } from "../../indexing/ignore";
-import { stripImages } from "../../llm/images";
+import { renderChatMessage } from "../../util/messageContent";
 
 const LANGUAGE_DEP_MGMT_FILENAMES = [
   "package.json", // JavaScript (Node.js)
@@ -45,10 +45,11 @@ const OnboardSlashCommand: SlashCommand = {
     const context = await gatherProjectContext(workspaceDir, ide);
     const prompt = createOnboardingPrompt(context);
 
-    for await (const chunk of llm.streamChat([
-      { role: "user", content: prompt },
-    ], new AbortController().signal)) {
-      yield stripImages(chunk.content);
+    for await (const chunk of llm.streamChat(
+      [{ role: "user", content: prompt }],
+      new AbortController().signal,
+    )) {
+      yield renderChatMessage(chunk);
     }
   },
 };

core/commands/slash/onboard.ts

@@ -1,5 +1,5 @@
 import { ChatMessage, SlashCommand } from "../../index.js";
-import { stripImages } from "../../llm/images.js";
+import { renderChatMessage } from "../../util/messageContent.js";
 
 const prompt = `
      Review the following code, focusing on Readability, Maintainability, Code Smells, Speed, and Memory Performance. Provide feedback with these guidelines:
@@ -43,10 +43,11 @@ const ReviewMessageCommand: SlashCommand = {
 
     const content = `${prompt} \r\n ${reviewText}`;
 
-    for await (const chunk of llm.streamChat([
-      { role: "user", content: content },
-    ], new AbortController().signal)) {
-      yield stripImages(chunk.content);
+    for await (const chunk of llm.streamChat(
+      [{ role: "user", content: content }],
+      new AbortController().signal,
+    )) {
+      yield renderChatMessage(chunk);
     }
   },
 };

core/commands/slash/review.ts

@@ -4,7 +4,7 @@ import path from "path";
 
 import { languageForFilepath } from "../../autocomplete/constants/AutocompleteLanguageInfo.js";
 import { SlashCommand } from "../../index.js";
-import { stripImages } from "../../llm/images.js";
+import { renderChatMessage } from "../../util/messageContent.js";
 
 // If useful elsewhere, helper funcs should move to core/util/index.ts or similar
 function getOffsetDatetime(date: Date): Date {
@@ -48,7 +48,7 @@ const ShareSlashCommand: SlashCommand = {
     // message in the chat history, this will omit it
     for (const msg of history.slice(0, history.length - 1)) {
       let msgText = msg.content;
-      msgText = stripImages(msg.content);
+      msgText = renderChatMessage(msg);
 
       if (msg.role === "user" && msgText.search("```") > -1) {
         msgText = reformatCodeBlocks(msgText);

core/commands/slash/share.ts

@@ -4,9 +4,9 @@ import Handlebars from "handlebars";
 import * as YAML from "yaml";
 
 import { walkDir } from "../indexing/walkDir";
-import { stripImages } from "../llm/images";
 import { renderTemplatedString } from "../promptFiles/v1/renderTemplatedString";
 import { getBasename } from "../util/index";
+import { renderChatMessage } from "../util/messageContent";
 
 import type {
   ChatMessage,
@@ -125,8 +125,11 @@ export function slashCommandFromPromptFile(
         systemMessage,
       );
 
-      for await (const chunk of context.llm.streamChat(messages, new AbortController().signal)) {
-        yield stripImages(chunk.content);
+      for await (const chunk of context.llm.streamChat(
+        messages,
+        new AbortController().signal,
+      )) {
+        yield renderChatMessage(chunk);
       }
 
       context.llm.systemMessage = originalSystemMessage;
@@ -233,7 +236,8 @@ function updateChatHistory(
   const messages = [...history];
 
   for (let i = messages.length - 1; i >= 0; i--) {
-    const { role, content } = messages[i];
+    const message = messages[i];
+    const { role, content } = message;
     if (role !== "user") {
       continue;
     }
@@ -251,7 +255,7 @@ function updateChatHistory(
       typeof content === "string" &&
       content.startsWith(`/${commandName}`)
     ) {
-      messages[i] = { ...messages[i], content: renderedPrompt };
+      messages[i] = { ...message, content: renderedPrompt };
       break;
     }
   }

core/config/promptFile.ts

@@ -1,7 +1,7 @@
 import { Chunk, ContinueConfig, IDE, ILLM } from "../..";
 import { getModelByRole } from "../../config/util";
-import { stripImages } from "../../llm/images";
 import generateRepoMap from "../../util/generateRepoMap";
+import { renderChatMessage } from "../../util/messageContent";
 
 const SUPPORTED_MODEL_TITLE_FAMILIES = [
   "claude-3",
@@ -58,11 +58,14 @@ After this, your response should begin with a <results> tag, followed by a list
 
 This is the question that you should select relevant files for: "${input}"`;
 
-    const response = await llm.chat([
-      { role: "user", content: prompt },
-      { role: "assistant", content: "<reasoning>" },
-    ], new AbortController().signal);
-    const content = stripImages(response.content);
+    const response = await llm.chat(
+      [
+        { role: "user", content: prompt },
+        { role: "assistant", content: "<reasoning>" },
+      ],
+      new AbortController().signal,
+    );
+    const content = renderChatMessage(response);
     console.debug("Repo map retrieval response: ", content);
 
     if (!content.includes("\n")) {