diff --git a/app/commit.json b/app/commit.json
index d39a980..ab67c57 100644
--- a/app/commit.json
+++ b/app/commit.json
@@ -1 +1 @@
-{ "commit": "6ba93974a02a98c83badf2f0002ff4812b8f75a9" }
+{ "commit": "070e911be17e1e1f3994220c3ed89b0060c67bd2" }
diff --git a/app/components/chat/AssistantMessage.tsx b/app/components/chat/AssistantMessage.tsx
index 7cdddda..be304c7 100644
--- a/app/components/chat/AssistantMessage.tsx
+++ b/app/components/chat/AssistantMessage.tsx
@@ -1,15 +1,22 @@
 import { memo } from 'react';
 import { Markdown } from './Markdown';
-import { USAGE_REGEX } from '~/utils/constants';
+import type { JSONValue } from 'ai';
 
 interface AssistantMessageProps {
   content: string;
+  annotations?: JSONValue[];
 }
 
-export const AssistantMessage = memo(({ content }: AssistantMessageProps) => {
-  const match = content.match(USAGE_REGEX);
-  const usage = match ? JSON.parse(match[1]) : null;
-  const cleanContent = content.replace(USAGE_REGEX, '').trim();
+export const AssistantMessage = memo(({ content, annotations }: AssistantMessageProps) => {
+  const filteredAnnotations = (annotations?.filter(
+    (annotation: JSONValue) => annotation && typeof annotation === 'object' && Object.keys(annotation).includes('type'),
+  ) || []) as { type: string; value: any }[];
+
+  const usage: {
+    completionTokens: number;
+    promptTokens: number;
+    totalTokens: number;
+  } = filteredAnnotations.find((annotation) => annotation.type === 'usage')?.value;
 
   return (
     <div className="overflow-hidden w-full">
@@ -18,7 +25,7 @@ export const AssistantMessage = memo(({ content }: AssistantMessageProps) => {
           Tokens: {usage.totalTokens} (prompt: {usage.promptTokens}, completion: {usage.completionTokens})
         </div>
       )}
-      <Markdown html>{cleanContent}</Markdown>
+      <Markdown html>{content}</Markdown>
     </div>
   );
 });
diff --git a/app/components/chat/Messages.client.tsx b/app/components/chat/Messages.client.tsx
index 4a2ac6a..f81ae09 100644
--- a/app/components/chat/Messages.client.tsx
+++ b/app/components/chat/Messages.client.tsx
@@ -65,7 +65,11 @@ export const Messages = React.forwardRef<HTMLDivElement, MessagesProps>((props:
                   </div>
                 )}
                 <div className="grid grid-col-1 w-full">
-                  {isUserMessage ? <UserMessage content={content} /> : <AssistantMessage content={content} />}
+                  {isUserMessage ? (
+                    <UserMessage content={content} />
+                  ) : (
+                    <AssistantMessage content={content} annotations={message.annotations} />
+                  )}
                 </div>
                 {!isUserMessage && (
                   <div className="flex gap-2 flex-col lg:flex-row">
diff --git a/app/lib/.server/llm/switchable-stream.ts b/app/lib/.server/llm/switchable-stream.ts
index 51f46ff..638db7a 100644
--- a/app/lib/.server/llm/switchable-stream.ts
+++ b/app/lib/.server/llm/switchable-stream.ts
@@ -1,5 +1,5 @@
 export default class SwitchableStream extends TransformStream {
-  _controller: TransformStreamDefaultController | null = null;
+  private _controller: TransformStreamDefaultController | null = null;
   private _currentReader: ReadableStreamDefaultReader | null = null;
   private _switches = 0;
 
diff --git a/app/routes/api.chat.ts b/app/routes/api.chat.ts
index c7d6383..2c47054 100644
--- a/app/routes/api.chat.ts
+++ b/app/routes/api.chat.ts
@@ -1,4 +1,5 @@
 import { type ActionFunctionArgs } from '@remix-run/cloudflare';
+import { createDataStream } from 'ai';
 import { MAX_RESPONSE_SEGMENTS, MAX_TOKENS } from '~/lib/.server/llm/constants';
 import { CONTINUE_PROMPT } from '~/lib/.server/llm/prompts';
 import { streamText, type Messages, type StreamingOptions } from '~/lib/.server/llm/stream-text';
@@ -53,26 +54,30 @@ async function chatAction({ context, request }: ActionFunctionArgs) {
       onFinish: async ({ text: content, finishReason, usage }) => {
         console.log('usage', usage);
 
-        if (usage && stream._controller) {
+        if (usage) {
           cumulativeUsage.completionTokens += usage.completionTokens || 0;
           cumulativeUsage.promptTokens += usage.promptTokens || 0;
           cumulativeUsage.totalTokens += usage.totalTokens || 0;
-
-          // Send usage info in message metadata for assistant messages
-          const usageMetadata = `0:"[Usage: ${JSON.stringify({
-            completionTokens: cumulativeUsage.completionTokens,
-            promptTokens: cumulativeUsage.promptTokens,
-            totalTokens: cumulativeUsage.totalTokens,
-          })}\n]"`;
-
-          console.log(usageMetadata);
-
-          const encodedData = new TextEncoder().encode(usageMetadata);
-          stream._controller.enqueue(encodedData);
         }
 
         if (finishReason !== 'length') {
-          return stream.close();
+          return stream
+            .switchSource(
+              createDataStream({
+                async execute(dataStream) {
+                  dataStream.writeMessageAnnotation({
+                    type: 'usage',
+                    value: {
+                      completionTokens: cumulativeUsage.completionTokens,
+                      promptTokens: cumulativeUsage.promptTokens,
+                      totalTokens: cumulativeUsage.totalTokens,
+                    },
+                  });
+                },
+                onError: (error: any) => `Custom error: ${error.message}`,
+              }),
+            )
+            .then(() => stream.close());
         }
 
         if (stream.switches >= MAX_RESPONSE_SEGMENTS) {
diff --git a/app/utils/constants.ts b/app/utils/constants.ts
index 5531c4b..6425995 100644
--- a/app/utils/constants.ts
+++ b/app/utils/constants.ts
@@ -9,7 +9,6 @@ export const WORK_DIR = `/home/${WORK_DIR_NAME}`;
 export const MODIFICATIONS_TAG_NAME = 'bolt_file_modifications';
 export const MODEL_REGEX = /^\[Model: (.*?)\]\n\n/;
 export const PROVIDER_REGEX = /\[Provider: (.*?)\]\n\n/;
-export const USAGE_REGEX = /\[Usage: ({.*?})\]/; // Keep this regex for assistant messages
 export const DEFAULT_MODEL = 'claude-3-5-sonnet-latest';
 export const PROMPT_COOKIE_KEY = 'cachedPrompt';