From eeb3db084b20333a94f6fdd460c854640807222c Mon Sep 17 00:00:00 2001
From: JOJO <1498581755@qq.com>
Date: Thu, 1 Jan 2026 14:23:39 +0800
Subject: [PATCH] chore: snapshot before collapse fix

---
 static/icons/未命名文件夹.zip                 | Bin 7373 -> 0 bytes
 static/icons/未命名文件夹/bot.svg             |  18 ------------
 static/icons/未命名文件夹/layers.svg          |   1 -
 static/icons/未命名文件夹/menu.svg            |  15 ----------
 static/icons/未命名文件夹/发送.svg            |   1 -
 static/icons/未命名文件夹/对话记录.svg        |   5 ----
 static/icons/未命名文件夹/搜索.svg            |   1 -
 static/icons/未命名文件夹/新建.svg            |  14 ----------
 static/icons/未命名文件夹/用户.svg            |  14 ----------
 static/icons/未命名文件夹/问题.svg            |   1 -
 static/src/App.vue                            |   4 +--
 static/src/app.ts                             |  26 +++++++++++++++---
 static/src/composables/useScrollControl.ts    |   7 +++--
 static/src/stores/chat.ts                     |   5 ++--
 .../styles/components/chat/_chat-area.scss    |   7 +++++
 15 files changed, 39 insertions(+), 80 deletions(-)
 delete mode 100644 static/icons/未命名文件夹.zip
 delete mode 100644 static/icons/未命名文件夹/bot.svg
 delete mode 100644 static/icons/未命名文件夹/layers.svg
 delete mode 100644 static/icons/未命名文件夹/menu.svg
 delete mode 100644 static/icons/未命名文件夹/发送.svg
 delete mode 100644 static/icons/未命名文件夹/对话记录.svg
 delete mode 100644 static/icons/未命名文件夹/搜索.svg
 delete mode 100644 static/icons/未命名文件夹/新建.svg
 delete mode 100644 static/icons/未命名文件夹/用户.svg
 delete mode 100644 static/icons/未命名文件夹/问题.svg

diff --git a/static/icons/未命名文件夹.zip b/static/icons/未命名文件夹.zip
deleted file mode 100644
index af7423571b97913fc596acc3d4bc022cf3840436..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7373
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
bAd1*JXsgoznF|Dh0iOzVAduHS;&1;41_l7t

diff --git a/static/icons/未命名文件夹/bot.svg b/static/icons/未命名文件夹/bot.svg
deleted file mode 100644
index 1a622f9..0000000
--- a/static/icons/未命名文件夹/bot.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M12 8V4H8" />
-  <rect width="16" height="12" x="4" y="8" rx="2" />
-  <path d="M2 14h2" />
-  <path d="M20 14h2" />
-  <path d="M15 13v2" />
-  <path d="M9 13v2" />
-</svg>
diff --git a/static/icons/未命名文件夹/layers.svg b/static/icons/未命名文件夹/layers.svg
deleted file mode 100644
index a36c416..0000000
--- a/static/icons/未命名文件夹/layers.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="48" height="48" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="opacity:1;"><path d="M12.83 2.18a2 2 0 0 0-1.66 0L2.6 6.08a1 1 0 0 0 0 1.83l8.58 3.91a2 2 0 0 0 1.66 0l8.58-3.9a1 1 0 0 0 0-1.83z"/><path d="M2 12a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 12"/><path d="M2 17a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 17"/></svg>
\ No newline at end of file
diff --git a/static/icons/未命名文件夹/menu.svg b/static/icons/未命名文件夹/menu.svg
deleted file mode 100644
index 0ec9745..0000000
--- a/static/icons/未命名文件夹/menu.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M4 5h16" />
-  <path d="M4 12h16" />
-  <path d="M4 19h16" />
-</svg>
diff --git a/static/icons/未命名文件夹/发送.svg b/static/icons/未命名文件夹/发送.svg
deleted file mode 100644
index 3356fc9..0000000
--- a/static/icons/未命名文件夹/发送.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="48" height="48" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="opacity:1;"><path      d="M14.536 21.686a.5.5 0 0 0 .937-.024l6.5-19a.496.496 0 0 0-.635-.635l-19 6.5a.5.5 0 0 0-.024.937l7.93 3.18a2 2 0 0 1 1.112 1.11zm7.318-19.539l-10.94 10.939"/></svg>
\ No newline at end of file
diff --git a/static/icons/未命名文件夹/对话记录.svg b/static/icons/未命名文件夹/对话记录.svg
deleted file mode 100644
index 7026581..0000000
--- a/static/icons/未命名文件夹/对话记录.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
-  <path d="M6 7c0-2 1.6-3.6 3.6-3.6h13c2 0 3.6 1.6 3.6 3.6v10c0 2-1.6 3.6-3.6 3.6h-6.2L12.4 25l0.7-4.4H9.6c-2 0-3.6-1.6-3.6-3.6V7Z" />
-  <path d="M10.4 11h11.2" />
-  <path d="M10.4 15h7.2" />
-</svg>
diff --git a/static/icons/未命名文件夹/搜索.svg b/static/icons/未命名文件夹/搜索.svg
deleted file mode 100644
index c0ad6d9..0000000
--- a/static/icons/未命名文件夹/搜索.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="48" height="48" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="opacity:1;"><path d="m21 21l-4.34-4.34"/><circle cx="11" cy="11" r="8"/></svg>
\ No newline at end of file
diff --git a/static/icons/未命名文件夹/新建.svg b/static/icons/未命名文件夹/新建.svg
deleted file mode 100644
index 7384498..0000000
--- a/static/icons/未命名文件夹/新建.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M21.174 6.812a1 1 0 0 0-3.986-3.987L3.842 16.174a2 2 0 0 0-.5.83l-1.321 4.352a.5.5 0 0 0 .623.622l4.353-1.32a2 2 0 0 0 .83-.497z" />
-  <path d="m15 5 4 4" />
-</svg>
diff --git a/static/icons/未命名文件夹/用户.svg b/static/icons/未命名文件夹/用户.svg
deleted file mode 100644
index 8e61592..0000000
--- a/static/icons/未命名文件夹/用户.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M19 21v-2a4 4 0 0 0-4-4H9a4 4 0 0 0-4 4v2" />
-  <circle cx="12" cy="7" r="4" />
-</svg>
diff --git a/static/icons/未命名文件夹/问题.svg b/static/icons/未命名文件夹/问题.svg
deleted file mode 100644
index c237815..0000000
--- a/static/icons/未命名文件夹/问题.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="48" height="48" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="opacity:1;"><circle cx="12" cy="12" r="10"/><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3m.08 4h.01"/></svg>
\ No newline at end of file
diff --git a/static/src/App.vue b/static/src/App.vue
index 97c1671..3e2283b 100644
--- a/static/src/App.vue
+++ b/static/src/App.vue
@@ -135,11 +135,11 @@
           <div
             v-if="chatDisplayMode === 'chat'"
             class="scroll-lock-toggle"
-            :class="{ locked: autoScrollEnabled && !userScrolling }"
+            :class="{ locked: autoScrollEnabled && !userScrolling && isOutputActive() }"
           >
             <button @click="toggleScrollLock" class="scroll-lock-btn">
               <svg
-                v-if="autoScrollEnabled && !userScrolling"
+                v-if="autoScrollEnabled && !userScrolling && isOutputActive()"
                 viewBox="0 0 24 24"
                 aria-hidden="true"
                 stroke-linecap="round"
diff --git a/static/src/app.ts b/static/src/app.ts
index 8a934c3..597d1fd 100644
--- a/static/src/app.ts
+++ b/static/src/app.ts
@@ -709,6 +709,9 @@ const appOptions = {
                 }
                 return elRef || null;
             },
+            isOutputActive() {
+                return !!(this.streamingMessage || this.taskInProgress || this.hasPendingToolActions());
+            },
             logMessageState(action, extra = {}) {
                 const count = Array.isArray(this.messages) ? this.messages.length : 'N/A';
                 debugLog('[Messages]', {
@@ -999,11 +1002,26 @@ const appOptions = {
                     const clientHeight = messagesArea.clientHeight;
                     const isAtBottom = scrollHeight - scrollTop - clientHeight < bottomThreshold;
                     
-                    if (isAtBottom) {
-                        this.chatSetScrollState({ userScrolling: false, autoScrollEnabled: true });
-                    } else {
-                        this.chatSetScrollState({ userScrolling: true, autoScrollEnabled: false });
+                    const activeLock = this.autoScrollEnabled && this.isOutputActive();
+                    
+                    // 锁定且当前有输出时，强制贴底
+                    if (activeLock) {
+                        if (!isAtBottom) {
+                            if (typeof this._setScrollingFlag === 'function') {
+                                this._setScrollingFlag(true);
+                            }
+                            messagesArea.scrollTop = messagesArea.scrollHeight;
+                            if (typeof this._setScrollingFlag === 'function') {
+                                setTimeout(() => this._setScrollingFlag && this._setScrollingFlag(false), 16);
+                            }
+                        }
+                        // 保持锁定状态下 userScrolling 为 false
+                        this.chatSetScrollState({ userScrolling: false });
+                        return;
                     }
+
+                    // 未锁定或无输出：允许自由滚动，仅记录位置
+                    this.chatSetScrollState({ userScrolling: !isAtBottom });
                 });
             },
             
diff --git a/static/src/composables/useScrollControl.ts b/static/src/composables/useScrollControl.ts
index fb95fa4..ee111c6 100644
--- a/static/src/composables/useScrollControl.ts
+++ b/static/src/composables/useScrollControl.ts
@@ -8,6 +8,7 @@ type ScrollContext = {
   _setScrollingFlag?: (value: boolean) => void;
   autoScrollEnabled?: boolean;
   userScrolling?: boolean;
+  isOutputActive?: () => boolean;
 };
 
 export function scrollToBottom(ctx: ScrollContext) {
@@ -46,14 +47,16 @@ export function scrollToBottom(ctx: ScrollContext) {
 }
 
 export function conditionalScrollToBottom(ctx: ScrollContext) {
-  if (ctx.autoScrollEnabled === true && ctx.userScrolling === false) {
+  const active = typeof ctx.isOutputActive === 'function' ? ctx.isOutputActive() : true;
+  if (ctx.autoScrollEnabled === true && ctx.userScrolling === false && active) {
     scrollToBottom(ctx);
   }
 }
 
 export function toggleScrollLock(ctx: ScrollContext) {
   const nextState = ctx.chatToggleScrollLockState?.() ?? false;
-  if (nextState) {
+  const active = typeof ctx.isOutputActive === 'function' ? ctx.isOutputActive() : true;
+  if (nextState && active) {
     scrollToBottom(ctx);
   }
   return nextState;
diff --git a/static/src/stores/chat.ts b/static/src/stores/chat.ts
index 87731f5..792aeb1 100644
--- a/static/src/stores/chat.ts
+++ b/static/src/stores/chat.ts
@@ -144,10 +144,11 @@ export const useChatStore = defineStore('chat', {
       this.setScrollState({ autoScrollEnabled: true, userScrolling: false });
     },
     disableAutoScroll() {
-      this.setScrollState({ autoScrollEnabled: false, userScrolling: true });
+      this.setScrollState({ autoScrollEnabled: false, userScrolling: false });
     },
     toggleScrollLockState() {
-      if (this.isScrollLocked) {
+      const locked = this.isScrollLocked;
+      if (locked) {
         this.disableAutoScroll();
         return false;
       }
diff --git a/static/src/styles/components/chat/_chat-area.scss b/static/src/styles/components/chat/_chat-area.scss
index aa35cb9..6f44b17 100644
--- a/static/src/styles/components/chat/_chat-area.scss
+++ b/static/src/styles/components/chat/_chat-area.scss
@@ -268,6 +268,13 @@
     transition:
         max-height 0.26s cubic-bezier(0.4, 0, 0.2, 1),
         opacity 0.26s cubic-bezier(0.4, 0, 0.2, 1);
+    /* 始终隐藏滚动条，避免堆叠模式展开时闪现 */
+    scrollbar-width: none;
+    -ms-overflow-style: none;
+}
+
+.collapsible-content::-webkit-scrollbar {
+    display: none;
 }
 
 .collapsible-block.expanded .collapsible-content {