From 6b985051f36f40efee47a27e618bef5db25fd993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samy=20Pess=C3=A9?= <samypesse@gmail.com>
Date: Fri, 12 Dec 2025 13:52:05 +0100
Subject: [PATCH] Use response.id instead of responseId (#3867)

---
 packages/gitbook/src/components/AI/server-actions/api.tsx | 8 ++++----
 packages/gitbook/src/components/AI/useAIChat.tsx          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/gitbook/src/components/AI/server-actions/api.tsx b/packages/gitbook/src/components/AI/server-actions/api.tsx
index 23440a6ae..dcbdb8ed5 100644
--- a/packages/gitbook/src/components/AI/server-actions/api.tsx
+++ b/packages/gitbook/src/components/AI/server-actions/api.tsx
@@ -128,10 +128,10 @@ function parseResponse<T>(
     parse: (response: AIStreamResponse) => T | undefined | Promise<T | undefined>
 ): {
     stream: EventIterator<T>;
-    response: Promise<{ responseId: string }>;
+    response: Promise<{ responseId: string | null }>;
 } {
-    let resolveResponse: (value: { responseId: string }) => void;
-    const response = new Promise<{ responseId: string }>((resolve) => {
+    let resolveResponse: (value: { responseId: string | null }) => void;
+    const response = new Promise<{ responseId: string | null }>((resolve) => {
         resolveResponse = resolve;
     });
 
@@ -147,7 +147,7 @@ function parseResponse<T>(
 
                 if (event.type === 'response_finish') {
                     foundResponse = true;
-                    resolveResponse({ responseId: event.responseId });
+                    resolveResponse({ responseId: event.response.id ?? null });
                 }
             }
 
diff --git a/packages/gitbook/src/components/AI/useAIChat.tsx b/packages/gitbook/src/components/AI/useAIChat.tsx
index 7225fc179..8f6519189 100644
--- a/packages/gitbook/src/components/AI/useAIChat.tsx
+++ b/packages/gitbook/src/components/AI/useAIChat.tsx
@@ -296,7 +296,7 @@ export function AIChatProvider(props: {
                         case 'response_finish': {
                             globalState.setState((state) => ({
                                 ...state,
-                                responseId: event.responseId,
+                                responseId: event.response.id ?? null,
                                 // Mark as not loading when the response is finished
                                 // Even if the stream might continue as we receive 'response_followup_suggestion'
                                 loading: false,