ChatGPTNextWeb · skymkmk · Sep 15, 2024 · Sep 15, 2024
diff --git a/app/client/api.ts b/app/client/api.ts
@@ -59,7 +59,7 @@ export interface ChatOptions {
   config: LLMConfig;
 
   onUpdate?: (message: string, chunk: string) => void;
-  onFinish: (message: string) => void;
+  onFinish: (message: string, finishedReason?: string) => void;
   onError?: (err: Error) => void;
   onController?: (controller: AbortController) => void;
   onBeforeTool?: (tool: ChatMessageTool) => void;

diff --git a/app/client/controller.ts b/app/client/controller.ts
@@ -26,6 +26,10 @@ export const ChatControllerPool = {
     return Object.values(this.controllers).length > 0;
   },
 
+  getPendingMessageId() {
+    return Object.keys(this.controllers).map((v) => v.split(",").at(-1));
+  },
+
   remove(sessionId: string, messageId: string) {
     const key = this.key(sessionId, messageId);
     delete this.controllers[key];

diff --git a/app/client/platforms/anthropic.ts b/app/client/platforms/anthropic.ts
@@ -262,7 +262,7 @@ export class ClaudeApi implements LLMApi {
             runTools[index]["function"]["arguments"] +=
               chunkJson?.delta?.partial_json;
           }
-          return chunkJson?.delta?.text;
+          return { delta: chunkJson?.delta?.text };
         },
         // processToolMessage, include tool_calls message and tool call results
         (

diff --git a/app/client/platforms/moonshot.ts b/app/client/platforms/moonshot.ts
@@ -163,7 +163,7 @@ export class MoonshotApi implements LLMApi {
                 runTools[index]["function"]["arguments"] += args;
               }
             }
-            return choices[0]?.delta?.content;
+            return { delta: choices[0]?.delta?.content };
           },
           // processToolMessage, include tool_calls message and tool call results
           (

diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts
@@ -266,6 +266,7 @@ export class ChatGPTApi implements LLMApi {
                 content: string;
                 tool_calls: ChatMessageTool[];
               };
+              finish_reason?: string;
             }>;
             const tool_calls = choices[0]?.delta?.tool_calls;
             if (tool_calls?.length > 0) {
@@ -286,7 +287,10 @@ export class ChatGPTApi implements LLMApi {
                 runTools[index]["function"]["arguments"] += args;
               }
             }
-            return choices[0]?.delta?.content;
+            return {
+              delta: choices[0]?.delta?.content,
+              finishReason: choices[0]?.finish_reason,
+            };
           },
           // processToolMessage, include tool_calls message and tool call results
           (

diff --git a/app/components/chat.tsx b/app/components/chat.tsx
@@ -9,6 +9,7 @@ import React, {
   RefObject,
 } from "react";
 
+import ContinueIcon from "../icons/continue.svg";
 import SendWhiteIcon from "../icons/send-white.svg";
 import BrainIcon from "../icons/brain.svg";
 import RenameIcon from "../icons/rename.svg";
@@ -461,7 +462,16 @@ export function ChatActions(props: {
 
   // stop all responses
   const couldStop = ChatControllerPool.hasPending();
-  const stopAll = () => ChatControllerPool.stopAll();
+  const stopAll = () => {
+    const stopList = ChatControllerPool.getPendingMessageId();
+    ChatControllerPool.stopAll();
+    chatStore.updateCurrentSession(
+      (session) =>
+        (session.messages = session.messages.map((v) =>
+          stopList.includes(v.id) ? { ...v, finishedReason: "aborted" } : v,
+        )),
+    );
+  };
 
   // switch model
   const currentModel = chatStore.currentSession().mask.modelConfig.model;
@@ -1045,6 +1055,12 @@ function _Chat() {
   // stop response
   const onUserStop = (messageId: string) => {
     ChatControllerPool.stop(session.id, messageId);
+    chatStore.updateCurrentSession(
+      (session) =>
+        (session.messages = session.messages.map((v) =>
+          v.id === messageId ? { ...v, finishedReason: "aborted" } : v,
+        )),
+    );
   };
 
   useEffect(() => {
@@ -1171,6 +1187,18 @@ function _Chat() {
     inputRef.current?.focus();
   };
 
+  const onContinue = (messageID: string) => {
+    chatStore.updateCurrentSession(
+      (session) =>
+        (session.messages = session.messages.map((v) =>
+          v.id === messageID ? { ...v, streaming: true } : v,
+        )),
+    );
+    chatStore
+      .onContinueBotMessage(messageID)
+      .finally(() => setIsLoading(false));
+  };
+
   const onPinMessage = (message: ChatMessage) => {
     chatStore.updateCurrentSession((session) =>
       session.mask.context.push(message),
@@ -1724,6 +1752,15 @@ function _Chat() {
                                   )
                                 }
                               />
+                              {["length", "aborted"].includes(
+                                message.finishedReason ?? "",
+                              ) ? (
+                                <ChatAction
+                                  text={Locale.Chat.Actions.Continue}
+                                  icon={<ContinueIcon />}
+                                  onClick={() => onContinue(message.id)}
+                                />
+                              ) : null}
                             </>
                           )}
                         </div>

diff --git a/app/icons/continue.svg b/app/icons/continue.svg
diff --git a/app/locales/ar.ts b/app/locales/ar.ts
@@ -45,6 +45,7 @@ const ar: PartialLocaleType = {
       Edit: "تحرير",
       RefreshTitle: "تحديث العنوان",
       RefreshToast: "تم إرسال طلب تحديث العنوان",
+      Continue: "استمر",
     },
     Commands: {
       new: "دردشة جديدة",

diff --git a/app/locales/bn.ts b/app/locales/bn.ts
@@ -45,6 +45,7 @@ const bn: PartialLocaleType = {
       Edit: "সম্পাদনা করুন",
       RefreshTitle: "শিরোনাম রিফ্রেশ করুন",
       RefreshToast: "শিরোনাম রিফ্রেশ অনুরোধ পাঠানো হয়েছে",
+      Continue: "চালিয়ে যান",
     },
     Commands: {
       new: "নতুন চ্যাট",

diff --git a/app/locales/cn.ts b/app/locales/cn.ts
@@ -46,6 +46,7 @@ const cn = {
       FullScreen: "全屏",
       RefreshTitle: "刷新标题",
       RefreshToast: "已发送刷新标题请求",
+      Continue: "继续",
     },
     Commands: {
       new: "新建聊天",

diff --git a/app/locales/cs.ts b/app/locales/cs.ts
@@ -45,6 +45,7 @@ const cs: PartialLocaleType = {
       Edit: "Upravit",
       RefreshTitle: "Obnovit název",
       RefreshToast: "Požadavek na obnovení názvu byl odeslán",
+      Continue: "Pokračovat",
     },
     Commands: {
       new: "Nová konverzace",

diff --git a/app/locales/de.ts b/app/locales/de.ts
@@ -45,6 +45,7 @@ const de: PartialLocaleType = {
       Edit: "Bearbeiten",
       RefreshTitle: "Titel aktualisieren",
       RefreshToast: "Anfrage zur Titelaktualisierung gesendet",
+      Continue: "Fortsetzen",
     },
     Commands: {
       new: "Neues Gespräch",

diff --git a/app/locales/en.ts b/app/locales/en.ts
@@ -47,6 +47,7 @@ const en: LocaleType = {
       FullScreen: "FullScreen",
       RefreshTitle: "Refresh Title",
       RefreshToast: "Title refresh request sent",
+      Continue: "Continue",
     },
     Commands: {
       new: "Start a new chat",

diff --git a/app/locales/es.ts b/app/locales/es.ts
@@ -46,6 +46,7 @@ const es: PartialLocaleType = {
       Edit: "Editar",
       RefreshTitle: "Actualizar título",
       RefreshToast: "Se ha enviado la solicitud de actualización del título",
+      Continue: "Continuar",
     },
     Commands: {
       new: "Nueva conversación",

diff --git a/app/locales/fr.ts b/app/locales/fr.ts
@@ -45,6 +45,7 @@ const fr: PartialLocaleType = {
       Edit: "Modifier",
       RefreshTitle: "Actualiser le titre",
       RefreshToast: "Demande d'actualisation du titre envoyée",
+      Continue: "Continuer",
     },
     Commands: {
       new: "Nouvelle discussion",

diff --git a/app/locales/id.ts b/app/locales/id.ts
@@ -45,6 +45,7 @@ const id: PartialLocaleType = {
       Edit: "Edit",
       RefreshTitle: "Segarkan Judul",
       RefreshToast: "Permintaan penyegaran judul telah dikirim",
+      Continue: "Lanjutkan",
     },
     Commands: {
       new: "Obrolan Baru",

diff --git a/app/locales/it.ts b/app/locales/it.ts
@@ -45,6 +45,7 @@ const it: PartialLocaleType = {
       Edit: "Modifica",
       RefreshTitle: "Aggiorna titolo",
       RefreshToast: "Richiesta di aggiornamento del titolo inviata",
+      Continue: "Continua",
     },
     Commands: {
       new: "Nuova chat",

diff --git a/app/locales/jp.ts b/app/locales/jp.ts
@@ -45,6 +45,7 @@ const jp: PartialLocaleType = {
       Edit: "編集",
       RefreshTitle: "タイトルを更新",
       RefreshToast: "タイトル更新リクエストが送信されました",
+      Continue: "続ける",
     },
     Commands: {
       new: "新しいチャット",

diff --git a/app/locales/ko.ts b/app/locales/ko.ts
@@ -45,6 +45,7 @@ const ko: PartialLocaleType = {
       Edit: "편집",
       RefreshTitle: "제목 새로고침",
       RefreshToast: "제목 새로고침 요청이 전송되었습니다",
+      Continue: "계속하다",
     },
     Commands: {
       new: "새 채팅",

diff --git a/app/locales/no.ts b/app/locales/no.ts
@@ -46,6 +46,7 @@ const no: PartialLocaleType = {
       Edit: "Rediger",
       RefreshTitle: "Oppdater tittel",
       RefreshToast: "Forespørsel om titteloppdatering sendt",
+      Continue: "Fortsette",
     },
     Commands: {
       new: "Ny samtale",

diff --git a/app/locales/pt.ts b/app/locales/pt.ts
@@ -45,6 +45,7 @@ const pt: PartialLocaleType = {
       Edit: "Editar",
       RefreshTitle: "Atualizar Título",
       RefreshToast: "Solicitação de atualização de título enviada",
+      Continue: "Continuar",
     },
     Commands: {
       new: "Iniciar um novo chat",

diff --git a/app/locales/ru.ts b/app/locales/ru.ts
@@ -45,6 +45,7 @@ const ru: PartialLocaleType = {
       Edit: "Редактировать",
       RefreshTitle: "Обновить заголовок",
       RefreshToast: "Запрос на обновление заголовка отправлен",
+      Continue: "Продолжить",
     },
     Commands: {
       new: "Новый чат",

diff --git a/app/locales/sk.ts b/app/locales/sk.ts
@@ -47,6 +47,7 @@ const sk: PartialLocaleType = {
       Edit: "Upraviť",
       RefreshTitle: "Obnoviť názov",
       RefreshToast: "Požiadavka na obnovenie názvu bola odoslaná",
+      Continue: "Pokračovať",
     },
     Commands: {
       new: "Začať nový chat",

diff --git a/app/locales/tr.ts b/app/locales/tr.ts
@@ -45,6 +45,7 @@ const tr: PartialLocaleType = {
       Edit: "Düzenle",
       RefreshTitle: "Başlığı Yenile",
       RefreshToast: "Başlık yenileme isteği gönderildi",
+      Continue: "Devam et",
     },
     Commands: {
       new: "Yeni sohbet",

diff --git a/app/locales/tw.ts b/app/locales/tw.ts
@@ -45,6 +45,7 @@ const tw = {
       Edit: "編輯",
       RefreshTitle: "刷新標題",
       RefreshToast: "已發送刷新標題請求",
+      Continue: "繼續",
     },
     Commands: {
       new: "新建聊天",

diff --git a/app/locales/vi.ts b/app/locales/vi.ts
@@ -45,6 +45,7 @@ const vi: PartialLocaleType = {
       Edit: "Chỉnh sửa",
       RefreshTitle: "Làm mới tiêu đề",
       RefreshToast: "Đã gửi yêu cầu làm mới tiêu đề",
+      Continue: "Tiếp tục",
     },
     Commands: {
       new: "Tạo cuộc trò chuyện mới",