From 8eaba6f3641c4433eeb75cc85b3ebbe92cc9bedb Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 18 Jan 2026 14:44:03 +0000
Subject: [PATCH] =?UTF-8?q?fix(ai-assistant):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=B5=81=E5=BC=8F=E5=93=8D=E5=BA=94=E6=9C=9F=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?=20loading=20=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  - 修改 loading 显示条件，streaming 状态时继续显示 loading icon
  - SSEClient 添加可选的 onFailed 回调，处理连接失败情况
  - 修复 done 事件处理，确保状态正确转为 completed
  - 解决工具调用期间 loading 动画过早消失的问题
---
 .../assets/js/components/AIAssistant/index.vue   | 15 +++++++++++----
 resources/assets/js/utils/index.js               | 16 +++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/resources/assets/js/components/AIAssistant/index.vue b/resources/assets/js/components/AIAssistant/index.vue
index 6d3ae3ac7..85b5ccba5 100644
--- a/resources/assets/js/components/AIAssistant/index.vue
+++ b/resources/assets/js/components/AIAssistant/index.vue
@@ -58,7 +58,7 @@
                         <template v-if="response.status === 'error'">
                             <span class="ai-assistant-output-error">{{ $L('发送失败') }}</span>
                         </template>
-                        <template v-else-if="response.rawOutput">
+                        <template v-else-if="response.rawOutput && response.status !== 'streaming'">
                             <Button
                                 v-if="showApplyButton"
                                 type="primary"
@@ -69,9 +69,9 @@
                                 {{ applyButtonText || $L('应用此内容') }}
                             </Button>
                         </template>
-                        <template v-else>
+                        <template v-else-if="!response.rawOutput || response.status === 'streaming'">
                             <Icon type="ios-loading" class="ai-assistant-output-icon icon-loading"/>
-                            <span v-if="loadingText" class="ai-assistant-output-status">{{ loadingText }}</span>
+                            <span v-if="loadingText && !response.rawOutput" class="ai-assistant-output-status">{{ loadingText }}</span>
                         </template>
                     </div>
                     <div class="ai-assistant-output-meta">
@@ -795,7 +795,7 @@ export default {
                         const donePayload = this.parseStreamPayload(event);
                         if (donePayload && donePayload.error) {
                             this.markResponseError(responseEntry, donePayload.error);
-                        } else if (responseEntry && responseEntry.status !== 'error' && responseEntry.rawOutput) {
+                        } else if (responseEntry && responseEntry.status !== 'error') {
                             responseEntry.status = 'completed';
                         }
                         this.releaseSSEClient(sse);
@@ -803,6 +803,13 @@ export default {
                         this.saveCurrentSession();
                         break;
                 }
+            }, () => {
+                // SSE 连接失败（重试次数用完）时的回调
+                if (responseEntry && responseEntry.status === 'streaming') {
+                    responseEntry.status = 'completed';
+                }
+                this.releaseSSEClient(sse);
+                this.saveCurrentSession();
             });
             return sse;
         },
diff --git a/resources/assets/js/utils/index.js b/resources/assets/js/utils/index.js
index fd06a2a85..85d2f6644 100644
--- a/resources/assets/js/utils/index.js
+++ b/resources/assets/js/utils/index.js
@@ -118,42 +118,44 @@ export class SSEClient {
         };
     }
 
-    _onError(type, handler) {
+    _onError(type, handler, onFailed) {
         return () => {
             if (window.systemInfo.debug === "yes") {
                 console.log("SSE retry: " + this.url);
             }
             if (this.es) {
-                this._removeAllEvent(type, handler);
+                this._removeAllEvent(type, handler, onFailed);
                 this.unsunscribe();
             }
 
             if (this.retry > 0) {
                 this.retry--;
                 this.timer = setTimeout(() => {
-                    this.subscribe(type, handler);
+                    this.subscribe(type, handler, onFailed);
                 }, this.options.interval);
+            } else if (typeof onFailed === 'function') {
+                onFailed();
             }
         };
     }
 
-    _removeAllEvent(type, handler) {
+    _removeAllEvent(type, handler, onFailed) {
         type = $A.isArray(type) ? type : [type]
         this.es.removeEventListener("open", this._onOpen);
         type.some(item => {
             this.es.removeEventListener(item, this._onMessage(item, handler));
         })
-        this.es.removeEventListener("error", this._onError(type, handler));
+        this.es.removeEventListener("error", this._onError(type, handler, onFailed));
     }
 
-    subscribe(type, handler) {
+    subscribe(type, handler, onFailed) {
         type = $A.isArray(type) ? type : [type]
         this.es = new EventSource(this.url);
         this.es.addEventListener("open", this._onOpen);
         type.some(item => {
             this.es.addEventListener(item, this._onMessage(item, handler));
         })
-        this.es.addEventListener("error", this._onError(type, handler));
+        this.es.addEventListener("error", this._onError(type, handler, onFailed));
     }
 
     unsunscribe() {