From 9289adf7f560358d63ea604d39fa9e152e6bb1bd Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Thu, 8 Jan 2026 00:07:44 +0800
Subject: [PATCH 01/12] support gpt 5.2

---
 internal/api/chat/list_supported_models_v2.go | 34 ++++++++++++++++++-
 .../services/toolkit/client/completion_v2.go  |  8 +++++
 .../_webapp/src/views/chat/footer/index.tsx   |  2 +-
 .../chat/footer/toolbar/prompt-selection.tsx  |  8 +++++
 .../src/views/settings/setting-item-input.tsx |  2 +-
 .../views/settings/setting-item-select.tsx    |  2 +-
 6 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/internal/api/chat/list_supported_models_v2.go b/internal/api/chat/list_supported_models_v2.go
index 7c37a7bd..5a7cfa4e 100644
--- a/internal/api/chat/list_supported_models_v2.go
+++ b/internal/api/chat/list_supported_models_v2.go
@@ -27,12 +27,20 @@ func (s *ChatServerV2) ListSupportedModels(
 	var models []*chatv2.SupportedModel
 	if strings.TrimSpace(settings.OpenAIAPIKey) == "" {
 		models = []*chatv2.SupportedModel{
+			{
+				Name:         "GPT-5.1",
+				Slug:         "openai/gpt-5.1",
+				TotalContext: 400000,
+				MaxOutput:    128000,
+				InputPrice:   125,  // $1.25
+				OutputPrice:  1000, // $10.00
+			},
 			{
 				Name:         "GPT-4.1",
 				Slug:         "openai/gpt-4.1",
 				TotalContext: 1050000,
 				MaxOutput:    32800,
-				InputPrice:   200,
+				InputPrice:   200, // $2.00
 				OutputPrice:  800,
 			},
 			{
@@ -78,6 +86,30 @@ func (s *ChatServerV2) ListSupportedModels(
 		}
 	} else {
 		models = []*chatv2.SupportedModel{
+			{
+				Name:         "GPT-5.2 Pro",
+				Slug:         openai.ChatModelGPT5_2Pro,
+				TotalContext: 400000,
+				MaxOutput:    128000,
+				InputPrice:   2100,  // $21.00
+				OutputPrice:  16800, // $168.00
+			},
+			{
+				Name:         "GPT-5.2",
+				Slug:         openai.ChatModelGPT5_2,
+				TotalContext: 400000,
+				MaxOutput:    128000,
+				InputPrice:   175,  // $1.75
+				OutputPrice:  1400, // $14.00
+			},
+			{
+				Name:         "GPT-5.1",
+				Slug:         openai.ChatModelGPT5_1,
+				TotalContext: 400000,
+				MaxOutput:    128000,
+				InputPrice:   125,  // $1.25
+				OutputPrice:  1000, // $10.00
+			},
 			{
 				Name:         "GPT-4.1",
 				Slug:         openai.ChatModelGPT4_1,
diff --git a/internal/services/toolkit/client/completion_v2.go b/internal/services/toolkit/client/completion_v2.go
index e7e5b7b2..79f15695 100644
--- a/internal/services/toolkit/client/completion_v2.go
+++ b/internal/services/toolkit/client/completion_v2.go
@@ -98,6 +98,14 @@ func (a *AIClientV2) ChatCompletionStreamV2(ctx context.Context, callbackStream
 				}
 				reasoning_content += s
 				// fmt.Print(s)
+			} else if field, ok := delta.JSON.ExtraFields["reasoning"]; ok && field.Raw() != "null" {
+				var s string
+				err := json.Unmarshal([]byte(field.Raw()), &s)
+				if err != nil {
+					// fmt.Println(err)
+				}
+				reasoning_content += s
+				// fmt.Print(s)
 			} else {
 				if !is_answering {
 					is_answering = true
diff --git a/webapp/_webapp/src/views/chat/footer/index.tsx b/webapp/_webapp/src/views/chat/footer/index.tsx
index 2f31f100..b5c8c389 100644
--- a/webapp/_webapp/src/views/chat/footer/index.tsx
+++ b/webapp/_webapp/src/views/chat/footer/index.tsx
@@ -121,7 +121,7 @@ export function PromptInput() {
   return (
     <div className="pd-app-tab-content-footer chat-prompt-input noselect rnd-cancel relative">
       {/* Only show one popup at a time - priority: prompts > actions > model selection */}
-      {prompts.length > 0 && <PromptSelection prompts={prompts} />}
+      {prompt.startsWith("/") && <PromptSelection prompts={prompts} />}
       {prompts.length === 0 && actions.length > 0 && <ActionSelection actions={actions} />}
       {prompts.length === 0 && actions.length === 0 && showModelSelection && (
         <ModelSelection onSelectModel={handleModelSelect} />
diff --git a/webapp/_webapp/src/views/chat/footer/toolbar/prompt-selection.tsx b/webapp/_webapp/src/views/chat/footer/toolbar/prompt-selection.tsx
index 79d7c286..a4f7774c 100644
--- a/webapp/_webapp/src/views/chat/footer/toolbar/prompt-selection.tsx
+++ b/webapp/_webapp/src/views/chat/footer/toolbar/prompt-selection.tsx
@@ -35,5 +35,13 @@ export function PromptSelection({ prompts }: PromptSelectionProps) {
     inputRef.current?.focus();
   }, [setPrompt, inputRef]);
 
+  if (prompts.length === 0) {
+    return (
+      <div className="transition-all duration-100 absolute bottom-full left-0 right-0 mb-1 z-50 bg-white shadow-lg rounded-lg border border-gray-200 p-4">
+        <div className="text-gray-500 text-sm text-center">No prompts found</div>
+      </div>
+    );
+  }
+
   return <Selection items={items} onSelect={onSelect} onClose={onClose} />;
 }
diff --git a/webapp/_webapp/src/views/settings/setting-item-input.tsx b/webapp/_webapp/src/views/settings/setting-item-input.tsx
index 54f2583e..634799d8 100644
--- a/webapp/_webapp/src/views/settings/setting-item-input.tsx
+++ b/webapp/_webapp/src/views/settings/setting-item-input.tsx
@@ -21,7 +21,7 @@ export const SettingItemInput = ({
 }: SettingItemInputProps) => (
   <div className="flex flex-row gap-2 w-full bg-content2 rounded-medium p-2 items-center">
     <div className="flex flex-col gap-0 w-full pl-3 pt-1 pb-1">
-      <p className="text-sm">{label}</p>
+      <p className="text-xs">{label}</p>
       <div className="flex flex-row gap-2">
         <input
           className={cn(className, "w-full text-xs bg-transparent p-2 rnd-cancel border border-gray-200 rounded-md")}
diff --git a/webapp/_webapp/src/views/settings/setting-item-select.tsx b/webapp/_webapp/src/views/settings/setting-item-select.tsx
index 9f666250..9eda2a05 100644
--- a/webapp/_webapp/src/views/settings/setting-item-select.tsx
+++ b/webapp/_webapp/src/views/settings/setting-item-select.tsx
@@ -19,7 +19,7 @@ export const SettingItemSelect = ({
 }: SettingItemSelectProps) => (
   <div className="flex flex-row gap-2 w-full bg-content2 rounded-medium p-2 items-center">
     <div className="flex flex-col gap-0 w-full pl-3 pt-1 pb-1">
-      <p className="text-sm">{label}</p>
+      <p className="text-xs">{label}</p>
       <p className="text-xs text-gray-500">{description}</p>
     </div>
     <Select

From 770c60b71013c82eeb9521b90b8819fc48efc514 Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Thu, 8 Jan 2026 00:47:34 +0800
Subject: [PATCH 02/12] support for reasoning

---
 .../services/toolkit/client/completion_v2.go  |  16 +-
 .../services/toolkit/handler/stream_v2.go     |  17 +-
 pkg/gen/api/chat/v2/chat.pb.go                | 195 +++++++++++++-----
 proto/chat/v2/chat.proto                      |   7 +
 .../_webapp/src/components/message-card.tsx   |   1 +
 .../message-entry-container/assistant.tsx     |  16 +-
 .../_webapp/src/hooks/useSendMessageStream.ts |   5 +
 .../src/pkg/gen/apiclient/chat/v2/chat_pb.ts  |  51 ++++-
 .../stores/conversation/handlers/converter.ts |  10 +-
 .../handlers/handleReasoningChunk.ts          |  38 ++++
 10 files changed, 282 insertions(+), 74 deletions(-)
 create mode 100644 webapp/_webapp/src/stores/conversation/handlers/handleReasoningChunk.ts

diff --git a/internal/services/toolkit/client/completion_v2.go b/internal/services/toolkit/client/completion_v2.go
index 79f15695..c1ec9791 100644
--- a/internal/services/toolkit/client/completion_v2.go
+++ b/internal/services/toolkit/client/completion_v2.go
@@ -93,19 +93,17 @@ func (a *AIClientV2) ChatCompletionStreamV2(ctx context.Context, callbackStream
 			if field, ok := delta.JSON.ExtraFields["reasoning_content"]; ok && field.Raw() != "null" {
 				var s string
 				err := json.Unmarshal([]byte(field.Raw()), &s)
-				if err != nil {
-					// fmt.Println(err)
+				if err == nil {
+					reasoning_content += s
+					streamHandler.HandleReasoningDelta(chunk.ID, s)
 				}
-				reasoning_content += s
-				// fmt.Print(s)
 			} else if field, ok := delta.JSON.ExtraFields["reasoning"]; ok && field.Raw() != "null" {
 				var s string
 				err := json.Unmarshal([]byte(field.Raw()), &s)
-				if err != nil {
-					// fmt.Println(err)
+				if err == nil {
+					reasoning_content += s
+					streamHandler.HandleReasoningDelta(chunk.ID, s)
 				}
-				reasoning_content += s
-				// fmt.Print(s)
 			} else {
 				if !is_answering {
 					is_answering = true
@@ -163,7 +161,7 @@ func (a *AIClientV2) ChatCompletionStreamV2(ctx context.Context, callbackStream
 				// fmt.Printf("FinishReason: %s\n", chunk.Choices[0].FinishReason)
 				// answer_content += chunk.Choices[0].Delta.Content
 				// fmt.Printf("answer_content: %s\n", answer_content)
-				streamHandler.HandleTextDoneItem(chunk, answer_content)
+				streamHandler.HandleTextDoneItem(chunk, answer_content, reasoning_content)
 				break
 			}
 		}
diff --git a/internal/services/toolkit/handler/stream_v2.go b/internal/services/toolkit/handler/stream_v2.go
index f95ca82d..86155dbe 100644
--- a/internal/services/toolkit/handler/stream_v2.go
+++ b/internal/services/toolkit/handler/stream_v2.go
@@ -98,7 +98,7 @@ func (h *StreamHandlerV2) HandleAddedItem(chunk openai.ChatCompletionChunk) {
 	}
 }
 
-func (h *StreamHandlerV2) HandleTextDoneItem(chunk openai.ChatCompletionChunk, content string) {
+func (h *StreamHandlerV2) HandleTextDoneItem(chunk openai.ChatCompletionChunk, content string, reasoning string) {
 	if h.callbackStream == nil {
 		return
 	}
@@ -112,6 +112,7 @@ func (h *StreamHandlerV2) HandleTextDoneItem(chunk openai.ChatCompletionChunk, c
 						Assistant: &chatv2.MessageTypeAssistant{
 							Content:   content,
 							ModelSlug: h.modelSlug,
+							Reasoning: &reasoning,
 						},
 					},
 				},
@@ -155,6 +156,20 @@ func (h *StreamHandlerV2) HandleTextDelta(chunk openai.ChatCompletionChunk) {
 	})
 }
 
+func (h *StreamHandlerV2) HandleReasoningDelta(messageId string, delta string) {
+	if h.callbackStream == nil {
+		return
+	}
+	h.callbackStream.Send(&chatv2.CreateConversationMessageStreamResponse{
+		ResponsePayload: &chatv2.CreateConversationMessageStreamResponse_ReasoningChunk{
+			ReasoningChunk: &chatv2.ReasoningChunk{
+				MessageId: messageId,
+				Delta:     delta,
+			},
+		},
+	})
+}
+
 func (h *StreamHandlerV2) SendIncompleteIndicator(reason string, responseId string) {
 	if h.callbackStream == nil {
 		return
diff --git a/pkg/gen/api/chat/v2/chat.pb.go b/pkg/gen/api/chat/v2/chat.pb.go
index 0db41ebd..3960de9c 100644
--- a/pkg/gen/api/chat/v2/chat.pb.go
+++ b/pkg/gen/api/chat/v2/chat.pb.go
@@ -236,6 +236,7 @@ type MessageTypeAssistant struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Content       string                 `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
 	ModelSlug     string                 `protobuf:"bytes,2,opt,name=model_slug,json=modelSlug,proto3" json:"model_slug,omitempty"`
+	Reasoning     *string                `protobuf:"bytes,3,opt,name=reasoning,proto3,oneof" json:"reasoning,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -284,6 +285,13 @@ func (x *MessageTypeAssistant) GetModelSlug() string {
 	return ""
 }
 
+func (x *MessageTypeAssistant) GetReasoning() string {
+	if x != nil && x.Reasoning != nil {
+		return *x.Reasoning
+	}
+	return ""
+}
+
 type MessageTypeUser struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Content       string                 `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
@@ -1345,6 +1353,58 @@ func (x *MessageChunk) GetDelta() string {
 	return ""
 }
 
+type ReasoningChunk struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	MessageId     string                 `protobuf:"bytes,1,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"` // The id of the message that this chunk belongs to
+	Delta         string                 `protobuf:"bytes,2,opt,name=delta,proto3" json:"delta,omitempty"`                          // The small piece of text
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ReasoningChunk) Reset() {
+	*x = ReasoningChunk{}
+	mi := &file_chat_v2_chat_proto_msgTypes[23]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ReasoningChunk) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReasoningChunk) ProtoMessage() {}
+
+func (x *ReasoningChunk) ProtoReflect() protoreflect.Message {
+	mi := &file_chat_v2_chat_proto_msgTypes[23]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReasoningChunk.ProtoReflect.Descriptor instead.
+func (*ReasoningChunk) Descriptor() ([]byte, []int) {
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{23}
+}
+
+func (x *ReasoningChunk) GetMessageId() string {
+	if x != nil {
+		return x.MessageId
+	}
+	return ""
+}
+
+func (x *ReasoningChunk) GetDelta() string {
+	if x != nil {
+		return x.Delta
+	}
+	return ""
+}
+
 type IncompleteIndicator struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Reason        string                 `protobuf:"bytes,1,opt,name=reason,proto3" json:"reason,omitempty"`
@@ -1355,7 +1415,7 @@ type IncompleteIndicator struct {
 
 func (x *IncompleteIndicator) Reset() {
 	*x = IncompleteIndicator{}
-	mi := &file_chat_v2_chat_proto_msgTypes[23]
+	mi := &file_chat_v2_chat_proto_msgTypes[24]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1367,7 +1427,7 @@ func (x *IncompleteIndicator) String() string {
 func (*IncompleteIndicator) ProtoMessage() {}
 
 func (x *IncompleteIndicator) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[23]
+	mi := &file_chat_v2_chat_proto_msgTypes[24]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1380,7 +1440,7 @@ func (x *IncompleteIndicator) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IncompleteIndicator.ProtoReflect.Descriptor instead.
 func (*IncompleteIndicator) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{23}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *IncompleteIndicator) GetReason() string {
@@ -1407,7 +1467,7 @@ type StreamPartEnd struct {
 
 func (x *StreamPartEnd) Reset() {
 	*x = StreamPartEnd{}
-	mi := &file_chat_v2_chat_proto_msgTypes[24]
+	mi := &file_chat_v2_chat_proto_msgTypes[25]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1419,7 +1479,7 @@ func (x *StreamPartEnd) String() string {
 func (*StreamPartEnd) ProtoMessage() {}
 
 func (x *StreamPartEnd) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[24]
+	mi := &file_chat_v2_chat_proto_msgTypes[25]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1432,7 +1492,7 @@ func (x *StreamPartEnd) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamPartEnd.ProtoReflect.Descriptor instead.
 func (*StreamPartEnd) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{24}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *StreamPartEnd) GetMessageId() string {
@@ -1459,7 +1519,7 @@ type StreamFinalization struct {
 
 func (x *StreamFinalization) Reset() {
 	*x = StreamFinalization{}
-	mi := &file_chat_v2_chat_proto_msgTypes[25]
+	mi := &file_chat_v2_chat_proto_msgTypes[26]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1471,7 +1531,7 @@ func (x *StreamFinalization) String() string {
 func (*StreamFinalization) ProtoMessage() {}
 
 func (x *StreamFinalization) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[25]
+	mi := &file_chat_v2_chat_proto_msgTypes[26]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1484,7 +1544,7 @@ func (x *StreamFinalization) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamFinalization.ProtoReflect.Descriptor instead.
 func (*StreamFinalization) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{25}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *StreamFinalization) GetConversationId() string {
@@ -1503,7 +1563,7 @@ type StreamError struct {
 
 func (x *StreamError) Reset() {
 	*x = StreamError{}
-	mi := &file_chat_v2_chat_proto_msgTypes[26]
+	mi := &file_chat_v2_chat_proto_msgTypes[27]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1515,7 +1575,7 @@ func (x *StreamError) String() string {
 func (*StreamError) ProtoMessage() {}
 
 func (x *StreamError) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[26]
+	mi := &file_chat_v2_chat_proto_msgTypes[27]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1528,7 +1588,7 @@ func (x *StreamError) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamError.ProtoReflect.Descriptor instead.
 func (*StreamError) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{26}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *StreamError) GetErrorMessage() string {
@@ -1557,7 +1617,7 @@ type CreateConversationMessageStreamRequest struct {
 
 func (x *CreateConversationMessageStreamRequest) Reset() {
 	*x = CreateConversationMessageStreamRequest{}
-	mi := &file_chat_v2_chat_proto_msgTypes[27]
+	mi := &file_chat_v2_chat_proto_msgTypes[28]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1569,7 +1629,7 @@ func (x *CreateConversationMessageStreamRequest) String() string {
 func (*CreateConversationMessageStreamRequest) ProtoMessage() {}
 
 func (x *CreateConversationMessageStreamRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[27]
+	mi := &file_chat_v2_chat_proto_msgTypes[28]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1582,7 +1642,7 @@ func (x *CreateConversationMessageStreamRequest) ProtoReflect() protoreflect.Mes
 
 // Deprecated: Use CreateConversationMessageStreamRequest.ProtoReflect.Descriptor instead.
 func (*CreateConversationMessageStreamRequest) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{27}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *CreateConversationMessageStreamRequest) GetProjectId() string {
@@ -1646,6 +1706,7 @@ type CreateConversationMessageStreamResponse struct {
 	//	*CreateConversationMessageStreamResponse_StreamPartEnd
 	//	*CreateConversationMessageStreamResponse_StreamFinalization
 	//	*CreateConversationMessageStreamResponse_StreamError
+	//	*CreateConversationMessageStreamResponse_ReasoningChunk
 	ResponsePayload isCreateConversationMessageStreamResponse_ResponsePayload `protobuf_oneof:"response_payload"`
 	unknownFields   protoimpl.UnknownFields
 	sizeCache       protoimpl.SizeCache
@@ -1653,7 +1714,7 @@ type CreateConversationMessageStreamResponse struct {
 
 func (x *CreateConversationMessageStreamResponse) Reset() {
 	*x = CreateConversationMessageStreamResponse{}
-	mi := &file_chat_v2_chat_proto_msgTypes[28]
+	mi := &file_chat_v2_chat_proto_msgTypes[29]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1665,7 +1726,7 @@ func (x *CreateConversationMessageStreamResponse) String() string {
 func (*CreateConversationMessageStreamResponse) ProtoMessage() {}
 
 func (x *CreateConversationMessageStreamResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[28]
+	mi := &file_chat_v2_chat_proto_msgTypes[29]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1678,7 +1739,7 @@ func (x *CreateConversationMessageStreamResponse) ProtoReflect() protoreflect.Me
 
 // Deprecated: Use CreateConversationMessageStreamResponse.ProtoReflect.Descriptor instead.
 func (*CreateConversationMessageStreamResponse) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{28}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *CreateConversationMessageStreamResponse) GetResponsePayload() isCreateConversationMessageStreamResponse_ResponsePayload {
@@ -1751,6 +1812,15 @@ func (x *CreateConversationMessageStreamResponse) GetStreamError() *StreamError
 	return nil
 }
 
+func (x *CreateConversationMessageStreamResponse) GetReasoningChunk() *ReasoningChunk {
+	if x != nil {
+		if x, ok := x.ResponsePayload.(*CreateConversationMessageStreamResponse_ReasoningChunk); ok {
+			return x.ReasoningChunk
+		}
+	}
+	return nil
+}
+
 type isCreateConversationMessageStreamResponse_ResponsePayload interface {
 	isCreateConversationMessageStreamResponse_ResponsePayload()
 }
@@ -1783,6 +1853,10 @@ type CreateConversationMessageStreamResponse_StreamError struct {
 	StreamError *StreamError `protobuf:"bytes,7,opt,name=stream_error,json=streamError,proto3,oneof"`
 }
 
+type CreateConversationMessageStreamResponse_ReasoningChunk struct {
+	ReasoningChunk *ReasoningChunk `protobuf:"bytes,8,opt,name=reasoning_chunk,json=reasoningChunk,proto3,oneof"`
+}
+
 func (*CreateConversationMessageStreamResponse_StreamInitialization) isCreateConversationMessageStreamResponse_ResponsePayload() {
 }
 
@@ -1804,6 +1878,9 @@ func (*CreateConversationMessageStreamResponse_StreamFinalization) isCreateConve
 func (*CreateConversationMessageStreamResponse_StreamError) isCreateConversationMessageStreamResponse_ResponsePayload() {
 }
 
+func (*CreateConversationMessageStreamResponse_ReasoningChunk) isCreateConversationMessageStreamResponse_ResponsePayload() {
+}
+
 var File_chat_v2_chat_proto protoreflect.FileDescriptor
 
 const file_chat_v2_chat_proto_rawDesc = "" +
@@ -1818,11 +1895,14 @@ const file_chat_v2_chat_proto_rawDesc = "" +
 	"\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n" +
 	"\x04args\x18\x02 \x01(\tR\x04args\"-\n" +
 	"\x11MessageTypeSystem\x12\x18\n" +
-	"\acontent\x18\x01 \x01(\tR\acontent\"O\n" +
+	"\acontent\x18\x01 \x01(\tR\acontent\"\x80\x01\n" +
 	"\x14MessageTypeAssistant\x12\x18\n" +
 	"\acontent\x18\x01 \x01(\tR\acontent\x12\x1d\n" +
 	"\n" +
-	"model_slug\x18\x02 \x01(\tR\tmodelSlug\"\x9e\x01\n" +
+	"model_slug\x18\x02 \x01(\tR\tmodelSlug\x12!\n" +
+	"\treasoning\x18\x03 \x01(\tH\x00R\treasoning\x88\x01\x01B\f\n" +
+	"\n" +
+	"_reasoning\"\x9e\x01\n" +
 	"\x0fMessageTypeUser\x12\x18\n" +
 	"\acontent\x18\x01 \x01(\tR\acontent\x12(\n" +
 	"\rselected_text\x18\x02 \x01(\tH\x00R\fselectedText\x88\x01\x01\x12%\n" +
@@ -1891,6 +1971,10 @@ const file_chat_v2_chat_proto_rawDesc = "" +
 	"\fMessageChunk\x12\x1d\n" +
 	"\n" +
 	"message_id\x18\x01 \x01(\tR\tmessageId\x12\x14\n" +
+	"\x05delta\x18\x02 \x01(\tR\x05delta\"E\n" +
+	"\x0eReasoningChunk\x12\x1d\n" +
+	"\n" +
+	"message_id\x18\x01 \x01(\tR\tmessageId\x12\x14\n" +
 	"\x05delta\x18\x02 \x01(\tR\x05delta\"N\n" +
 	"\x13IncompleteIndicator\x12\x16\n" +
 	"\x06reason\x18\x01 \x01(\tR\x06reason\x12\x1f\n" +
@@ -1917,7 +2001,7 @@ const file_chat_v2_chat_proto_rawDesc = "" +
 	"\x10_conversation_idB\x15\n" +
 	"\x13_user_selected_textB\x14\n" +
 	"\x12_conversation_typeB\x0e\n" +
-	"\f_surrounding\"\xb9\x04\n" +
+	"\f_surrounding\"\xfd\x04\n" +
 	"'CreateConversationMessageStreamResponse\x12T\n" +
 	"\x15stream_initialization\x18\x01 \x01(\v2\x1d.chat.v2.StreamInitializationH\x00R\x14streamInitialization\x12F\n" +
 	"\x11stream_part_begin\x18\x02 \x01(\v2\x18.chat.v2.StreamPartBeginH\x00R\x0fstreamPartBegin\x12<\n" +
@@ -1925,7 +2009,8 @@ const file_chat_v2_chat_proto_rawDesc = "" +
 	"\x14incomplete_indicator\x18\x04 \x01(\v2\x1c.chat.v2.IncompleteIndicatorH\x00R\x13incompleteIndicator\x12@\n" +
 	"\x0fstream_part_end\x18\x05 \x01(\v2\x16.chat.v2.StreamPartEndH\x00R\rstreamPartEnd\x12N\n" +
 	"\x13stream_finalization\x18\x06 \x01(\v2\x1b.chat.v2.StreamFinalizationH\x00R\x12streamFinalization\x129\n" +
-	"\fstream_error\x18\a \x01(\v2\x14.chat.v2.StreamErrorH\x00R\vstreamErrorB\x12\n" +
+	"\fstream_error\x18\a \x01(\v2\x14.chat.v2.StreamErrorH\x00R\vstreamError\x12B\n" +
+	"\x0freasoning_chunk\x18\b \x01(\v2\x17.chat.v2.ReasoningChunkH\x00R\x0ereasoningChunkB\x12\n" +
 	"\x10response_payload*R\n" +
 	"\x10ConversationType\x12!\n" +
 	"\x1dCONVERSATION_TYPE_UNSPECIFIED\x10\x00\x12\x1b\n" +
@@ -1952,7 +2037,7 @@ func file_chat_v2_chat_proto_rawDescGZIP() []byte {
 }
 
 var file_chat_v2_chat_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_chat_v2_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 29)
+var file_chat_v2_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 30)
 var file_chat_v2_chat_proto_goTypes = []any{
 	(ConversationType)(0),                           // 0: chat.v2.ConversationType
 	(*MessageTypeToolCall)(nil),                     // 1: chat.v2.MessageTypeToolCall
@@ -1978,12 +2063,13 @@ var file_chat_v2_chat_proto_goTypes = []any{
 	(*StreamInitialization)(nil),                    // 21: chat.v2.StreamInitialization
 	(*StreamPartBegin)(nil),                         // 22: chat.v2.StreamPartBegin
 	(*MessageChunk)(nil),                            // 23: chat.v2.MessageChunk
-	(*IncompleteIndicator)(nil),                     // 24: chat.v2.IncompleteIndicator
-	(*StreamPartEnd)(nil),                           // 25: chat.v2.StreamPartEnd
-	(*StreamFinalization)(nil),                      // 26: chat.v2.StreamFinalization
-	(*StreamError)(nil),                             // 27: chat.v2.StreamError
-	(*CreateConversationMessageStreamRequest)(nil),  // 28: chat.v2.CreateConversationMessageStreamRequest
-	(*CreateConversationMessageStreamResponse)(nil), // 29: chat.v2.CreateConversationMessageStreamResponse
+	(*ReasoningChunk)(nil),                          // 24: chat.v2.ReasoningChunk
+	(*IncompleteIndicator)(nil),                     // 25: chat.v2.IncompleteIndicator
+	(*StreamPartEnd)(nil),                           // 26: chat.v2.StreamPartEnd
+	(*StreamFinalization)(nil),                      // 27: chat.v2.StreamFinalization
+	(*StreamError)(nil),                             // 28: chat.v2.StreamError
+	(*CreateConversationMessageStreamRequest)(nil),  // 29: chat.v2.CreateConversationMessageStreamRequest
+	(*CreateConversationMessageStreamResponse)(nil), // 30: chat.v2.CreateConversationMessageStreamResponse
 }
 var file_chat_v2_chat_proto_depIdxs = []int32{
 	3,  // 0: chat.v2.MessagePayload.system:type_name -> chat.v2.MessageTypeSystem
@@ -2004,27 +2090,28 @@ var file_chat_v2_chat_proto_depIdxs = []int32{
 	21, // 15: chat.v2.CreateConversationMessageStreamResponse.stream_initialization:type_name -> chat.v2.StreamInitialization
 	22, // 16: chat.v2.CreateConversationMessageStreamResponse.stream_part_begin:type_name -> chat.v2.StreamPartBegin
 	23, // 17: chat.v2.CreateConversationMessageStreamResponse.message_chunk:type_name -> chat.v2.MessageChunk
-	24, // 18: chat.v2.CreateConversationMessageStreamResponse.incomplete_indicator:type_name -> chat.v2.IncompleteIndicator
-	25, // 19: chat.v2.CreateConversationMessageStreamResponse.stream_part_end:type_name -> chat.v2.StreamPartEnd
-	26, // 20: chat.v2.CreateConversationMessageStreamResponse.stream_finalization:type_name -> chat.v2.StreamFinalization
-	27, // 21: chat.v2.CreateConversationMessageStreamResponse.stream_error:type_name -> chat.v2.StreamError
-	10, // 22: chat.v2.ChatService.ListConversations:input_type -> chat.v2.ListConversationsRequest
-	12, // 23: chat.v2.ChatService.GetConversation:input_type -> chat.v2.GetConversationRequest
-	28, // 24: chat.v2.ChatService.CreateConversationMessageStream:input_type -> chat.v2.CreateConversationMessageStreamRequest
-	14, // 25: chat.v2.ChatService.UpdateConversation:input_type -> chat.v2.UpdateConversationRequest
-	16, // 26: chat.v2.ChatService.DeleteConversation:input_type -> chat.v2.DeleteConversationRequest
-	19, // 27: chat.v2.ChatService.ListSupportedModels:input_type -> chat.v2.ListSupportedModelsRequest
-	11, // 28: chat.v2.ChatService.ListConversations:output_type -> chat.v2.ListConversationsResponse
-	13, // 29: chat.v2.ChatService.GetConversation:output_type -> chat.v2.GetConversationResponse
-	29, // 30: chat.v2.ChatService.CreateConversationMessageStream:output_type -> chat.v2.CreateConversationMessageStreamResponse
-	15, // 31: chat.v2.ChatService.UpdateConversation:output_type -> chat.v2.UpdateConversationResponse
-	17, // 32: chat.v2.ChatService.DeleteConversation:output_type -> chat.v2.DeleteConversationResponse
-	20, // 33: chat.v2.ChatService.ListSupportedModels:output_type -> chat.v2.ListSupportedModelsResponse
-	28, // [28:34] is the sub-list for method output_type
-	22, // [22:28] is the sub-list for method input_type
-	22, // [22:22] is the sub-list for extension type_name
-	22, // [22:22] is the sub-list for extension extendee
-	0,  // [0:22] is the sub-list for field type_name
+	25, // 18: chat.v2.CreateConversationMessageStreamResponse.incomplete_indicator:type_name -> chat.v2.IncompleteIndicator
+	26, // 19: chat.v2.CreateConversationMessageStreamResponse.stream_part_end:type_name -> chat.v2.StreamPartEnd
+	27, // 20: chat.v2.CreateConversationMessageStreamResponse.stream_finalization:type_name -> chat.v2.StreamFinalization
+	28, // 21: chat.v2.CreateConversationMessageStreamResponse.stream_error:type_name -> chat.v2.StreamError
+	24, // 22: chat.v2.CreateConversationMessageStreamResponse.reasoning_chunk:type_name -> chat.v2.ReasoningChunk
+	10, // 23: chat.v2.ChatService.ListConversations:input_type -> chat.v2.ListConversationsRequest
+	12, // 24: chat.v2.ChatService.GetConversation:input_type -> chat.v2.GetConversationRequest
+	29, // 25: chat.v2.ChatService.CreateConversationMessageStream:input_type -> chat.v2.CreateConversationMessageStreamRequest
+	14, // 26: chat.v2.ChatService.UpdateConversation:input_type -> chat.v2.UpdateConversationRequest
+	16, // 27: chat.v2.ChatService.DeleteConversation:input_type -> chat.v2.DeleteConversationRequest
+	19, // 28: chat.v2.ChatService.ListSupportedModels:input_type -> chat.v2.ListSupportedModelsRequest
+	11, // 29: chat.v2.ChatService.ListConversations:output_type -> chat.v2.ListConversationsResponse
+	13, // 30: chat.v2.ChatService.GetConversation:output_type -> chat.v2.GetConversationResponse
+	30, // 31: chat.v2.ChatService.CreateConversationMessageStream:output_type -> chat.v2.CreateConversationMessageStreamResponse
+	15, // 32: chat.v2.ChatService.UpdateConversation:output_type -> chat.v2.UpdateConversationResponse
+	17, // 33: chat.v2.ChatService.DeleteConversation:output_type -> chat.v2.DeleteConversationResponse
+	20, // 34: chat.v2.ChatService.ListSupportedModels:output_type -> chat.v2.ListSupportedModelsResponse
+	29, // [29:35] is the sub-list for method output_type
+	23, // [23:29] is the sub-list for method input_type
+	23, // [23:23] is the sub-list for extension type_name
+	23, // [23:23] is the sub-list for extension extendee
+	0,  // [0:23] is the sub-list for field type_name
 }
 
 func init() { file_chat_v2_chat_proto_init() }
@@ -2032,6 +2119,7 @@ func file_chat_v2_chat_proto_init() {
 	if File_chat_v2_chat_proto != nil {
 		return
 	}
+	file_chat_v2_chat_proto_msgTypes[3].OneofWrappers = []any{}
 	file_chat_v2_chat_proto_msgTypes[4].OneofWrappers = []any{}
 	file_chat_v2_chat_proto_msgTypes[6].OneofWrappers = []any{
 		(*MessagePayload_System)(nil),
@@ -2042,8 +2130,8 @@ func file_chat_v2_chat_proto_init() {
 		(*MessagePayload_Unknown)(nil),
 	}
 	file_chat_v2_chat_proto_msgTypes[9].OneofWrappers = []any{}
-	file_chat_v2_chat_proto_msgTypes[27].OneofWrappers = []any{}
-	file_chat_v2_chat_proto_msgTypes[28].OneofWrappers = []any{
+	file_chat_v2_chat_proto_msgTypes[28].OneofWrappers = []any{}
+	file_chat_v2_chat_proto_msgTypes[29].OneofWrappers = []any{
 		(*CreateConversationMessageStreamResponse_StreamInitialization)(nil),
 		(*CreateConversationMessageStreamResponse_StreamPartBegin)(nil),
 		(*CreateConversationMessageStreamResponse_MessageChunk)(nil),
@@ -2051,6 +2139,7 @@ func file_chat_v2_chat_proto_init() {
 		(*CreateConversationMessageStreamResponse_StreamPartEnd)(nil),
 		(*CreateConversationMessageStreamResponse_StreamFinalization)(nil),
 		(*CreateConversationMessageStreamResponse_StreamError)(nil),
+		(*CreateConversationMessageStreamResponse_ReasoningChunk)(nil),
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -2058,7 +2147,7 @@ func file_chat_v2_chat_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_chat_v2_chat_proto_rawDesc), len(file_chat_v2_chat_proto_rawDesc)),
 			NumEnums:      1,
-			NumMessages:   29,
+			NumMessages:   30,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/proto/chat/v2/chat.proto b/proto/chat/v2/chat.proto
index 68130275..f44d55ba 100644
--- a/proto/chat/v2/chat.proto
+++ b/proto/chat/v2/chat.proto
@@ -52,6 +52,7 @@ message MessageTypeSystem {
 message MessageTypeAssistant {
   string content = 1;
   string model_slug = 2;
+  optional string reasoning = 3;
 }
 
 message MessageTypeUser {
@@ -165,6 +166,11 @@ message MessageChunk {
   string delta = 2; // The small piece of text
 }
 
+message ReasoningChunk {
+  string message_id = 1; // The id of the message that this chunk belongs to
+  string delta = 2; // The small piece of text
+}
+
 message IncompleteIndicator {
   string reason = 1;
   string response_id = 2;
@@ -223,5 +229,6 @@ message CreateConversationMessageStreamResponse {
     StreamPartEnd stream_part_end = 5;
     StreamFinalization stream_finalization = 6;
     StreamError stream_error = 7;
+    ReasoningChunk reasoning_chunk = 8;
   }
 }
diff --git a/webapp/_webapp/src/components/message-card.tsx b/webapp/_webapp/src/components/message-card.tsx
index 2a5f406c..0f6eff7f 100644
--- a/webapp/_webapp/src/components/message-card.tsx
+++ b/webapp/_webapp/src/components/message-card.tsx
@@ -60,6 +60,7 @@ export const MessageCard = memo(({ messageEntry, prevAttachment, animated }: Mes
       return (
         <AssistantMessageContainer
           message={messageEntry.assistant?.content}
+          reasoning={messageEntry.assistant?.reasoning}
           messageId={messageEntry.messageId}
           animated={animated ?? false}
           prevAttachment={prevAttachment ?? ""}
diff --git a/webapp/_webapp/src/components/message-entry-container/assistant.tsx b/webapp/_webapp/src/components/message-entry-container/assistant.tsx
index 80986082..60a62822 100644
--- a/webapp/_webapp/src/components/message-entry-container/assistant.tsx
+++ b/webapp/_webapp/src/components/message-entry-container/assistant.tsx
@@ -1,4 +1,5 @@
 import { cn, Tooltip } from "@heroui/react";
+import { GeneralToolCard } from "./tools/general";
 import { useCallback, useMemo, useState } from "react";
 import googleAnalytics from "../../libs/google-analytics";
 import { getProjectId } from "../../libs/helpers";
@@ -17,6 +18,7 @@ const preprocessMessage = (message: string): string | undefined => {
 
 export const AssistantMessageContainer = ({
   message,
+  reasoning,
   messageId,
   animated,
   prevAttachment,
@@ -24,6 +26,7 @@ export const AssistantMessageContainer = ({
   preparing,
 }: {
   message: string;
+  reasoning?: string;
   messageId: string;
   animated: boolean;
   prevAttachment: string;
@@ -49,7 +52,7 @@ export const AssistantMessageContainer = ({
     }
   }, [user?.id, projectId, processedMessage, messageId]);
 
-  const showMessage = processedMessage?.length || 0 > 0;
+  const showMessage = (processedMessage?.length || 0 > 0) || (reasoning?.length || 0 > 0);
   const staleComponent = stale && <div className="message-box-stale-description">This message is stale.</div>;
   const writingIndicator =
     stale || !showMessage ? null : (
@@ -64,10 +67,20 @@ export const AssistantMessageContainer = ({
         )}
       />
     );
+
+  const reasoningComponent = reasoning && (
+    <div key="reasoning" className="reasoning-container mb-3 animate-in fade-in slide-in-from-top-2 duration-300">
+      <GeneralToolCard functionName="reasoning" message={reasoning} animated={animated} />
+    </div>
+  );
+
   return (
     showMessage && (
       <div className="chat-message-entry noselect">
         <div className={cn("message-box-assistant rnd-cancel", messageId.startsWith("error-") && "!text-red-500")}>
+          {/* Reasoning content */}
+          {reasoningComponent}
+
           {/* Message content */}
           <div className="canselect">
             <MarkdownComponent prevAttachment={prevAttachment} animated={animated}>
@@ -92,3 +105,4 @@ export const AssistantMessageContainer = ({
     )
   );
 };
+
diff --git a/webapp/_webapp/src/hooks/useSendMessageStream.ts b/webapp/_webapp/src/hooks/useSendMessageStream.ts
index c6b44027..3c2d1829 100644
--- a/webapp/_webapp/src/hooks/useSendMessageStream.ts
+++ b/webapp/_webapp/src/hooks/useSendMessageStream.ts
@@ -13,12 +13,14 @@ import { createConversationMessageStream } from "../query/api";
 import { handleStreamInitialization } from "../stores/conversation/handlers/handleStreamInitialization";
 import { handleStreamPartBegin } from "../stores/conversation/handlers/handleStreamPartBegin";
 import { handleMessageChunk } from "../stores/conversation/handlers/handleMessageChunk";
+import { handleReasoningChunk } from "../stores/conversation/handlers/handleReasoningChunk";
 import { handleStreamPartEnd } from "../stores/conversation/handlers/handleStreamPartEnd";
 import { handleStreamFinalization } from "../stores/conversation/handlers/handleStreamFinalization";
 import { handleStreamError } from "../stores/conversation/handlers/handleStreamError";
 import {
   MessageChunk,
   MessageTypeUserSchema,
+  ReasoningChunk,
   StreamError,
   StreamInitialization,
   StreamPartBegin,
@@ -144,6 +146,9 @@ export function useSendMessageStream() {
               case "incompleteIndicator":
                 handleIncompleteIndicator(response.responsePayload.value as IncompleteIndicator);
                 break;
+              case "reasoningChunk":
+                handleReasoningChunk(response.responsePayload.value as ReasoningChunk, updateStreamingMessage);
+                break;
               default: {
                 if (response.responsePayload.value !== undefined) {
                   const _typeCheck: never = response.responsePayload;
diff --git a/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts b/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts
index c41584a5..defe9b64 100644
--- a/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts
+++ b/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts
@@ -11,7 +11,7 @@ import type { Message as Message$1 } from "@bufbuild/protobuf";
  * Describes the file chat/v2/chat.proto.
  */
 export const file_chat_v2_chat: GenFile = /*@__PURE__*/
-  fileDesc("ChJjaGF0L3YyL2NoYXQucHJvdG8SB2NoYXQudjIiUAoTTWVzc2FnZVR5cGVUb29sQ2FsbBIMCgRuYW1lGAEgASgJEgwKBGFyZ3MYAiABKAkSDgoGcmVzdWx0GAMgASgJEg0KBWVycm9yGAQgASgJIkEKI01lc3NhZ2VUeXBlVG9vbENhbGxQcmVwYXJlQXJndW1lbnRzEgwKBG5hbWUYASABKAkSDAoEYXJncxgCIAEoCSIkChFNZXNzYWdlVHlwZVN5c3RlbRIPCgdjb250ZW50GAEgASgJIjsKFE1lc3NhZ2VUeXBlQXNzaXN0YW50Eg8KB2NvbnRlbnQYASABKAkSEgoKbW9kZWxfc2x1ZxgCIAEoCSJ6Cg9NZXNzYWdlVHlwZVVzZXISDwoHY29udGVudBgBIAEoCRIaCg1zZWxlY3RlZF90ZXh0GAIgASgJSACIAQESGAoLc3Vycm91bmRpbmcYByABKAlIAYgBAUIQCg5fc2VsZWN0ZWRfdGV4dEIOCgxfc3Vycm91bmRpbmciKQoSTWVzc2FnZVR5cGVVbmtub3duEhMKC2Rlc2NyaXB0aW9uGAEgASgJIuQCCg5NZXNzYWdlUGF5bG9hZBIsCgZzeXN0ZW0YASABKAsyGi5jaGF0LnYyLk1lc3NhZ2VUeXBlU3lzdGVtSAASKAoEdXNlchgCIAEoCzIYLmNoYXQudjIuTWVzc2FnZVR5cGVVc2VySAASMgoJYXNzaXN0YW50GAMgASgLMh0uY2hhdC52Mi5NZXNzYWdlVHlwZUFzc2lzdGFudEgAElMKG3Rvb2xfY2FsbF9wcmVwYXJlX2FyZ3VtZW50cxgEIAEoCzIsLmNoYXQudjIuTWVzc2FnZVR5cGVUb29sQ2FsbFByZXBhcmVBcmd1bWVudHNIABIxCgl0b29sX2NhbGwYBSABKAsyHC5jaGF0LnYyLk1lc3NhZ2VUeXBlVG9vbENhbGxIABIuCgd1bmtub3duGAYgASgLMhsuY2hhdC52Mi5NZXNzYWdlVHlwZVVua25vd25IAEIOCgxtZXNzYWdlX3R5cGUiWgoHTWVzc2FnZRISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAiABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkEhEKCXRpbWVzdGFtcBgDIAEoAyJhCgxDb252ZXJzYXRpb24SCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEgoKbW9kZWxfc2x1ZxgDIAEoCRIiCghtZXNzYWdlcxgEIAMoCzIQLmNoYXQudjIuTWVzc2FnZSJCChhMaXN0Q29udmVyc2F0aW9uc1JlcXVlc3QSFwoKcHJvamVjdF9pZBgBIAEoCUgAiAEBQg0KC19wcm9qZWN0X2lkIkkKGUxpc3RDb252ZXJzYXRpb25zUmVzcG9uc2USLAoNY29udmVyc2F0aW9ucxgBIAMoCzIVLmNoYXQudjIuQ29udmVyc2F0aW9uIjEKFkdldENvbnZlcnNhdGlvblJlcXVlc3QSFwoPY29udmVyc2F0aW9uX2lkGAEgASgJIkYKF0dldENvbnZlcnNhdGlvblJlc3BvbnNlEisKDGNvbnZlcnNhdGlvbhgBIAEoCzIVLmNoYXQudjIuQ29udmVyc2F0aW9uIkMKGVVwZGF0ZUNvbnZlcnNhdGlvblJlcXVlc3QSFwoPY29udmVyc2F0aW9uX2lkGAEgASgJEg0KBXRpdGxlGAIgASgJIkkKGlVwZGF0ZUNvbnZlcnNhdGlvblJlc3BvbnNlEisKDGNvbnZlcnNhdGlvbhgBIAEoCzIVLmNoYXQudjIuQ29udmVyc2F0aW9uIjQKGURlbGV0ZUNvbnZlcnNhdGlvblJlcXVlc3QSFwoPY29udmVyc2F0aW9uX2lkGAEgASgJIhwKGkRlbGV0ZUNvbnZlcnNhdGlvblJlc3BvbnNlIoIBCg5TdXBwb3J0ZWRNb2RlbBIMCgRuYW1lGAEgASgJEgwKBHNsdWcYAiABKAkSFQoNdG90YWxfY29udGV4dBgDIAEoAxISCgptYXhfb3V0cHV0GAQgASgDEhMKC2lucHV0X3ByaWNlGAUgASgDEhQKDG91dHB1dF9wcmljZRgGIAEoAyIcChpMaXN0U3VwcG9ydGVkTW9kZWxzUmVxdWVzdCJGChtMaXN0U3VwcG9ydGVkTW9kZWxzUmVzcG9uc2USJwoGbW9kZWxzGAEgAygLMhcuY2hhdC52Mi5TdXBwb3J0ZWRNb2RlbCJDChRTdHJlYW1Jbml0aWFsaXphdGlvbhIXCg9jb252ZXJzYXRpb25faWQYASABKAkSEgoKbW9kZWxfc2x1ZxgCIAEoCSJPCg9TdHJlYW1QYXJ0QmVnaW4SEgoKbWVzc2FnZV9pZBgBIAEoCRIoCgdwYXlsb2FkGAMgASgLMhcuY2hhdC52Mi5NZXNzYWdlUGF5bG9hZCIxCgxNZXNzYWdlQ2h1bmsSEgoKbWVzc2FnZV9pZBgBIAEoCRINCgVkZWx0YRgCIAEoCSI6ChNJbmNvbXBsZXRlSW5kaWNhdG9yEg4KBnJlYXNvbhgBIAEoCRITCgtyZXNwb25zZV9pZBgCIAEoCSJNCg1TdHJlYW1QYXJ0RW5kEhIKCm1lc3NhZ2VfaWQYASABKAkSKAoHcGF5bG9hZBgDIAEoCzIXLmNoYXQudjIuTWVzc2FnZVBheWxvYWQiLQoSU3RyZWFtRmluYWxpemF0aW9uEhcKD2NvbnZlcnNhdGlvbl9pZBgBIAEoCSIkCgtTdHJlYW1FcnJvchIVCg1lcnJvcl9tZXNzYWdlGAEgASgJIssCCiZDcmVhdGVDb252ZXJzYXRpb25NZXNzYWdlU3RyZWFtUmVxdWVzdBISCgpwcm9qZWN0X2lkGAEgASgJEhwKD2NvbnZlcnNhdGlvbl9pZBgCIAEoCUgAiAEBEhIKCm1vZGVsX3NsdWcYAyABKAkSFAoMdXNlcl9tZXNzYWdlGAQgASgJEh8KEnVzZXJfc2VsZWN0ZWRfdGV4dBgFIAEoCUgBiAEBEjkKEWNvbnZlcnNhdGlvbl90eXBlGAYgASgOMhkuY2hhdC52Mi5Db252ZXJzYXRpb25UeXBlSAKIAQESGAoLc3Vycm91bmRpbmcYCCABKAlIA4gBAUISChBfY29udmVyc2F0aW9uX2lkQhUKE191c2VyX3NlbGVjdGVkX3RleHRCFAoSX2NvbnZlcnNhdGlvbl90eXBlQg4KDF9zdXJyb3VuZGluZyK/AwonQ3JlYXRlQ29udmVyc2F0aW9uTWVzc2FnZVN0cmVhbVJlc3BvbnNlEj4KFXN0cmVhbV9pbml0aWFsaXphdGlvbhgBIAEoCzIdLmNoYXQudjIuU3RyZWFtSW5pdGlhbGl6YXRpb25IABI1ChFzdHJlYW1fcGFydF9iZWdpbhgCIAEoCzIYLmNoYXQudjIuU3RyZWFtUGFydEJlZ2luSAASLgoNbWVzc2FnZV9jaHVuaxgDIAEoCzIVLmNoYXQudjIuTWVzc2FnZUNodW5rSAASPAoUaW5jb21wbGV0ZV9pbmRpY2F0b3IYBCABKAsyHC5jaGF0LnYyLkluY29tcGxldGVJbmRpY2F0b3JIABIxCg9zdHJlYW1fcGFydF9lbmQYBSABKAsyFi5jaGF0LnYyLlN0cmVhbVBhcnRFbmRIABI6ChNzdHJlYW1fZmluYWxpemF0aW9uGAYgASgLMhsuY2hhdC52Mi5TdHJlYW1GaW5hbGl6YXRpb25IABIsCgxzdHJlYW1fZXJyb3IYByABKAsyFC5jaGF0LnYyLlN0cmVhbUVycm9ySABCEgoQcmVzcG9uc2VfcGF5bG9hZCpSChBDb252ZXJzYXRpb25UeXBlEiEKHUNPTlZFUlNBVElPTl9UWVBFX1VOU1BFQ0lGSUVEEAASGwoXQ09OVkVSU0FUSU9OX1RZUEVfREVCVUcQATKoBwoLQ2hhdFNlcnZpY2USgwEKEUxpc3RDb252ZXJzYXRpb25zEiEuY2hhdC52Mi5MaXN0Q29udmVyc2F0aW9uc1JlcXVlc3QaIi5jaGF0LnYyLkxpc3RDb252ZXJzYXRpb25zUmVzcG9uc2UiJ4LT5JMCIRIfL19wZC9hcGkvdjIvY2hhdHMvY29udmVyc2F0aW9ucxKPAQoPR2V0Q29udmVyc2F0aW9uEh8uY2hhdC52Mi5HZXRDb252ZXJzYXRpb25SZXF1ZXN0GiAuY2hhdC52Mi5HZXRDb252ZXJzYXRpb25SZXNwb25zZSI5gtPkkwIzEjEvX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zL3tjb252ZXJzYXRpb25faWR9EsIBCh9DcmVhdGVDb252ZXJzYXRpb25NZXNzYWdlU3RyZWFtEi8uY2hhdC52Mi5DcmVhdGVDb252ZXJzYXRpb25NZXNzYWdlU3RyZWFtUmVxdWVzdBowLmNoYXQudjIuQ3JlYXRlQ29udmVyc2F0aW9uTWVzc2FnZVN0cmVhbVJlc3BvbnNlIjqC0+STAjQ6ASoiLy9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMvbWVzc2FnZXMvc3RyZWFtMAESmwEKElVwZGF0ZUNvbnZlcnNhdGlvbhIiLmNoYXQudjIuVXBkYXRlQ29udmVyc2F0aW9uUmVxdWVzdBojLmNoYXQudjIuVXBkYXRlQ29udmVyc2F0aW9uUmVzcG9uc2UiPILT5JMCNjoBKjIxL19wZC9hcGkvdjIvY2hhdHMvY29udmVyc2F0aW9ucy97Y29udmVyc2F0aW9uX2lkfRKYAQoSRGVsZXRlQ29udmVyc2F0aW9uEiIuY2hhdC52Mi5EZWxldGVDb252ZXJzYXRpb25SZXF1ZXN0GiMuY2hhdC52Mi5EZWxldGVDb252ZXJzYXRpb25SZXNwb25zZSI5gtPkkwIzKjEvX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zL3tjb252ZXJzYXRpb25faWR9EoIBChNMaXN0U3VwcG9ydGVkTW9kZWxzEiMuY2hhdC52Mi5MaXN0U3VwcG9ydGVkTW9kZWxzUmVxdWVzdBokLmNoYXQudjIuTGlzdFN1cHBvcnRlZE1vZGVsc1Jlc3BvbnNlIiCC0+STAhoSGC9fcGQvYXBpL3YyL2NoYXRzL21vZGVsc0J/Cgtjb20uY2hhdC52MkIJQ2hhdFByb3RvUAFaKHBhcGVyZGVidWdnZXIvcGtnL2dlbi9hcGkvY2hhdC92MjtjaGF0djKiAgNDWFiqAgdDaGF0LlYyygIHQ2hhdFxWMuICE0NoYXRcVjJcR1BCTWV0YWRhdGHqAghDaGF0OjpWMmIGcHJvdG8z", [file_google_api_annotations]);
+  fileDesc("ChJjaGF0L3YyL2NoYXQucHJvdG8SB2NoYXQudjIiUAoTTWVzc2FnZVR5cGVUb29sQ2FsbBIMCgRuYW1lGAEgASgJEgwKBGFyZ3MYAiABKAkSDgoGcmVzdWx0GAMgASgJEg0KBWVycm9yGAQgASgJIkEKI01lc3NhZ2VUeXBlVG9vbENhbGxQcmVwYXJlQXJndW1lbnRzEgwKBG5hbWUYASABKAkSDAoEYXJncxgCIAEoCSIkChFNZXNzYWdlVHlwZVN5c3RlbRIPCgdjb250ZW50GAEgASgJImEKFE1lc3NhZ2VUeXBlQXNzaXN0YW50Eg8KB2NvbnRlbnQYASABKAkSEgoKbW9kZWxfc2x1ZxgCIAEoCRIWCglyZWFzb25pbmcYAyABKAlIAIgBAUIMCgpfcmVhc29uaW5nInoKD01lc3NhZ2VUeXBlVXNlchIPCgdjb250ZW50GAEgASgJEhoKDXNlbGVjdGVkX3RleHQYAiABKAlIAIgBARIYCgtzdXJyb3VuZGluZxgHIAEoCUgBiAEBQhAKDl9zZWxlY3RlZF90ZXh0Qg4KDF9zdXJyb3VuZGluZyIpChJNZXNzYWdlVHlwZVVua25vd24SEwoLZGVzY3JpcHRpb24YASABKAki5AIKDk1lc3NhZ2VQYXlsb2FkEiwKBnN5c3RlbRgBIAEoCzIaLmNoYXQudjIuTWVzc2FnZVR5cGVTeXN0ZW1IABIoCgR1c2VyGAIgASgLMhguY2hhdC52Mi5NZXNzYWdlVHlwZVVzZXJIABIyCglhc3Npc3RhbnQYAyABKAsyHS5jaGF0LnYyLk1lc3NhZ2VUeXBlQXNzaXN0YW50SAASUwobdG9vbF9jYWxsX3ByZXBhcmVfYXJndW1lbnRzGAQgASgLMiwuY2hhdC52Mi5NZXNzYWdlVHlwZVRvb2xDYWxsUHJlcGFyZUFyZ3VtZW50c0gAEjEKCXRvb2xfY2FsbBgFIAEoCzIcLmNoYXQudjIuTWVzc2FnZVR5cGVUb29sQ2FsbEgAEi4KB3Vua25vd24YBiABKAsyGy5jaGF0LnYyLk1lc3NhZ2VUeXBlVW5rbm93bkgAQg4KDG1lc3NhZ2VfdHlwZSJaCgdNZXNzYWdlEhIKCm1lc3NhZ2VfaWQYASABKAkSKAoHcGF5bG9hZBgCIAEoCzIXLmNoYXQudjIuTWVzc2FnZVBheWxvYWQSEQoJdGltZXN0YW1wGAMgASgDImEKDENvbnZlcnNhdGlvbhIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRISCgptb2RlbF9zbHVnGAMgASgJEiIKCG1lc3NhZ2VzGAQgAygLMhAuY2hhdC52Mi5NZXNzYWdlIkIKGExpc3RDb252ZXJzYXRpb25zUmVxdWVzdBIXCgpwcm9qZWN0X2lkGAEgASgJSACIAQFCDQoLX3Byb2plY3RfaWQiSQoZTGlzdENvbnZlcnNhdGlvbnNSZXNwb25zZRIsCg1jb252ZXJzYXRpb25zGAEgAygLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iMQoWR2V0Q29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkiRgoXR2V0Q29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iQwoZVXBkYXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkSDQoFdGl0bGUYAiABKAkiSQoaVXBkYXRlQ29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iNAoZRGVsZXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkiHAoaRGVsZXRlQ29udmVyc2F0aW9uUmVzcG9uc2UiggEKDlN1cHBvcnRlZE1vZGVsEgwKBG5hbWUYASABKAkSDAoEc2x1ZxgCIAEoCRIVCg10b3RhbF9jb250ZXh0GAMgASgDEhIKCm1heF9vdXRwdXQYBCABKAMSEwoLaW5wdXRfcHJpY2UYBSABKAMSFAoMb3V0cHV0X3ByaWNlGAYgASgDIhwKGkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0IkYKG0xpc3RTdXBwb3J0ZWRNb2RlbHNSZXNwb25zZRInCgZtb2RlbHMYASADKAsyFy5jaGF0LnYyLlN1cHBvcnRlZE1vZGVsIkMKFFN0cmVhbUluaXRpYWxpemF0aW9uEhcKD2NvbnZlcnNhdGlvbl9pZBgBIAEoCRISCgptb2RlbF9zbHVnGAIgASgJIk8KD1N0cmVhbVBhcnRCZWdpbhISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIjEKDE1lc3NhZ2VDaHVuaxISCgptZXNzYWdlX2lkGAEgASgJEg0KBWRlbHRhGAIgASgJIjMKDlJlYXNvbmluZ0NodW5rEhIKCm1lc3NhZ2VfaWQYASABKAkSDQoFZGVsdGEYAiABKAkiOgoTSW5jb21wbGV0ZUluZGljYXRvchIOCgZyZWFzb24YASABKAkSEwoLcmVzcG9uc2VfaWQYAiABKAkiTQoNU3RyZWFtUGFydEVuZBISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIi0KElN0cmVhbUZpbmFsaXphdGlvbhIXCg9jb252ZXJzYXRpb25faWQYASABKAkiJAoLU3RyZWFtRXJyb3ISFQoNZXJyb3JfbWVzc2FnZRgBIAEoCSLLAgomQ3JlYXRlQ29udmVyc2F0aW9uTWVzc2FnZVN0cmVhbVJlcXVlc3QSEgoKcHJvamVjdF9pZBgBIAEoCRIcCg9jb252ZXJzYXRpb25faWQYAiABKAlIAIgBARISCgptb2RlbF9zbHVnGAMgASgJEhQKDHVzZXJfbWVzc2FnZRgEIAEoCRIfChJ1c2VyX3NlbGVjdGVkX3RleHQYBSABKAlIAYgBARI5ChFjb252ZXJzYXRpb25fdHlwZRgGIAEoDjIZLmNoYXQudjIuQ29udmVyc2F0aW9uVHlwZUgCiAEBEhgKC3N1cnJvdW5kaW5nGAggASgJSAOIAQFCEgoQX2NvbnZlcnNhdGlvbl9pZEIVChNfdXNlcl9zZWxlY3RlZF90ZXh0QhQKEl9jb252ZXJzYXRpb25fdHlwZUIOCgxfc3Vycm91bmRpbmci8wMKJ0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXNwb25zZRI+ChVzdHJlYW1faW5pdGlhbGl6YXRpb24YASABKAsyHS5jaGF0LnYyLlN0cmVhbUluaXRpYWxpemF0aW9uSAASNQoRc3RyZWFtX3BhcnRfYmVnaW4YAiABKAsyGC5jaGF0LnYyLlN0cmVhbVBhcnRCZWdpbkgAEi4KDW1lc3NhZ2VfY2h1bmsYAyABKAsyFS5jaGF0LnYyLk1lc3NhZ2VDaHVua0gAEjwKFGluY29tcGxldGVfaW5kaWNhdG9yGAQgASgLMhwuY2hhdC52Mi5JbmNvbXBsZXRlSW5kaWNhdG9ySAASMQoPc3RyZWFtX3BhcnRfZW5kGAUgASgLMhYuY2hhdC52Mi5TdHJlYW1QYXJ0RW5kSAASOgoTc3RyZWFtX2ZpbmFsaXphdGlvbhgGIAEoCzIbLmNoYXQudjIuU3RyZWFtRmluYWxpemF0aW9uSAASLAoMc3RyZWFtX2Vycm9yGAcgASgLMhQuY2hhdC52Mi5TdHJlYW1FcnJvckgAEjIKD3JlYXNvbmluZ19jaHVuaxgIIAEoCzIXLmNoYXQudjIuUmVhc29uaW5nQ2h1bmtIAEISChByZXNwb25zZV9wYXlsb2FkKlIKEENvbnZlcnNhdGlvblR5cGUSIQodQ09OVkVSU0FUSU9OX1RZUEVfVU5TUEVDSUZJRUQQABIbChdDT05WRVJTQVRJT05fVFlQRV9ERUJVRxABMqgHCgtDaGF0U2VydmljZRKDAQoRTGlzdENvbnZlcnNhdGlvbnMSIS5jaGF0LnYyLkxpc3RDb252ZXJzYXRpb25zUmVxdWVzdBoiLmNoYXQudjIuTGlzdENvbnZlcnNhdGlvbnNSZXNwb25zZSIngtPkkwIhEh8vX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zEo8BCg9HZXRDb252ZXJzYXRpb24SHy5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlcXVlc3QaIC5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMSMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SwgEKH0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW0SLy5jaGF0LnYyLkNyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXF1ZXN0GjAuY2hhdC52Mi5DcmVhdGVDb252ZXJzYXRpb25NZXNzYWdlU3RyZWFtUmVzcG9uc2UiOoLT5JMCNDoBKiIvL19wZC9hcGkvdjIvY2hhdHMvY29udmVyc2F0aW9ucy9tZXNzYWdlcy9zdHJlYW0wARKbAQoSVXBkYXRlQ29udmVyc2F0aW9uEiIuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXF1ZXN0GiMuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXNwb25zZSI8gtPkkwI2OgEqMjEvX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zL3tjb252ZXJzYXRpb25faWR9EpgBChJEZWxldGVDb252ZXJzYXRpb24SIi5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlcXVlc3QaIy5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMqMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SggEKE0xpc3RTdXBwb3J0ZWRNb2RlbHMSIy5jaGF0LnYyLkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0GiQuY2hhdC52Mi5MaXN0U3VwcG9ydGVkTW9kZWxzUmVzcG9uc2UiIILT5JMCGhIYL19wZC9hcGkvdjIvY2hhdHMvbW9kZWxzQn8KC2NvbS5jaGF0LnYyQglDaGF0UHJvdG9QAVoocGFwZXJkZWJ1Z2dlci9wa2cvZ2VuL2FwaS9jaGF0L3YyO2NoYXR2MqICA0NYWKoCB0NoYXQuVjLKAgdDaGF0XFYy4gITQ2hhdFxWMlxHUEJNZXRhZGF0YeoCCENoYXQ6OlYyYgZwcm90bzM", [file_google_api_annotations]);
 
 /**
  * @generated from message chat.v2.MessageTypeToolCall
@@ -105,6 +105,11 @@ export type MessageTypeAssistant = Message$1<"chat.v2.MessageTypeAssistant"> & {
    * @generated from field: string model_slug = 2;
    */
   modelSlug: string;
+
+  /**
+   * @generated from field: optional string reasoning = 3;
+   */
+  reasoning?: string;
 };
 
 /**
@@ -572,6 +577,32 @@ export type MessageChunk = Message$1<"chat.v2.MessageChunk"> & {
 export const MessageChunkSchema: GenMessage<MessageChunk> = /*@__PURE__*/
   messageDesc(file_chat_v2_chat, 22);
 
+/**
+ * @generated from message chat.v2.ReasoningChunk
+ */
+export type ReasoningChunk = Message$1<"chat.v2.ReasoningChunk"> & {
+  /**
+   * The id of the message that this chunk belongs to
+   *
+   * @generated from field: string message_id = 1;
+   */
+  messageId: string;
+
+  /**
+   * The small piece of text
+   *
+   * @generated from field: string delta = 2;
+   */
+  delta: string;
+};
+
+/**
+ * Describes the message chat.v2.ReasoningChunk.
+ * Use `create(ReasoningChunkSchema)` to create a new message.
+ */
+export const ReasoningChunkSchema: GenMessage<ReasoningChunk> = /*@__PURE__*/
+  messageDesc(file_chat_v2_chat, 23);
+
 /**
  * @generated from message chat.v2.IncompleteIndicator
  */
@@ -592,7 +623,7 @@ export type IncompleteIndicator = Message$1<"chat.v2.IncompleteIndicator"> & {
  * Use `create(IncompleteIndicatorSchema)` to create a new message.
  */
 export const IncompleteIndicatorSchema: GenMessage<IncompleteIndicator> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 23);
+  messageDesc(file_chat_v2_chat, 24);
 
 /**
  * @generated from message chat.v2.StreamPartEnd
@@ -614,7 +645,7 @@ export type StreamPartEnd = Message$1<"chat.v2.StreamPartEnd"> & {
  * Use `create(StreamPartEndSchema)` to create a new message.
  */
 export const StreamPartEndSchema: GenMessage<StreamPartEnd> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 24);
+  messageDesc(file_chat_v2_chat, 25);
 
 /**
  * Sent when the current AI response is fully streamed
@@ -638,7 +669,7 @@ export type StreamFinalization = Message$1<"chat.v2.StreamFinalization"> & {
  * Use `create(StreamFinalizationSchema)` to create a new message.
  */
 export const StreamFinalizationSchema: GenMessage<StreamFinalization> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 25);
+  messageDesc(file_chat_v2_chat, 26);
 
 /**
  * @generated from message chat.v2.StreamError
@@ -655,7 +686,7 @@ export type StreamError = Message$1<"chat.v2.StreamError"> & {
  * Use `create(StreamErrorSchema)` to create a new message.
  */
 export const StreamErrorSchema: GenMessage<StreamError> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 26);
+  messageDesc(file_chat_v2_chat, 27);
 
 /**
  * This message should be the same as CreateConversationMessageRequest
@@ -706,7 +737,7 @@ export type CreateConversationMessageStreamRequest = Message$1<"chat.v2.CreateCo
  * Use `create(CreateConversationMessageStreamRequestSchema)` to create a new message.
  */
 export const CreateConversationMessageStreamRequestSchema: GenMessage<CreateConversationMessageStreamRequest> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 27);
+  messageDesc(file_chat_v2_chat, 28);
 
 /**
  * Response for streaming a message within an existing conversation
@@ -759,6 +790,12 @@ export type CreateConversationMessageStreamResponse = Message$1<"chat.v2.CreateC
      */
     value: StreamError;
     case: "streamError";
+  } | {
+    /**
+     * @generated from field: chat.v2.ReasoningChunk reasoning_chunk = 8;
+     */
+    value: ReasoningChunk;
+    case: "reasoningChunk";
   } | { case: undefined; value?: undefined };
 };
 
@@ -767,7 +804,7 @@ export type CreateConversationMessageStreamResponse = Message$1<"chat.v2.CreateC
  * Use `create(CreateConversationMessageStreamResponseSchema)` to create a new message.
  */
 export const CreateConversationMessageStreamResponseSchema: GenMessage<CreateConversationMessageStreamResponse> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 28);
+  messageDesc(file_chat_v2_chat, 29);
 
 /**
  * @generated from enum chat.v2.ConversationType
diff --git a/webapp/_webapp/src/stores/conversation/handlers/converter.ts b/webapp/_webapp/src/stores/conversation/handlers/converter.ts
index 2c6bf2b8..eddb3fa8 100644
--- a/webapp/_webapp/src/stores/conversation/handlers/converter.ts
+++ b/webapp/_webapp/src/stores/conversation/handlers/converter.ts
@@ -7,12 +7,16 @@ import { useConversationStore } from "../conversation-store";
 
 export const convertMessageEntryToMessage = (messageEntry: MessageEntry): Message | undefined => {
   if (messageEntry.assistant) {
+    const assistantPayload: { content: string; reasoning?: string } = {
+      content: messageEntry.assistant.content,
+    };
+    if (messageEntry.assistant.reasoning) {
+      assistantPayload.reasoning = messageEntry.assistant.reasoning;
+    }
     return fromJson(MessageSchema, {
       messageId: messageEntry.messageId,
       payload: {
-        assistant: {
-          content: messageEntry.assistant.content,
-        },
+        assistant: assistantPayload,
       },
     });
   } else if (messageEntry.toolCall) {
diff --git a/webapp/_webapp/src/stores/conversation/handlers/handleReasoningChunk.ts b/webapp/_webapp/src/stores/conversation/handlers/handleReasoningChunk.ts
new file mode 100644
index 00000000..62e08a9f
--- /dev/null
+++ b/webapp/_webapp/src/stores/conversation/handlers/handleReasoningChunk.ts
@@ -0,0 +1,38 @@
+import { logError } from "../../../libs/logger";
+import { ReasoningChunk, MessageTypeAssistant } from "../../../pkg/gen/apiclient/chat/v2/chat_pb";
+import { StreamingMessage } from "../../streaming-message-store";
+import { MessageEntry, MessageEntryStatus } from "../types";
+
+export function handleReasoningChunk(
+  chunk: ReasoningChunk,
+  updateStreamingMessage: (updater: (prev: StreamingMessage) => StreamingMessage) => void,
+) {
+  updateStreamingMessage((prevMessage) => {
+    const updatedParts = prevMessage.parts.map((part: MessageEntry) => {
+      const isTargetPart = part.messageId === chunk.messageId && part.assistant;
+
+      if (!isTargetPart) return part;
+
+      const currentReasoning = part.assistant!.reasoning ?? "";
+      const updatedAssistant: MessageTypeAssistant = {
+        ...part.assistant!,
+        reasoning: currentReasoning + chunk.delta,
+      };
+
+      if (part.status !== MessageEntryStatus.PREPARING) {
+        logError("Reasoning chunk received for non-preparing part, this is a critical error");
+      }
+
+      return {
+        ...part,
+        assistant: updatedAssistant,
+      };
+    });
+
+    return {
+      ...prevMessage,
+      parts: updatedParts,
+      sequence: prevMessage.sequence + 1,
+    };
+  });
+}

From 6e2aa51f5dc7a3d53db2761d001cc18da47d870a Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Thu, 8 Jan 2026 01:00:02 +0800
Subject: [PATCH 03/12] feat: message edit

---
 .../create_conversation_message_stream_v2.go  | 50 +++++++++++++-
 pkg/gen/api/chat/v2/chat.pb.go                | 16 ++++-
 proto/chat/v2/chat.proto                      |  1 +
 .../_webapp/src/components/message-card.tsx   |  5 +-
 .../message-entry-container/assistant.tsx     |  5 +-
 .../message-entry-container/user.tsx          | 68 +++++++++++++++++--
 .../_webapp/src/hooks/useSendMessageStream.ts |  3 +-
 .../src/pkg/gen/apiclient/chat/v2/chat_pb.ts  |  7 +-
 webapp/_webapp/src/views/chat/body/index.tsx  |  1 +
 9 files changed, 141 insertions(+), 15 deletions(-)

diff --git a/internal/api/chat/create_conversation_message_stream_v2.go b/internal/api/chat/create_conversation_message_stream_v2.go
index 2e9f95ba..3c829e8b 100644
--- a/internal/api/chat/create_conversation_message_stream_v2.go
+++ b/internal/api/chat/create_conversation_message_stream_v2.go
@@ -146,6 +146,7 @@ func (s *ChatServerV2) appendConversationMessage(
 	userSelectedText string,
 	surrounding string,
 	conversationType chatv2.ConversationType,
+	parentMessageId string,
 ) (*models.Conversation, error) {
 	objectID, err := bson.ObjectIDFromHex(conversationId)
 	if err != nil {
@@ -157,6 +158,50 @@ func (s *ChatServerV2) appendConversationMessage(
 		return nil, err
 	}
 
+	// Handle branching / edit mode
+	if parentMessageId != "" {
+		if parentMessageId == "root" {
+			// Clear all history, keep only the system message (first element) of OpenaiChatHistoryCompletion
+			conversation.InappChatHistory = []bson.M{}
+			if len(conversation.OpenaiChatHistoryCompletion) > 0 {
+				conversation.OpenaiChatHistoryCompletion = conversation.OpenaiChatHistoryCompletion[:1]
+			} else {
+				// Should not happen, but safe fallback
+				conversation.OpenaiChatHistoryCompletion = []openai.ChatCompletionMessageParamUnion{}
+			}
+		} else {
+			// Find parent message and truncate after it
+			foundIndex := -1
+			for i, msg := range conversation.InappChatHistory {
+				// msg["message_id"] matches parentMessageId
+				// BSON M maps to map[string]interface{}, message_id should be string
+				if id, ok := msg["message_id"].(string); ok && id == parentMessageId {
+					foundIndex = i
+					break
+				}
+			}
+
+			if foundIndex != -1 {
+				// Truncate InappChatHistory to include the parent message
+				conversation.InappChatHistory = conversation.InappChatHistory[:foundIndex+1]
+
+				// Truncate OpenaiChatHistoryCompletion
+				// Map index: Inapp[i] -> Openai[i+1] (because Openai[0] is system)
+				// So we want to keep up to foundIndex + 1 (which corresponds to foundIndex in Inapp)
+				// The slice end is exclusive, so we slice up to (foundIndex + 1) + 1 = foundIndex + 2
+				if len(conversation.OpenaiChatHistoryCompletion) > foundIndex+1 {
+					conversation.OpenaiChatHistoryCompletion = conversation.OpenaiChatHistoryCompletion[:foundIndex+2]
+				}
+			} else {
+				// Parent message not found, maybe ignore or error?
+				// For now, let's log a warning and append (linear behavior fallback) or maybe error is better.
+				// s.logger.Warn("Parent message not found during edit", "parentMessageId", parentMessageId)
+				// Actually, throwing error is safer to avoid confusing state
+				return nil, shared.ErrBadRequest("Parent message not found")
+			}
+		}
+	}
+
 	userMsg, userOaiMsg, err := s.buildUserMessage(ctx, userMessage, userSelectedText, surrounding, conversationType)
 	if err != nil {
 		return nil, err
@@ -178,7 +223,7 @@ func (s *ChatServerV2) appendConversationMessage(
 
 // prepare creates a new conversation if conversationId is "", otherwise appends a message to the conversation
 // conversationType can be switched multiple times within a single conversation
-func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversationId string, userMessage string, userSelectedText string, surrounding string, modelSlug string, conversationType chatv2.ConversationType) (context.Context, *models.Conversation, *models.Settings, error) {
+func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversationId string, userMessage string, userSelectedText string, surrounding string, modelSlug string, conversationType chatv2.ConversationType, parentMessageId string) (context.Context, *models.Conversation, *models.Settings, error) {
 	actor, err := contextutil.GetActor(ctx)
 	if err != nil {
 		return ctx, nil, nil, err
@@ -234,6 +279,7 @@ func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversati
 			userSelectedText,
 			surrounding,
 			conversationType,
+			parentMessageId,
 		)
 	}
 
@@ -265,9 +311,11 @@ func (s *ChatServerV2) CreateConversationMessageStream(
 		req.GetConversationId(),
 		req.GetUserMessage(),
 		req.GetUserSelectedText(),
+
 		req.GetSurrounding(),
 		modelSlug,
 		req.GetConversationType(),
+		req.GetParentMessageId(),
 	)
 	if err != nil {
 		return s.sendStreamError(stream, err)
diff --git a/pkg/gen/api/chat/v2/chat.pb.go b/pkg/gen/api/chat/v2/chat.pb.go
index 3960de9c..e0762dfa 100644
--- a/pkg/gen/api/chat/v2/chat.pb.go
+++ b/pkg/gen/api/chat/v2/chat.pb.go
@@ -1611,6 +1611,7 @@ type CreateConversationMessageStreamRequest struct {
 	UserSelectedText *string                `protobuf:"bytes,5,opt,name=user_selected_text,json=userSelectedText,proto3,oneof" json:"user_selected_text,omitempty"`
 	ConversationType *ConversationType      `protobuf:"varint,6,opt,name=conversation_type,json=conversationType,proto3,enum=chat.v2.ConversationType,oneof" json:"conversation_type,omitempty"`
 	Surrounding      *string                `protobuf:"bytes,8,opt,name=surrounding,proto3,oneof" json:"surrounding,omitempty"`
+	ParentMessageId  *string                `protobuf:"bytes,9,opt,name=parent_message_id,json=parentMessageId,proto3,oneof" json:"parent_message_id,omitempty"`
 	unknownFields    protoimpl.UnknownFields
 	sizeCache        protoimpl.SizeCache
 }
@@ -1694,6 +1695,13 @@ func (x *CreateConversationMessageStreamRequest) GetSurrounding() string {
 	return ""
 }
 
+func (x *CreateConversationMessageStreamRequest) GetParentMessageId() string {
+	if x != nil && x.ParentMessageId != nil {
+		return *x.ParentMessageId
+	}
+	return ""
+}
+
 // Response for streaming a message within an existing conversation
 type CreateConversationMessageStreamResponse struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
@@ -1987,7 +1995,7 @@ const file_chat_v2_chat_proto_rawDesc = "" +
 	"\x12StreamFinalization\x12'\n" +
 	"\x0fconversation_id\x18\x01 \x01(\tR\x0econversationId\"2\n" +
 	"\vStreamError\x12#\n" +
-	"\rerror_message\x18\x01 \x01(\tR\ferrorMessage\"\xaf\x03\n" +
+	"\rerror_message\x18\x01 \x01(\tR\ferrorMessage\"\xf6\x03\n" +
 	"&CreateConversationMessageStreamRequest\x12\x1d\n" +
 	"\n" +
 	"project_id\x18\x01 \x01(\tR\tprojectId\x12,\n" +
@@ -1997,11 +2005,13 @@ const file_chat_v2_chat_proto_rawDesc = "" +
 	"\fuser_message\x18\x04 \x01(\tR\vuserMessage\x121\n" +
 	"\x12user_selected_text\x18\x05 \x01(\tH\x01R\x10userSelectedText\x88\x01\x01\x12K\n" +
 	"\x11conversation_type\x18\x06 \x01(\x0e2\x19.chat.v2.ConversationTypeH\x02R\x10conversationType\x88\x01\x01\x12%\n" +
-	"\vsurrounding\x18\b \x01(\tH\x03R\vsurrounding\x88\x01\x01B\x12\n" +
+	"\vsurrounding\x18\b \x01(\tH\x03R\vsurrounding\x88\x01\x01\x12/\n" +
+	"\x11parent_message_id\x18\t \x01(\tH\x04R\x0fparentMessageId\x88\x01\x01B\x12\n" +
 	"\x10_conversation_idB\x15\n" +
 	"\x13_user_selected_textB\x14\n" +
 	"\x12_conversation_typeB\x0e\n" +
-	"\f_surrounding\"\xfd\x04\n" +
+	"\f_surroundingB\x14\n" +
+	"\x12_parent_message_id\"\xfd\x04\n" +
 	"'CreateConversationMessageStreamResponse\x12T\n" +
 	"\x15stream_initialization\x18\x01 \x01(\v2\x1d.chat.v2.StreamInitializationH\x00R\x14streamInitialization\x12F\n" +
 	"\x11stream_part_begin\x18\x02 \x01(\v2\x18.chat.v2.StreamPartBeginH\x00R\x0fstreamPartBegin\x12<\n" +
diff --git a/proto/chat/v2/chat.proto b/proto/chat/v2/chat.proto
index f44d55ba..13e5988b 100644
--- a/proto/chat/v2/chat.proto
+++ b/proto/chat/v2/chat.proto
@@ -217,6 +217,7 @@ message CreateConversationMessageStreamRequest {
   optional string user_selected_text = 5;
   optional ConversationType conversation_type = 6;
   optional string surrounding = 8;
+  optional string parent_message_id = 9;
 }
 
 // Response for streaming a message within an existing conversation
diff --git a/webapp/_webapp/src/components/message-card.tsx b/webapp/_webapp/src/components/message-card.tsx
index 0f6eff7f..603da9d7 100644
--- a/webapp/_webapp/src/components/message-card.tsx
+++ b/webapp/_webapp/src/components/message-card.tsx
@@ -36,10 +36,11 @@ export const STYLES = {
 interface MessageCardProps {
   messageEntry: MessageEntry;
   prevAttachment?: string;
+  previousMessageId?: string;
   animated?: boolean;
 }
 
-export const MessageCard = memo(({ messageEntry, prevAttachment, animated }: MessageCardProps) => {
+export const MessageCard = memo(({ messageEntry, prevAttachment, previousMessageId, animated }: MessageCardProps) => {
   const returnComponent = () => {
     if (messageEntry.toolCall !== undefined) {
       return (
@@ -86,7 +87,9 @@ export const MessageCard = memo(({ messageEntry, prevAttachment, animated }: Mes
           content={messageEntry.user?.content ?? ""}
           attachment={messageEntry.user?.selectedText ?? ""}
           stale={messageEntry.status === MessageEntryStatus.STALE}
+
           messageId={messageEntry.messageId}
+          previousMessageId={previousMessageId}
         />
       );
     }
diff --git a/webapp/_webapp/src/components/message-entry-container/assistant.tsx b/webapp/_webapp/src/components/message-entry-container/assistant.tsx
index 60a62822..38b876bf 100644
--- a/webapp/_webapp/src/components/message-entry-container/assistant.tsx
+++ b/webapp/_webapp/src/components/message-entry-container/assistant.tsx
@@ -69,7 +69,10 @@ export const AssistantMessageContainer = ({
     );
 
   const reasoningComponent = reasoning && (
-    <div key="reasoning" className="reasoning-container mb-3 animate-in fade-in slide-in-from-top-2 duration-300">
+    <div
+      key="reasoning"
+      className={cn("reasoning-container mb-3", animated && "animate-in fade-in slide-in-from-top-2 duration-300")}
+    >
       <GeneralToolCard functionName="reasoning" message={reasoning} animated={animated} />
     </div>
   );
diff --git a/webapp/_webapp/src/components/message-entry-container/user.tsx b/webapp/_webapp/src/components/message-entry-container/user.tsx
index 99231a04..a5dc5f74 100644
--- a/webapp/_webapp/src/components/message-entry-container/user.tsx
+++ b/webapp/_webapp/src/components/message-entry-container/user.tsx
@@ -5,6 +5,7 @@ import { Icon } from "@iconify/react/dist/iconify.js";
 import googleAnalytics from "../../libs/google-analytics";
 import { getProjectId } from "../../libs/helpers";
 import { useAuthStore } from "../../stores/auth-store";
+import { useSendMessageStream } from "../../hooks/useSendMessageStream";
 // import MarkdownComponent from "../markdown";
 
 export const UserMessageContainer = ({
@@ -12,15 +13,21 @@ export const UserMessageContainer = ({
   attachment,
   stale,
   messageId,
+  previousMessageId,
 }: {
   content: string;
   attachment: string;
   stale: boolean;
   messageId: string;
+  previousMessageId?: string;
 }) => {
   const { user } = useAuthStore();
   const projectId = getProjectId();
   const [copySuccess, setCopySuccess] = useState(false);
+  const { sendMessageStream } = useSendMessageStream();
+  
+  const [isEditing, setIsEditing] = useState(false);
+  const [editContent, setEditContent] = useState(content);
 
   const handleCopy = useCallback(() => {
     if (content) {
@@ -36,6 +43,17 @@ export const UserMessageContainer = ({
     }
   }, [user?.id, projectId, content, messageId]);
 
+  const handleSaveEdit = useCallback(async () => {
+    if (!editContent.trim()) return;
+    
+    // If previousMessageId is undefined, it means this is the first message (root)
+    // We pass "root" to indicate we want to truncate everything before this new message
+    const parentId = previousMessageId ?? "root";
+    
+    await sendMessageStream(editContent, attachment, parentId);
+    setIsEditing(false);
+  }, [editContent, attachment, previousMessageId, sendMessageStream]);
+
   const staleComponent = stale && (
     <div className="message-box-stale-description">
       Connection error. <br /> Please reload this conversation.
@@ -45,19 +63,55 @@ export const UserMessageContainer = ({
     // Align right
     <div className="chat-message-entry">
       <div className="message-box-user-wrapper">
-        <div className="actions actions-left rnd-cancel noselect">
+        <div className="actions actions-left rnd-cancel noselect flex gap-1">
+          <Tooltip content="Edit" placement="bottom" size="sm" delay={1000}>
+             <span onClick={() => {
+                setIsEditing(true);
+                setEditContent(content);
+             }} tabIndex={0} role="button" aria-label="Edit message">
+               <Icon icon="tabler:pencil" className="icon" />
+             </span>
+          </Tooltip>
           <Tooltip content="Copy" placement="bottom" size="sm" delay={1000}>
             <span onClick={handleCopy} tabIndex={0} role="button" aria-label="Copy message">
               <Icon icon={copySuccess ? "tabler:copy-check" : "tabler:copy"} className="icon" />
             </span>
           </Tooltip>
         </div>
-        <div className={cn("message-box-user rnd-cancel", stale && "message-box-stale")}>
-          {/* <MarkdownComponent> */}
-          <div className="whitespace-pre-wrap">{content || "Error: No content"}</div>
-          {/* </MarkdownComponent> */}
-          {attachment && <AttachmentPopover attachment={attachment} />}
-          {staleComponent}
+        <div className={cn("message-box-user rnd-cancel", stale && "message-box-stale", isEditing && "!w-full !max-w-none")}>
+          {isEditing ? (
+            <div className="flex flex-col gap-2 w-full min-w-[300px]">
+                <textarea
+                  className="w-full p-2 rounded bg-default-100 text-small text-default-900 outline-none resize-none border border-default-200 focus:border-primary"
+                  value={editContent}
+                  onChange={(e) => setEditContent(e.target.value)}
+                  rows={Math.max(3, editContent.split('\n').length)}
+                  autoFocus
+                />
+                <div className="flex justify-end gap-2">
+                    <button 
+                        className="px-3 py-1 text-tiny rounded bg-default-200 hover:bg-default-300 transition-colors"
+                        onClick={() => setIsEditing(false)}
+                    >
+                        Cancel
+                    </button>
+                    <button 
+                         className="px-3 py-1 text-tiny rounded bg-primary text-white hover:bg-primary-500 transition-colors"
+                         onClick={handleSaveEdit}
+                    >
+                        Send
+                    </button>
+                </div>
+            </div>
+          ) : (
+            <>
+              {/* <MarkdownComponent> */}
+              <div className="whitespace-pre-wrap">{content || "Error: No content"}</div>
+              {/* </MarkdownComponent> */}
+              {attachment && <AttachmentPopover attachment={attachment} />}
+              {staleComponent}
+            </>
+          )}
         </div>
       </div>
     </div>
diff --git a/webapp/_webapp/src/hooks/useSendMessageStream.ts b/webapp/_webapp/src/hooks/useSendMessageStream.ts
index 3c2d1829..9428fc83 100644
--- a/webapp/_webapp/src/hooks/useSendMessageStream.ts
+++ b/webapp/_webapp/src/hooks/useSendMessageStream.ts
@@ -70,7 +70,7 @@ export function useSendMessageStream() {
   const { conversationMode } = useSettingStore();
 
   const sendMessageStream = useCallback(
-    async (message: string, selectedText: string) => {
+    async (message: string, selectedText: string, parentMessageId?: string) => {
       if (!message || !message.trim()) {
         logWarn("No message to send");
         return;
@@ -85,6 +85,7 @@ export function useSendMessageStream() {
         userSelectedText: selectedText,
         surrounding: storeSurroundingText ?? undefined,
         conversationType: conversationMode === "debug" ? ConversationType.DEBUG : ConversationType.UNSPECIFIED,
+        parentMessageId,
       };
 
       resetStreamingMessage(); // ensure no stale message in the streaming messages
diff --git a/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts b/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts
index defe9b64..b7d92f4e 100644
--- a/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts
+++ b/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts
@@ -11,7 +11,7 @@ import type { Message as Message$1 } from "@bufbuild/protobuf";
  * Describes the file chat/v2/chat.proto.
  */
 export const file_chat_v2_chat: GenFile = /*@__PURE__*/
-  fileDesc("ChJjaGF0L3YyL2NoYXQucHJvdG8SB2NoYXQudjIiUAoTTWVzc2FnZVR5cGVUb29sQ2FsbBIMCgRuYW1lGAEgASgJEgwKBGFyZ3MYAiABKAkSDgoGcmVzdWx0GAMgASgJEg0KBWVycm9yGAQgASgJIkEKI01lc3NhZ2VUeXBlVG9vbENhbGxQcmVwYXJlQXJndW1lbnRzEgwKBG5hbWUYASABKAkSDAoEYXJncxgCIAEoCSIkChFNZXNzYWdlVHlwZVN5c3RlbRIPCgdjb250ZW50GAEgASgJImEKFE1lc3NhZ2VUeXBlQXNzaXN0YW50Eg8KB2NvbnRlbnQYASABKAkSEgoKbW9kZWxfc2x1ZxgCIAEoCRIWCglyZWFzb25pbmcYAyABKAlIAIgBAUIMCgpfcmVhc29uaW5nInoKD01lc3NhZ2VUeXBlVXNlchIPCgdjb250ZW50GAEgASgJEhoKDXNlbGVjdGVkX3RleHQYAiABKAlIAIgBARIYCgtzdXJyb3VuZGluZxgHIAEoCUgBiAEBQhAKDl9zZWxlY3RlZF90ZXh0Qg4KDF9zdXJyb3VuZGluZyIpChJNZXNzYWdlVHlwZVVua25vd24SEwoLZGVzY3JpcHRpb24YASABKAki5AIKDk1lc3NhZ2VQYXlsb2FkEiwKBnN5c3RlbRgBIAEoCzIaLmNoYXQudjIuTWVzc2FnZVR5cGVTeXN0ZW1IABIoCgR1c2VyGAIgASgLMhguY2hhdC52Mi5NZXNzYWdlVHlwZVVzZXJIABIyCglhc3Npc3RhbnQYAyABKAsyHS5jaGF0LnYyLk1lc3NhZ2VUeXBlQXNzaXN0YW50SAASUwobdG9vbF9jYWxsX3ByZXBhcmVfYXJndW1lbnRzGAQgASgLMiwuY2hhdC52Mi5NZXNzYWdlVHlwZVRvb2xDYWxsUHJlcGFyZUFyZ3VtZW50c0gAEjEKCXRvb2xfY2FsbBgFIAEoCzIcLmNoYXQudjIuTWVzc2FnZVR5cGVUb29sQ2FsbEgAEi4KB3Vua25vd24YBiABKAsyGy5jaGF0LnYyLk1lc3NhZ2VUeXBlVW5rbm93bkgAQg4KDG1lc3NhZ2VfdHlwZSJaCgdNZXNzYWdlEhIKCm1lc3NhZ2VfaWQYASABKAkSKAoHcGF5bG9hZBgCIAEoCzIXLmNoYXQudjIuTWVzc2FnZVBheWxvYWQSEQoJdGltZXN0YW1wGAMgASgDImEKDENvbnZlcnNhdGlvbhIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRISCgptb2RlbF9zbHVnGAMgASgJEiIKCG1lc3NhZ2VzGAQgAygLMhAuY2hhdC52Mi5NZXNzYWdlIkIKGExpc3RDb252ZXJzYXRpb25zUmVxdWVzdBIXCgpwcm9qZWN0X2lkGAEgASgJSACIAQFCDQoLX3Byb2plY3RfaWQiSQoZTGlzdENvbnZlcnNhdGlvbnNSZXNwb25zZRIsCg1jb252ZXJzYXRpb25zGAEgAygLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iMQoWR2V0Q29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkiRgoXR2V0Q29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iQwoZVXBkYXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkSDQoFdGl0bGUYAiABKAkiSQoaVXBkYXRlQ29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iNAoZRGVsZXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkiHAoaRGVsZXRlQ29udmVyc2F0aW9uUmVzcG9uc2UiggEKDlN1cHBvcnRlZE1vZGVsEgwKBG5hbWUYASABKAkSDAoEc2x1ZxgCIAEoCRIVCg10b3RhbF9jb250ZXh0GAMgASgDEhIKCm1heF9vdXRwdXQYBCABKAMSEwoLaW5wdXRfcHJpY2UYBSABKAMSFAoMb3V0cHV0X3ByaWNlGAYgASgDIhwKGkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0IkYKG0xpc3RTdXBwb3J0ZWRNb2RlbHNSZXNwb25zZRInCgZtb2RlbHMYASADKAsyFy5jaGF0LnYyLlN1cHBvcnRlZE1vZGVsIkMKFFN0cmVhbUluaXRpYWxpemF0aW9uEhcKD2NvbnZlcnNhdGlvbl9pZBgBIAEoCRISCgptb2RlbF9zbHVnGAIgASgJIk8KD1N0cmVhbVBhcnRCZWdpbhISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIjEKDE1lc3NhZ2VDaHVuaxISCgptZXNzYWdlX2lkGAEgASgJEg0KBWRlbHRhGAIgASgJIjMKDlJlYXNvbmluZ0NodW5rEhIKCm1lc3NhZ2VfaWQYASABKAkSDQoFZGVsdGEYAiABKAkiOgoTSW5jb21wbGV0ZUluZGljYXRvchIOCgZyZWFzb24YASABKAkSEwoLcmVzcG9uc2VfaWQYAiABKAkiTQoNU3RyZWFtUGFydEVuZBISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIi0KElN0cmVhbUZpbmFsaXphdGlvbhIXCg9jb252ZXJzYXRpb25faWQYASABKAkiJAoLU3RyZWFtRXJyb3ISFQoNZXJyb3JfbWVzc2FnZRgBIAEoCSLLAgomQ3JlYXRlQ29udmVyc2F0aW9uTWVzc2FnZVN0cmVhbVJlcXVlc3QSEgoKcHJvamVjdF9pZBgBIAEoCRIcCg9jb252ZXJzYXRpb25faWQYAiABKAlIAIgBARISCgptb2RlbF9zbHVnGAMgASgJEhQKDHVzZXJfbWVzc2FnZRgEIAEoCRIfChJ1c2VyX3NlbGVjdGVkX3RleHQYBSABKAlIAYgBARI5ChFjb252ZXJzYXRpb25fdHlwZRgGIAEoDjIZLmNoYXQudjIuQ29udmVyc2F0aW9uVHlwZUgCiAEBEhgKC3N1cnJvdW5kaW5nGAggASgJSAOIAQFCEgoQX2NvbnZlcnNhdGlvbl9pZEIVChNfdXNlcl9zZWxlY3RlZF90ZXh0QhQKEl9jb252ZXJzYXRpb25fdHlwZUIOCgxfc3Vycm91bmRpbmci8wMKJ0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXNwb25zZRI+ChVzdHJlYW1faW5pdGlhbGl6YXRpb24YASABKAsyHS5jaGF0LnYyLlN0cmVhbUluaXRpYWxpemF0aW9uSAASNQoRc3RyZWFtX3BhcnRfYmVnaW4YAiABKAsyGC5jaGF0LnYyLlN0cmVhbVBhcnRCZWdpbkgAEi4KDW1lc3NhZ2VfY2h1bmsYAyABKAsyFS5jaGF0LnYyLk1lc3NhZ2VDaHVua0gAEjwKFGluY29tcGxldGVfaW5kaWNhdG9yGAQgASgLMhwuY2hhdC52Mi5JbmNvbXBsZXRlSW5kaWNhdG9ySAASMQoPc3RyZWFtX3BhcnRfZW5kGAUgASgLMhYuY2hhdC52Mi5TdHJlYW1QYXJ0RW5kSAASOgoTc3RyZWFtX2ZpbmFsaXphdGlvbhgGIAEoCzIbLmNoYXQudjIuU3RyZWFtRmluYWxpemF0aW9uSAASLAoMc3RyZWFtX2Vycm9yGAcgASgLMhQuY2hhdC52Mi5TdHJlYW1FcnJvckgAEjIKD3JlYXNvbmluZ19jaHVuaxgIIAEoCzIXLmNoYXQudjIuUmVhc29uaW5nQ2h1bmtIAEISChByZXNwb25zZV9wYXlsb2FkKlIKEENvbnZlcnNhdGlvblR5cGUSIQodQ09OVkVSU0FUSU9OX1RZUEVfVU5TUEVDSUZJRUQQABIbChdDT05WRVJTQVRJT05fVFlQRV9ERUJVRxABMqgHCgtDaGF0U2VydmljZRKDAQoRTGlzdENvbnZlcnNhdGlvbnMSIS5jaGF0LnYyLkxpc3RDb252ZXJzYXRpb25zUmVxdWVzdBoiLmNoYXQudjIuTGlzdENvbnZlcnNhdGlvbnNSZXNwb25zZSIngtPkkwIhEh8vX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zEo8BCg9HZXRDb252ZXJzYXRpb24SHy5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlcXVlc3QaIC5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMSMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SwgEKH0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW0SLy5jaGF0LnYyLkNyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXF1ZXN0GjAuY2hhdC52Mi5DcmVhdGVDb252ZXJzYXRpb25NZXNzYWdlU3RyZWFtUmVzcG9uc2UiOoLT5JMCNDoBKiIvL19wZC9hcGkvdjIvY2hhdHMvY29udmVyc2F0aW9ucy9tZXNzYWdlcy9zdHJlYW0wARKbAQoSVXBkYXRlQ29udmVyc2F0aW9uEiIuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXF1ZXN0GiMuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXNwb25zZSI8gtPkkwI2OgEqMjEvX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zL3tjb252ZXJzYXRpb25faWR9EpgBChJEZWxldGVDb252ZXJzYXRpb24SIi5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlcXVlc3QaIy5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMqMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SggEKE0xpc3RTdXBwb3J0ZWRNb2RlbHMSIy5jaGF0LnYyLkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0GiQuY2hhdC52Mi5MaXN0U3VwcG9ydGVkTW9kZWxzUmVzcG9uc2UiIILT5JMCGhIYL19wZC9hcGkvdjIvY2hhdHMvbW9kZWxzQn8KC2NvbS5jaGF0LnYyQglDaGF0UHJvdG9QAVoocGFwZXJkZWJ1Z2dlci9wa2cvZ2VuL2FwaS9jaGF0L3YyO2NoYXR2MqICA0NYWKoCB0NoYXQuVjLKAgdDaGF0XFYy4gITQ2hhdFxWMlxHUEJNZXRhZGF0YeoCCENoYXQ6OlYyYgZwcm90bzM", [file_google_api_annotations]);
+  fileDesc("ChJjaGF0L3YyL2NoYXQucHJvdG8SB2NoYXQudjIiUAoTTWVzc2FnZVR5cGVUb29sQ2FsbBIMCgRuYW1lGAEgASgJEgwKBGFyZ3MYAiABKAkSDgoGcmVzdWx0GAMgASgJEg0KBWVycm9yGAQgASgJIkEKI01lc3NhZ2VUeXBlVG9vbENhbGxQcmVwYXJlQXJndW1lbnRzEgwKBG5hbWUYASABKAkSDAoEYXJncxgCIAEoCSIkChFNZXNzYWdlVHlwZVN5c3RlbRIPCgdjb250ZW50GAEgASgJImEKFE1lc3NhZ2VUeXBlQXNzaXN0YW50Eg8KB2NvbnRlbnQYASABKAkSEgoKbW9kZWxfc2x1ZxgCIAEoCRIWCglyZWFzb25pbmcYAyABKAlIAIgBAUIMCgpfcmVhc29uaW5nInoKD01lc3NhZ2VUeXBlVXNlchIPCgdjb250ZW50GAEgASgJEhoKDXNlbGVjdGVkX3RleHQYAiABKAlIAIgBARIYCgtzdXJyb3VuZGluZxgHIAEoCUgBiAEBQhAKDl9zZWxlY3RlZF90ZXh0Qg4KDF9zdXJyb3VuZGluZyIpChJNZXNzYWdlVHlwZVVua25vd24SEwoLZGVzY3JpcHRpb24YASABKAki5AIKDk1lc3NhZ2VQYXlsb2FkEiwKBnN5c3RlbRgBIAEoCzIaLmNoYXQudjIuTWVzc2FnZVR5cGVTeXN0ZW1IABIoCgR1c2VyGAIgASgLMhguY2hhdC52Mi5NZXNzYWdlVHlwZVVzZXJIABIyCglhc3Npc3RhbnQYAyABKAsyHS5jaGF0LnYyLk1lc3NhZ2VUeXBlQXNzaXN0YW50SAASUwobdG9vbF9jYWxsX3ByZXBhcmVfYXJndW1lbnRzGAQgASgLMiwuY2hhdC52Mi5NZXNzYWdlVHlwZVRvb2xDYWxsUHJlcGFyZUFyZ3VtZW50c0gAEjEKCXRvb2xfY2FsbBgFIAEoCzIcLmNoYXQudjIuTWVzc2FnZVR5cGVUb29sQ2FsbEgAEi4KB3Vua25vd24YBiABKAsyGy5jaGF0LnYyLk1lc3NhZ2VUeXBlVW5rbm93bkgAQg4KDG1lc3NhZ2VfdHlwZSJaCgdNZXNzYWdlEhIKCm1lc3NhZ2VfaWQYASABKAkSKAoHcGF5bG9hZBgCIAEoCzIXLmNoYXQudjIuTWVzc2FnZVBheWxvYWQSEQoJdGltZXN0YW1wGAMgASgDImEKDENvbnZlcnNhdGlvbhIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRISCgptb2RlbF9zbHVnGAMgASgJEiIKCG1lc3NhZ2VzGAQgAygLMhAuY2hhdC52Mi5NZXNzYWdlIkIKGExpc3RDb252ZXJzYXRpb25zUmVxdWVzdBIXCgpwcm9qZWN0X2lkGAEgASgJSACIAQFCDQoLX3Byb2plY3RfaWQiSQoZTGlzdENvbnZlcnNhdGlvbnNSZXNwb25zZRIsCg1jb252ZXJzYXRpb25zGAEgAygLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iMQoWR2V0Q29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkiRgoXR2V0Q29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iQwoZVXBkYXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkSDQoFdGl0bGUYAiABKAkiSQoaVXBkYXRlQ29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iNAoZRGVsZXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkiHAoaRGVsZXRlQ29udmVyc2F0aW9uUmVzcG9uc2UiggEKDlN1cHBvcnRlZE1vZGVsEgwKBG5hbWUYASABKAkSDAoEc2x1ZxgCIAEoCRIVCg10b3RhbF9jb250ZXh0GAMgASgDEhIKCm1heF9vdXRwdXQYBCABKAMSEwoLaW5wdXRfcHJpY2UYBSABKAMSFAoMb3V0cHV0X3ByaWNlGAYgASgDIhwKGkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0IkYKG0xpc3RTdXBwb3J0ZWRNb2RlbHNSZXNwb25zZRInCgZtb2RlbHMYASADKAsyFy5jaGF0LnYyLlN1cHBvcnRlZE1vZGVsIkMKFFN0cmVhbUluaXRpYWxpemF0aW9uEhcKD2NvbnZlcnNhdGlvbl9pZBgBIAEoCRISCgptb2RlbF9zbHVnGAIgASgJIk8KD1N0cmVhbVBhcnRCZWdpbhISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIjEKDE1lc3NhZ2VDaHVuaxISCgptZXNzYWdlX2lkGAEgASgJEg0KBWRlbHRhGAIgASgJIjMKDlJlYXNvbmluZ0NodW5rEhIKCm1lc3NhZ2VfaWQYASABKAkSDQoFZGVsdGEYAiABKAkiOgoTSW5jb21wbGV0ZUluZGljYXRvchIOCgZyZWFzb24YASABKAkSEwoLcmVzcG9uc2VfaWQYAiABKAkiTQoNU3RyZWFtUGFydEVuZBISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIi0KElN0cmVhbUZpbmFsaXphdGlvbhIXCg9jb252ZXJzYXRpb25faWQYASABKAkiJAoLU3RyZWFtRXJyb3ISFQoNZXJyb3JfbWVzc2FnZRgBIAEoCSKBAwomQ3JlYXRlQ29udmVyc2F0aW9uTWVzc2FnZVN0cmVhbVJlcXVlc3QSEgoKcHJvamVjdF9pZBgBIAEoCRIcCg9jb252ZXJzYXRpb25faWQYAiABKAlIAIgBARISCgptb2RlbF9zbHVnGAMgASgJEhQKDHVzZXJfbWVzc2FnZRgEIAEoCRIfChJ1c2VyX3NlbGVjdGVkX3RleHQYBSABKAlIAYgBARI5ChFjb252ZXJzYXRpb25fdHlwZRgGIAEoDjIZLmNoYXQudjIuQ29udmVyc2F0aW9uVHlwZUgCiAEBEhgKC3N1cnJvdW5kaW5nGAggASgJSAOIAQESHgoRcGFyZW50X21lc3NhZ2VfaWQYCSABKAlIBIgBAUISChBfY29udmVyc2F0aW9uX2lkQhUKE191c2VyX3NlbGVjdGVkX3RleHRCFAoSX2NvbnZlcnNhdGlvbl90eXBlQg4KDF9zdXJyb3VuZGluZ0IUChJfcGFyZW50X21lc3NhZ2VfaWQi8wMKJ0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXNwb25zZRI+ChVzdHJlYW1faW5pdGlhbGl6YXRpb24YASABKAsyHS5jaGF0LnYyLlN0cmVhbUluaXRpYWxpemF0aW9uSAASNQoRc3RyZWFtX3BhcnRfYmVnaW4YAiABKAsyGC5jaGF0LnYyLlN0cmVhbVBhcnRCZWdpbkgAEi4KDW1lc3NhZ2VfY2h1bmsYAyABKAsyFS5jaGF0LnYyLk1lc3NhZ2VDaHVua0gAEjwKFGluY29tcGxldGVfaW5kaWNhdG9yGAQgASgLMhwuY2hhdC52Mi5JbmNvbXBsZXRlSW5kaWNhdG9ySAASMQoPc3RyZWFtX3BhcnRfZW5kGAUgASgLMhYuY2hhdC52Mi5TdHJlYW1QYXJ0RW5kSAASOgoTc3RyZWFtX2ZpbmFsaXphdGlvbhgGIAEoCzIbLmNoYXQudjIuU3RyZWFtRmluYWxpemF0aW9uSAASLAoMc3RyZWFtX2Vycm9yGAcgASgLMhQuY2hhdC52Mi5TdHJlYW1FcnJvckgAEjIKD3JlYXNvbmluZ19jaHVuaxgIIAEoCzIXLmNoYXQudjIuUmVhc29uaW5nQ2h1bmtIAEISChByZXNwb25zZV9wYXlsb2FkKlIKEENvbnZlcnNhdGlvblR5cGUSIQodQ09OVkVSU0FUSU9OX1RZUEVfVU5TUEVDSUZJRUQQABIbChdDT05WRVJTQVRJT05fVFlQRV9ERUJVRxABMqgHCgtDaGF0U2VydmljZRKDAQoRTGlzdENvbnZlcnNhdGlvbnMSIS5jaGF0LnYyLkxpc3RDb252ZXJzYXRpb25zUmVxdWVzdBoiLmNoYXQudjIuTGlzdENvbnZlcnNhdGlvbnNSZXNwb25zZSIngtPkkwIhEh8vX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zEo8BCg9HZXRDb252ZXJzYXRpb24SHy5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlcXVlc3QaIC5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMSMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SwgEKH0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW0SLy5jaGF0LnYyLkNyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXF1ZXN0GjAuY2hhdC52Mi5DcmVhdGVDb252ZXJzYXRpb25NZXNzYWdlU3RyZWFtUmVzcG9uc2UiOoLT5JMCNDoBKiIvL19wZC9hcGkvdjIvY2hhdHMvY29udmVyc2F0aW9ucy9tZXNzYWdlcy9zdHJlYW0wARKbAQoSVXBkYXRlQ29udmVyc2F0aW9uEiIuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXF1ZXN0GiMuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXNwb25zZSI8gtPkkwI2OgEqMjEvX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zL3tjb252ZXJzYXRpb25faWR9EpgBChJEZWxldGVDb252ZXJzYXRpb24SIi5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlcXVlc3QaIy5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMqMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SggEKE0xpc3RTdXBwb3J0ZWRNb2RlbHMSIy5jaGF0LnYyLkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0GiQuY2hhdC52Mi5MaXN0U3VwcG9ydGVkTW9kZWxzUmVzcG9uc2UiIILT5JMCGhIYL19wZC9hcGkvdjIvY2hhdHMvbW9kZWxzQn8KC2NvbS5jaGF0LnYyQglDaGF0UHJvdG9QAVoocGFwZXJkZWJ1Z2dlci9wa2cvZ2VuL2FwaS9jaGF0L3YyO2NoYXR2MqICA0NYWKoCB0NoYXQuVjLKAgdDaGF0XFYy4gITQ2hhdFxWMlxHUEJNZXRhZGF0YeoCCENoYXQ6OlYyYgZwcm90bzM", [file_google_api_annotations]);
 
 /**
  * @generated from message chat.v2.MessageTypeToolCall
@@ -730,6 +730,11 @@ export type CreateConversationMessageStreamRequest = Message$1<"chat.v2.CreateCo
    * @generated from field: optional string surrounding = 8;
    */
   surrounding?: string;
+
+  /**
+   * @generated from field: optional string parent_message_id = 9;
+   */
+  parentMessageId?: string;
 };
 
 /**
diff --git a/webapp/_webapp/src/views/chat/body/index.tsx b/webapp/_webapp/src/views/chat/body/index.tsx
index 7010d737..bebdad23 100644
--- a/webapp/_webapp/src/views/chat/body/index.tsx
+++ b/webapp/_webapp/src/views/chat/body/index.tsx
@@ -83,6 +83,7 @@ export const ChatBody = ({ conversation }: ChatBodyProps) => {
             animated={false}
             messageEntry={messageToMessageEntry(message)}
             prevAttachment={getPrevUserMessage(visibleMessages, index)?.selectedText}
+            previousMessageId={index > 0 ? visibleMessages[index - 1].messageId : undefined}
           />
         </div>
       )),

From 1991102cc0be6aa9ea7a34a0e41581a03a1e715e Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Thu, 8 Jan 2026 11:59:32 +0800
Subject: [PATCH 04/12] fix: branch id

---
 .../create_conversation_message_stream_v2.go  | 128 +++---
 internal/api/chat/get_conversation_v2.go      |   5 +-
 internal/api/mapper/conversation_v2.go        |  59 ++-
 internal/models/conversation.go               | 178 +++++++-
 pkg/gen/api/chat/v2/chat.pb.go                | 382 ++++++++++++------
 pkg/gen/api/chat/v2/chat.pb.gw.go             |  14 +
 proto/chat/v2/chat.proto                      |  13 +
 .../src/components/branch-switcher.tsx        |  94 +++++
 .../src/pkg/gen/apiclient/chat/v2/chat_pb.ts  | 110 +++--
 webapp/_webapp/src/query/api.ts               |   3 +-
 .../_webapp/src/views/chat/header/index.tsx   |   3 +
 11 files changed, 751 insertions(+), 238 deletions(-)
 create mode 100644 webapp/_webapp/src/components/branch-switcher.tsx

diff --git a/internal/api/chat/create_conversation_message_stream_v2.go b/internal/api/chat/create_conversation_message_stream_v2.go
index 3c829e8b..97e6c14c 100644
--- a/internal/api/chat/create_conversation_message_stream_v2.go
+++ b/internal/api/chat/create_conversation_message_stream_v2.go
@@ -137,7 +137,7 @@ func (s *ChatServerV2) createConversation(
 }
 
 // appendConversationMessage appends a message to the conversation and writes it to the database
-// Returns the Conversation object
+// Returns the Conversation object and the active branch
 func (s *ChatServerV2) appendConversationMessage(
 	ctx context.Context,
 	userId bson.ObjectID,
@@ -147,96 +147,77 @@ func (s *ChatServerV2) appendConversationMessage(
 	surrounding string,
 	conversationType chatv2.ConversationType,
 	parentMessageId string,
-) (*models.Conversation, error) {
+) (*models.Conversation, *models.Branch, error) {
 	objectID, err := bson.ObjectIDFromHex(conversationId)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	conversation, err := s.chatServiceV2.GetConversationV2(ctx, userId, objectID)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
+	// Ensure branches are initialized (migrate legacy data if needed)
+	conversation.EnsureBranches()
+
+	var activeBranch *models.Branch
+
 	// Handle branching / edit mode
 	if parentMessageId != "" {
-		if parentMessageId == "root" {
-			// Clear all history, keep only the system message (first element) of OpenaiChatHistoryCompletion
-			conversation.InappChatHistory = []bson.M{}
-			if len(conversation.OpenaiChatHistoryCompletion) > 0 {
-				conversation.OpenaiChatHistoryCompletion = conversation.OpenaiChatHistoryCompletion[:1]
-			} else {
-				// Should not happen, but safe fallback
-				conversation.OpenaiChatHistoryCompletion = []openai.ChatCompletionMessageParamUnion{}
-			}
-		} else {
-			// Find parent message and truncate after it
-			foundIndex := -1
-			for i, msg := range conversation.InappChatHistory {
-				// msg["message_id"] matches parentMessageId
-				// BSON M maps to map[string]interface{}, message_id should be string
-				if id, ok := msg["message_id"].(string); ok && id == parentMessageId {
-					foundIndex = i
-					break
-				}
-			}
-
-			if foundIndex != -1 {
-				// Truncate InappChatHistory to include the parent message
-				conversation.InappChatHistory = conversation.InappChatHistory[:foundIndex+1]
-
-				// Truncate OpenaiChatHistoryCompletion
-				// Map index: Inapp[i] -> Openai[i+1] (because Openai[0] is system)
-				// So we want to keep up to foundIndex + 1 (which corresponds to foundIndex in Inapp)
-				// The slice end is exclusive, so we slice up to (foundIndex + 1) + 1 = foundIndex + 2
-				if len(conversation.OpenaiChatHistoryCompletion) > foundIndex+1 {
-					conversation.OpenaiChatHistoryCompletion = conversation.OpenaiChatHistoryCompletion[:foundIndex+2]
-				}
-			} else {
-				// Parent message not found, maybe ignore or error?
-				// For now, let's log a warning and append (linear behavior fallback) or maybe error is better.
-				// s.logger.Warn("Parent message not found during edit", "parentMessageId", parentMessageId)
-				// Actually, throwing error is safer to avoid confusing state
-				return nil, shared.ErrBadRequest("Parent message not found")
-			}
+		// Create a new branch for the edit
+		activeBranch = conversation.CreateNewBranch("", parentMessageId)
+		if activeBranch == nil {
+			return nil, nil, shared.ErrBadRequest("Failed to create new branch")
+		}
+	} else {
+		// Normal append - use active (latest) branch
+		activeBranch = conversation.GetActiveBranch()
+		if activeBranch == nil {
+			// This shouldn't happen after EnsureBranches, but handle it
+			return nil, nil, shared.ErrBadRequest("No active branch found")
 		}
 	}
 
+	// Now we get the branch, we can append the message to the branch.
 	userMsg, userOaiMsg, err := s.buildUserMessage(ctx, userMessage, userSelectedText, surrounding, conversationType)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	bsonMsg, err := convertToBSONV2(userMsg)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
-	conversation.InappChatHistory = append(conversation.InappChatHistory, bsonMsg)
-	conversation.OpenaiChatHistoryCompletion = append(conversation.OpenaiChatHistoryCompletion, userOaiMsg)
+
+	// Append to the active branch
+	activeBranch.InappChatHistory = append(activeBranch.InappChatHistory, bsonMsg)
+	activeBranch.OpenaiChatHistoryCompletion = append(activeBranch.OpenaiChatHistoryCompletion, userOaiMsg)
 
 	if err := s.chatServiceV2.UpdateConversationV2(conversation); err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
-	return conversation, nil
+	return conversation, activeBranch, nil
 }
 
 // prepare creates a new conversation if conversationId is "", otherwise appends a message to the conversation
 // conversationType can be switched multiple times within a single conversation
-func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversationId string, userMessage string, userSelectedText string, surrounding string, modelSlug string, conversationType chatv2.ConversationType, parentMessageId string) (context.Context, *models.Conversation, *models.Settings, error) {
+// Returns: context, conversation, activeBranch, settings, error
+func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversationId string, userMessage string, userSelectedText string, surrounding string, modelSlug string, conversationType chatv2.ConversationType, parentMessageId string) (context.Context, *models.Conversation, *models.Branch, *models.Settings, error) {
 	actor, err := contextutil.GetActor(ctx)
 	if err != nil {
-		return ctx, nil, nil, err
+		return ctx, nil, nil, nil, err
 	}
 
 	project, err := s.projectService.GetProject(ctx, actor.ID, projectId)
 	if err != nil && err != mongo.ErrNoDocuments {
-		return ctx, nil, nil, err
+		return ctx, nil, nil, nil, err
 	}
 
 	userInstructions, err := s.userService.GetUserInstructions(ctx, actor.ID)
 	if err != nil {
-		return ctx, nil, nil, err
+		return ctx, nil, nil, nil, err
 	}
 
 	var latexFullSource string
@@ -245,18 +226,20 @@ func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversati
 		latexFullSource = "latex_full_source is not available in debug mode"
 	default:
 		if project == nil || project.IsOutOfDate() {
-			return ctx, nil, nil, shared.ErrProjectOutOfDate("project is out of date")
+			return ctx, nil, nil, nil, shared.ErrProjectOutOfDate("project is out of date")
 		}
 
 		latexFullSource, err = project.GetFullContent()
 		if err != nil {
-			return ctx, nil, nil, err
+			return ctx, nil, nil, nil, err
 		}
 	}
 
 	var conversation *models.Conversation
+	var activeBranch *models.Branch
 
 	if conversationId == "" {
+		// Create a new conversation
 		conversation, err = s.createConversation(
 			ctx,
 			actor.ID,
@@ -270,8 +253,15 @@ func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversati
 			modelSlug,
 			conversationType,
 		)
+		if err != nil {
+			return ctx, nil, nil, nil, err
+		}
+		// For new conversations, ensure branches and get the active one
+		conversation.EnsureBranches()
+		activeBranch = conversation.GetActiveBranch()
 	} else {
-		conversation, err = s.appendConversationMessage(
+		// Append to an existing conversation
+		conversation, activeBranch, err = s.appendConversationMessage(
 			ctx,
 			actor.ID,
 			conversationId,
@@ -281,10 +271,9 @@ func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversati
 			conversationType,
 			parentMessageId,
 		)
-	}
-
-	if err != nil {
-		return ctx, nil, nil, err
+		if err != nil {
+			return ctx, nil, nil, nil, err
+		}
 	}
 
 	ctx = contextutil.SetProjectID(ctx, conversation.ProjectID)
@@ -292,10 +281,10 @@ func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversati
 
 	settings, err := s.userService.GetUserSettings(ctx, actor.ID)
 	if err != nil {
-		return ctx, conversation, nil, err
+		return ctx, conversation, activeBranch, nil, err
 	}
 
-	return ctx, conversation, settings, nil
+	return ctx, conversation, activeBranch, settings, nil
 }
 
 func (s *ChatServerV2) CreateConversationMessageStream(
@@ -305,7 +294,7 @@ func (s *ChatServerV2) CreateConversationMessageStream(
 	ctx := stream.Context()
 
 	modelSlug := req.GetModelSlug()
-	ctx, conversation, settings, err := s.prepare(
+	ctx, conversation, activeBranch, settings, err := s.prepare(
 		ctx,
 		req.GetProjectId(),
 		req.GetConversationId(),
@@ -326,12 +315,13 @@ func (s *ChatServerV2) CreateConversationMessageStream(
 		APIKey: settings.OpenAIAPIKey,
 	}
 
-	openaiChatHistory, inappChatHistory, err := s.aiClientV2.ChatCompletionStreamV2(ctx, stream, conversation.ID.Hex(), modelSlug, conversation.OpenaiChatHistoryCompletion, llmProvider)
+	// Use active branch's history for the LLM call
+	openaiChatHistory, inappChatHistory, err := s.aiClientV2.ChatCompletionStreamV2(ctx, stream, conversation.ID.Hex(), modelSlug, activeBranch.OpenaiChatHistoryCompletion, llmProvider)
 	if err != nil {
 		return s.sendStreamError(stream, err)
 	}
 
-	// Append messages to the conversation
+	// Append messages to the active branch
 	bsonMessages := make([]bson.M, len(inappChatHistory))
 	for i := range inappChatHistory {
 		bsonMsg, err := convertToBSONV2(&inappChatHistory[i])
@@ -340,16 +330,16 @@ func (s *ChatServerV2) CreateConversationMessageStream(
 		}
 		bsonMessages[i] = bsonMsg
 	}
-	conversation.InappChatHistory = append(conversation.InappChatHistory, bsonMessages...)
-	conversation.OpenaiChatHistoryCompletion = openaiChatHistory
+	activeBranch.InappChatHistory = append(activeBranch.InappChatHistory, bsonMessages...)
+	activeBranch.OpenaiChatHistoryCompletion = openaiChatHistory
 	if err := s.chatServiceV2.UpdateConversationV2(conversation); err != nil {
 		return s.sendStreamError(stream, err)
 	}
 
 	if conversation.Title == services.DefaultConversationTitle {
 		go func() {
-			protoMessages := make([]*chatv2.Message, len(conversation.InappChatHistory))
-			for i, bsonMsg := range conversation.InappChatHistory {
+			protoMessages := make([]*chatv2.Message, len(activeBranch.InappChatHistory))
+			for i, bsonMsg := range activeBranch.InappChatHistory {
 				protoMessages[i] = mapper.BSONToChatMessageV2(bsonMsg)
 			}
 			title, err := s.aiClientV2.GetConversationTitleV2(ctx, protoMessages, llmProvider)
diff --git a/internal/api/chat/get_conversation_v2.go b/internal/api/chat/get_conversation_v2.go
index 2d69920e..dfa715af 100644
--- a/internal/api/chat/get_conversation_v2.go
+++ b/internal/api/chat/get_conversation_v2.go
@@ -29,7 +29,10 @@ func (s *ChatServerV2) GetConversation(
 		return nil, err
 	}
 
+	// Use specified branch_id if provided, otherwise use active branch
+	branchID := req.GetBranchId()
+
 	return &chatv2.GetConversationResponse{
-		Conversation: mapper.MapModelConversationToProtoV2(conversation),
+		Conversation: mapper.MapModelConversationToProtoV2WithBranch(conversation, branchID),
 	}, nil
 }
diff --git a/internal/api/mapper/conversation_v2.go b/internal/api/mapper/conversation_v2.go
index 23c10fae..1216c6f7 100644
--- a/internal/api/mapper/conversation_v2.go
+++ b/internal/api/mapper/conversation_v2.go
@@ -22,9 +22,45 @@ func BSONToChatMessageV2(msg bson.M) *chatv2.Message {
 	return m
 }
 
+// MapModelConversationToProtoV2 converts a conversation model to proto.
+// Uses the active branch by default, or the specified branchID if provided.
 func MapModelConversationToProtoV2(conversation *models.Conversation) *chatv2.Conversation {
+	return MapModelConversationToProtoV2WithBranch(conversation, "")
+}
+
+// MapModelConversationToProtoV2WithBranch converts a conversation model to proto
+// with explicit branch selection. If branchID is empty, uses the active branch.
+func MapModelConversationToProtoV2WithBranch(conversation *models.Conversation, branchID string) *chatv2.Conversation {
+	// Ensure branches are initialized (migrate legacy data if needed)
+	conversation.EnsureBranches()
+
+	// Determine which branch to use
+	var selectedBranch *models.Branch
+	var currentBranchID string
+	var currentBranchIndex int32
+
+	if branchID != "" {
+		selectedBranch = conversation.GetBranchByID(branchID)
+	}
+	if selectedBranch == nil {
+		selectedBranch = conversation.GetActiveBranch()
+	}
+
+	// Get messages from the selected branch or use legacy fallback
+	var inappHistory []bson.M
+	if selectedBranch != nil {
+		inappHistory = selectedBranch.InappChatHistory
+		currentBranchID = selectedBranch.ID
+		currentBranchIndex = int32(conversation.GetBranchIndex(selectedBranch.ID))
+	} else {
+		// Fallback to legacy fields (should not happen after EnsureBranches)
+		inappHistory = conversation.InappChatHistory
+		currentBranchID = ""
+		currentBranchIndex = 1
+	}
+
 	// Convert BSON messages back to protobuf messages
-	filteredMessages := lo.Map(conversation.InappChatHistory, func(msg bson.M, _ int) *chatv2.Message {
+	filteredMessages := lo.Map(inappHistory, func(msg bson.M, _ int) *chatv2.Message {
 		return BSONToChatMessageV2(msg)
 	})
 
@@ -37,10 +73,23 @@ func MapModelConversationToProtoV2(conversation *models.Conversation) *chatv2.Co
 		modelSlug = models.SlugFromLanguageModel(models.LanguageModel(conversation.LanguageModel))
 	}
 
+	// Build branch info list
+	branches := lo.Map(conversation.Branches, func(b models.Branch, _ int) *chatv2.BranchInfo {
+		return &chatv2.BranchInfo{
+			Id:        b.ID,
+			CreatedAt: int64(b.CreatedAt),
+			UpdatedAt: int64(b.UpdatedAt),
+		}
+	})
+
 	return &chatv2.Conversation{
-		Id:        conversation.ID.Hex(),
-		Title:     conversation.Title,
-		ModelSlug: modelSlug,
-		Messages:  filteredMessages,
+		Id:                 conversation.ID.Hex(),
+		Title:              conversation.Title,
+		ModelSlug:          modelSlug,
+		Messages:           filteredMessages,
+		CurrentBranchId:    currentBranchID,
+		Branches:           branches,
+		CurrentBranchIndex: currentBranchIndex,
+		TotalBranches:      int32(len(conversation.Branches)),
 	}
 }
diff --git a/internal/models/conversation.go b/internal/models/conversation.go
index fdabf859..8c0e688b 100644
--- a/internal/models/conversation.go
+++ b/internal/models/conversation.go
@@ -1,19 +1,37 @@
 package models
 
 import (
+	"time"
+
+	"github.com/google/uuid"
 	"github.com/openai/openai-go/v2/responses"
 	"github.com/openai/openai-go/v3"
 	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
+// Branch represents a single conversation branch created from message edits
+type Branch struct {
+	ID                          string                                   `bson:"id"`
+	CreatedAt                   bson.DateTime                            `bson:"created_at"`
+	UpdatedAt                   bson.DateTime                            `bson:"updated_at"`
+	InappChatHistory            []bson.M                                 `bson:"inapp_chat_history"`
+	OpenaiChatHistoryCompletion []openai.ChatCompletionMessageParamUnion `bson:"openai_chat_history_completion"`
+}
+
 type Conversation struct {
-	BaseModel        `bson:",inline"`
-	UserID           bson.ObjectID `bson:"user_id"`
-	ProjectID        string        `bson:"project_id"`
-	Title            string        `bson:"title"`
-	LanguageModel    LanguageModel `bson:"language_model"`
-	ModelSlug        string        `bson:"model_slug"`
-	InappChatHistory []bson.M      `bson:"inapp_chat_history"` // Store as raw BSON to avoid protobuf decoding issues
+	BaseModel     `bson:",inline"`
+	UserID        bson.ObjectID `bson:"user_id"`
+	ProjectID     string        `bson:"project_id"`
+	Title         string        `bson:"title"`
+	LanguageModel LanguageModel `bson:"language_model"`
+	ModelSlug     string        `bson:"model_slug"`
+
+	// Multiple branches for edit history
+	Branches []Branch `bson:"branches"`
+
+	// Below are legacy fields - kept for backward compatibility with old data
+	// When Branches is empty, use these as fallback (treated as default branch)
+	InappChatHistory []bson.M `bson:"inapp_chat_history"`
 
 	OpenaiChatHistory           responses.ResponseInputParam             `bson:"openai_chat_history"` // The actual chat history sent to GPT
 	OpenaiChatParams            responses.ResponseNewParams              `bson:"openai_chat_params"`  // Conversation parameters, such as temperature, etc.
@@ -24,3 +42,149 @@ type Conversation struct {
 func (c Conversation) CollectionName() string {
 	return "conversations"
 }
+
+// GetActiveBranch returns the most recently updated branch.
+// If no branches exist, returns nil (caller should use legacy fields).
+func (c *Conversation) GetActiveBranch() *Branch {
+	if len(c.Branches) == 0 {
+		return nil
+	}
+
+	var activeBranch *Branch
+	var latestUpdate bson.DateTime
+	for i := range c.Branches {
+		if c.Branches[i].UpdatedAt >= latestUpdate {
+			latestUpdate = c.Branches[i].UpdatedAt
+			activeBranch = &c.Branches[i]
+		}
+	}
+	return activeBranch
+}
+
+// GetBranchByID returns the branch with the given ID, or nil if not found.
+func (c *Conversation) GetBranchByID(branchID string) *Branch {
+	for i := range c.Branches {
+		if c.Branches[i].ID == branchID {
+			return &c.Branches[i]
+		}
+	}
+	return nil
+}
+
+// GetBranchIndex returns the 1-indexed position of the branch with the given ID.
+// Returns 0 if not found. Branches are sorted by CreatedAt.
+func (c *Conversation) GetBranchIndex(branchID string) int {
+	for i := range c.Branches {
+		if c.Branches[i].ID == branchID {
+			return i + 1
+		}
+	}
+	return 0
+}
+
+// CreateNewBranch creates a new branch based on an existing branch,
+// truncated after the specified message ID.
+// If baseBranchID is empty and there are no branches, uses legacy fields.
+// Returns the new branch (already appended to c.Branches).
+func (c *Conversation) CreateNewBranch(baseBranchID string, truncateAfterMsgID string) *Branch {
+	now := bson.NewDateTimeFromTime(time.Now())
+	newBranch := Branch{
+		ID:        uuid.New().String(),
+		CreatedAt: now,
+		UpdatedAt: now,
+	}
+
+	// Get source history
+	var sourceInappHistory []bson.M
+	var sourceOpenaiHistory []openai.ChatCompletionMessageParamUnion
+
+	if baseBranchID != "" {
+		baseBranch := c.GetBranchByID(baseBranchID)
+		if baseBranch != nil {
+			sourceInappHistory = baseBranch.InappChatHistory
+			sourceOpenaiHistory = baseBranch.OpenaiChatHistoryCompletion
+		}
+	}
+
+	// Fallback to legacy fields if no base branch found
+	if sourceInappHistory == nil {
+		if len(c.Branches) > 0 {
+			// Use active branch
+			activeBranch := c.GetActiveBranch()
+			if activeBranch != nil {
+				sourceInappHistory = activeBranch.InappChatHistory
+				sourceOpenaiHistory = activeBranch.OpenaiChatHistoryCompletion
+			}
+		} else {
+			// Use legacy fields
+			sourceInappHistory = c.InappChatHistory
+			sourceOpenaiHistory = c.OpenaiChatHistoryCompletion
+		}
+	}
+
+	// Handle truncation
+	if truncateAfterMsgID == "root" {
+		// Clear all history, keep only system message
+		newBranch.InappChatHistory = []bson.M{}
+		if len(sourceOpenaiHistory) > 0 {
+			newBranch.OpenaiChatHistoryCompletion = sourceOpenaiHistory[:1]
+		} else {
+			newBranch.OpenaiChatHistoryCompletion = []openai.ChatCompletionMessageParamUnion{}
+		}
+	} else if truncateAfterMsgID != "" {
+		// Find parent message and truncate after it
+		foundIndex := -1
+		for i, msg := range sourceInappHistory {
+			if id, ok := msg["messageId"].(string); ok && id == truncateAfterMsgID {
+				foundIndex = i
+				break
+			}
+		}
+
+		if foundIndex != -1 {
+			// Copy up to and including the parent message
+			newBranch.InappChatHistory = make([]bson.M, foundIndex+1)
+			copy(newBranch.InappChatHistory, sourceInappHistory[:foundIndex+1])
+
+			// Map index: Inapp[i] -> Openai[i+1] (because Openai[0] is system)
+			if len(sourceOpenaiHistory) > foundIndex+1 {
+				newBranch.OpenaiChatHistoryCompletion = make([]openai.ChatCompletionMessageParamUnion, foundIndex+2)
+				copy(newBranch.OpenaiChatHistoryCompletion, sourceOpenaiHistory[:foundIndex+2])
+			} else {
+				newBranch.OpenaiChatHistoryCompletion = make([]openai.ChatCompletionMessageParamUnion, len(sourceOpenaiHistory))
+				copy(newBranch.OpenaiChatHistoryCompletion, sourceOpenaiHistory)
+			}
+		} else {
+			// Parent not found, copy entire history
+			newBranch.InappChatHistory = make([]bson.M, len(sourceInappHistory))
+			copy(newBranch.InappChatHistory, sourceInappHistory)
+			newBranch.OpenaiChatHistoryCompletion = make([]openai.ChatCompletionMessageParamUnion, len(sourceOpenaiHistory))
+			copy(newBranch.OpenaiChatHistoryCompletion, sourceOpenaiHistory)
+		}
+	} else {
+		// No truncation, copy entire history
+		newBranch.InappChatHistory = make([]bson.M, len(sourceInappHistory))
+		copy(newBranch.InappChatHistory, sourceInappHistory)
+		newBranch.OpenaiChatHistoryCompletion = make([]openai.ChatCompletionMessageParamUnion, len(sourceOpenaiHistory))
+		copy(newBranch.OpenaiChatHistoryCompletion, sourceOpenaiHistory)
+	}
+
+	c.Branches = append(c.Branches, newBranch)
+	return &c.Branches[len(c.Branches)-1]
+}
+
+// EnsureBranches migrates legacy data to branch structure if needed.
+// Call this when loading a conversation that might have old data format.
+func (c *Conversation) EnsureBranches() {
+	if len(c.Branches) == 0 && len(c.InappChatHistory) > 0 {
+		// Migrate legacy data to first branch
+		now := bson.NewDateTimeFromTime(time.Now())
+		c.Branches = []Branch{{
+			ID:                          uuid.New().String(),
+			CreatedAt:                   c.CreatedAt,
+			UpdatedAt:                   now,
+			InappChatHistory:            c.InappChatHistory,
+			OpenaiChatHistoryCompletion: c.OpenaiChatHistoryCompletion,
+		}}
+	}
+}
diff --git a/pkg/gen/api/chat/v2/chat.pb.go b/pkg/gen/api/chat/v2/chat.pb.go
index e0762dfa..95ec11f4 100644
--- a/pkg/gen/api/chat/v2/chat.pb.go
+++ b/pkg/gen/api/chat/v2/chat.pb.go
@@ -602,20 +602,85 @@ func (x *Message) GetTimestamp() int64 {
 	return 0
 }
 
+type BranchInfo struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	CreatedAt     int64                  `protobuf:"varint,2,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	UpdatedAt     int64                  `protobuf:"varint,3,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *BranchInfo) Reset() {
+	*x = BranchInfo{}
+	mi := &file_chat_v2_chat_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *BranchInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BranchInfo) ProtoMessage() {}
+
+func (x *BranchInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_chat_v2_chat_proto_msgTypes[8]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BranchInfo.ProtoReflect.Descriptor instead.
+func (*BranchInfo) Descriptor() ([]byte, []int) {
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *BranchInfo) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *BranchInfo) GetCreatedAt() int64 {
+	if x != nil {
+		return x.CreatedAt
+	}
+	return 0
+}
+
+func (x *BranchInfo) GetUpdatedAt() int64 {
+	if x != nil {
+		return x.UpdatedAt
+	}
+	return 0
+}
+
 type Conversation struct {
 	state     protoimpl.MessageState `protogen:"open.v1"`
 	Id        string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	Title     string                 `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
 	ModelSlug string                 `protobuf:"bytes,3,opt,name=model_slug,json=modelSlug,proto3" json:"model_slug,omitempty"`
 	// If list conversations, then messages length is 0.
-	Messages      []*Message `protobuf:"bytes,4,rep,name=messages,proto3" json:"messages,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
+	Messages []*Message `protobuf:"bytes,4,rep,name=messages,proto3" json:"messages,omitempty"`
+	// Branch information
+	CurrentBranchId    string        `protobuf:"bytes,5,opt,name=current_branch_id,json=currentBranchId,proto3" json:"current_branch_id,omitempty"`           // ID of the branch being viewed
+	Branches           []*BranchInfo `protobuf:"bytes,6,rep,name=branches,proto3" json:"branches,omitempty"`                                                  // All available branches
+	CurrentBranchIndex int32         `protobuf:"varint,7,opt,name=current_branch_index,json=currentBranchIndex,proto3" json:"current_branch_index,omitempty"` // 1-indexed position for UI
+	TotalBranches      int32         `protobuf:"varint,8,opt,name=total_branches,json=totalBranches,proto3" json:"total_branches,omitempty"`                  // Total number of branches
+	unknownFields      protoimpl.UnknownFields
+	sizeCache          protoimpl.SizeCache
 }
 
 func (x *Conversation) Reset() {
 	*x = Conversation{}
-	mi := &file_chat_v2_chat_proto_msgTypes[8]
+	mi := &file_chat_v2_chat_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -627,7 +692,7 @@ func (x *Conversation) String() string {
 func (*Conversation) ProtoMessage() {}
 
 func (x *Conversation) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[8]
+	mi := &file_chat_v2_chat_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -640,7 +705,7 @@ func (x *Conversation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Conversation.ProtoReflect.Descriptor instead.
 func (*Conversation) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{8}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *Conversation) GetId() string {
@@ -671,6 +736,34 @@ func (x *Conversation) GetMessages() []*Message {
 	return nil
 }
 
+func (x *Conversation) GetCurrentBranchId() string {
+	if x != nil {
+		return x.CurrentBranchId
+	}
+	return ""
+}
+
+func (x *Conversation) GetBranches() []*BranchInfo {
+	if x != nil {
+		return x.Branches
+	}
+	return nil
+}
+
+func (x *Conversation) GetCurrentBranchIndex() int32 {
+	if x != nil {
+		return x.CurrentBranchIndex
+	}
+	return 0
+}
+
+func (x *Conversation) GetTotalBranches() int32 {
+	if x != nil {
+		return x.TotalBranches
+	}
+	return 0
+}
+
 type ListConversationsRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	ProjectId     *string                `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3,oneof" json:"project_id,omitempty"`
@@ -680,7 +773,7 @@ type ListConversationsRequest struct {
 
 func (x *ListConversationsRequest) Reset() {
 	*x = ListConversationsRequest{}
-	mi := &file_chat_v2_chat_proto_msgTypes[9]
+	mi := &file_chat_v2_chat_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -692,7 +785,7 @@ func (x *ListConversationsRequest) String() string {
 func (*ListConversationsRequest) ProtoMessage() {}
 
 func (x *ListConversationsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[9]
+	mi := &file_chat_v2_chat_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -705,7 +798,7 @@ func (x *ListConversationsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListConversationsRequest.ProtoReflect.Descriptor instead.
 func (*ListConversationsRequest) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{9}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *ListConversationsRequest) GetProjectId() string {
@@ -725,7 +818,7 @@ type ListConversationsResponse struct {
 
 func (x *ListConversationsResponse) Reset() {
 	*x = ListConversationsResponse{}
-	mi := &file_chat_v2_chat_proto_msgTypes[10]
+	mi := &file_chat_v2_chat_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -737,7 +830,7 @@ func (x *ListConversationsResponse) String() string {
 func (*ListConversationsResponse) ProtoMessage() {}
 
 func (x *ListConversationsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[10]
+	mi := &file_chat_v2_chat_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -750,7 +843,7 @@ func (x *ListConversationsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListConversationsResponse.ProtoReflect.Descriptor instead.
 func (*ListConversationsResponse) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{10}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *ListConversationsResponse) GetConversations() []*Conversation {
@@ -763,13 +856,14 @@ func (x *ListConversationsResponse) GetConversations() []*Conversation {
 type GetConversationRequest struct {
 	state          protoimpl.MessageState `protogen:"open.v1"`
 	ConversationId string                 `protobuf:"bytes,1,opt,name=conversation_id,json=conversationId,proto3" json:"conversation_id,omitempty"`
+	BranchId       *string                `protobuf:"bytes,2,opt,name=branch_id,json=branchId,proto3,oneof" json:"branch_id,omitempty"` // Optional: specific branch to view
 	unknownFields  protoimpl.UnknownFields
 	sizeCache      protoimpl.SizeCache
 }
 
 func (x *GetConversationRequest) Reset() {
 	*x = GetConversationRequest{}
-	mi := &file_chat_v2_chat_proto_msgTypes[11]
+	mi := &file_chat_v2_chat_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -781,7 +875,7 @@ func (x *GetConversationRequest) String() string {
 func (*GetConversationRequest) ProtoMessage() {}
 
 func (x *GetConversationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[11]
+	mi := &file_chat_v2_chat_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -794,7 +888,7 @@ func (x *GetConversationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetConversationRequest.ProtoReflect.Descriptor instead.
 func (*GetConversationRequest) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{11}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *GetConversationRequest) GetConversationId() string {
@@ -804,6 +898,13 @@ func (x *GetConversationRequest) GetConversationId() string {
 	return ""
 }
 
+func (x *GetConversationRequest) GetBranchId() string {
+	if x != nil && x.BranchId != nil {
+		return *x.BranchId
+	}
+	return ""
+}
+
 type GetConversationResponse struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Conversation  *Conversation          `protobuf:"bytes,1,opt,name=conversation,proto3" json:"conversation,omitempty"`
@@ -813,7 +914,7 @@ type GetConversationResponse struct {
 
 func (x *GetConversationResponse) Reset() {
 	*x = GetConversationResponse{}
-	mi := &file_chat_v2_chat_proto_msgTypes[12]
+	mi := &file_chat_v2_chat_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -825,7 +926,7 @@ func (x *GetConversationResponse) String() string {
 func (*GetConversationResponse) ProtoMessage() {}
 
 func (x *GetConversationResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[12]
+	mi := &file_chat_v2_chat_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -838,7 +939,7 @@ func (x *GetConversationResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetConversationResponse.ProtoReflect.Descriptor instead.
 func (*GetConversationResponse) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{12}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *GetConversationResponse) GetConversation() *Conversation {
@@ -858,7 +959,7 @@ type UpdateConversationRequest struct {
 
 func (x *UpdateConversationRequest) Reset() {
 	*x = UpdateConversationRequest{}
-	mi := &file_chat_v2_chat_proto_msgTypes[13]
+	mi := &file_chat_v2_chat_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -870,7 +971,7 @@ func (x *UpdateConversationRequest) String() string {
 func (*UpdateConversationRequest) ProtoMessage() {}
 
 func (x *UpdateConversationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[13]
+	mi := &file_chat_v2_chat_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -883,7 +984,7 @@ func (x *UpdateConversationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateConversationRequest.ProtoReflect.Descriptor instead.
 func (*UpdateConversationRequest) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{13}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *UpdateConversationRequest) GetConversationId() string {
@@ -909,7 +1010,7 @@ type UpdateConversationResponse struct {
 
 func (x *UpdateConversationResponse) Reset() {
 	*x = UpdateConversationResponse{}
-	mi := &file_chat_v2_chat_proto_msgTypes[14]
+	mi := &file_chat_v2_chat_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -921,7 +1022,7 @@ func (x *UpdateConversationResponse) String() string {
 func (*UpdateConversationResponse) ProtoMessage() {}
 
 func (x *UpdateConversationResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[14]
+	mi := &file_chat_v2_chat_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -934,7 +1035,7 @@ func (x *UpdateConversationResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateConversationResponse.ProtoReflect.Descriptor instead.
 func (*UpdateConversationResponse) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{14}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *UpdateConversationResponse) GetConversation() *Conversation {
@@ -953,7 +1054,7 @@ type DeleteConversationRequest struct {
 
 func (x *DeleteConversationRequest) Reset() {
 	*x = DeleteConversationRequest{}
-	mi := &file_chat_v2_chat_proto_msgTypes[15]
+	mi := &file_chat_v2_chat_proto_msgTypes[16]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -965,7 +1066,7 @@ func (x *DeleteConversationRequest) String() string {
 func (*DeleteConversationRequest) ProtoMessage() {}
 
 func (x *DeleteConversationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[15]
+	mi := &file_chat_v2_chat_proto_msgTypes[16]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -978,7 +1079,7 @@ func (x *DeleteConversationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteConversationRequest.ProtoReflect.Descriptor instead.
 func (*DeleteConversationRequest) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{15}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *DeleteConversationRequest) GetConversationId() string {
@@ -996,7 +1097,7 @@ type DeleteConversationResponse struct {
 
 func (x *DeleteConversationResponse) Reset() {
 	*x = DeleteConversationResponse{}
-	mi := &file_chat_v2_chat_proto_msgTypes[16]
+	mi := &file_chat_v2_chat_proto_msgTypes[17]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1008,7 +1109,7 @@ func (x *DeleteConversationResponse) String() string {
 func (*DeleteConversationResponse) ProtoMessage() {}
 
 func (x *DeleteConversationResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[16]
+	mi := &file_chat_v2_chat_proto_msgTypes[17]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1021,7 +1122,7 @@ func (x *DeleteConversationResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteConversationResponse.ProtoReflect.Descriptor instead.
 func (*DeleteConversationResponse) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{16}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{17}
 }
 
 type SupportedModel struct {
@@ -1038,7 +1139,7 @@ type SupportedModel struct {
 
 func (x *SupportedModel) Reset() {
 	*x = SupportedModel{}
-	mi := &file_chat_v2_chat_proto_msgTypes[17]
+	mi := &file_chat_v2_chat_proto_msgTypes[18]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1050,7 +1151,7 @@ func (x *SupportedModel) String() string {
 func (*SupportedModel) ProtoMessage() {}
 
 func (x *SupportedModel) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[17]
+	mi := &file_chat_v2_chat_proto_msgTypes[18]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1063,7 +1164,7 @@ func (x *SupportedModel) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SupportedModel.ProtoReflect.Descriptor instead.
 func (*SupportedModel) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{17}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *SupportedModel) GetName() string {
@@ -1116,7 +1217,7 @@ type ListSupportedModelsRequest struct {
 
 func (x *ListSupportedModelsRequest) Reset() {
 	*x = ListSupportedModelsRequest{}
-	mi := &file_chat_v2_chat_proto_msgTypes[18]
+	mi := &file_chat_v2_chat_proto_msgTypes[19]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1128,7 +1229,7 @@ func (x *ListSupportedModelsRequest) String() string {
 func (*ListSupportedModelsRequest) ProtoMessage() {}
 
 func (x *ListSupportedModelsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[18]
+	mi := &file_chat_v2_chat_proto_msgTypes[19]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1141,7 +1242,7 @@ func (x *ListSupportedModelsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListSupportedModelsRequest.ProtoReflect.Descriptor instead.
 func (*ListSupportedModelsRequest) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{18}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{19}
 }
 
 type ListSupportedModelsResponse struct {
@@ -1153,7 +1254,7 @@ type ListSupportedModelsResponse struct {
 
 func (x *ListSupportedModelsResponse) Reset() {
 	*x = ListSupportedModelsResponse{}
-	mi := &file_chat_v2_chat_proto_msgTypes[19]
+	mi := &file_chat_v2_chat_proto_msgTypes[20]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1165,7 +1266,7 @@ func (x *ListSupportedModelsResponse) String() string {
 func (*ListSupportedModelsResponse) ProtoMessage() {}
 
 func (x *ListSupportedModelsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[19]
+	mi := &file_chat_v2_chat_proto_msgTypes[20]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1178,7 +1279,7 @@ func (x *ListSupportedModelsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListSupportedModelsResponse.ProtoReflect.Descriptor instead.
 func (*ListSupportedModelsResponse) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{19}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *ListSupportedModelsResponse) GetModels() []*SupportedModel {
@@ -1199,7 +1300,7 @@ type StreamInitialization struct {
 
 func (x *StreamInitialization) Reset() {
 	*x = StreamInitialization{}
-	mi := &file_chat_v2_chat_proto_msgTypes[20]
+	mi := &file_chat_v2_chat_proto_msgTypes[21]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1211,7 +1312,7 @@ func (x *StreamInitialization) String() string {
 func (*StreamInitialization) ProtoMessage() {}
 
 func (x *StreamInitialization) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[20]
+	mi := &file_chat_v2_chat_proto_msgTypes[21]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1224,7 +1325,7 @@ func (x *StreamInitialization) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamInitialization.ProtoReflect.Descriptor instead.
 func (*StreamInitialization) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{20}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *StreamInitialization) GetConversationId() string {
@@ -1256,7 +1357,7 @@ type StreamPartBegin struct {
 
 func (x *StreamPartBegin) Reset() {
 	*x = StreamPartBegin{}
-	mi := &file_chat_v2_chat_proto_msgTypes[21]
+	mi := &file_chat_v2_chat_proto_msgTypes[22]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1268,7 +1369,7 @@ func (x *StreamPartBegin) String() string {
 func (*StreamPartBegin) ProtoMessage() {}
 
 func (x *StreamPartBegin) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[21]
+	mi := &file_chat_v2_chat_proto_msgTypes[22]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1281,7 +1382,7 @@ func (x *StreamPartBegin) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamPartBegin.ProtoReflect.Descriptor instead.
 func (*StreamPartBegin) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{21}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *StreamPartBegin) GetMessageId() string {
@@ -1311,7 +1412,7 @@ type MessageChunk struct {
 
 func (x *MessageChunk) Reset() {
 	*x = MessageChunk{}
-	mi := &file_chat_v2_chat_proto_msgTypes[22]
+	mi := &file_chat_v2_chat_proto_msgTypes[23]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1323,7 +1424,7 @@ func (x *MessageChunk) String() string {
 func (*MessageChunk) ProtoMessage() {}
 
 func (x *MessageChunk) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[22]
+	mi := &file_chat_v2_chat_proto_msgTypes[23]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1336,7 +1437,7 @@ func (x *MessageChunk) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MessageChunk.ProtoReflect.Descriptor instead.
 func (*MessageChunk) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{22}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *MessageChunk) GetMessageId() string {
@@ -1363,7 +1464,7 @@ type ReasoningChunk struct {
 
 func (x *ReasoningChunk) Reset() {
 	*x = ReasoningChunk{}
-	mi := &file_chat_v2_chat_proto_msgTypes[23]
+	mi := &file_chat_v2_chat_proto_msgTypes[24]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1375,7 +1476,7 @@ func (x *ReasoningChunk) String() string {
 func (*ReasoningChunk) ProtoMessage() {}
 
 func (x *ReasoningChunk) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[23]
+	mi := &file_chat_v2_chat_proto_msgTypes[24]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1388,7 +1489,7 @@ func (x *ReasoningChunk) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReasoningChunk.ProtoReflect.Descriptor instead.
 func (*ReasoningChunk) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{23}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *ReasoningChunk) GetMessageId() string {
@@ -1415,7 +1516,7 @@ type IncompleteIndicator struct {
 
 func (x *IncompleteIndicator) Reset() {
 	*x = IncompleteIndicator{}
-	mi := &file_chat_v2_chat_proto_msgTypes[24]
+	mi := &file_chat_v2_chat_proto_msgTypes[25]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1427,7 +1528,7 @@ func (x *IncompleteIndicator) String() string {
 func (*IncompleteIndicator) ProtoMessage() {}
 
 func (x *IncompleteIndicator) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[24]
+	mi := &file_chat_v2_chat_proto_msgTypes[25]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1440,7 +1541,7 @@ func (x *IncompleteIndicator) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IncompleteIndicator.ProtoReflect.Descriptor instead.
 func (*IncompleteIndicator) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{24}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *IncompleteIndicator) GetReason() string {
@@ -1467,7 +1568,7 @@ type StreamPartEnd struct {
 
 func (x *StreamPartEnd) Reset() {
 	*x = StreamPartEnd{}
-	mi := &file_chat_v2_chat_proto_msgTypes[25]
+	mi := &file_chat_v2_chat_proto_msgTypes[26]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1479,7 +1580,7 @@ func (x *StreamPartEnd) String() string {
 func (*StreamPartEnd) ProtoMessage() {}
 
 func (x *StreamPartEnd) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[25]
+	mi := &file_chat_v2_chat_proto_msgTypes[26]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1492,7 +1593,7 @@ func (x *StreamPartEnd) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamPartEnd.ProtoReflect.Descriptor instead.
 func (*StreamPartEnd) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{25}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *StreamPartEnd) GetMessageId() string {
@@ -1519,7 +1620,7 @@ type StreamFinalization struct {
 
 func (x *StreamFinalization) Reset() {
 	*x = StreamFinalization{}
-	mi := &file_chat_v2_chat_proto_msgTypes[26]
+	mi := &file_chat_v2_chat_proto_msgTypes[27]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1531,7 +1632,7 @@ func (x *StreamFinalization) String() string {
 func (*StreamFinalization) ProtoMessage() {}
 
 func (x *StreamFinalization) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[26]
+	mi := &file_chat_v2_chat_proto_msgTypes[27]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1544,7 +1645,7 @@ func (x *StreamFinalization) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamFinalization.ProtoReflect.Descriptor instead.
 func (*StreamFinalization) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{26}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *StreamFinalization) GetConversationId() string {
@@ -1563,7 +1664,7 @@ type StreamError struct {
 
 func (x *StreamError) Reset() {
 	*x = StreamError{}
-	mi := &file_chat_v2_chat_proto_msgTypes[27]
+	mi := &file_chat_v2_chat_proto_msgTypes[28]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1575,7 +1676,7 @@ func (x *StreamError) String() string {
 func (*StreamError) ProtoMessage() {}
 
 func (x *StreamError) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[27]
+	mi := &file_chat_v2_chat_proto_msgTypes[28]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1588,7 +1689,7 @@ func (x *StreamError) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamError.ProtoReflect.Descriptor instead.
 func (*StreamError) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{27}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *StreamError) GetErrorMessage() string {
@@ -1618,7 +1719,7 @@ type CreateConversationMessageStreamRequest struct {
 
 func (x *CreateConversationMessageStreamRequest) Reset() {
 	*x = CreateConversationMessageStreamRequest{}
-	mi := &file_chat_v2_chat_proto_msgTypes[28]
+	mi := &file_chat_v2_chat_proto_msgTypes[29]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1630,7 +1731,7 @@ func (x *CreateConversationMessageStreamRequest) String() string {
 func (*CreateConversationMessageStreamRequest) ProtoMessage() {}
 
 func (x *CreateConversationMessageStreamRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[28]
+	mi := &file_chat_v2_chat_proto_msgTypes[29]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1643,7 +1744,7 @@ func (x *CreateConversationMessageStreamRequest) ProtoReflect() protoreflect.Mes
 
 // Deprecated: Use CreateConversationMessageStreamRequest.ProtoReflect.Descriptor instead.
 func (*CreateConversationMessageStreamRequest) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{28}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *CreateConversationMessageStreamRequest) GetProjectId() string {
@@ -1722,7 +1823,7 @@ type CreateConversationMessageStreamResponse struct {
 
 func (x *CreateConversationMessageStreamResponse) Reset() {
 	*x = CreateConversationMessageStreamResponse{}
-	mi := &file_chat_v2_chat_proto_msgTypes[29]
+	mi := &file_chat_v2_chat_proto_msgTypes[30]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1734,7 +1835,7 @@ func (x *CreateConversationMessageStreamResponse) String() string {
 func (*CreateConversationMessageStreamResponse) ProtoMessage() {}
 
 func (x *CreateConversationMessageStreamResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_v2_chat_proto_msgTypes[29]
+	mi := &file_chat_v2_chat_proto_msgTypes[30]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1747,7 +1848,7 @@ func (x *CreateConversationMessageStreamResponse) ProtoReflect() protoreflect.Me
 
 // Deprecated: Use CreateConversationMessageStreamResponse.ProtoReflect.Descriptor instead.
 func (*CreateConversationMessageStreamResponse) Descriptor() ([]byte, []int) {
-	return file_chat_v2_chat_proto_rawDescGZIP(), []int{29}
+	return file_chat_v2_chat_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *CreateConversationMessageStreamResponse) GetResponsePayload() isCreateConversationMessageStreamResponse_ResponsePayload {
@@ -1931,21 +2032,35 @@ const file_chat_v2_chat_proto_rawDesc = "" +
 	"\n" +
 	"message_id\x18\x01 \x01(\tR\tmessageId\x121\n" +
 	"\apayload\x18\x02 \x01(\v2\x17.chat.v2.MessagePayloadR\apayload\x12\x1c\n" +
-	"\ttimestamp\x18\x03 \x01(\x03R\ttimestamp\"\x81\x01\n" +
+	"\ttimestamp\x18\x03 \x01(\x03R\ttimestamp\"Z\n" +
+	"\n" +
+	"BranchInfo\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12\x1d\n" +
+	"\n" +
+	"created_at\x18\x02 \x01(\x03R\tcreatedAt\x12\x1d\n" +
+	"\n" +
+	"updated_at\x18\x03 \x01(\x03R\tupdatedAt\"\xb7\x02\n" +
 	"\fConversation\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x14\n" +
 	"\x05title\x18\x02 \x01(\tR\x05title\x12\x1d\n" +
 	"\n" +
 	"model_slug\x18\x03 \x01(\tR\tmodelSlug\x12,\n" +
-	"\bmessages\x18\x04 \x03(\v2\x10.chat.v2.MessageR\bmessages\"M\n" +
+	"\bmessages\x18\x04 \x03(\v2\x10.chat.v2.MessageR\bmessages\x12*\n" +
+	"\x11current_branch_id\x18\x05 \x01(\tR\x0fcurrentBranchId\x12/\n" +
+	"\bbranches\x18\x06 \x03(\v2\x13.chat.v2.BranchInfoR\bbranches\x120\n" +
+	"\x14current_branch_index\x18\a \x01(\x05R\x12currentBranchIndex\x12%\n" +
+	"\x0etotal_branches\x18\b \x01(\x05R\rtotalBranches\"M\n" +
 	"\x18ListConversationsRequest\x12\"\n" +
 	"\n" +
 	"project_id\x18\x01 \x01(\tH\x00R\tprojectId\x88\x01\x01B\r\n" +
 	"\v_project_id\"X\n" +
 	"\x19ListConversationsResponse\x12;\n" +
-	"\rconversations\x18\x01 \x03(\v2\x15.chat.v2.ConversationR\rconversations\"A\n" +
+	"\rconversations\x18\x01 \x03(\v2\x15.chat.v2.ConversationR\rconversations\"q\n" +
 	"\x16GetConversationRequest\x12'\n" +
-	"\x0fconversation_id\x18\x01 \x01(\tR\x0econversationId\"T\n" +
+	"\x0fconversation_id\x18\x01 \x01(\tR\x0econversationId\x12 \n" +
+	"\tbranch_id\x18\x02 \x01(\tH\x00R\bbranchId\x88\x01\x01B\f\n" +
+	"\n" +
+	"_branch_id\"T\n" +
 	"\x17GetConversationResponse\x129\n" +
 	"\fconversation\x18\x01 \x01(\v2\x15.chat.v2.ConversationR\fconversation\"Z\n" +
 	"\x19UpdateConversationRequest\x12'\n" +
@@ -2047,7 +2162,7 @@ func file_chat_v2_chat_proto_rawDescGZIP() []byte {
 }
 
 var file_chat_v2_chat_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_chat_v2_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 30)
+var file_chat_v2_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 31)
 var file_chat_v2_chat_proto_goTypes = []any{
 	(ConversationType)(0),                           // 0: chat.v2.ConversationType
 	(*MessageTypeToolCall)(nil),                     // 1: chat.v2.MessageTypeToolCall
@@ -2058,28 +2173,29 @@ var file_chat_v2_chat_proto_goTypes = []any{
 	(*MessageTypeUnknown)(nil),                      // 6: chat.v2.MessageTypeUnknown
 	(*MessagePayload)(nil),                          // 7: chat.v2.MessagePayload
 	(*Message)(nil),                                 // 8: chat.v2.Message
-	(*Conversation)(nil),                            // 9: chat.v2.Conversation
-	(*ListConversationsRequest)(nil),                // 10: chat.v2.ListConversationsRequest
-	(*ListConversationsResponse)(nil),               // 11: chat.v2.ListConversationsResponse
-	(*GetConversationRequest)(nil),                  // 12: chat.v2.GetConversationRequest
-	(*GetConversationResponse)(nil),                 // 13: chat.v2.GetConversationResponse
-	(*UpdateConversationRequest)(nil),               // 14: chat.v2.UpdateConversationRequest
-	(*UpdateConversationResponse)(nil),              // 15: chat.v2.UpdateConversationResponse
-	(*DeleteConversationRequest)(nil),               // 16: chat.v2.DeleteConversationRequest
-	(*DeleteConversationResponse)(nil),              // 17: chat.v2.DeleteConversationResponse
-	(*SupportedModel)(nil),                          // 18: chat.v2.SupportedModel
-	(*ListSupportedModelsRequest)(nil),              // 19: chat.v2.ListSupportedModelsRequest
-	(*ListSupportedModelsResponse)(nil),             // 20: chat.v2.ListSupportedModelsResponse
-	(*StreamInitialization)(nil),                    // 21: chat.v2.StreamInitialization
-	(*StreamPartBegin)(nil),                         // 22: chat.v2.StreamPartBegin
-	(*MessageChunk)(nil),                            // 23: chat.v2.MessageChunk
-	(*ReasoningChunk)(nil),                          // 24: chat.v2.ReasoningChunk
-	(*IncompleteIndicator)(nil),                     // 25: chat.v2.IncompleteIndicator
-	(*StreamPartEnd)(nil),                           // 26: chat.v2.StreamPartEnd
-	(*StreamFinalization)(nil),                      // 27: chat.v2.StreamFinalization
-	(*StreamError)(nil),                             // 28: chat.v2.StreamError
-	(*CreateConversationMessageStreamRequest)(nil),  // 29: chat.v2.CreateConversationMessageStreamRequest
-	(*CreateConversationMessageStreamResponse)(nil), // 30: chat.v2.CreateConversationMessageStreamResponse
+	(*BranchInfo)(nil),                              // 9: chat.v2.BranchInfo
+	(*Conversation)(nil),                            // 10: chat.v2.Conversation
+	(*ListConversationsRequest)(nil),                // 11: chat.v2.ListConversationsRequest
+	(*ListConversationsResponse)(nil),               // 12: chat.v2.ListConversationsResponse
+	(*GetConversationRequest)(nil),                  // 13: chat.v2.GetConversationRequest
+	(*GetConversationResponse)(nil),                 // 14: chat.v2.GetConversationResponse
+	(*UpdateConversationRequest)(nil),               // 15: chat.v2.UpdateConversationRequest
+	(*UpdateConversationResponse)(nil),              // 16: chat.v2.UpdateConversationResponse
+	(*DeleteConversationRequest)(nil),               // 17: chat.v2.DeleteConversationRequest
+	(*DeleteConversationResponse)(nil),              // 18: chat.v2.DeleteConversationResponse
+	(*SupportedModel)(nil),                          // 19: chat.v2.SupportedModel
+	(*ListSupportedModelsRequest)(nil),              // 20: chat.v2.ListSupportedModelsRequest
+	(*ListSupportedModelsResponse)(nil),             // 21: chat.v2.ListSupportedModelsResponse
+	(*StreamInitialization)(nil),                    // 22: chat.v2.StreamInitialization
+	(*StreamPartBegin)(nil),                         // 23: chat.v2.StreamPartBegin
+	(*MessageChunk)(nil),                            // 24: chat.v2.MessageChunk
+	(*ReasoningChunk)(nil),                          // 25: chat.v2.ReasoningChunk
+	(*IncompleteIndicator)(nil),                     // 26: chat.v2.IncompleteIndicator
+	(*StreamPartEnd)(nil),                           // 27: chat.v2.StreamPartEnd
+	(*StreamFinalization)(nil),                      // 28: chat.v2.StreamFinalization
+	(*StreamError)(nil),                             // 29: chat.v2.StreamError
+	(*CreateConversationMessageStreamRequest)(nil),  // 30: chat.v2.CreateConversationMessageStreamRequest
+	(*CreateConversationMessageStreamResponse)(nil), // 31: chat.v2.CreateConversationMessageStreamResponse
 }
 var file_chat_v2_chat_proto_depIdxs = []int32{
 	3,  // 0: chat.v2.MessagePayload.system:type_name -> chat.v2.MessageTypeSystem
@@ -2090,38 +2206,39 @@ var file_chat_v2_chat_proto_depIdxs = []int32{
 	6,  // 5: chat.v2.MessagePayload.unknown:type_name -> chat.v2.MessageTypeUnknown
 	7,  // 6: chat.v2.Message.payload:type_name -> chat.v2.MessagePayload
 	8,  // 7: chat.v2.Conversation.messages:type_name -> chat.v2.Message
-	9,  // 8: chat.v2.ListConversationsResponse.conversations:type_name -> chat.v2.Conversation
-	9,  // 9: chat.v2.GetConversationResponse.conversation:type_name -> chat.v2.Conversation
-	9,  // 10: chat.v2.UpdateConversationResponse.conversation:type_name -> chat.v2.Conversation
-	18, // 11: chat.v2.ListSupportedModelsResponse.models:type_name -> chat.v2.SupportedModel
-	7,  // 12: chat.v2.StreamPartBegin.payload:type_name -> chat.v2.MessagePayload
-	7,  // 13: chat.v2.StreamPartEnd.payload:type_name -> chat.v2.MessagePayload
-	0,  // 14: chat.v2.CreateConversationMessageStreamRequest.conversation_type:type_name -> chat.v2.ConversationType
-	21, // 15: chat.v2.CreateConversationMessageStreamResponse.stream_initialization:type_name -> chat.v2.StreamInitialization
-	22, // 16: chat.v2.CreateConversationMessageStreamResponse.stream_part_begin:type_name -> chat.v2.StreamPartBegin
-	23, // 17: chat.v2.CreateConversationMessageStreamResponse.message_chunk:type_name -> chat.v2.MessageChunk
-	25, // 18: chat.v2.CreateConversationMessageStreamResponse.incomplete_indicator:type_name -> chat.v2.IncompleteIndicator
-	26, // 19: chat.v2.CreateConversationMessageStreamResponse.stream_part_end:type_name -> chat.v2.StreamPartEnd
-	27, // 20: chat.v2.CreateConversationMessageStreamResponse.stream_finalization:type_name -> chat.v2.StreamFinalization
-	28, // 21: chat.v2.CreateConversationMessageStreamResponse.stream_error:type_name -> chat.v2.StreamError
-	24, // 22: chat.v2.CreateConversationMessageStreamResponse.reasoning_chunk:type_name -> chat.v2.ReasoningChunk
-	10, // 23: chat.v2.ChatService.ListConversations:input_type -> chat.v2.ListConversationsRequest
-	12, // 24: chat.v2.ChatService.GetConversation:input_type -> chat.v2.GetConversationRequest
-	29, // 25: chat.v2.ChatService.CreateConversationMessageStream:input_type -> chat.v2.CreateConversationMessageStreamRequest
-	14, // 26: chat.v2.ChatService.UpdateConversation:input_type -> chat.v2.UpdateConversationRequest
-	16, // 27: chat.v2.ChatService.DeleteConversation:input_type -> chat.v2.DeleteConversationRequest
-	19, // 28: chat.v2.ChatService.ListSupportedModels:input_type -> chat.v2.ListSupportedModelsRequest
-	11, // 29: chat.v2.ChatService.ListConversations:output_type -> chat.v2.ListConversationsResponse
-	13, // 30: chat.v2.ChatService.GetConversation:output_type -> chat.v2.GetConversationResponse
-	30, // 31: chat.v2.ChatService.CreateConversationMessageStream:output_type -> chat.v2.CreateConversationMessageStreamResponse
-	15, // 32: chat.v2.ChatService.UpdateConversation:output_type -> chat.v2.UpdateConversationResponse
-	17, // 33: chat.v2.ChatService.DeleteConversation:output_type -> chat.v2.DeleteConversationResponse
-	20, // 34: chat.v2.ChatService.ListSupportedModels:output_type -> chat.v2.ListSupportedModelsResponse
-	29, // [29:35] is the sub-list for method output_type
-	23, // [23:29] is the sub-list for method input_type
-	23, // [23:23] is the sub-list for extension type_name
-	23, // [23:23] is the sub-list for extension extendee
-	0,  // [0:23] is the sub-list for field type_name
+	9,  // 8: chat.v2.Conversation.branches:type_name -> chat.v2.BranchInfo
+	10, // 9: chat.v2.ListConversationsResponse.conversations:type_name -> chat.v2.Conversation
+	10, // 10: chat.v2.GetConversationResponse.conversation:type_name -> chat.v2.Conversation
+	10, // 11: chat.v2.UpdateConversationResponse.conversation:type_name -> chat.v2.Conversation
+	19, // 12: chat.v2.ListSupportedModelsResponse.models:type_name -> chat.v2.SupportedModel
+	7,  // 13: chat.v2.StreamPartBegin.payload:type_name -> chat.v2.MessagePayload
+	7,  // 14: chat.v2.StreamPartEnd.payload:type_name -> chat.v2.MessagePayload
+	0,  // 15: chat.v2.CreateConversationMessageStreamRequest.conversation_type:type_name -> chat.v2.ConversationType
+	22, // 16: chat.v2.CreateConversationMessageStreamResponse.stream_initialization:type_name -> chat.v2.StreamInitialization
+	23, // 17: chat.v2.CreateConversationMessageStreamResponse.stream_part_begin:type_name -> chat.v2.StreamPartBegin
+	24, // 18: chat.v2.CreateConversationMessageStreamResponse.message_chunk:type_name -> chat.v2.MessageChunk
+	26, // 19: chat.v2.CreateConversationMessageStreamResponse.incomplete_indicator:type_name -> chat.v2.IncompleteIndicator
+	27, // 20: chat.v2.CreateConversationMessageStreamResponse.stream_part_end:type_name -> chat.v2.StreamPartEnd
+	28, // 21: chat.v2.CreateConversationMessageStreamResponse.stream_finalization:type_name -> chat.v2.StreamFinalization
+	29, // 22: chat.v2.CreateConversationMessageStreamResponse.stream_error:type_name -> chat.v2.StreamError
+	25, // 23: chat.v2.CreateConversationMessageStreamResponse.reasoning_chunk:type_name -> chat.v2.ReasoningChunk
+	11, // 24: chat.v2.ChatService.ListConversations:input_type -> chat.v2.ListConversationsRequest
+	13, // 25: chat.v2.ChatService.GetConversation:input_type -> chat.v2.GetConversationRequest
+	30, // 26: chat.v2.ChatService.CreateConversationMessageStream:input_type -> chat.v2.CreateConversationMessageStreamRequest
+	15, // 27: chat.v2.ChatService.UpdateConversation:input_type -> chat.v2.UpdateConversationRequest
+	17, // 28: chat.v2.ChatService.DeleteConversation:input_type -> chat.v2.DeleteConversationRequest
+	20, // 29: chat.v2.ChatService.ListSupportedModels:input_type -> chat.v2.ListSupportedModelsRequest
+	12, // 30: chat.v2.ChatService.ListConversations:output_type -> chat.v2.ListConversationsResponse
+	14, // 31: chat.v2.ChatService.GetConversation:output_type -> chat.v2.GetConversationResponse
+	31, // 32: chat.v2.ChatService.CreateConversationMessageStream:output_type -> chat.v2.CreateConversationMessageStreamResponse
+	16, // 33: chat.v2.ChatService.UpdateConversation:output_type -> chat.v2.UpdateConversationResponse
+	18, // 34: chat.v2.ChatService.DeleteConversation:output_type -> chat.v2.DeleteConversationResponse
+	21, // 35: chat.v2.ChatService.ListSupportedModels:output_type -> chat.v2.ListSupportedModelsResponse
+	30, // [30:36] is the sub-list for method output_type
+	24, // [24:30] is the sub-list for method input_type
+	24, // [24:24] is the sub-list for extension type_name
+	24, // [24:24] is the sub-list for extension extendee
+	0,  // [0:24] is the sub-list for field type_name
 }
 
 func init() { file_chat_v2_chat_proto_init() }
@@ -2139,9 +2256,10 @@ func file_chat_v2_chat_proto_init() {
 		(*MessagePayload_ToolCall)(nil),
 		(*MessagePayload_Unknown)(nil),
 	}
-	file_chat_v2_chat_proto_msgTypes[9].OneofWrappers = []any{}
-	file_chat_v2_chat_proto_msgTypes[28].OneofWrappers = []any{}
-	file_chat_v2_chat_proto_msgTypes[29].OneofWrappers = []any{
+	file_chat_v2_chat_proto_msgTypes[10].OneofWrappers = []any{}
+	file_chat_v2_chat_proto_msgTypes[12].OneofWrappers = []any{}
+	file_chat_v2_chat_proto_msgTypes[29].OneofWrappers = []any{}
+	file_chat_v2_chat_proto_msgTypes[30].OneofWrappers = []any{
 		(*CreateConversationMessageStreamResponse_StreamInitialization)(nil),
 		(*CreateConversationMessageStreamResponse_StreamPartBegin)(nil),
 		(*CreateConversationMessageStreamResponse_MessageChunk)(nil),
@@ -2157,7 +2275,7 @@ func file_chat_v2_chat_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_chat_v2_chat_proto_rawDesc), len(file_chat_v2_chat_proto_rawDesc)),
 			NumEnums:      1,
-			NumMessages:   30,
+			NumMessages:   31,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/pkg/gen/api/chat/v2/chat.pb.gw.go b/pkg/gen/api/chat/v2/chat.pb.gw.go
index 81f7e4e6..7165d02a 100644
--- a/pkg/gen/api/chat/v2/chat.pb.gw.go
+++ b/pkg/gen/api/chat/v2/chat.pb.gw.go
@@ -70,6 +70,8 @@ func local_request_ChatService_ListConversations_0(ctx context.Context, marshale
 	return msg, metadata, err
 }
 
+var filter_ChatService_GetConversation_0 = &utilities.DoubleArray{Encoding: map[string]int{"conversation_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+
 func request_ChatService_GetConversation_0(ctx context.Context, marshaler runtime.Marshaler, client ChatServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var (
 		protoReq GetConversationRequest
@@ -87,6 +89,12 @@ func request_ChatService_GetConversation_0(ctx context.Context, marshaler runtim
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "conversation_id", err)
 	}
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ChatService_GetConversation_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
 	msg, err := client.GetConversation(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 }
@@ -105,6 +113,12 @@ func local_request_ChatService_GetConversation_0(ctx context.Context, marshaler
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "conversation_id", err)
 	}
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ChatService_GetConversation_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
 	msg, err := server.GetConversation(ctx, &protoReq)
 	return msg, metadata, err
 }
diff --git a/proto/chat/v2/chat.proto b/proto/chat/v2/chat.proto
index 13e5988b..809333ba 100644
--- a/proto/chat/v2/chat.proto
+++ b/proto/chat/v2/chat.proto
@@ -82,12 +82,24 @@ message Message {
   int64 timestamp = 3;
 }
 
+message BranchInfo {
+  string id = 1;
+  int64 created_at = 2;
+  int64 updated_at = 3;
+}
+
 message Conversation {
   string id = 1;
   string title = 2;
   string model_slug = 3;
   // If list conversations, then messages length is 0.
   repeated Message messages = 4;
+
+  // Branch information
+  string current_branch_id = 5;           // ID of the branch being viewed
+  repeated BranchInfo branches = 6;       // All available branches
+  int32 current_branch_index = 7;         // 1-indexed position for UI
+  int32 total_branches = 8;               // Total number of branches
 }
 
 message ListConversationsRequest {
@@ -101,6 +113,7 @@ message ListConversationsResponse {
 
 message GetConversationRequest {
   string conversation_id = 1;
+  optional string branch_id = 2;          // Optional: specific branch to view
 }
 
 message GetConversationResponse {
diff --git a/webapp/_webapp/src/components/branch-switcher.tsx b/webapp/_webapp/src/components/branch-switcher.tsx
new file mode 100644
index 00000000..9fd5f38e
--- /dev/null
+++ b/webapp/_webapp/src/components/branch-switcher.tsx
@@ -0,0 +1,94 @@
+import { Icon } from "@iconify/react";
+import { Conversation } from "../pkg/gen/apiclient/chat/v2/chat_pb";
+import { getConversation } from "../query/api";
+import { useConversationStore } from "../stores/conversation/conversation-store";
+import { useStreamingMessageStore } from "../stores/streaming-message-store";
+import { useState } from "react";
+
+interface BranchSwitcherProps {
+  conversation?: Conversation;
+}
+
+export const BranchSwitcher = ({ conversation }: BranchSwitcherProps) => {
+  const [isLoading, setIsLoading] = useState(false);
+  const setCurrentConversation = useConversationStore((s) => s.setCurrentConversation);
+  const isStreaming = useConversationStore((s) => s.isStreaming);
+
+  // Don't show if no branches or only one branch
+  const totalBranches = conversation?.totalBranches ?? 0;
+  if (totalBranches <= 1) {
+    return null;
+  }
+
+  const currentIndex = conversation?.currentBranchIndex ?? 1;
+  const branches = conversation?.branches ?? [];
+
+  const switchToBranch = async (branchId: string) => {
+    if (!conversation?.id || isLoading || isStreaming) return;
+
+    setIsLoading(true);
+    try {
+      const response = await getConversation({
+        conversationId: conversation.id,
+        branchId: branchId,
+      });
+      if (response.conversation) {
+        setCurrentConversation(response.conversation);
+        useStreamingMessageStore.getState().resetStreamingMessage();
+        useStreamingMessageStore.getState().resetIncompleteIndicator();
+      }
+    } catch (error) {
+      console.error("Failed to switch branch:", error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handlePrevious = () => {
+    if (currentIndex <= 1) return;
+    const prevBranchId = branches[currentIndex - 2]?.id;
+    if (prevBranchId) {
+      switchToBranch(prevBranchId);
+    }
+  };
+
+  const handleNext = () => {
+    if (currentIndex >= totalBranches) return;
+    const nextBranchId = branches[currentIndex]?.id;
+    if (nextBranchId) {
+      switchToBranch(nextBranchId);
+    }
+  };
+
+  const canGoPrev = currentIndex > 1 && !isLoading && !isStreaming;
+  const canGoNext = currentIndex < totalBranches && !isLoading && !isStreaming;
+
+  return (
+    <div className="flex items-center gap-1 text-xs text-gray-400">
+      <Icon icon="tabler:git-branch" className="w-3 h-3" />
+      <button
+        onClick={handlePrevious}
+        disabled={!canGoPrev}
+        className={`p-0.5 rounded hover:bg-gray-700/50 transition-colors ${
+          canGoPrev ? "text-gray-600 cursor-pointer" : "text-gray-300 cursor-not-allowed"
+        }`}
+        title="Previous branch"
+      >
+        <Icon icon="tabler:chevron-left" className="w-3.5 h-3.5" />
+      </button>
+      <span className={`min-w-[3rem] text-center ${isLoading ? "text-gray-500" : ""}`}>
+        {isLoading ? "..." : `${currentIndex} / ${totalBranches}`}
+      </span>
+      <button
+        onClick={handleNext}
+        disabled={!canGoNext}
+        className={`p-0.5 rounded hover:bg-gray-700/50 transition-colors ${
+          canGoNext ? "text-gray-600 cursor-pointer" : "text-gray-300 cursor-not-allowed"
+        }`}
+        title="Next branch"
+      >
+        <Icon icon="tabler:chevron-right" className="w-3.5 h-3.5" />
+      </button>
+    </div>
+  );
+};
diff --git a/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts b/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts
index b7d92f4e..0868640e 100644
--- a/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts
+++ b/webapp/_webapp/src/pkg/gen/apiclient/chat/v2/chat_pb.ts
@@ -11,7 +11,7 @@ import type { Message as Message$1 } from "@bufbuild/protobuf";
  * Describes the file chat/v2/chat.proto.
  */
 export const file_chat_v2_chat: GenFile = /*@__PURE__*/
-  fileDesc("ChJjaGF0L3YyL2NoYXQucHJvdG8SB2NoYXQudjIiUAoTTWVzc2FnZVR5cGVUb29sQ2FsbBIMCgRuYW1lGAEgASgJEgwKBGFyZ3MYAiABKAkSDgoGcmVzdWx0GAMgASgJEg0KBWVycm9yGAQgASgJIkEKI01lc3NhZ2VUeXBlVG9vbENhbGxQcmVwYXJlQXJndW1lbnRzEgwKBG5hbWUYASABKAkSDAoEYXJncxgCIAEoCSIkChFNZXNzYWdlVHlwZVN5c3RlbRIPCgdjb250ZW50GAEgASgJImEKFE1lc3NhZ2VUeXBlQXNzaXN0YW50Eg8KB2NvbnRlbnQYASABKAkSEgoKbW9kZWxfc2x1ZxgCIAEoCRIWCglyZWFzb25pbmcYAyABKAlIAIgBAUIMCgpfcmVhc29uaW5nInoKD01lc3NhZ2VUeXBlVXNlchIPCgdjb250ZW50GAEgASgJEhoKDXNlbGVjdGVkX3RleHQYAiABKAlIAIgBARIYCgtzdXJyb3VuZGluZxgHIAEoCUgBiAEBQhAKDl9zZWxlY3RlZF90ZXh0Qg4KDF9zdXJyb3VuZGluZyIpChJNZXNzYWdlVHlwZVVua25vd24SEwoLZGVzY3JpcHRpb24YASABKAki5AIKDk1lc3NhZ2VQYXlsb2FkEiwKBnN5c3RlbRgBIAEoCzIaLmNoYXQudjIuTWVzc2FnZVR5cGVTeXN0ZW1IABIoCgR1c2VyGAIgASgLMhguY2hhdC52Mi5NZXNzYWdlVHlwZVVzZXJIABIyCglhc3Npc3RhbnQYAyABKAsyHS5jaGF0LnYyLk1lc3NhZ2VUeXBlQXNzaXN0YW50SAASUwobdG9vbF9jYWxsX3ByZXBhcmVfYXJndW1lbnRzGAQgASgLMiwuY2hhdC52Mi5NZXNzYWdlVHlwZVRvb2xDYWxsUHJlcGFyZUFyZ3VtZW50c0gAEjEKCXRvb2xfY2FsbBgFIAEoCzIcLmNoYXQudjIuTWVzc2FnZVR5cGVUb29sQ2FsbEgAEi4KB3Vua25vd24YBiABKAsyGy5jaGF0LnYyLk1lc3NhZ2VUeXBlVW5rbm93bkgAQg4KDG1lc3NhZ2VfdHlwZSJaCgdNZXNzYWdlEhIKCm1lc3NhZ2VfaWQYASABKAkSKAoHcGF5bG9hZBgCIAEoCzIXLmNoYXQudjIuTWVzc2FnZVBheWxvYWQSEQoJdGltZXN0YW1wGAMgASgDImEKDENvbnZlcnNhdGlvbhIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRISCgptb2RlbF9zbHVnGAMgASgJEiIKCG1lc3NhZ2VzGAQgAygLMhAuY2hhdC52Mi5NZXNzYWdlIkIKGExpc3RDb252ZXJzYXRpb25zUmVxdWVzdBIXCgpwcm9qZWN0X2lkGAEgASgJSACIAQFCDQoLX3Byb2plY3RfaWQiSQoZTGlzdENvbnZlcnNhdGlvbnNSZXNwb25zZRIsCg1jb252ZXJzYXRpb25zGAEgAygLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iMQoWR2V0Q29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkiRgoXR2V0Q29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iQwoZVXBkYXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkSDQoFdGl0bGUYAiABKAkiSQoaVXBkYXRlQ29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iNAoZRGVsZXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkiHAoaRGVsZXRlQ29udmVyc2F0aW9uUmVzcG9uc2UiggEKDlN1cHBvcnRlZE1vZGVsEgwKBG5hbWUYASABKAkSDAoEc2x1ZxgCIAEoCRIVCg10b3RhbF9jb250ZXh0GAMgASgDEhIKCm1heF9vdXRwdXQYBCABKAMSEwoLaW5wdXRfcHJpY2UYBSABKAMSFAoMb3V0cHV0X3ByaWNlGAYgASgDIhwKGkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0IkYKG0xpc3RTdXBwb3J0ZWRNb2RlbHNSZXNwb25zZRInCgZtb2RlbHMYASADKAsyFy5jaGF0LnYyLlN1cHBvcnRlZE1vZGVsIkMKFFN0cmVhbUluaXRpYWxpemF0aW9uEhcKD2NvbnZlcnNhdGlvbl9pZBgBIAEoCRISCgptb2RlbF9zbHVnGAIgASgJIk8KD1N0cmVhbVBhcnRCZWdpbhISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIjEKDE1lc3NhZ2VDaHVuaxISCgptZXNzYWdlX2lkGAEgASgJEg0KBWRlbHRhGAIgASgJIjMKDlJlYXNvbmluZ0NodW5rEhIKCm1lc3NhZ2VfaWQYASABKAkSDQoFZGVsdGEYAiABKAkiOgoTSW5jb21wbGV0ZUluZGljYXRvchIOCgZyZWFzb24YASABKAkSEwoLcmVzcG9uc2VfaWQYAiABKAkiTQoNU3RyZWFtUGFydEVuZBISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIi0KElN0cmVhbUZpbmFsaXphdGlvbhIXCg9jb252ZXJzYXRpb25faWQYASABKAkiJAoLU3RyZWFtRXJyb3ISFQoNZXJyb3JfbWVzc2FnZRgBIAEoCSKBAwomQ3JlYXRlQ29udmVyc2F0aW9uTWVzc2FnZVN0cmVhbVJlcXVlc3QSEgoKcHJvamVjdF9pZBgBIAEoCRIcCg9jb252ZXJzYXRpb25faWQYAiABKAlIAIgBARISCgptb2RlbF9zbHVnGAMgASgJEhQKDHVzZXJfbWVzc2FnZRgEIAEoCRIfChJ1c2VyX3NlbGVjdGVkX3RleHQYBSABKAlIAYgBARI5ChFjb252ZXJzYXRpb25fdHlwZRgGIAEoDjIZLmNoYXQudjIuQ29udmVyc2F0aW9uVHlwZUgCiAEBEhgKC3N1cnJvdW5kaW5nGAggASgJSAOIAQESHgoRcGFyZW50X21lc3NhZ2VfaWQYCSABKAlIBIgBAUISChBfY29udmVyc2F0aW9uX2lkQhUKE191c2VyX3NlbGVjdGVkX3RleHRCFAoSX2NvbnZlcnNhdGlvbl90eXBlQg4KDF9zdXJyb3VuZGluZ0IUChJfcGFyZW50X21lc3NhZ2VfaWQi8wMKJ0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXNwb25zZRI+ChVzdHJlYW1faW5pdGlhbGl6YXRpb24YASABKAsyHS5jaGF0LnYyLlN0cmVhbUluaXRpYWxpemF0aW9uSAASNQoRc3RyZWFtX3BhcnRfYmVnaW4YAiABKAsyGC5jaGF0LnYyLlN0cmVhbVBhcnRCZWdpbkgAEi4KDW1lc3NhZ2VfY2h1bmsYAyABKAsyFS5jaGF0LnYyLk1lc3NhZ2VDaHVua0gAEjwKFGluY29tcGxldGVfaW5kaWNhdG9yGAQgASgLMhwuY2hhdC52Mi5JbmNvbXBsZXRlSW5kaWNhdG9ySAASMQoPc3RyZWFtX3BhcnRfZW5kGAUgASgLMhYuY2hhdC52Mi5TdHJlYW1QYXJ0RW5kSAASOgoTc3RyZWFtX2ZpbmFsaXphdGlvbhgGIAEoCzIbLmNoYXQudjIuU3RyZWFtRmluYWxpemF0aW9uSAASLAoMc3RyZWFtX2Vycm9yGAcgASgLMhQuY2hhdC52Mi5TdHJlYW1FcnJvckgAEjIKD3JlYXNvbmluZ19jaHVuaxgIIAEoCzIXLmNoYXQudjIuUmVhc29uaW5nQ2h1bmtIAEISChByZXNwb25zZV9wYXlsb2FkKlIKEENvbnZlcnNhdGlvblR5cGUSIQodQ09OVkVSU0FUSU9OX1RZUEVfVU5TUEVDSUZJRUQQABIbChdDT05WRVJTQVRJT05fVFlQRV9ERUJVRxABMqgHCgtDaGF0U2VydmljZRKDAQoRTGlzdENvbnZlcnNhdGlvbnMSIS5jaGF0LnYyLkxpc3RDb252ZXJzYXRpb25zUmVxdWVzdBoiLmNoYXQudjIuTGlzdENvbnZlcnNhdGlvbnNSZXNwb25zZSIngtPkkwIhEh8vX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zEo8BCg9HZXRDb252ZXJzYXRpb24SHy5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlcXVlc3QaIC5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMSMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SwgEKH0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW0SLy5jaGF0LnYyLkNyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXF1ZXN0GjAuY2hhdC52Mi5DcmVhdGVDb252ZXJzYXRpb25NZXNzYWdlU3RyZWFtUmVzcG9uc2UiOoLT5JMCNDoBKiIvL19wZC9hcGkvdjIvY2hhdHMvY29udmVyc2F0aW9ucy9tZXNzYWdlcy9zdHJlYW0wARKbAQoSVXBkYXRlQ29udmVyc2F0aW9uEiIuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXF1ZXN0GiMuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXNwb25zZSI8gtPkkwI2OgEqMjEvX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zL3tjb252ZXJzYXRpb25faWR9EpgBChJEZWxldGVDb252ZXJzYXRpb24SIi5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlcXVlc3QaIy5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMqMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SggEKE0xpc3RTdXBwb3J0ZWRNb2RlbHMSIy5jaGF0LnYyLkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0GiQuY2hhdC52Mi5MaXN0U3VwcG9ydGVkTW9kZWxzUmVzcG9uc2UiIILT5JMCGhIYL19wZC9hcGkvdjIvY2hhdHMvbW9kZWxzQn8KC2NvbS5jaGF0LnYyQglDaGF0UHJvdG9QAVoocGFwZXJkZWJ1Z2dlci9wa2cvZ2VuL2FwaS9jaGF0L3YyO2NoYXR2MqICA0NYWKoCB0NoYXQuVjLKAgdDaGF0XFYy4gITQ2hhdFxWMlxHUEJNZXRhZGF0YeoCCENoYXQ6OlYyYgZwcm90bzM", [file_google_api_annotations]);
+  fileDesc("ChJjaGF0L3YyL2NoYXQucHJvdG8SB2NoYXQudjIiUAoTTWVzc2FnZVR5cGVUb29sQ2FsbBIMCgRuYW1lGAEgASgJEgwKBGFyZ3MYAiABKAkSDgoGcmVzdWx0GAMgASgJEg0KBWVycm9yGAQgASgJIkEKI01lc3NhZ2VUeXBlVG9vbENhbGxQcmVwYXJlQXJndW1lbnRzEgwKBG5hbWUYASABKAkSDAoEYXJncxgCIAEoCSIkChFNZXNzYWdlVHlwZVN5c3RlbRIPCgdjb250ZW50GAEgASgJImEKFE1lc3NhZ2VUeXBlQXNzaXN0YW50Eg8KB2NvbnRlbnQYASABKAkSEgoKbW9kZWxfc2x1ZxgCIAEoCRIWCglyZWFzb25pbmcYAyABKAlIAIgBAUIMCgpfcmVhc29uaW5nInoKD01lc3NhZ2VUeXBlVXNlchIPCgdjb250ZW50GAEgASgJEhoKDXNlbGVjdGVkX3RleHQYAiABKAlIAIgBARIYCgtzdXJyb3VuZGluZxgHIAEoCUgBiAEBQhAKDl9zZWxlY3RlZF90ZXh0Qg4KDF9zdXJyb3VuZGluZyIpChJNZXNzYWdlVHlwZVVua25vd24SEwoLZGVzY3JpcHRpb24YASABKAki5AIKDk1lc3NhZ2VQYXlsb2FkEiwKBnN5c3RlbRgBIAEoCzIaLmNoYXQudjIuTWVzc2FnZVR5cGVTeXN0ZW1IABIoCgR1c2VyGAIgASgLMhguY2hhdC52Mi5NZXNzYWdlVHlwZVVzZXJIABIyCglhc3Npc3RhbnQYAyABKAsyHS5jaGF0LnYyLk1lc3NhZ2VUeXBlQXNzaXN0YW50SAASUwobdG9vbF9jYWxsX3ByZXBhcmVfYXJndW1lbnRzGAQgASgLMiwuY2hhdC52Mi5NZXNzYWdlVHlwZVRvb2xDYWxsUHJlcGFyZUFyZ3VtZW50c0gAEjEKCXRvb2xfY2FsbBgFIAEoCzIcLmNoYXQudjIuTWVzc2FnZVR5cGVUb29sQ2FsbEgAEi4KB3Vua25vd24YBiABKAsyGy5jaGF0LnYyLk1lc3NhZ2VUeXBlVW5rbm93bkgAQg4KDG1lc3NhZ2VfdHlwZSJaCgdNZXNzYWdlEhIKCm1lc3NhZ2VfaWQYASABKAkSKAoHcGF5bG9hZBgCIAEoCzIXLmNoYXQudjIuTWVzc2FnZVBheWxvYWQSEQoJdGltZXN0YW1wGAMgASgDIkAKCkJyYW5jaEluZm8SCgoCaWQYASABKAkSEgoKY3JlYXRlZF9hdBgCIAEoAxISCgp1cGRhdGVkX2F0GAMgASgDItkBCgxDb252ZXJzYXRpb24SCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEgoKbW9kZWxfc2x1ZxgDIAEoCRIiCghtZXNzYWdlcxgEIAMoCzIQLmNoYXQudjIuTWVzc2FnZRIZChFjdXJyZW50X2JyYW5jaF9pZBgFIAEoCRIlCghicmFuY2hlcxgGIAMoCzITLmNoYXQudjIuQnJhbmNoSW5mbxIcChRjdXJyZW50X2JyYW5jaF9pbmRleBgHIAEoBRIWCg50b3RhbF9icmFuY2hlcxgIIAEoBSJCChhMaXN0Q29udmVyc2F0aW9uc1JlcXVlc3QSFwoKcHJvamVjdF9pZBgBIAEoCUgAiAEBQg0KC19wcm9qZWN0X2lkIkkKGUxpc3RDb252ZXJzYXRpb25zUmVzcG9uc2USLAoNY29udmVyc2F0aW9ucxgBIAMoCzIVLmNoYXQudjIuQ29udmVyc2F0aW9uIlcKFkdldENvbnZlcnNhdGlvblJlcXVlc3QSFwoPY29udmVyc2F0aW9uX2lkGAEgASgJEhYKCWJyYW5jaF9pZBgCIAEoCUgAiAEBQgwKCl9icmFuY2hfaWQiRgoXR2V0Q29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iQwoZVXBkYXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkSDQoFdGl0bGUYAiABKAkiSQoaVXBkYXRlQ29udmVyc2F0aW9uUmVzcG9uc2USKwoMY29udmVyc2F0aW9uGAEgASgLMhUuY2hhdC52Mi5Db252ZXJzYXRpb24iNAoZRGVsZXRlQ29udmVyc2F0aW9uUmVxdWVzdBIXCg9jb252ZXJzYXRpb25faWQYASABKAkiHAoaRGVsZXRlQ29udmVyc2F0aW9uUmVzcG9uc2UiggEKDlN1cHBvcnRlZE1vZGVsEgwKBG5hbWUYASABKAkSDAoEc2x1ZxgCIAEoCRIVCg10b3RhbF9jb250ZXh0GAMgASgDEhIKCm1heF9vdXRwdXQYBCABKAMSEwoLaW5wdXRfcHJpY2UYBSABKAMSFAoMb3V0cHV0X3ByaWNlGAYgASgDIhwKGkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0IkYKG0xpc3RTdXBwb3J0ZWRNb2RlbHNSZXNwb25zZRInCgZtb2RlbHMYASADKAsyFy5jaGF0LnYyLlN1cHBvcnRlZE1vZGVsIkMKFFN0cmVhbUluaXRpYWxpemF0aW9uEhcKD2NvbnZlcnNhdGlvbl9pZBgBIAEoCRISCgptb2RlbF9zbHVnGAIgASgJIk8KD1N0cmVhbVBhcnRCZWdpbhISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIjEKDE1lc3NhZ2VDaHVuaxISCgptZXNzYWdlX2lkGAEgASgJEg0KBWRlbHRhGAIgASgJIjMKDlJlYXNvbmluZ0NodW5rEhIKCm1lc3NhZ2VfaWQYASABKAkSDQoFZGVsdGEYAiABKAkiOgoTSW5jb21wbGV0ZUluZGljYXRvchIOCgZyZWFzb24YASABKAkSEwoLcmVzcG9uc2VfaWQYAiABKAkiTQoNU3RyZWFtUGFydEVuZBISCgptZXNzYWdlX2lkGAEgASgJEigKB3BheWxvYWQYAyABKAsyFy5jaGF0LnYyLk1lc3NhZ2VQYXlsb2FkIi0KElN0cmVhbUZpbmFsaXphdGlvbhIXCg9jb252ZXJzYXRpb25faWQYASABKAkiJAoLU3RyZWFtRXJyb3ISFQoNZXJyb3JfbWVzc2FnZRgBIAEoCSKBAwomQ3JlYXRlQ29udmVyc2F0aW9uTWVzc2FnZVN0cmVhbVJlcXVlc3QSEgoKcHJvamVjdF9pZBgBIAEoCRIcCg9jb252ZXJzYXRpb25faWQYAiABKAlIAIgBARISCgptb2RlbF9zbHVnGAMgASgJEhQKDHVzZXJfbWVzc2FnZRgEIAEoCRIfChJ1c2VyX3NlbGVjdGVkX3RleHQYBSABKAlIAYgBARI5ChFjb252ZXJzYXRpb25fdHlwZRgGIAEoDjIZLmNoYXQudjIuQ29udmVyc2F0aW9uVHlwZUgCiAEBEhgKC3N1cnJvdW5kaW5nGAggASgJSAOIAQESHgoRcGFyZW50X21lc3NhZ2VfaWQYCSABKAlIBIgBAUISChBfY29udmVyc2F0aW9uX2lkQhUKE191c2VyX3NlbGVjdGVkX3RleHRCFAoSX2NvbnZlcnNhdGlvbl90eXBlQg4KDF9zdXJyb3VuZGluZ0IUChJfcGFyZW50X21lc3NhZ2VfaWQi8wMKJ0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXNwb25zZRI+ChVzdHJlYW1faW5pdGlhbGl6YXRpb24YASABKAsyHS5jaGF0LnYyLlN0cmVhbUluaXRpYWxpemF0aW9uSAASNQoRc3RyZWFtX3BhcnRfYmVnaW4YAiABKAsyGC5jaGF0LnYyLlN0cmVhbVBhcnRCZWdpbkgAEi4KDW1lc3NhZ2VfY2h1bmsYAyABKAsyFS5jaGF0LnYyLk1lc3NhZ2VDaHVua0gAEjwKFGluY29tcGxldGVfaW5kaWNhdG9yGAQgASgLMhwuY2hhdC52Mi5JbmNvbXBsZXRlSW5kaWNhdG9ySAASMQoPc3RyZWFtX3BhcnRfZW5kGAUgASgLMhYuY2hhdC52Mi5TdHJlYW1QYXJ0RW5kSAASOgoTc3RyZWFtX2ZpbmFsaXphdGlvbhgGIAEoCzIbLmNoYXQudjIuU3RyZWFtRmluYWxpemF0aW9uSAASLAoMc3RyZWFtX2Vycm9yGAcgASgLMhQuY2hhdC52Mi5TdHJlYW1FcnJvckgAEjIKD3JlYXNvbmluZ19jaHVuaxgIIAEoCzIXLmNoYXQudjIuUmVhc29uaW5nQ2h1bmtIAEISChByZXNwb25zZV9wYXlsb2FkKlIKEENvbnZlcnNhdGlvblR5cGUSIQodQ09OVkVSU0FUSU9OX1RZUEVfVU5TUEVDSUZJRUQQABIbChdDT05WRVJTQVRJT05fVFlQRV9ERUJVRxABMqgHCgtDaGF0U2VydmljZRKDAQoRTGlzdENvbnZlcnNhdGlvbnMSIS5jaGF0LnYyLkxpc3RDb252ZXJzYXRpb25zUmVxdWVzdBoiLmNoYXQudjIuTGlzdENvbnZlcnNhdGlvbnNSZXNwb25zZSIngtPkkwIhEh8vX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zEo8BCg9HZXRDb252ZXJzYXRpb24SHy5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlcXVlc3QaIC5jaGF0LnYyLkdldENvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMSMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SwgEKH0NyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW0SLy5jaGF0LnYyLkNyZWF0ZUNvbnZlcnNhdGlvbk1lc3NhZ2VTdHJlYW1SZXF1ZXN0GjAuY2hhdC52Mi5DcmVhdGVDb252ZXJzYXRpb25NZXNzYWdlU3RyZWFtUmVzcG9uc2UiOoLT5JMCNDoBKiIvL19wZC9hcGkvdjIvY2hhdHMvY29udmVyc2F0aW9ucy9tZXNzYWdlcy9zdHJlYW0wARKbAQoSVXBkYXRlQ29udmVyc2F0aW9uEiIuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXF1ZXN0GiMuY2hhdC52Mi5VcGRhdGVDb252ZXJzYXRpb25SZXNwb25zZSI8gtPkkwI2OgEqMjEvX3BkL2FwaS92Mi9jaGF0cy9jb252ZXJzYXRpb25zL3tjb252ZXJzYXRpb25faWR9EpgBChJEZWxldGVDb252ZXJzYXRpb24SIi5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlcXVlc3QaIy5jaGF0LnYyLkRlbGV0ZUNvbnZlcnNhdGlvblJlc3BvbnNlIjmC0+STAjMqMS9fcGQvYXBpL3YyL2NoYXRzL2NvbnZlcnNhdGlvbnMve2NvbnZlcnNhdGlvbl9pZH0SggEKE0xpc3RTdXBwb3J0ZWRNb2RlbHMSIy5jaGF0LnYyLkxpc3RTdXBwb3J0ZWRNb2RlbHNSZXF1ZXN0GiQuY2hhdC52Mi5MaXN0U3VwcG9ydGVkTW9kZWxzUmVzcG9uc2UiIILT5JMCGhIYL19wZC9hcGkvdjIvY2hhdHMvbW9kZWxzQn8KC2NvbS5jaGF0LnYyQglDaGF0UHJvdG9QAVoocGFwZXJkZWJ1Z2dlci9wa2cvZ2VuL2FwaS9jaGF0L3YyO2NoYXR2MqICA0NYWKoCB0NoYXQuVjLKAgdDaGF0XFYy4gITQ2hhdFxWMlxHUEJNZXRhZGF0YeoCCENoYXQ6OlYyYgZwcm90bzM", [file_google_api_annotations]);
 
 /**
  * @generated from message chat.v2.MessageTypeToolCall
@@ -243,6 +243,33 @@ export type Message = Message$1<"chat.v2.Message"> & {
 export const MessageSchema: GenMessage<Message> = /*@__PURE__*/
   messageDesc(file_chat_v2_chat, 7);
 
+/**
+ * @generated from message chat.v2.BranchInfo
+ */
+export type BranchInfo = Message$1<"chat.v2.BranchInfo"> & {
+  /**
+   * @generated from field: string id = 1;
+   */
+  id: string;
+
+  /**
+   * @generated from field: int64 created_at = 2;
+   */
+  createdAt: bigint;
+
+  /**
+   * @generated from field: int64 updated_at = 3;
+   */
+  updatedAt: bigint;
+};
+
+/**
+ * Describes the message chat.v2.BranchInfo.
+ * Use `create(BranchInfoSchema)` to create a new message.
+ */
+export const BranchInfoSchema: GenMessage<BranchInfo> = /*@__PURE__*/
+  messageDesc(file_chat_v2_chat, 8);
+
 /**
  * @generated from message chat.v2.Conversation
  */
@@ -268,6 +295,36 @@ export type Conversation = Message$1<"chat.v2.Conversation"> & {
    * @generated from field: repeated chat.v2.Message messages = 4;
    */
   messages: Message[];
+
+  /**
+   * Branch information
+   *
+   * ID of the branch being viewed
+   *
+   * @generated from field: string current_branch_id = 5;
+   */
+  currentBranchId: string;
+
+  /**
+   * All available branches
+   *
+   * @generated from field: repeated chat.v2.BranchInfo branches = 6;
+   */
+  branches: BranchInfo[];
+
+  /**
+   * 1-indexed position for UI
+   *
+   * @generated from field: int32 current_branch_index = 7;
+   */
+  currentBranchIndex: number;
+
+  /**
+   * Total number of branches
+   *
+   * @generated from field: int32 total_branches = 8;
+   */
+  totalBranches: number;
 };
 
 /**
@@ -275,7 +332,7 @@ export type Conversation = Message$1<"chat.v2.Conversation"> & {
  * Use `create(ConversationSchema)` to create a new message.
  */
 export const ConversationSchema: GenMessage<Conversation> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 8);
+  messageDesc(file_chat_v2_chat, 9);
 
 /**
  * @generated from message chat.v2.ListConversationsRequest
@@ -292,7 +349,7 @@ export type ListConversationsRequest = Message$1<"chat.v2.ListConversationsReque
  * Use `create(ListConversationsRequestSchema)` to create a new message.
  */
 export const ListConversationsRequestSchema: GenMessage<ListConversationsRequest> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 9);
+  messageDesc(file_chat_v2_chat, 10);
 
 /**
  * @generated from message chat.v2.ListConversationsResponse
@@ -311,7 +368,7 @@ export type ListConversationsResponse = Message$1<"chat.v2.ListConversationsResp
  * Use `create(ListConversationsResponseSchema)` to create a new message.
  */
 export const ListConversationsResponseSchema: GenMessage<ListConversationsResponse> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 10);
+  messageDesc(file_chat_v2_chat, 11);
 
 /**
  * @generated from message chat.v2.GetConversationRequest
@@ -321,6 +378,13 @@ export type GetConversationRequest = Message$1<"chat.v2.GetConversationRequest">
    * @generated from field: string conversation_id = 1;
    */
   conversationId: string;
+
+  /**
+   * Optional: specific branch to view
+   *
+   * @generated from field: optional string branch_id = 2;
+   */
+  branchId?: string;
 };
 
 /**
@@ -328,7 +392,7 @@ export type GetConversationRequest = Message$1<"chat.v2.GetConversationRequest">
  * Use `create(GetConversationRequestSchema)` to create a new message.
  */
 export const GetConversationRequestSchema: GenMessage<GetConversationRequest> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 11);
+  messageDesc(file_chat_v2_chat, 12);
 
 /**
  * @generated from message chat.v2.GetConversationResponse
@@ -345,7 +409,7 @@ export type GetConversationResponse = Message$1<"chat.v2.GetConversationResponse
  * Use `create(GetConversationResponseSchema)` to create a new message.
  */
 export const GetConversationResponseSchema: GenMessage<GetConversationResponse> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 12);
+  messageDesc(file_chat_v2_chat, 13);
 
 /**
  * @generated from message chat.v2.UpdateConversationRequest
@@ -367,7 +431,7 @@ export type UpdateConversationRequest = Message$1<"chat.v2.UpdateConversationReq
  * Use `create(UpdateConversationRequestSchema)` to create a new message.
  */
 export const UpdateConversationRequestSchema: GenMessage<UpdateConversationRequest> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 13);
+  messageDesc(file_chat_v2_chat, 14);
 
 /**
  * @generated from message chat.v2.UpdateConversationResponse
@@ -384,7 +448,7 @@ export type UpdateConversationResponse = Message$1<"chat.v2.UpdateConversationRe
  * Use `create(UpdateConversationResponseSchema)` to create a new message.
  */
 export const UpdateConversationResponseSchema: GenMessage<UpdateConversationResponse> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 14);
+  messageDesc(file_chat_v2_chat, 15);
 
 /**
  * @generated from message chat.v2.DeleteConversationRequest
@@ -401,7 +465,7 @@ export type DeleteConversationRequest = Message$1<"chat.v2.DeleteConversationReq
  * Use `create(DeleteConversationRequestSchema)` to create a new message.
  */
 export const DeleteConversationRequestSchema: GenMessage<DeleteConversationRequest> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 15);
+  messageDesc(file_chat_v2_chat, 16);
 
 /**
  * explicitly empty
@@ -416,7 +480,7 @@ export type DeleteConversationResponse = Message$1<"chat.v2.DeleteConversationRe
  * Use `create(DeleteConversationResponseSchema)` to create a new message.
  */
 export const DeleteConversationResponseSchema: GenMessage<DeleteConversationResponse> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 16);
+  messageDesc(file_chat_v2_chat, 17);
 
 /**
  * @generated from message chat.v2.SupportedModel
@@ -462,7 +526,7 @@ export type SupportedModel = Message$1<"chat.v2.SupportedModel"> & {
  * Use `create(SupportedModelSchema)` to create a new message.
  */
 export const SupportedModelSchema: GenMessage<SupportedModel> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 17);
+  messageDesc(file_chat_v2_chat, 18);
 
 /**
  * explicitly empty
@@ -477,7 +541,7 @@ export type ListSupportedModelsRequest = Message$1<"chat.v2.ListSupportedModelsR
  * Use `create(ListSupportedModelsRequestSchema)` to create a new message.
  */
 export const ListSupportedModelsRequestSchema: GenMessage<ListSupportedModelsRequest> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 18);
+  messageDesc(file_chat_v2_chat, 19);
 
 /**
  * @generated from message chat.v2.ListSupportedModelsResponse
@@ -494,7 +558,7 @@ export type ListSupportedModelsResponse = Message$1<"chat.v2.ListSupportedModels
  * Use `create(ListSupportedModelsResponseSchema)` to create a new message.
  */
 export const ListSupportedModelsResponseSchema: GenMessage<ListSupportedModelsResponse> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 19);
+  messageDesc(file_chat_v2_chat, 20);
 
 /**
  * Information sent once at the beginning of a new conversation stream
@@ -518,7 +582,7 @@ export type StreamInitialization = Message$1<"chat.v2.StreamInitialization"> & {
  * Use `create(StreamInitializationSchema)` to create a new message.
  */
 export const StreamInitializationSchema: GenMessage<StreamInitialization> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 20);
+  messageDesc(file_chat_v2_chat, 21);
 
 /**
  * Designed as StreamPartBegin and StreamPartEnd to
@@ -546,7 +610,7 @@ export type StreamPartBegin = Message$1<"chat.v2.StreamPartBegin"> & {
  * Use `create(StreamPartBeginSchema)` to create a new message.
  */
 export const StreamPartBeginSchema: GenMessage<StreamPartBegin> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 21);
+  messageDesc(file_chat_v2_chat, 22);
 
 /**
  * Note: After the StreamPartBegin of tool_call, there can be no MessageChunk,
@@ -575,7 +639,7 @@ export type MessageChunk = Message$1<"chat.v2.MessageChunk"> & {
  * Use `create(MessageChunkSchema)` to create a new message.
  */
 export const MessageChunkSchema: GenMessage<MessageChunk> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 22);
+  messageDesc(file_chat_v2_chat, 23);
 
 /**
  * @generated from message chat.v2.ReasoningChunk
@@ -601,7 +665,7 @@ export type ReasoningChunk = Message$1<"chat.v2.ReasoningChunk"> & {
  * Use `create(ReasoningChunkSchema)` to create a new message.
  */
 export const ReasoningChunkSchema: GenMessage<ReasoningChunk> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 23);
+  messageDesc(file_chat_v2_chat, 24);
 
 /**
  * @generated from message chat.v2.IncompleteIndicator
@@ -623,7 +687,7 @@ export type IncompleteIndicator = Message$1<"chat.v2.IncompleteIndicator"> & {
  * Use `create(IncompleteIndicatorSchema)` to create a new message.
  */
 export const IncompleteIndicatorSchema: GenMessage<IncompleteIndicator> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 24);
+  messageDesc(file_chat_v2_chat, 25);
 
 /**
  * @generated from message chat.v2.StreamPartEnd
@@ -645,7 +709,7 @@ export type StreamPartEnd = Message$1<"chat.v2.StreamPartEnd"> & {
  * Use `create(StreamPartEndSchema)` to create a new message.
  */
 export const StreamPartEndSchema: GenMessage<StreamPartEnd> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 25);
+  messageDesc(file_chat_v2_chat, 26);
 
 /**
  * Sent when the current AI response is fully streamed
@@ -669,7 +733,7 @@ export type StreamFinalization = Message$1<"chat.v2.StreamFinalization"> & {
  * Use `create(StreamFinalizationSchema)` to create a new message.
  */
 export const StreamFinalizationSchema: GenMessage<StreamFinalization> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 26);
+  messageDesc(file_chat_v2_chat, 27);
 
 /**
  * @generated from message chat.v2.StreamError
@@ -686,7 +750,7 @@ export type StreamError = Message$1<"chat.v2.StreamError"> & {
  * Use `create(StreamErrorSchema)` to create a new message.
  */
 export const StreamErrorSchema: GenMessage<StreamError> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 27);
+  messageDesc(file_chat_v2_chat, 28);
 
 /**
  * This message should be the same as CreateConversationMessageRequest
@@ -742,7 +806,7 @@ export type CreateConversationMessageStreamRequest = Message$1<"chat.v2.CreateCo
  * Use `create(CreateConversationMessageStreamRequestSchema)` to create a new message.
  */
 export const CreateConversationMessageStreamRequestSchema: GenMessage<CreateConversationMessageStreamRequest> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 28);
+  messageDesc(file_chat_v2_chat, 29);
 
 /**
  * Response for streaming a message within an existing conversation
@@ -809,7 +873,7 @@ export type CreateConversationMessageStreamResponse = Message$1<"chat.v2.CreateC
  * Use `create(CreateConversationMessageStreamResponseSchema)` to create a new message.
  */
 export const CreateConversationMessageStreamResponseSchema: GenMessage<CreateConversationMessageStreamResponse> = /*@__PURE__*/
-  messageDesc(file_chat_v2_chat, 29);
+  messageDesc(file_chat_v2_chat, 30);
 
 /**
  * @generated from enum chat.v2.ConversationType
diff --git a/webapp/_webapp/src/query/api.ts b/webapp/_webapp/src/query/api.ts
index 9f4245e2..85b6999c 100644
--- a/webapp/_webapp/src/query/api.ts
+++ b/webapp/_webapp/src/query/api.ts
@@ -116,7 +116,8 @@ export const listSupportedModels = async (data: PlainMessage<ListSupportedModels
 };
 
 export const getConversation = async (data: PlainMessage<GetConversationRequest>) => {
-  const response = await apiclientV2.get(`/chats/conversations/${data.conversationId}`);
+  const params = data.branchId ? { branchId: data.branchId } : undefined;
+  const response = await apiclientV2.get(`/chats/conversations/${data.conversationId}`, params);
   return fromJson(GetConversationResponseSchema, response);
 };
 
diff --git a/webapp/_webapp/src/views/chat/header/index.tsx b/webapp/_webapp/src/views/chat/header/index.tsx
index f9a712cb..0476d2e7 100644
--- a/webapp/_webapp/src/views/chat/header/index.tsx
+++ b/webapp/_webapp/src/views/chat/header/index.tsx
@@ -5,6 +5,7 @@ import { flushSync } from "react-dom";
 import { useStreamingMessageStore } from "../../../stores/streaming-message-store";
 import { useConversationUiStore } from "../../../stores/conversation/conversation-ui-store";
 import { ChatHistoryModal } from "./chat-history-modal";
+import { BranchSwitcher } from "../../../components/branch-switcher";
 
 export const NewConversation = () => {
   flushSync(() => {
@@ -32,6 +33,7 @@ export const ChatHeader = () => {
       title={title}
       actions={
         <>
+          <BranchSwitcher conversation={currentConversation} />
           <ChatButton
             icon="tabler:plus"
             alt="New Conversation"
@@ -52,3 +54,4 @@ export const ChatHeader = () => {
     />
   );
 };
+

From a44522167b1b151c7c5a1c7f79ab4c4df5478cd9 Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Thu, 8 Jan 2026 12:23:29 +0800
Subject: [PATCH 05/12] fix: message branches

---
 internal/models/conversation.go               |  3 +-
 internal/services/toolkit/client/utils.go     |  2 +-
 internal/services/toolkit/client/utils_v2.go  |  3 +-
 internal/services/toolkit/handler/stream.go   | 16 +++++------
 internal/services/toolkit/handler/toolcall.go |  4 +--
 .../_webapp/src/hooks/useSendMessageStream.ts | 21 ++++++++++++++
 .../stores/conversation/handlers/converter.ts | 28 +++++++++++++++++++
 7 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/internal/models/conversation.go b/internal/models/conversation.go
index 8c0e688b..8d8c449a 100644
--- a/internal/models/conversation.go
+++ b/internal/models/conversation.go
@@ -1,6 +1,7 @@
 package models
 
 import (
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -135,7 +136,7 @@ func (c *Conversation) CreateNewBranch(baseBranchID string, truncateAfterMsgID s
 		// Find parent message and truncate after it
 		foundIndex := -1
 		for i, msg := range sourceInappHistory {
-			if id, ok := msg["messageId"].(string); ok && id == truncateAfterMsgID {
+			if id, ok := msg["messageId"].(string); ok && strings.Contains(id, truncateAfterMsgID) {
 				foundIndex = i
 				break
 			}
diff --git a/internal/services/toolkit/client/utils.go b/internal/services/toolkit/client/utils.go
index 62609e09..529195d2 100644
--- a/internal/services/toolkit/client/utils.go
+++ b/internal/services/toolkit/client/utils.go
@@ -35,7 +35,7 @@ func appendAssistantTextResponse(openaiChatHistory *responses.ResponseNewParamsI
 	}
 	openaiChatHistory.OfInputItemList = append(openaiChatHistory.OfInputItemList, response)
 	*inappChatHistory = append(*inappChatHistory, chatv1.Message{
-		MessageId: "openai_" + item.ID,
+		MessageId: item.ID,
 		Payload: &chatv1.MessagePayload{
 			MessageType: &chatv1.MessagePayload_Assistant{
 				Assistant: &chatv1.MessageTypeAssistant{
diff --git a/internal/services/toolkit/client/utils_v2.go b/internal/services/toolkit/client/utils_v2.go
index c3ab40dd..65747ef8 100644
--- a/internal/services/toolkit/client/utils_v2.go
+++ b/internal/services/toolkit/client/utils_v2.go
@@ -7,7 +7,6 @@ It is used to append assistant responses to both OpenAI and in-app chat historie
 */
 import (
 	"context"
-	"fmt"
 	"paperdebugger/internal/libs/cfg"
 	"paperdebugger/internal/libs/db"
 	"paperdebugger/internal/libs/logger"
@@ -39,7 +38,7 @@ func appendAssistantTextResponseV2(openaiChatHistory *OpenAIChatHistory, inappCh
 	})
 
 	*inappChatHistory = append(*inappChatHistory, chatv2.Message{
-		MessageId: fmt.Sprintf("openai_%s", contentId),
+		MessageId: contentId,
 		Payload: &chatv2.MessagePayload{
 			MessageType: &chatv2.MessagePayload_Assistant{
 				Assistant: &chatv2.MessageTypeAssistant{
diff --git a/internal/services/toolkit/handler/stream.go b/internal/services/toolkit/handler/stream.go
index 87328dad..e00a429d 100644
--- a/internal/services/toolkit/handler/stream.go
+++ b/internal/services/toolkit/handler/stream.go
@@ -64,7 +64,7 @@ func (h *StreamHandlerV1) HandleAddedItem(chunk responses.ResponseStreamEventUni
 		h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
 			ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartBegin{
 				StreamPartBegin: &chatv1.StreamPartBegin{
-					MessageId: "openai_" + chunk.Item.ID,
+					MessageId: chunk.Item.ID,
 					Payload: &chatv1.MessagePayload{
 						MessageType: &chatv1.MessagePayload_Assistant{
 							Assistant: &chatv1.MessageTypeAssistant{},
@@ -77,7 +77,7 @@ func (h *StreamHandlerV1) HandleAddedItem(chunk responses.ResponseStreamEventUni
 		h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
 			ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartBegin{
 				StreamPartBegin: &chatv1.StreamPartBegin{
-					MessageId: "openai_" + chunk.Item.ID,
+					MessageId: chunk.Item.ID,
 					Payload: &chatv1.MessagePayload{
 						MessageType: &chatv1.MessagePayload_ToolCallPrepareArguments{
 							ToolCallPrepareArguments: &chatv1.MessageTypeToolCallPrepareArguments{
@@ -101,7 +101,7 @@ func (h *StreamHandlerV1) HandleDoneItem(chunk responses.ResponseStreamEventUnio
 		h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
 			ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
 				StreamPartEnd: &chatv1.StreamPartEnd{
-					MessageId: "openai_" + item.ID,
+					MessageId: item.ID,
 					Payload: &chatv1.MessagePayload{
 						MessageType: &chatv1.MessagePayload_Assistant{
 							Assistant: &chatv1.MessageTypeAssistant{
@@ -116,7 +116,7 @@ func (h *StreamHandlerV1) HandleDoneItem(chunk responses.ResponseStreamEventUnio
 		h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
 			ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
 				StreamPartEnd: &chatv1.StreamPartEnd{
-					MessageId: "openai_" + item.ID,
+					MessageId: item.ID,
 					Payload: &chatv1.MessagePayload{
 						MessageType: &chatv1.MessagePayload_ToolCallPrepareArguments{
 							ToolCallPrepareArguments: &chatv1.MessageTypeToolCallPrepareArguments{
@@ -132,7 +132,7 @@ func (h *StreamHandlerV1) HandleDoneItem(chunk responses.ResponseStreamEventUnio
 		h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
 			ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
 				StreamPartEnd: &chatv1.StreamPartEnd{
-					MessageId: "openai_" + item.ID,
+					MessageId: item.ID,
 					Payload: &chatv1.MessagePayload{
 						MessageType: &chatv1.MessagePayload_Unknown{
 							Unknown: &chatv1.MessageTypeUnknown{
@@ -153,7 +153,7 @@ func (h *StreamHandlerV1) HandleTextDelta(chunk responses.ResponseStreamEventUni
 	h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
 		ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_MessageChunk{
 			MessageChunk: &chatv1.MessageChunk{
-				MessageId: "openai_" + chunk.ItemID,
+				MessageId: chunk.ItemID,
 				Delta:     chunk.Delta,
 			},
 		},
@@ -194,7 +194,7 @@ func (h *StreamHandlerV1) SendToolCallBegin(toolCall responses.ResponseFunctionT
 	h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
 		ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartBegin{
 			StreamPartBegin: &chatv1.StreamPartBegin{
-				MessageId: "openai_" + toolCall.CallID,
+				MessageId: toolCall.CallID,
 				Payload: &chatv1.MessagePayload{
 					MessageType: &chatv1.MessagePayload_ToolCall{
 						ToolCall: &chatv1.MessageTypeToolCall{
@@ -215,7 +215,7 @@ func (h *StreamHandlerV1) SendToolCallEnd(toolCall responses.ResponseFunctionToo
 	h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
 		ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
 			StreamPartEnd: &chatv1.StreamPartEnd{
-				MessageId: "openai_" + toolCall.CallID,
+				MessageId: toolCall.CallID,
 				Payload: &chatv1.MessagePayload{
 					MessageType: &chatv1.MessagePayload_ToolCall{
 						ToolCall: &chatv1.MessageTypeToolCall{
diff --git a/internal/services/toolkit/handler/toolcall.go b/internal/services/toolkit/handler/toolcall.go
index 2b3db2a2..80511068 100644
--- a/internal/services/toolkit/handler/toolcall.go
+++ b/internal/services/toolkit/handler/toolcall.go
@@ -68,7 +68,7 @@ func (h *ToolCallHandler) HandleToolCalls(ctx context.Context, outputs []respons
 				// If there was an error, append an error output to OpenAI chat history and in-app chat history.
 				openaiChatHistory.OfInputItemList = append(openaiChatHistory.OfInputItemList, responses.ResponseInputItemParamOfFunctionCallOutput(toolCall.CallID, "Error: "+err.Error()))
 				inappChatHistory = append(inappChatHistory, chatv1.Message{
-					MessageId: "openai_" + toolCall.CallID,
+					MessageId: toolCall.CallID,
 					Payload: &chatv1.MessagePayload{
 						MessageType: &chatv1.MessagePayload_ToolCall{
 							ToolCall: &chatv1.MessageTypeToolCall{
@@ -83,7 +83,7 @@ func (h *ToolCallHandler) HandleToolCalls(ctx context.Context, outputs []respons
 				// On success, append the result to both OpenAI and in-app chat histories.
 				openaiChatHistory.OfInputItemList = append(openaiChatHistory.OfInputItemList, responses.ResponseInputItemParamOfFunctionCallOutput(toolCall.CallID, result))
 				inappChatHistory = append(inappChatHistory, chatv1.Message{
-					MessageId: "openai_" + toolCall.CallID,
+					MessageId: toolCall.CallID,
 					Payload: &chatv1.MessagePayload{
 						MessageType: &chatv1.MessagePayload_ToolCall{
 							ToolCall: &chatv1.MessageTypeToolCall{
diff --git a/webapp/_webapp/src/hooks/useSendMessageStream.ts b/webapp/_webapp/src/hooks/useSendMessageStream.ts
index 9428fc83..2ba134f5 100644
--- a/webapp/_webapp/src/hooks/useSendMessageStream.ts
+++ b/webapp/_webapp/src/hooks/useSendMessageStream.ts
@@ -91,6 +91,27 @@ export function useSendMessageStream() {
       resetStreamingMessage(); // ensure no stale message in the streaming messages
       resetIncompleteIndicator();
 
+      // When editing a message (parentMessageId is provided), truncate the conversation
+      // to only include messages up to and including the parent message
+      if (parentMessageId && currentConversation.messages.length > 0) {
+        const parentIndex = currentConversation.messages.findIndex(
+          (m) => m.messageId === parentMessageId
+        );
+        if (parentIndex !== -1) {
+          // Truncate messages to include only up to parentMessage
+          useConversationStore.getState().updateCurrentConversation((prev) => ({
+            ...prev,
+            messages: prev.messages.slice(0, parentIndex + 1),
+          }));
+        } else if (parentMessageId === "root") {
+          // Clear all messages for "root" edit
+          useConversationStore.getState().updateCurrentConversation((prev) => ({
+            ...prev,
+            messages: [],
+          }));
+        }
+      }
+
       const newMessageEntry: MessageEntry = {
         messageId: "dummy",
         status: MessageEntryStatus.PREPARING,
diff --git a/webapp/_webapp/src/stores/conversation/handlers/converter.ts b/webapp/_webapp/src/stores/conversation/handlers/converter.ts
index eddb3fa8..bff45be2 100644
--- a/webapp/_webapp/src/stores/conversation/handlers/converter.ts
+++ b/webapp/_webapp/src/stores/conversation/handlers/converter.ts
@@ -4,6 +4,7 @@ import { MessageEntry, MessageEntryStatus } from "../types";
 import { useStreamingMessageStore } from "../../streaming-message-store";
 import { flushSync } from "react-dom";
 import { useConversationStore } from "../conversation-store";
+import { getConversation } from "../../../query/api";
 
 export const convertMessageEntryToMessage = (messageEntry: MessageEntry): Message | undefined => {
   if (messageEntry.assistant) {
@@ -70,4 +71,31 @@ export const flushStreamingMessageToConversation = (conversationId?: string, mod
 
   useStreamingMessageStore.getState().resetStreamingMessage();
   // Do not reset incomplete indicator here, it will be reset in useSendMessageStream
+
+  // Async update branch info (doesn't block, doesn't overwrite messages)
+  if (conversationId) {
+    updateBranchInfoAsync(conversationId);
+  }
+};
+
+// Fetch branch info from server and update only branch-related fields
+// This preserves the messages (including reasoning) while updating branch info
+const updateBranchInfoAsync = async (conversationId: string) => {
+  try {
+    const response = await getConversation({ conversationId });
+    if (response.conversation) {
+      const branchInfo = response.conversation;
+      useConversationStore.getState().updateCurrentConversation((prev: Conversation) => ({
+        ...prev,
+        // Only update branch-related fields, keep messages intact
+        currentBranchId: branchInfo.currentBranchId,
+        branches: branchInfo.branches,
+        currentBranchIndex: branchInfo.currentBranchIndex,
+        totalBranches: branchInfo.totalBranches,
+      }));
+    }
+  } catch (error) {
+    console.error("Failed to update branch info:", error);
+    // Non-critical error, branch switcher just won't show
+  }
 };

From 319d502d21bfc19f2d38932cd244f87f20c99bf4 Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Thu, 8 Jan 2026 12:28:33 +0800
Subject: [PATCH 06/12] fix: compatability

---
 internal/services/toolkit/handler/stream_v2.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/internal/services/toolkit/handler/stream_v2.go b/internal/services/toolkit/handler/stream_v2.go
index 86155dbe..8bb23a0b 100644
--- a/internal/services/toolkit/handler/stream_v2.go
+++ b/internal/services/toolkit/handler/stream_v2.go
@@ -103,17 +103,23 @@ func (h *StreamHandlerV2) HandleTextDoneItem(chunk openai.ChatCompletionChunk, c
 		return
 	}
 
+	assistant := &chatv2.MessageTypeAssistant{
+		Content:   content,
+		ModelSlug: h.modelSlug,
+	}
+
+	// Only send Reasoning if it's not empty
+	if reasoning != "" {
+		assistant.Reasoning = &reasoning
+	}
+
 	h.callbackStream.Send(&chatv2.CreateConversationMessageStreamResponse{
 		ResponsePayload: &chatv2.CreateConversationMessageStreamResponse_StreamPartEnd{
 			StreamPartEnd: &chatv2.StreamPartEnd{
 				MessageId: chunk.ID,
 				Payload: &chatv2.MessagePayload{
 					MessageType: &chatv2.MessagePayload_Assistant{
-						Assistant: &chatv2.MessageTypeAssistant{
-							Content:   content,
-							ModelSlug: h.modelSlug,
-							Reasoning: &reasoning,
-						},
+						Assistant: assistant,
 					},
 				},
 			},

From 27d2902bd92f87d54cbc565c89ce83197bcf1fa7 Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Thu, 8 Jan 2026 14:01:46 +0800
Subject: [PATCH 07/12] update faro

---
 webapp/_webapp/src/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/_webapp/src/index.css b/webapp/_webapp/src/index.css
index 88ba8954..055f76de 100644
--- a/webapp/_webapp/src/index.css
+++ b/webapp/_webapp/src/index.css
@@ -459,7 +459,7 @@ video, canvas, audio, iframe, embed, object {
 }
 
 .pd-rnd.dragging {
-  box-shadow: rgba(0, 0, 0, 0.2) 0px 8px 32px; /* horizontal, vertical, blur, spread */
+  box-shadow: rgba(0, 0, 0, 0.2) 0px 4px 12px; /* Same as hover, no expand */
 }
 
 .pd-context-menu {

From c6caa2ebaa198660581a05d969dc103deba6c616 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Fri, 9 Jan 2026 17:02:40 +0800
Subject: [PATCH 08/12] fix: UpdatedAt timestamp not updating when appending
 messages to branches (#80)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Junyi-99 <14367694+Junyi-99@users.noreply.github.com>
---
 internal/api/chat/create_conversation_message_stream_v2.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/internal/api/chat/create_conversation_message_stream_v2.go b/internal/api/chat/create_conversation_message_stream_v2.go
index 97e6c14c..fd68ee0b 100644
--- a/internal/api/chat/create_conversation_message_stream_v2.go
+++ b/internal/api/chat/create_conversation_message_stream_v2.go
@@ -2,6 +2,8 @@ package chat
 
 import (
 	"context"
+	"time"
+
 	"paperdebugger/internal/api/mapper"
 	"paperdebugger/internal/libs/contextutil"
 	"paperdebugger/internal/libs/shared"
@@ -193,6 +195,7 @@ func (s *ChatServerV2) appendConversationMessage(
 	// Append to the active branch
 	activeBranch.InappChatHistory = append(activeBranch.InappChatHistory, bsonMsg)
 	activeBranch.OpenaiChatHistoryCompletion = append(activeBranch.OpenaiChatHistoryCompletion, userOaiMsg)
+	activeBranch.UpdatedAt = bson.NewDateTimeFromTime(time.Now())
 
 	if err := s.chatServiceV2.UpdateConversationV2(conversation); err != nil {
 		return nil, nil, err
@@ -332,6 +335,7 @@ func (s *ChatServerV2) CreateConversationMessageStream(
 	}
 	activeBranch.InappChatHistory = append(activeBranch.InappChatHistory, bsonMessages...)
 	activeBranch.OpenaiChatHistoryCompletion = openaiChatHistory
+	activeBranch.UpdatedAt = bson.NewDateTimeFromTime(time.Now())
 	if err := s.chatServiceV2.UpdateConversationV2(conversation); err != nil {
 		return s.sendStreamError(stream, err)
 	}

From 87c7f4609824c4f992a03911e2655538b474ec6b Mon Sep 17 00:00:00 2001
From: Junyi <hji200914@gmail.com>
Date: Mon, 19 Jan 2026 16:06:16 +0800
Subject: [PATCH 09/12] feat: ms-word support (#90)

Co-authored-by: Yiwei Gong <imwithye@gmail.com>
Co-authored-by: andre <95348273+4ndrelim@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/build-backend-prd.yml |  50 +++++++++
 .github/workflows/stage.yml             | 136 ++++++++++++++++++++++++
 webapp/_webapp/src/devtool/app.tsx      |  15 ++-
 webapp/_webapp/src/main.tsx             |  22 ++--
 4 files changed, 212 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/stage.yml

diff --git a/.github/workflows/build-backend-prd.yml b/.github/workflows/build-backend-prd.yml
index 412e8763..71f49182 100644
--- a/.github/workflows/build-backend-prd.yml
+++ b/.github/workflows/build-backend-prd.yml
@@ -7,6 +7,56 @@ on:
     types: [prd]
 
 jobs:
+  build-chrome-extension:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.client_payload.tag }}
+
+      - name: Setup env
+        run: |
+          echo "MONOREPO_REVISION=$(git rev-parse HEAD | cut -c1-6)" >> $GITHUB_ENV
+          echo "BRANCH_NAME=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
+          echo "VERSION=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      - name: Build
+        run: |
+          export GRAFANA_API_KEY=${{ secrets.GRAFANA_API_KEY }}
+          cd webapp/_webapp
+          npm install
+          npm run build:prd:chrome
+
+      - name: 👉 Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: paperdebugger-chrome-extension-prd
+          path: webapp/_webapp/dist
+
+      - name: Install zip
+        run: |
+          sudo apt-get update && sudo apt-get install -y zip
+
+      - name: Zip extension files
+        run: |
+          zip -r dist.zip webapp/_webapp/dist/*
+
+      - name: Upload to Chrome Web Store (upload only)
+        uses: mobilefirstllc/cws-publish@latest
+        with:
+          action: 'upload'  # one of: upload, publish, testers
+          client_id: ${{ secrets.CHROME_EXT_CLIENT_ID }}
+          client_secret: ${{ secrets.CHROME_EXT_CLIENT_SECRET }}
+          refresh_token: ${{ secrets.CHROME_EXT_REFRESH_TOKEN }}
+          extension_id: 'dfkedikhakpapbfcnbpmfhpklndgiaog'
+          zip_file: 'dist.zip'
+
   build-backend-and-push:
     runs-on: ubuntu-latest
     permissions:
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
new file mode 100644
index 00000000..c3f6e626
--- /dev/null
+++ b/.github/workflows/stage.yml
@@ -0,0 +1,136 @@
+name: Release
+on:
+  push:
+    tags:
+      - 'v*'
+  repository_dispatch:
+    types: [release]
+
+jobs:
+  build-chrome-extension:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.client_payload.tag }}
+      
+      - name: Setup env
+        run: |
+          echo "MONOREPO_REVISION=$(git rev-parse HEAD | cut -c1-6)" >> $GITHUB_ENV
+          echo "BRANCH_NAME=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
+          echo "VERSION=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      - name: Build
+        run: |
+          export GRAFANA_API_KEY=${{ secrets.GRAFANA_API_KEY }}
+          cd webapp/_webapp
+          npm install
+          npm run build:stg:chrome
+
+      - name: 👉 Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: paperdebugger-chrome-extension-stg
+          path: webapp/_webapp/dist
+
+      - name: Install zip
+        run: |
+          sudo apt-get update && sudo apt-get install -y zip
+
+      - name: Zip extension files
+        run: |
+          zip -r dist.zip webapp/_webapp/dist/*
+
+      - name: Upload to Chrome Web Store (upload only)
+        uses: mobilefirstllc/cws-publish@latest
+        with:
+          action: 'upload'  # one of: upload, publish, testers
+          client_id: ${{ secrets.CHROME_EXT_CLIENT_ID }}
+          client_secret: ${{ secrets.CHROME_EXT_CLIENT_SECRET }}
+          refresh_token: ${{ secrets.CHROME_EXT_REFRESH_TOKEN }}
+          extension_id: 'gjkgbnnlfophcfffoinfgdnhjnfankbn'
+          zip_file: 'dist.zip'
+        continue-on-error: true
+
+  build-backend-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    outputs:
+      IMAGE_TAG: ${{ steps.output.outputs.IMAGE_TAG }}
+      PAPERDEBUGGER_IMAGE: ${{ steps.output.outputs.PAPERDEBUGGER_IMAGE }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup env
+        run: |
+          echo "MONOREPO_REVISION=$(git rev-parse HEAD | cut -c1-6)" >> $GITHUB_ENV
+          echo "BRANCH_NAME=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
+          echo "VERSION=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
+      - name: Log in to the container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push docker image
+        run: |
+          make all
+      - id: output
+        name: Output image tag
+        run: |
+          export IMAGE_TAG=${BRANCH_NAME}-${MONOREPO_REVISION}
+          echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_OUTPUT
+          echo "PAPERDEBUGGER_IMAGE=ghcr.io/paperdebugger/sharelatex-paperdebugger:${IMAGE_TAG}" >> $GITHUB_OUTPUT
+
+  deploy-stg:
+    needs: build-backend-and-push
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Clone deploy repo
+        run: |
+          git clone https://${{ secrets.GH_PAT }}@github.com/paperdebugger/deploy.git ../deploy
+      - name: Generate kubernetes manifests
+        env:
+          OPENAI_BASE_URL: ${{ secrets.OPENAI_BASE_URL_STG }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY_STG }}
+          INFERENCE_BASE_URL: ${{ secrets.INFERENCE_BASE_URL_STG }}
+          INFERENCE_API_KEY: ${{ secrets.INFERENCE_API_KEY_STG }}
+          MCP_BASIC_KEY: ${{ secrets.MCP_BASIC_KEY_STG }}
+          MCP_PAPERSCORE_KEY: ${{ secrets.MCP_PAPERSCORE_KEY_STG }}
+          XTRAMCP_OPENAI_BASE_URL: ${{ secrets.XTRAMCP_OPENAI_BASE_URL_STG }}
+          XTRAMCP_OPENAI_API_KEY: ${{ secrets.XTRAMCP_OPENAI_API_KEY_STG }}
+          XTRAMCP_OPENREVIEW_BASE_URL: ${{ secrets.XTRAMCP_OPENREVIEW_BASE_URL_STG }}
+          XTRAMCP_OPENREVIEW_USERNAME: ${{ secrets.XTRAMCP_OPENREVIEW_USERNAME_STG }}
+          XTRAMCP_OPENREVIEW_PASSWORD: ${{ secrets.XTRAMCP_OPENREVIEW_PASSWORD_STG }}
+          XTRAMCP_CROSSREF_EMAIL_ADDRESS: ${{ secrets.XTRAMCP_CROSSREF_EMAIL_ADDRESS_STG }}
+          XTRAMCP_DOI_EMAIL_ADDRESS: ${{ secrets.XTRAMCP_DOI_EMAIL_ADDRESS_STG }}
+          XTRAMCP_ARXIV_METADATA_DB_URL: ${{ secrets.XTRAMCP_ARXIV_METADATA_DB_URL_STG }}
+          XTRAMCP_MONGO_URI: ${{ secrets.XTRAMCP_MONGO_URI_STG }}
+          MONGO_URI: ${{ secrets.MONGO_URI_STG }}
+          GHCR_DOCKER_CONFIG: ${{ secrets.GHCR_DOCKER_CONFIG_STG }}
+          CLOUDFLARE_TUNNEL_TOKEN: ${{ secrets.CLOUDFLARE_TUNNEL_TOKEN_STG }}
+        run: |
+          export PAPERDEBUGGER_IMAGE=${{ needs.build-backend-and-push.outputs.PAPERDEBUGGER_IMAGE }}
+          mkdir -p ../deploy/stg
+          ./hack/stg.sh > ../deploy/stg/paperdebugger.yaml
+      - name: Push changes to deploy repo
+        run: |
+          export IMAGE_TAG=${{ needs.build-backend-and-push.outputs.IMAGE_TAG }}
+          cd ../deploy
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git add stg/paperdebugger.yaml
+          git diff --staged --quiet || git commit -m "chore: update paperdebugger stg, revision ${IMAGE_TAG}"
+          git push
diff --git a/webapp/_webapp/src/devtool/app.tsx b/webapp/_webapp/src/devtool/app.tsx
index a2597d65..d930808d 100644
--- a/webapp/_webapp/src/devtool/app.tsx
+++ b/webapp/_webapp/src/devtool/app.tsx
@@ -5,6 +5,7 @@ import { getCookies } from "../intermediate";
 import { TooltipArea } from "./tooltip";
 import { DevTools } from "../views/devtools";
 import { useDevtoolStore } from "../stores/devtool-store";
+import { storage } from "../libs/storage";
 
 const App = () => {
   const { token, refreshToken, setToken, setRefreshToken } = useAuthStore();
@@ -13,25 +14,29 @@ const App = () => {
   const [gclb, setGclb] = useState(localStorage.getItem("pd.auth.gclb") ?? "");
   const { showTool } = useDevtoolStore();
   
+  const [projectId, setProjectId] = useState(storage.getItem("pd.projectId") ?? "");
+  const [overleafSession, setOverleafSession] = useState(storage.getItem("pd.auth.overleafSession") ?? "");
+  const [gclb, setGclb] = useState(storage.getItem("pd.auth.gclb") ?? "");
+
   useEffect(() => {
     getCookies(window.location.hostname).then((cookies) => {
-      setOverleafSession(cookies.session ?? localStorage.getItem("pd.auth.overleafSession") ?? "");
-      setGclb(cookies.gclb ?? localStorage.getItem("pd.auth.gclb") ?? "");
+      setOverleafSession(cookies.session ?? storage.getItem("pd.auth.overleafSession") ?? "");
+      setGclb(cookies.gclb ?? storage.getItem("pd.auth.gclb") ?? "");
     });
   }, []);
 
   const setProjectId_ = useCallback((projectId: string) => {
-    localStorage.setItem("pd.projectId", projectId);
+    storage.setItem("pd.projectId", projectId);
     setProjectId(projectId);
   }, []);
 
   const setOverleafSession_ = useCallback((overleafSession: string) => {
-    localStorage.setItem("pd.auth.overleafSession", overleafSession);
+    storage.setItem("pd.auth.overleafSession", overleafSession);
     setOverleafSession(overleafSession);
   }, []);
 
   const setGclb_ = useCallback((gclb: string) => {
-    localStorage.setItem("pd.auth.gclb", gclb);
+    storage.setItem("pd.auth.gclb", gclb);
     setGclb(gclb);
   }, []);
 
diff --git a/webapp/_webapp/src/main.tsx b/webapp/_webapp/src/main.tsx
index fa89b021..50725016 100644
--- a/webapp/_webapp/src/main.tsx
+++ b/webapp/_webapp/src/main.tsx
@@ -23,6 +23,7 @@ import { getWebInstrumentations, initializeFaro } from "@grafana/faro-web-sdk";
 import { TracingInstrumentation } from "@grafana/faro-web-tracing";
 import { getManifest } from "./libs/manifest";
 import { AdapterProvider, getOverleafAdapter } from "./adapters";
+import { AdapterProvider, getOverleafAdapter } from "./adapters";
 
 initializeFaro({
   url: "https://faro-collector-prod-ap-southeast-1.grafana.net/collect/79c7648395df4df8b58c228fad42af57",
@@ -230,13 +231,22 @@ if (!import.meta.env.DEV) {
 
     const root = createRoot(div);
     const adapter = getOverleafAdapter();
-    // This block only runs in production (!DEV), so always render without StrictMode
     root.render(
-      <Providers>
-        <AdapterProvider adapter={adapter}>
-          <Main />
-        </AdapterProvider>
-      </Providers>
+      import.meta.env.DEV ? (
+        <StrictMode>
+          <Providers>
+            <AdapterProvider adapter={adapter}>
+              <Main />
+            </AdapterProvider>
+          </Providers>
+        </StrictMode>
+      ) : (
+        <Providers>
+          <AdapterProvider adapter={adapter}>
+            <Main />
+          </AdapterProvider>
+        </Providers>
+      ),
     );
     googleAnalytics.firePageViewEvent(
       "unknown",

From d140c22698432f2bf2400a214225beb44c4f1247 Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Mon, 19 Jan 2026 16:16:01 +0800
Subject: [PATCH 10/12] chore: github actions

---
 .github/workflows/build-backend-prd.yml |  50 ---------
 .github/workflows/stage.yml             | 136 ------------------------
 2 files changed, 186 deletions(-)
 delete mode 100644 .github/workflows/stage.yml

diff --git a/.github/workflows/build-backend-prd.yml b/.github/workflows/build-backend-prd.yml
index 71f49182..412e8763 100644
--- a/.github/workflows/build-backend-prd.yml
+++ b/.github/workflows/build-backend-prd.yml
@@ -7,56 +7,6 @@ on:
     types: [prd]
 
 jobs:
-  build-chrome-extension:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.client_payload.tag }}
-
-      - name: Setup env
-        run: |
-          echo "MONOREPO_REVISION=$(git rev-parse HEAD | cut -c1-6)" >> $GITHUB_ENV
-          echo "BRANCH_NAME=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
-          echo "VERSION=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
-
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
-      - name: Build
-        run: |
-          export GRAFANA_API_KEY=${{ secrets.GRAFANA_API_KEY }}
-          cd webapp/_webapp
-          npm install
-          npm run build:prd:chrome
-
-      - name: 👉 Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: paperdebugger-chrome-extension-prd
-          path: webapp/_webapp/dist
-
-      - name: Install zip
-        run: |
-          sudo apt-get update && sudo apt-get install -y zip
-
-      - name: Zip extension files
-        run: |
-          zip -r dist.zip webapp/_webapp/dist/*
-
-      - name: Upload to Chrome Web Store (upload only)
-        uses: mobilefirstllc/cws-publish@latest
-        with:
-          action: 'upload'  # one of: upload, publish, testers
-          client_id: ${{ secrets.CHROME_EXT_CLIENT_ID }}
-          client_secret: ${{ secrets.CHROME_EXT_CLIENT_SECRET }}
-          refresh_token: ${{ secrets.CHROME_EXT_REFRESH_TOKEN }}
-          extension_id: 'dfkedikhakpapbfcnbpmfhpklndgiaog'
-          zip_file: 'dist.zip'
-
   build-backend-and-push:
     runs-on: ubuntu-latest
     permissions:
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
deleted file mode 100644
index c3f6e626..00000000
--- a/.github/workflows/stage.yml
+++ /dev/null
@@ -1,136 +0,0 @@
-name: Release
-on:
-  push:
-    tags:
-      - 'v*'
-  repository_dispatch:
-    types: [release]
-
-jobs:
-  build-chrome-extension:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.client_payload.tag }}
-      
-      - name: Setup env
-        run: |
-          echo "MONOREPO_REVISION=$(git rev-parse HEAD | cut -c1-6)" >> $GITHUB_ENV
-          echo "BRANCH_NAME=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
-          echo "VERSION=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
-
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
-      - name: Build
-        run: |
-          export GRAFANA_API_KEY=${{ secrets.GRAFANA_API_KEY }}
-          cd webapp/_webapp
-          npm install
-          npm run build:stg:chrome
-
-      - name: 👉 Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: paperdebugger-chrome-extension-stg
-          path: webapp/_webapp/dist
-
-      - name: Install zip
-        run: |
-          sudo apt-get update && sudo apt-get install -y zip
-
-      - name: Zip extension files
-        run: |
-          zip -r dist.zip webapp/_webapp/dist/*
-
-      - name: Upload to Chrome Web Store (upload only)
-        uses: mobilefirstllc/cws-publish@latest
-        with:
-          action: 'upload'  # one of: upload, publish, testers
-          client_id: ${{ secrets.CHROME_EXT_CLIENT_ID }}
-          client_secret: ${{ secrets.CHROME_EXT_CLIENT_SECRET }}
-          refresh_token: ${{ secrets.CHROME_EXT_REFRESH_TOKEN }}
-          extension_id: 'gjkgbnnlfophcfffoinfgdnhjnfankbn'
-          zip_file: 'dist.zip'
-        continue-on-error: true
-
-  build-backend-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    outputs:
-      IMAGE_TAG: ${{ steps.output.outputs.IMAGE_TAG }}
-      PAPERDEBUGGER_IMAGE: ${{ steps.output.outputs.PAPERDEBUGGER_IMAGE }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Setup env
-        run: |
-          echo "MONOREPO_REVISION=$(git rev-parse HEAD | cut -c1-6)" >> $GITHUB_ENV
-          echo "BRANCH_NAME=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
-          echo "VERSION=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV
-      - name: Log in to the container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push docker image
-        run: |
-          make all
-      - id: output
-        name: Output image tag
-        run: |
-          export IMAGE_TAG=${BRANCH_NAME}-${MONOREPO_REVISION}
-          echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_OUTPUT
-          echo "PAPERDEBUGGER_IMAGE=ghcr.io/paperdebugger/sharelatex-paperdebugger:${IMAGE_TAG}" >> $GITHUB_OUTPUT
-
-  deploy-stg:
-    needs: build-backend-and-push
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Clone deploy repo
-        run: |
-          git clone https://${{ secrets.GH_PAT }}@github.com/paperdebugger/deploy.git ../deploy
-      - name: Generate kubernetes manifests
-        env:
-          OPENAI_BASE_URL: ${{ secrets.OPENAI_BASE_URL_STG }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY_STG }}
-          INFERENCE_BASE_URL: ${{ secrets.INFERENCE_BASE_URL_STG }}
-          INFERENCE_API_KEY: ${{ secrets.INFERENCE_API_KEY_STG }}
-          MCP_BASIC_KEY: ${{ secrets.MCP_BASIC_KEY_STG }}
-          MCP_PAPERSCORE_KEY: ${{ secrets.MCP_PAPERSCORE_KEY_STG }}
-          XTRAMCP_OPENAI_BASE_URL: ${{ secrets.XTRAMCP_OPENAI_BASE_URL_STG }}
-          XTRAMCP_OPENAI_API_KEY: ${{ secrets.XTRAMCP_OPENAI_API_KEY_STG }}
-          XTRAMCP_OPENREVIEW_BASE_URL: ${{ secrets.XTRAMCP_OPENREVIEW_BASE_URL_STG }}
-          XTRAMCP_OPENREVIEW_USERNAME: ${{ secrets.XTRAMCP_OPENREVIEW_USERNAME_STG }}
-          XTRAMCP_OPENREVIEW_PASSWORD: ${{ secrets.XTRAMCP_OPENREVIEW_PASSWORD_STG }}
-          XTRAMCP_CROSSREF_EMAIL_ADDRESS: ${{ secrets.XTRAMCP_CROSSREF_EMAIL_ADDRESS_STG }}
-          XTRAMCP_DOI_EMAIL_ADDRESS: ${{ secrets.XTRAMCP_DOI_EMAIL_ADDRESS_STG }}
-          XTRAMCP_ARXIV_METADATA_DB_URL: ${{ secrets.XTRAMCP_ARXIV_METADATA_DB_URL_STG }}
-          XTRAMCP_MONGO_URI: ${{ secrets.XTRAMCP_MONGO_URI_STG }}
-          MONGO_URI: ${{ secrets.MONGO_URI_STG }}
-          GHCR_DOCKER_CONFIG: ${{ secrets.GHCR_DOCKER_CONFIG_STG }}
-          CLOUDFLARE_TUNNEL_TOKEN: ${{ secrets.CLOUDFLARE_TUNNEL_TOKEN_STG }}
-        run: |
-          export PAPERDEBUGGER_IMAGE=${{ needs.build-backend-and-push.outputs.PAPERDEBUGGER_IMAGE }}
-          mkdir -p ../deploy/stg
-          ./hack/stg.sh > ../deploy/stg/paperdebugger.yaml
-      - name: Push changes to deploy repo
-        run: |
-          export IMAGE_TAG=${{ needs.build-backend-and-push.outputs.IMAGE_TAG }}
-          cd ../deploy
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add stg/paperdebugger.yaml
-          git diff --staged --quiet || git commit -m "chore: update paperdebugger stg, revision ${IMAGE_TAG}"
-          git push

From 48bdda69783b44088d844071924b0c8db5b152da Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Mon, 19 Jan 2026 19:05:33 +0800
Subject: [PATCH 11/12] refactor: improve conversation branch handling and
 error management

- Updated CreateNewBranch method to return an error if the parent message is not found, enhancing error handling.
- Modified appendConversationMessage to handle errors from CreateNewBranch.
- Added migration logic for legacy data to branch structure in GetConversation and ListConversations, ensuring stability of branch IDs.
- Introduced HandleAssistantPartBegin to manage assistant message streaming more effectively.
- Enhanced conversation state update in the frontend to prevent stale data application during asynchronous updates.
---
 .../create_conversation_message_stream_v2.go  |  7 ++--
 internal/api/chat/get_conversation_v2.go      | 16 +++++++
 internal/api/chat/list_conversations_v2.go    | 12 ++++++
 internal/models/conversation.go               | 42 ++++++++++---------
 .../services/toolkit/client/completion_v2.go  | 20 +++++----
 .../services/toolkit/handler/stream_v2.go     | 21 ++++++++++
 .../stores/conversation/handlers/converter.ts | 24 +++++++----
 7 files changed, 104 insertions(+), 38 deletions(-)

diff --git a/internal/api/chat/create_conversation_message_stream_v2.go b/internal/api/chat/create_conversation_message_stream_v2.go
index fd68ee0b..fcb1e8af 100644
--- a/internal/api/chat/create_conversation_message_stream_v2.go
+++ b/internal/api/chat/create_conversation_message_stream_v2.go
@@ -168,9 +168,10 @@ func (s *ChatServerV2) appendConversationMessage(
 	// Handle branching / edit mode
 	if parentMessageId != "" {
 		// Create a new branch for the edit
-		activeBranch = conversation.CreateNewBranch("", parentMessageId)
-		if activeBranch == nil {
-			return nil, nil, shared.ErrBadRequest("Failed to create new branch")
+		var err error
+		activeBranch, err = conversation.CreateNewBranch("", parentMessageId)
+		if err != nil {
+			return nil, nil, shared.ErrBadRequest(err)
 		}
 	} else {
 		// Normal append - use active (latest) branch
diff --git a/internal/api/chat/get_conversation_v2.go b/internal/api/chat/get_conversation_v2.go
index dfa715af..c014b962 100644
--- a/internal/api/chat/get_conversation_v2.go
+++ b/internal/api/chat/get_conversation_v2.go
@@ -5,6 +5,7 @@ import (
 
 	"paperdebugger/internal/api/mapper"
 	"paperdebugger/internal/libs/contextutil"
+	"paperdebugger/internal/libs/shared"
 	chatv2 "paperdebugger/pkg/gen/api/chat/v2"
 
 	"go.mongodb.org/mongo-driver/v2/bson"
@@ -29,9 +30,24 @@ func (s *ChatServerV2) GetConversation(
 		return nil, err
 	}
 
+	// Migrate legacy data to branch structure if needed
+	// Persist immediately so branch IDs remain stable across API calls
+	if conversation.EnsureBranches() {
+		if err := s.chatServiceV2.UpdateConversationV2(conversation); err != nil {
+			return nil, err
+		}
+	}
+
 	// Use specified branch_id if provided, otherwise use active branch
 	branchID := req.GetBranchId()
 
+	// Validate that the provided branchId exists in the conversation
+	if branchID != "" {
+		if conversation.GetBranchByID(branchID) == nil {
+			return nil, shared.ErrBadRequest("branch_id not found in conversation")
+		}
+	}
+
 	return &chatv2.GetConversationResponse{
 		Conversation: mapper.MapModelConversationToProtoV2WithBranch(conversation, branchID),
 	}, nil
diff --git a/internal/api/chat/list_conversations_v2.go b/internal/api/chat/list_conversations_v2.go
index 2b6fbf2e..87df8f15 100644
--- a/internal/api/chat/list_conversations_v2.go
+++ b/internal/api/chat/list_conversations_v2.go
@@ -25,6 +25,18 @@ func (s *ChatServerV2) ListConversations(
 		return nil, err
 	}
 
+	// Migrate legacy data to branch structure if needed
+	// Persist immediately so branch IDs remain stable across API calls
+	for _, conversation := range conversations {
+		if conversation.EnsureBranches() {
+			// Persist migration asynchronously to avoid blocking the response
+			// Errors are logged but don't fail the request
+			go func(c *models.Conversation) {
+				_ = s.chatServiceV2.UpdateConversationV2(c)
+			}(conversation)
+		}
+	}
+
 	return &chatv2.ListConversationsResponse{
 		Conversations: lo.Map(conversations, func(conversation *models.Conversation, _ int) *chatv2.Conversation {
 			return mapper.MapModelConversationToProtoV2(conversation)
diff --git a/internal/models/conversation.go b/internal/models/conversation.go
index 8d8c449a..b060f43f 100644
--- a/internal/models/conversation.go
+++ b/internal/models/conversation.go
@@ -1,6 +1,7 @@
 package models
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
@@ -86,8 +87,9 @@ func (c *Conversation) GetBranchIndex(branchID string) int {
 // CreateNewBranch creates a new branch based on an existing branch,
 // truncated after the specified message ID.
 // If baseBranchID is empty and there are no branches, uses legacy fields.
-// Returns the new branch (already appended to c.Branches).
-func (c *Conversation) CreateNewBranch(baseBranchID string, truncateAfterMsgID string) *Branch {
+// Returns the new branch (already appended to c.Branches) and an error if
+// truncateAfterMsgID is provided but the message is not found in the history.
+func (c *Conversation) CreateNewBranch(baseBranchID string, truncateAfterMsgID string) (*Branch, error) {
 	now := bson.NewDateTimeFromTime(time.Now())
 	newBranch := Branch{
 		ID:        uuid.New().String(),
@@ -142,23 +144,20 @@ func (c *Conversation) CreateNewBranch(baseBranchID string, truncateAfterMsgID s
 			}
 		}
 
-		if foundIndex != -1 {
-			// Copy up to and including the parent message
-			newBranch.InappChatHistory = make([]bson.M, foundIndex+1)
-			copy(newBranch.InappChatHistory, sourceInappHistory[:foundIndex+1])
-
-			// Map index: Inapp[i] -> Openai[i+1] (because Openai[0] is system)
-			if len(sourceOpenaiHistory) > foundIndex+1 {
-				newBranch.OpenaiChatHistoryCompletion = make([]openai.ChatCompletionMessageParamUnion, foundIndex+2)
-				copy(newBranch.OpenaiChatHistoryCompletion, sourceOpenaiHistory[:foundIndex+2])
-			} else {
-				newBranch.OpenaiChatHistoryCompletion = make([]openai.ChatCompletionMessageParamUnion, len(sourceOpenaiHistory))
-				copy(newBranch.OpenaiChatHistoryCompletion, sourceOpenaiHistory)
-			}
+		if foundIndex == -1 {
+			// Parent message not found - return error instead of silently copying entire history
+			return nil, fmt.Errorf("parent message with ID %q not found in conversation history", truncateAfterMsgID)
+		}
+
+		// Copy up to and including the parent message
+		newBranch.InappChatHistory = make([]bson.M, foundIndex+1)
+		copy(newBranch.InappChatHistory, sourceInappHistory[:foundIndex+1])
+
+		// Map index: Inapp[i] -> Openai[i+1] (because Openai[0] is system)
+		if len(sourceOpenaiHistory) > foundIndex+1 {
+			newBranch.OpenaiChatHistoryCompletion = make([]openai.ChatCompletionMessageParamUnion, foundIndex+2)
+			copy(newBranch.OpenaiChatHistoryCompletion, sourceOpenaiHistory[:foundIndex+2])
 		} else {
-			// Parent not found, copy entire history
-			newBranch.InappChatHistory = make([]bson.M, len(sourceInappHistory))
-			copy(newBranch.InappChatHistory, sourceInappHistory)
 			newBranch.OpenaiChatHistoryCompletion = make([]openai.ChatCompletionMessageParamUnion, len(sourceOpenaiHistory))
 			copy(newBranch.OpenaiChatHistoryCompletion, sourceOpenaiHistory)
 		}
@@ -171,12 +170,13 @@ func (c *Conversation) CreateNewBranch(baseBranchID string, truncateAfterMsgID s
 	}
 
 	c.Branches = append(c.Branches, newBranch)
-	return &c.Branches[len(c.Branches)-1]
+	return &c.Branches[len(c.Branches)-1], nil
 }
 
 // EnsureBranches migrates legacy data to branch structure if needed.
 // Call this when loading a conversation that might have old data format.
-func (c *Conversation) EnsureBranches() {
+// Returns true if migration occurred (caller should persist the conversation).
+func (c *Conversation) EnsureBranches() bool {
 	if len(c.Branches) == 0 && len(c.InappChatHistory) > 0 {
 		// Migrate legacy data to first branch
 		now := bson.NewDateTimeFromTime(time.Now())
@@ -187,5 +187,7 @@ func (c *Conversation) EnsureBranches() {
 			InappChatHistory:            c.InappChatHistory,
 			OpenaiChatHistoryCompletion: c.OpenaiChatHistoryCompletion,
 		}}
+		return true
 	}
+	return false
 }
diff --git a/internal/services/toolkit/client/completion_v2.go b/internal/services/toolkit/client/completion_v2.go
index c1ec9791..92e1af3a 100644
--- a/internal/services/toolkit/client/completion_v2.go
+++ b/internal/services/toolkit/client/completion_v2.go
@@ -75,7 +75,7 @@ func (a *AIClientV2) ChatCompletionStreamV2(ctx context.Context, callbackStream
 		reasoning_content := ""
 		answer_content := ""
 		answer_content_id := ""
-		is_answering := false
+		has_sent_part_begin := false
 		tool_info := map[int]map[string]string{}
 		toolCalls := []openai.FinishedChatCompletionToolCall{}
 		for stream.Next() {
@@ -90,6 +90,18 @@ func (a *AIClientV2) ChatCompletionStreamV2(ctx context.Context, callbackStream
 
 			delta := chunk.Choices[0].Delta
 
+			// Send StreamPartBegin before any content (reasoning or answer) to ensure
+			// the frontend has created the assistant message part before receiving chunks.
+			// This is critical for models that send reasoning_content before regular content.
+			// We use HandleAssistantPartBegin instead of HandleAddedItem because the first
+			// chunk with reasoning content may not have delta.Role set to "assistant".
+			_, hasReasoningContent := delta.JSON.ExtraFields["reasoning_content"]
+			_, hasReasoning := delta.JSON.ExtraFields["reasoning"]
+			if !has_sent_part_begin && (delta.Role == "assistant" || delta.Content != "" || hasReasoningContent || hasReasoning) {
+				has_sent_part_begin = true
+				streamHandler.HandleAssistantPartBegin(chunk.ID)
+			}
+
 			if field, ok := delta.JSON.ExtraFields["reasoning_content"]; ok && field.Raw() != "null" {
 				var s string
 				err := json.Unmarshal([]byte(field.Raw()), &s)
@@ -105,12 +117,6 @@ func (a *AIClientV2) ChatCompletionStreamV2(ctx context.Context, callbackStream
 					streamHandler.HandleReasoningDelta(chunk.ID, s)
 				}
 			} else {
-				if !is_answering {
-					is_answering = true
-					// fmt.Println("\n\n========== Response ==========")
-					streamHandler.HandleAddedItem(chunk)
-				}
-
 				if delta.Content != "" {
 					answer_content += delta.Content
 					answer_content_id = chunk.ID
diff --git a/internal/services/toolkit/handler/stream_v2.go b/internal/services/toolkit/handler/stream_v2.go
index 8bb23a0b..862a0a42 100644
--- a/internal/services/toolkit/handler/stream_v2.go
+++ b/internal/services/toolkit/handler/stream_v2.go
@@ -41,6 +41,27 @@ func (h *StreamHandlerV2) SendInitialization() {
 	})
 }
 
+// HandleAssistantPartBegin sends a StreamPartBegin message for an assistant message.
+// Unlike HandleAddedItem, this doesn't check the delta.Role field, which is important
+// because reasoning models may send reasoning_content before the role field is set.
+func (h *StreamHandlerV2) HandleAssistantPartBegin(messageId string) {
+	if h.callbackStream == nil {
+		return
+	}
+	h.callbackStream.Send(&chatv2.CreateConversationMessageStreamResponse{
+		ResponsePayload: &chatv2.CreateConversationMessageStreamResponse_StreamPartBegin{
+			StreamPartBegin: &chatv2.StreamPartBegin{
+				MessageId: messageId,
+				Payload: &chatv2.MessagePayload{
+					MessageType: &chatv2.MessagePayload_Assistant{
+						Assistant: &chatv2.MessageTypeAssistant{},
+					},
+				},
+			},
+		},
+	})
+}
+
 func (h *StreamHandlerV2) HandleAddedItem(chunk openai.ChatCompletionChunk) {
 	if h.callbackStream == nil {
 		return
diff --git a/webapp/_webapp/src/stores/conversation/handlers/converter.ts b/webapp/_webapp/src/stores/conversation/handlers/converter.ts
index bff45be2..29471a7e 100644
--- a/webapp/_webapp/src/stores/conversation/handlers/converter.ts
+++ b/webapp/_webapp/src/stores/conversation/handlers/converter.ts
@@ -85,16 +85,24 @@ const updateBranchInfoAsync = async (conversationId: string) => {
     const response = await getConversation({ conversationId });
     if (response.conversation) {
       const branchInfo = response.conversation;
-      useConversationStore.getState().updateCurrentConversation((prev: Conversation) => ({
-        ...prev,
-        // Only update branch-related fields, keep messages intact
-        currentBranchId: branchInfo.currentBranchId,
-        branches: branchInfo.branches,
-        currentBranchIndex: branchInfo.currentBranchIndex,
-        totalBranches: branchInfo.totalBranches,
-      }));
+      useConversationStore.getState().updateCurrentConversation((prev: Conversation) => {
+        // Guard against race condition: if user navigated to a different conversation
+        // while the fetch was in progress, don't apply the stale branch info
+        if (prev.id !== conversationId) {
+          return prev;
+        }
+        return {
+          ...prev,
+          // Only update branch-related fields, keep messages intact
+          currentBranchId: branchInfo.currentBranchId,
+          branches: branchInfo.branches,
+          currentBranchIndex: branchInfo.currentBranchIndex,
+          totalBranches: branchInfo.totalBranches,
+        };
+      });
     }
   } catch (error) {
+    // eslint-disable-next-line no-console
     console.error("Failed to update branch info:", error);
     // Non-critical error, branch switcher just won't show
   }

From ba572426d0bba007c9e04610f9ec3652105ceb17 Mon Sep 17 00:00:00 2001
From: Junyi Hou <hji200914@gmail.com>
Date: Mon, 19 Jan 2026 19:43:57 +0800
Subject: [PATCH 12/12] chore: update .gitignore and enhance project
 instruction handling in conversation preparation

- Added '.claude' to .gitignore to exclude specific files from version control.
- Refactored conversation preparation logic in both V1 and V2 to use a local variable for project instructions, improving code clarity.
- Updated toolkit client to register file and LaTeX tools with project service injection, enhancing functionality.
- Modified error messages in file and folder tools to indicate unimplemented features.
---
 .gitignore                                    |  2 +
 .../create_conversation_message_stream.go     |  7 ++-
 .../create_conversation_message_stream_v2.go  |  7 ++-
 internal/services/toolkit/client/utils_v2.go  | 56 ++++++++-----------
 .../toolkit/tools/files/file_create.go        |  2 +-
 .../toolkit/tools/files/file_delete.go        |  2 +-
 .../toolkit/tools/files/file_search.go        |  2 +-
 .../toolkit/tools/files/folder_create.go      |  2 +-
 .../toolkit/tools/files/folder_delete.go      |  7 +--
 .../toolkit/tools/latex/locate_section.go     |  5 +-
 webapp/_webapp/src/libs/google-analytics.ts   |  4 +-
 .../office/src/adapters/document-adapter.ts   |  2 +-
 12 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1dfa72ce..506e28e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.claude
+
 # docker image build
 .dockerignore
 node_modules
diff --git a/internal/api/chat/create_conversation_message_stream.go b/internal/api/chat/create_conversation_message_stream.go
index 3d6b2faa..4bec1fab 100644
--- a/internal/api/chat/create_conversation_message_stream.go
+++ b/internal/api/chat/create_conversation_message_stream.go
@@ -207,9 +207,13 @@ func (s *ChatServerV1) prepare(ctx context.Context, projectId string, conversati
 	}
 
 	var latexFullSource string
+	var projectInstructions string
 	switch conversationType {
 	case chatv1.ConversationType_CONVERSATION_TYPE_DEBUG:
 		latexFullSource = "latex_full_source is not available in debug mode"
+		if project != nil {
+			projectInstructions = project.Instructions
+		}
 	default:
 		if project == nil || project.IsOutOfDate() {
 			return ctx, nil, nil, shared.ErrProjectOutOfDate("project is out of date")
@@ -219,6 +223,7 @@ func (s *ChatServerV1) prepare(ctx context.Context, projectId string, conversati
 		if err != nil {
 			return ctx, nil, nil, err
 		}
+		projectInstructions = project.Instructions
 	}
 
 	var conversation *models.Conversation
@@ -229,7 +234,7 @@ func (s *ChatServerV1) prepare(ctx context.Context, projectId string, conversati
 			actor.ID,
 			projectId,
 			latexFullSource,
-			project.Instructions,
+			projectInstructions,
 			userInstructions,
 			userMessage,
 			userSelectedText,
diff --git a/internal/api/chat/create_conversation_message_stream_v2.go b/internal/api/chat/create_conversation_message_stream_v2.go
index fcb1e8af..c264cdbd 100644
--- a/internal/api/chat/create_conversation_message_stream_v2.go
+++ b/internal/api/chat/create_conversation_message_stream_v2.go
@@ -225,9 +225,13 @@ func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversati
 	}
 
 	var latexFullSource string
+	var projectInstructions string
 	switch conversationType {
 	case chatv2.ConversationType_CONVERSATION_TYPE_DEBUG:
 		latexFullSource = "latex_full_source is not available in debug mode"
+		if project != nil {
+			projectInstructions = project.Instructions
+		}
 	default:
 		if project == nil || project.IsOutOfDate() {
 			return ctx, nil, nil, nil, shared.ErrProjectOutOfDate("project is out of date")
@@ -237,6 +241,7 @@ func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversati
 		if err != nil {
 			return ctx, nil, nil, nil, err
 		}
+		projectInstructions = project.Instructions
 	}
 
 	var conversation *models.Conversation
@@ -249,7 +254,7 @@ func (s *ChatServerV2) prepare(ctx context.Context, projectId string, conversati
 			actor.ID,
 			projectId,
 			latexFullSource,
-			project.Instructions,
+			projectInstructions,
 			userInstructions,
 			userMessage,
 			userSelectedText,
diff --git a/internal/services/toolkit/client/utils_v2.go b/internal/services/toolkit/client/utils_v2.go
index 65747ef8..2eed3eee 100644
--- a/internal/services/toolkit/client/utils_v2.go
+++ b/internal/services/toolkit/client/utils_v2.go
@@ -12,6 +12,8 @@ import (
 	"paperdebugger/internal/libs/logger"
 	"paperdebugger/internal/services"
 	"paperdebugger/internal/services/toolkit/registry"
+	filetools "paperdebugger/internal/services/toolkit/tools/files"
+	latextools "paperdebugger/internal/services/toolkit/tools/latex"
 	"paperdebugger/internal/services/toolkit/tools/xtramcp"
 	chatv2 "paperdebugger/pkg/gen/api/chat/v2"
 	"strings"
@@ -109,40 +111,26 @@ func initializeToolkitV2(
 ) *registry.ToolRegistryV2 {
 	toolRegistry := registry.NewToolRegistryV2()
 
-	// Register static file tools (create/delete don't need ProjectService - they're placeholder only)
-	// toolRegistry.Register("create_file", filetools.CreateFileToolDescriptionV2, filetools.CreateFileTool)
-	// toolRegistry.Register("delete_file", filetools.DeleteFileToolDescriptionV2, filetools.DeleteFileTool)
-	// toolRegistry.Register("create_folder", filetools.CreateFolderToolDescriptionV2, filetools.CreateFolderTool)
-	// toolRegistry.Register("delete_folder", filetools.DeleteFolderToolDescriptionV2, filetools.DeleteFolderTool)
-
-	// Register file tools with ProjectService injection
-	// readFileTool := filetools.NewReadFileTool(projectService)
-	// toolRegistry.Register("read_file", filetools.ReadFileToolDescriptionV2, readFileTool.Call)
-
-	// listFolderTool := filetools.NewListFolderTool(projectService)
-	// toolRegistry.Register("list_folder", filetools.ListFolderToolDescriptionV2, listFolderTool.Call)
-
-	// searchStringTool := filetools.NewSearchStringTool(projectService)
-	// toolRegistry.Register("search_string", filetools.SearchStringToolDescriptionV2, searchStringTool.Call)
-
-	// searchFileTool := filetools.NewSearchFileTool(projectService)
-	// toolRegistry.Register("search_file", filetools.SearchFileToolDescriptionV2, searchFileTool.Call)
-
-	logger.Info("[AI Client V2] Registered static file tools", "count", 0)
-
-	// Register LaTeX tools with ProjectService injection
-	// documentStructureTool := latextools.NewDocumentStructureTool(projectService)
-	// toolRegistry.Register("get_document_structure", latextools.GetDocumentStructureToolDescriptionV2, documentStructureTool.Call)
-
-	// toolRegistry.Register("locate_section", latextools.LocateSectionToolDescriptionV2, latextools.LocateSectionTool)
-
-	// readSectionSourceTool := latextools.NewReadSectionSourceTool(projectService)
-	// toolRegistry.Register("read_section_source", latextools.ReadSectionSourceToolDescriptionV2, readSectionSourceTool.Call)
-
-	// readSourceLineRangeTool := latextools.NewReadSourceLineRangeTool(projectService)
-	// toolRegistry.Register("read_source_line_range", latextools.ReadSourceLineRangeToolDescriptionV2, readSourceLineRangeTool.Call)
-
-	logger.Info("[AI Client V2] Registered static LaTeX tools", "count", 0)
+	readFileTool := filetools.NewReadFileTool(projectService)
+	listFolderTool := filetools.NewListFolderTool(projectService)
+	searchStringTool := filetools.NewSearchStringTool(projectService)
+	searchFileTool := filetools.NewSearchFileTool(projectService)
+	documentStructureTool := latextools.NewDocumentStructureTool(projectService)
+	readSectionSourceTool := latextools.NewReadSectionSourceTool(projectService)
+	readSourceLineRangeTool := latextools.NewReadSourceLineRangeTool(projectService)
+
+	toolRegistry.Register("create_file", filetools.CreateFileToolDescriptionV2, filetools.CreateFileTool)
+	toolRegistry.Register("delete_file", filetools.DeleteFileToolDescriptionV2, filetools.DeleteFileTool)
+	toolRegistry.Register("create_folder", filetools.CreateFolderToolDescriptionV2, filetools.CreateFolderTool)
+	toolRegistry.Register("delete_folder", filetools.DeleteFolderToolDescriptionV2, filetools.DeleteFolderTool)
+	toolRegistry.Register("read_file", filetools.ReadFileToolDescriptionV2, readFileTool.Call)
+	toolRegistry.Register("list_folder", filetools.ListFolderToolDescriptionV2, listFolderTool.Call)
+	toolRegistry.Register("search_string", filetools.SearchStringToolDescriptionV2, searchStringTool.Call)
+	toolRegistry.Register("search_file", filetools.SearchFileToolDescriptionV2, searchFileTool.Call)
+	toolRegistry.Register("get_document_structure", latextools.GetDocumentStructureToolDescriptionV2, documentStructureTool.Call)
+	toolRegistry.Register("locate_section", latextools.LocateSectionToolDescriptionV2, latextools.LocateSectionTool)
+	toolRegistry.Register("read_section_source", latextools.ReadSectionSourceToolDescriptionV2, readSectionSourceTool.Call)
+	toolRegistry.Register("read_source_line_range", latextools.ReadSourceLineRangeToolDescriptionV2, readSourceLineRangeTool.Call)
 
 	// Load tools dynamically from backend
 	xtraMCPLoader := xtramcp.NewXtraMCPLoaderV2(db, projectService, cfg.XtraMCPURI)
diff --git a/internal/services/toolkit/tools/files/file_create.go b/internal/services/toolkit/tools/files/file_create.go
index 54f91ecc..0cb9b31a 100644
--- a/internal/services/toolkit/tools/files/file_create.go
+++ b/internal/services/toolkit/tools/files/file_create.go
@@ -45,5 +45,5 @@ func CreateFileTool(ctx context.Context, toolCallId string, args json.RawMessage
 	}
 
 	// TODO: Implement actual file creation logic
-	return fmt.Sprintf("[DUMMY] File created at: %s (content length: %d bytes)", getArgs.Path, len(getArgs.Content)), "", nil
+	return "", "", fmt.Errorf("create_file tool is not yet implemented: cannot create file at %s", getArgs.Path)
 }
diff --git a/internal/services/toolkit/tools/files/file_delete.go b/internal/services/toolkit/tools/files/file_delete.go
index 18f78ddd..448142db 100644
--- a/internal/services/toolkit/tools/files/file_delete.go
+++ b/internal/services/toolkit/tools/files/file_delete.go
@@ -40,5 +40,5 @@ func DeleteFileTool(ctx context.Context, toolCallId string, args json.RawMessage
 	}
 
 	// TODO: Implement actual file deletion logic
-	return fmt.Sprintf("[DUMMY] File deleted: %s", getArgs.Path), "", nil
+	return "", "", fmt.Errorf("delete_file tool is not yet implemented: cannot delete file at %s", getArgs.Path)
 }
diff --git a/internal/services/toolkit/tools/files/file_search.go b/internal/services/toolkit/tools/files/file_search.go
index 790d05f8..81c3b8f2 100644
--- a/internal/services/toolkit/tools/files/file_search.go
+++ b/internal/services/toolkit/tools/files/file_search.go
@@ -104,7 +104,7 @@ func (t *SearchFileTool) Call(ctx context.Context, toolCallId string, args json.
 				if !recursive && dir != searchPath {
 					continue
 				}
-				if recursive && !strings.HasPrefix(docPath, searchPath) {
+				if recursive && !strings.HasPrefix(docPath, searchPath+"/") {
 					continue
 				}
 			}
diff --git a/internal/services/toolkit/tools/files/folder_create.go b/internal/services/toolkit/tools/files/folder_create.go
index 4c5a1c4e..7327d336 100644
--- a/internal/services/toolkit/tools/files/folder_create.go
+++ b/internal/services/toolkit/tools/files/folder_create.go
@@ -40,5 +40,5 @@ func CreateFolderTool(ctx context.Context, toolCallId string, args json.RawMessa
 	}
 
 	// TODO: Implement actual folder creation logic
-	return fmt.Sprintf("[DUMMY] Folder created at: %s", getArgs.Path), "", nil
+	return "", "", fmt.Errorf("create_folder tool is not yet implemented: cannot create folder at %s", getArgs.Path)
 }
diff --git a/internal/services/toolkit/tools/files/folder_delete.go b/internal/services/toolkit/tools/files/folder_delete.go
index d18f979e..9a76685c 100644
--- a/internal/services/toolkit/tools/files/folder_delete.go
+++ b/internal/services/toolkit/tools/files/folder_delete.go
@@ -44,11 +44,6 @@ func DeleteFolderTool(ctx context.Context, toolCallId string, args json.RawMessa
 		return "", "", err
 	}
 
-	recursive := false
-	if getArgs.Recursive != nil {
-		recursive = *getArgs.Recursive
-	}
-
 	// TODO: Implement actual folder deletion logic
-	return fmt.Sprintf("[DUMMY] Folder deleted: %s (recursive: %v)", getArgs.Path, recursive), "", nil
+	return "", "", fmt.Errorf("delete_folder tool is not yet implemented: cannot delete folder at %s", getArgs.Path)
 }
diff --git a/internal/services/toolkit/tools/latex/locate_section.go b/internal/services/toolkit/tools/latex/locate_section.go
index d0b26830..df7d7d65 100644
--- a/internal/services/toolkit/tools/latex/locate_section.go
+++ b/internal/services/toolkit/tools/latex/locate_section.go
@@ -40,8 +40,5 @@ func LocateSectionTool(ctx context.Context, toolCallId string, args json.RawMess
 	}
 
 	// TODO: Implement actual section location logic
-	return fmt.Sprintf(`[DUMMY] Located section '%s':
-File: main.tex
-Start Line: 42
-End Line: 87`, getArgs.Title), "", nil
+	return "", "", fmt.Errorf("locate_section tool is not yet implemented: cannot locate section '%s'", getArgs.Title)
 }
diff --git a/webapp/_webapp/src/libs/google-analytics.ts b/webapp/_webapp/src/libs/google-analytics.ts
index 2085f8c2..cb34a5f9 100644
--- a/webapp/_webapp/src/libs/google-analytics.ts
+++ b/webapp/_webapp/src/libs/google-analytics.ts
@@ -75,10 +75,10 @@ class Analytics {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async fireErrorEvent(error: any, additionalParams = {}) {
+  async fireErrorEvent(clientId: string | undefined, error: any, additionalParams = {}) {
     // Note: 'error' is a reserved event name and cannot be used
     // see https://developers.google.com/analytics/devguides/collection/protocol/ga4/reference?client_type=gtag#reserved_names
-    return this.fireEvent("extension_error", {
+    return this.fireEvent(clientId, "extension_error", {
       ...error,
       ...additionalParams,
     });
diff --git a/webapp/office/src/adapters/document-adapter.ts b/webapp/office/src/adapters/document-adapter.ts
index 0359aabd..d13c2e4f 100644
--- a/webapp/office/src/adapters/document-adapter.ts
+++ b/webapp/office/src/adapters/document-adapter.ts
@@ -228,7 +228,7 @@ export class WordAdapter implements DocumentAdapter {
       }
     };
 
-    intervalId = setInterval(checkSelection, 500);
+    intervalId = setInterval(checkSelection, 1000);
     checkSelection();
 
     return () => {