diff --git a/src/components/ChatForm/FilesPreview.tsx b/src/components/ChatForm/FilesPreview.tsx
index f6addbfd..ab18f066 100644
--- a/src/components/ChatForm/FilesPreview.tsx
+++ b/src/components/ChatForm/FilesPreview.tsx
@@ -2,16 +2,26 @@ import React from "react";
 import { Box } from "@radix-ui/themes";
 import { Text, TruncateLeft } from "../Text";
 import { ChatContextFile } from "../../services/refact";
+import { PlainText } from "../ChatContent/PlainText";
 import styles from "./ChatForm.module.css";
 
 export const FilesPreview: React.FC<{
-  files: ChatContextFile[];
+  files: (ChatContextFile | string)[];
   // onRemovePreviewFile: (name: string) => void;
 }> = ({ files }) => {
   if (files.length === 0) return null;
   return (
     <Box p="2" pb="0">
       {files.map((file, i) => {
+        if (typeof file === "string") {
+          return (
+            <pre key={"plain_text_" + i} className={styles.file}>
+              <Text size="1" className={styles.file_name}>
+                <PlainText>{file}</PlainText>
+              </Text>
+            </pre>
+          );
+        }
         const lineText =
           file.line1 && file.line2 ? `:${file.line1}-${file.line2}` : "";
         return (
diff --git a/src/components/ChatForm/useCommandCompletionAndPreviewFiles.ts b/src/components/ChatForm/useCommandCompletionAndPreviewFiles.ts
index 14a5f716..89860cdc 100644
--- a/src/components/ChatForm/useCommandCompletionAndPreviewFiles.ts
+++ b/src/components/ChatForm/useCommandCompletionAndPreviewFiles.ts
@@ -64,7 +64,9 @@ function useCommandCompletion() {
   };
 }
 
-function useGetCommandPreviewQuery(query: string): ChatContextFile[] {
+function useGetCommandPreviewQuery(
+  query: string,
+): (ChatContextFile | string)[] {
   const hasCaps = useHasCaps();
   const { data } = commandsApi.useGetCommandPreviewQuery(query, {
     skip: !hasCaps,
diff --git a/src/services/refact/commands.ts b/src/services/refact/commands.ts
index 535779af..1254a9dd 100644
--- a/src/services/refact/commands.ts
+++ b/src/services/refact/commands.ts
@@ -67,7 +67,7 @@ export const commandsApi = createApi({
         }
       },
     }),
-    getCommandPreview: builder.query<ChatContextFile[], string>({
+    getCommandPreview: builder.query<(ChatContextFile | string)[], string>({
       queryFn: async (query, api, _opts, baseQuery) => {
         const state = api.getState() as RootState;
         const port = state.config.lspPort as unknown as number;
@@ -81,7 +81,7 @@ export const commandsApi = createApi({
         });
 
         if (response.error) return { error: response.error };
-
+        // console.log(response);
         if (
           !isCommandPreviewResponse(response.data) &&
           !isDetailMessage(response.data)
@@ -99,13 +99,24 @@ export const commandsApi = createApi({
           return { data: [] };
         }
 
-        const files = response.data.messages.reduce<ChatContextFile[]>(
-          (acc, { content }) => {
-            const fileData = parseOrElse<ChatContextFile[]>(content, []);
+        const files = response.data.messages.reduce<
+          (ChatContextFile | string)[]
+        >((acc, message) => {
+          // can be plain text
+          if (isCommandFilePreview(message)) {
+            const fileData = parseOrElse<ChatContextFile[]>(
+              message.content,
+              [],
+            );
             return [...acc, ...fileData];
-          },
-          [],
-        );
+          }
+
+          if (isCommandPlainTextPreview(message)) {
+            // TODO: add name or something
+            return [...acc, message.content];
+          }
+          return acc;
+        }, []);
 
         return { data: files };
       },
@@ -139,11 +150,44 @@ export function isDetailMessage(json: unknown): json is DetailMessage {
   if (!("detail" in json)) return false;
   return true;
 }
+type PreviewPlainText = {
+  content: string;
+  role: "plain_text";
+};
 
-export type CommandPreviewContent = {
+type PreviewFile = {
   content: string;
   role: "context_file";
 };
+
+export type CommandPreviewContent = PreviewPlainText | PreviewFile;
+
+function isCommandFilePreview(json: unknown): json is PreviewFile {
+  if (!json) return false;
+  if (typeof json !== "object") return false;
+  if (!("role" in json)) return false;
+  if (json.role !== "context_file") return false;
+  if (!("content" in json)) return false;
+  if (typeof json.content !== "string") return false;
+  return true;
+}
+
+function isCommandPlainTextPreview(json: unknown): json is PreviewPlainText {
+  if (!json) return false;
+  if (typeof json !== "object") return false;
+  if (!("role" in json)) return false;
+  if (json.role !== "plain_text") return false;
+  if (!("content" in json)) return false;
+  if (typeof json.content !== "string") return false;
+  return true;
+}
+
+function isCommandPreviewContent(json: unknown): json is CommandPreviewContent {
+  if (isCommandFilePreview(json)) return true;
+  if (isCommandPlainTextPreview(json)) return true;
+  return false;
+}
+
 export type CommandPreviewResponse = {
   messages: CommandPreviewContent[];
 };
@@ -158,13 +202,5 @@ export function isCommandPreviewResponse(
 
   if (!json.messages.length) return true;
 
-  const firstMessage: unknown = json.messages[0];
-  if (!firstMessage) return false;
-  if (typeof firstMessage !== "object") return false;
-  if (!("role" in firstMessage)) return false;
-  if (firstMessage.role !== "context_file") return false;
-  if (!("content" in firstMessage)) return false;
-  if (typeof firstMessage.content !== "string") return false;
-
-  return true;
+  return json.messages.every((message) => isCommandPreviewContent(message));
 }