From 9f9e043849b6f497e00399900ff234cf097eba82 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 14 十月 2026 17:04:33 +0800
Subject: [PATCH] fix: 修改上下文

---
 src/main/java/com/custom/webui/service/impl/MessageServiceImpl.java |  117 +++++++++++++++++++++++++++++++++++++--
 src/main/java/com/custom/webui/dto/resp/StreamEvent.java            |   18 ++++++
 src/main/resources/application.yml                                  |   19 +++++-
 3 files changed, 145 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/custom/webui/dto/resp/StreamEvent.java b/src/main/java/com/custom/webui/dto/resp/StreamEvent.java
index fef9151..b9b444f 100644
--- a/src/main/java/com/custom/webui/dto/resp/StreamEvent.java
+++ b/src/main/java/com/custom/webui/dto/resp/StreamEvent.java
@@ -46,6 +46,18 @@
     /** 鑷姩鐢熸垚鐨勪細璇濇爣棰橈紙title 浜嬩欢锛� */
     private String title;
 
+    /**
+     * 鏈疆**瀹為檯甯﹁繘涓婁笅鏂囩殑鍘嗗彶娑堟伅鏉℃暟**锛坉one 浜嬩欢涓嬪彂锛屼粎鐢ㄤ簬璇婃柇锛夈��
+     *
+     * <p>涓轰粈涔堝�煎緱鏀捐繘鍗忚閲岋細鏇剧粡鍑鸿繃涓�涓緢闅惧彂鐜扮殑 bug 鈥斺��
+     * 涓婁笅鏂囬绠楄鍓椂锛屾渶鏂颁竴鏉★紙妯″瀷涓婁竴鏉¢暱鍥炵瓟锛夋斁涓嶄笅灏辨暣娈垫斁寮冿紝
+     * 浜庢槸妯″瀷鏀跺埌鐨勪笂涓嬫枃閲屽彧鏈夌敤鎴峰垰闂殑閭d竴鍙ワ紝琛ㄧ幇涓恒�屾瘡杞兘涓嶈寰椾笂鏂囥�嶃��
+     * 浠� HTTP 灞傞潰瀹屽叏鐪嬩笉鍑烘潵锛屽彧鑳界炕鏈嶅姟绔棩蹇椼��
+     * 鎶婂畠鏀捐繘 done 浜嬩欢鍚庯紝鐢ㄤ竴涓姹傚氨鑳界‘璁ゃ�屾ā鍨嬪埌搴曠湅鍒颁簡鍑犳潯鍘嗗彶銆嶏紝
+     * 鍐掔儫娴嬭瘯涔熻兘鐩存帴鏂█瀹� 鈥斺�� 杩欑被闂浠ュ悗涓嶄細鍐嶉潤榛樺彂鐢熴��
+     */
+    private Integer contextMessages;
+
     @Data
     /**
      * 寮曠敤鏉ユ簮銆�
@@ -91,11 +103,17 @@
     }
 
     public static StreamEvent done(Long messageId, String content, List<Source> sources) {
+        return done(messageId, content, sources, null);
+    }
+
+    public static StreamEvent done(Long messageId, String content, List<Source> sources,
+                                  Integer contextMessages) {
         StreamEvent e = new StreamEvent();
         e.type = "done";
         e.messageId = messageId;
         e.content = content;
         e.sources = sources;
+        e.contextMessages = contextMessages;
         return e;
     }
 
diff --git a/src/main/java/com/custom/webui/service/impl/MessageServiceImpl.java b/src/main/java/com/custom/webui/service/impl/MessageServiceImpl.java
index 5579bb9..b8f016a 100644
--- a/src/main/java/com/custom/webui/service/impl/MessageServiceImpl.java
+++ b/src/main/java/com/custom/webui/service/impl/MessageServiceImpl.java
@@ -410,6 +410,12 @@
             List<LlmService.LlmMessage> context =
                     buildContext(chat, meta, persisted, ragContext, imageText);
 
+            // 鏈疆瀹為檯甯﹁繘鍘荤殑鍘嗗彶鏉℃暟锛堜笉鍚� system锛夛紝闅� done 浜嬩欢涓嬪彂鐢ㄤ簬璇婃柇锛�
+            // 銆屾ā鍨嬩笉璁板緱涓婃枃銆嶈繖绫婚棶棰樺簲褰撲竴涓姹傚氨鑳界‘璁わ紝鑰屼笉鏄幓缈绘棩蹇�
+            int contextMessages = (int) context.stream()
+                    .filter(m -> !Message.ROLE_SYSTEM.equals(m.role()))
+                    .count();
+
             // 4) 鍚姩瀹氭湡钀藉簱瀹氭椂鍣紙杩涚▼琚� kill 鏃舵渶澶氫涪 FLUSH_INTERVAL 鐨勫唴瀹癸級
             flushTask = flusher.scheduleAtFixedRate(
                     () -> flushPartial(assistantMessageId, buffer, lastFlushed),
@@ -435,7 +441,8 @@
                     buildMetadata(model, sources, chatId));
             touchChat(chatId);
 
-            send(emitter, "done", StreamEvent.done(assistantMessageId, fullContent, sources));
+            send(emitter, "done",
+                    StreamEvent.done(assistantMessageId, fullContent, sources, contextMessages));
 
             emitter.complete();
 
@@ -673,13 +680,41 @@
         // 鍏抽敭鐐癸細**浠庢渶杩戠殑娑堟伅寰�鍥炶**锛岃鍒伴绠楃敤瀹屼负姝€��
         // 涔嬪墠鐨勫疄鐜版槸銆屽彇鏈�杩� 20 鏉″悗鍏ㄩ儴濉炶繘鍘汇�嶏紝鍙彈鏉℃暟闄愬埗銆�
         // 涓嶅彈 token 闄愬埗 鈥斺�� 20 鏉¢暱鍥炵瓟杞绘槗灏辫兘鍒颁笂涓囧瓧绗︼紝
-        // 鍔犱笂鍥剧墖 OCR 鏂囧瓧鐩存帴瓒呰繃 num_ctx锛孫llama 渚夸粠澶撮潤榛樻埅鏂紝
+        // 鍔犱笂鍥剧墖 OCR 鏂囧瓧鐩存帴瓒呰繃 num_ctx锛屾ā鍨嬫湇鍔′究浠庡ご闈欓粯鎴柇锛�
         // 鎶婃渶鍓嶉潰鐨� system 娑堟伅锛堝浘鐗囧唴瀹广�佺煡璇嗗簱璧勬枡锛夋暣娈典涪鎺夛紝
         // 浜庢槸銆屾ā鍨嬪ソ鍍忔病鐪嬪埌鍥剧墖銆嶃�傝繖鏄湰椤圭洰鏈�闅炬煡鐨勪竴绫� bug锛�
         // 涓嶆姤閿欍�佷笉鎶ヨ锛屽彧鏄ā鍨嬭浣滄病鐪嬭銆�
+        //
+        // 鍚庢潵鍙堣俯浜嗙浜屽眰鍧戯紙鐢ㄦ埛鎶ャ�屾瘡杞璇濋兘涓嶈寰椾笂鏂囥�嶏級锛�
+        // 寰幆浠庢渶杩戜竴鏉″線鍓嶈蛋锛岃�屾渶杩戜竴鏉″線寰�姝f槸妯″瀷鐨�**涓婁竴鏉¢暱鍥炵瓟**
+        // 锛堝疄娴� 5815 / 8809 瀛楋級銆傚畠涓�瓒呰繃棰勭畻锛岀涓�娆℃瘮杈冨氨 break锛�
+        // 鏁存鍘嗗彶琚涪鍏� 鈥斺�� 妯″瀷鍙敹鍒扮敤鎴峰垰闂殑閭d竴鍙ャ��
+        //
+        // 鎵�浠ョ幇鍦ㄦ湁涓ゆ潯纭鍒欙細
+        //   1. **鏈疆鎻愰棶鏃犳潯浠跺畬鏁翠繚鐣�**锛堟埅鏂嚜宸辩殑闂绛変簬娌¢棶鍑哄幓锛�
+        //   2. 棰勭暀缁欏巻鍙茬殑棰濆害閲岋紝濡傛灉**鏈�鏂颁竴鏉�**鏀句笉涓嬶紝鑷冲皯鎴彇涓�娈垫憳瑕�
+        //      锛堝紑澶� + 缁撳熬锛夛紝鑰屼笉鏄暣娈垫斁寮�
         int budget = Math.max(500, llmProperties.getContextCharBudget());
         int systemCost = systemPrompt.length();
         int remaining = budget - systemCost;
+
+        // 瑙勫垯 1锛氬厛鏃犳潯浠舵墸鎺夋湰杞彁闂殑棰濆害銆�
+        // loadBranchHistory 鐨勭粓鐐规槸 assistant 鍗犱綅娑堟伅锛堝凡琚繃婊わ級锛�
+        // 鍥犳鍒楄〃鏈�鍚庝竴鏉″氨鏄湰杞殑鐢ㄦ埛娑堟伅銆�
+        LlmService.LlmMessage currentTurn = null;
+        int currentTurnCost = 0;
+        if (!historyMessages.isEmpty()
+                && Message.ROLE_USER.equals(historyMessages.get(historyMessages.size() - 1).role())) {
+            currentTurn = historyMessages.get(historyMessages.size() - 1);
+            currentTurnCost = currentTurn.content().length();
+            remaining -= currentTurnCost;
+            if (remaining < 0) {
+                log.warn("鏈疆鎻愰棶鏈韩灏辫秴鍑轰笂涓嬫枃棰勭畻 chatId={} 鎻愰棶={}瀛� budget={}锛�"
+                                + "浠嶄細瀹屾暣鍙戦�侊紙鎴柇闂绛変簬娌¢棶锛夛紝浣嗘湰杞笉甯︿换浣曞巻鍙插璇濄��"
+                                + "濡傞渶鎼哄甫鍘嗗彶璇疯皟澶� webui.llm.context-char-budget",
+                        chat.getId(), currentTurnCost, budget);
+            }
+        }
 
         if (remaining <= 0) {
             // system 閮ㄥ垎宸插崰婊¢绠楋紙渚嬪瓒呴暱 OCR 鏂囧瓧锛夛紝
@@ -690,15 +725,41 @@
                     chat.getId(), systemCost, budget);
         } else {
             int limit = Math.max(1, llmProperties.getHistoryLimit());
-            int from = Math.max(0, historyMessages.size() - limit);
+            // 鏈疆鎻愰棶鍗曠嫭澶勭悊锛屼笉鍙備笌鍘嗗彶鏉℃暟涓婇檺涓庨绠楃珵浜�
+            int endExclusive = currentTurn != null ? historyMessages.size() - 1 : historyMessages.size();
+            int from = Math.max(0, endExclusive - limit);
 
             // 浠庢渶杩戜竴鏉″線鍓嶇疮鍔狅紝瓒呭嚭棰勭畻灏卞仠
             java.util.LinkedList<LlmService.LlmMessage> picked = new java.util.LinkedList<>();
             int used = 0;
-            for (int i = historyMessages.size() - 1; i >= from; i--) {
+            int excerpted = 0;
+            for (int i = endExclusive - 1; i >= from; i--) {
                 LlmService.LlmMessage msg = historyMessages.get(i);
                 int cost = msg.content() == null ? 0 : msg.content().length();
+
                 if (used + cost > remaining) {
+                    /*
+                     * 鏀句笉涓嬨�傝繖閲�**缁濅笉鑳界洿鎺ユ斁寮冩暣娈靛巻鍙�** 鈥斺�� 杩欐槸瀹炴祴韪╁埌鐨�
+                     * 涓�涓弗閲� bug锛�
+                     *
+                     * 寰幆鏄粠銆屾渶杩戜竴鏉°�嶅線鍓嶈蛋鐨勶紝鑰屾渶杩戜竴鏉¢�氬父姝f槸妯″瀷涓婁竴鏉�
+                     * 鍥炵瓟銆傛湰鍦版ā鍨嬬殑闀垮洖绛斿姩杈� 4000~9000 瀛楋紙瀹炴祴 8809 瀛楋級锛�
+                     * 涓�瓒呰繃棰勭畻锛岀涓�娆℃瘮杈冨氨 break锛宲icked 閲岀┖绌哄涔� 鈥斺��
+                     * 浜庢槸銆屾ā鍨嬫敹鍒扮殑涓婁笅鏂囬噷鍙湁鐢ㄦ埛鍒氶棶鐨勯偅鍙ヨ瘽銆嶏紝
+                     * 琛ㄧ幇涓恒�屾瘡杞璇濋兘涓嶈寰椾笂鏂囥�嶃��
+                     *
+                     * 鎵�浠ワ細**鏈�鏂扮殑涓�鏉″繀椤荤暀涓�鐐�**銆傛斁涓嶄笅灏辨埅鍙栦竴娈�
+                     * 锛堝紑澶� + 缁撳熬锛夛紝淇濊瘉妯″瀷鑷冲皯鐭ラ亾涓婁竴杞浜嗕粈涔堛��
+                     * 鏇磋�佺殑鏉$洰鎵嶅厑璁告暣鏉′涪寮冿紝杩欐牱淇濈暀鐨勬案杩滄槸涓�娈佃繛缁殑杩戞湡瀵硅瘽銆�
+                     */
+                    if (excerpted == 0) {
+                        String excerpt = excerptForContext(msg.content(), remaining - used);
+                        if (excerpt != null) {
+                            picked.addFirst(new LlmService.LlmMessage(msg.role(), excerpt));
+                            used += excerpt.length();
+                            excerpted++;
+                        }
+                    }
                     break;
                 }
                 picked.addFirst(msg);
@@ -706,9 +767,18 @@
             }
 
             context.addAll(picked);
+            // 瑙勫垯 1 钀藉湴锛氭湰杞彁闂畬鏁磋拷鍔犲湪鏈�鍚�
+            if (currentTurn != null) {
+                context.add(currentTurn);
+            }
 
-            int skipped = (historyMessages.size() - from) - picked.size();
-            if (skipped > 0) {
+            int skipped = (endExclusive - from) - picked.size();
+            if (excerpted > 0) {
+                log.info("鍘嗗彶瀵硅瘽瑁佸壀 chatId={} 淇濈暀={} 鏉★紙鍏朵腑鏈�鏂颁竴鏉¤秴棰勭畻銆佸凡鎴彇鎽樿锛変涪寮�={} 鏉� "
+                                + "锛坆udget={} system={} 宸茬敤={}锛夈��"
+                                + "鎯宠鏇村鍘嗗彶鍘熸牱杩涘叆涓婁笅鏂囷紝鍙皟澶� webui.llm.context-char-budget",
+                        chat.getId(), picked.size(), skipped, budget, systemCost, used);
+            } else if (skipped > 0) {
                 log.info("鍘嗗彶瀵硅瘽鎸夊瓧绗﹂绠楄鍓� chatId={} 淇濈暀={} 鏉� 涓㈠純={} 鏉� "
                                 + "锛坆udget={} system={} 宸茬敤={}锛�",
                         chat.getId(), picked.size(), skipped, budget, systemCost, used);
@@ -735,6 +805,41 @@
     }
 
     /**
+     * 鎶婁竴鏉¤秴闀垮巻鍙叉秷鎭帇鎴愯兘濉炶繘棰勭畻鐨勬憳瑕侊紙寮�澶� + 缁撳熬锛夈��
+     *
+     * <p>涓轰粈涔堜笉鐩存帴鐮嶆帀鍚庡崐娈碉紙鍙暀寮�澶达級锛氱敤鎴蜂笅涓�鍙ヨ拷闂線寰�閽堝涓婁竴杞洖绛旂殑
+     * <b>缁撹</b>锛屽彧鐣欏紑澶翠細璁╂ā鍨嬬瓟闈炴墍闂紱鍙暀缁撳熬鍙堜細涓㈡帀闂鑳屾櫙銆�
+     * 鎵�浠ヤ袱澶撮兘鐣欙紝涓棿鐢ㄧ渷鐣ユ爣璁拌繛璧锋潵銆�
+     *
+     * <p>棰勭畻灏忓埌杩炴爣璁伴兘鏀句笉涓嬫椂杩斿洖 {@code null}锛堣皟鐢ㄦ柟浼氭斁寮冭繖鏉★級銆�
+     * 杩欓噷鐨� {@code MIN_EXCERPT} 淇濊瘉銆屾憳瑕佽嚦灏戞槸涓�鍙ュ畬鏁寸殑璇濄�嶏紝
+     * 鑰屼笉鏄杩涘幓涓や笁涓瓧鍗犵潃浣嶇疆鍗存鏃犱俊鎭噺銆�
+     */
+    private static final int MIN_EXCERPT = 120;
+
+    private String excerptForContext(String content, int budget) {
+        if (content == null || content.isBlank() || budget < MIN_EXCERPT) {
+            return null;
+        }
+        if (content.length() <= budget) {
+            return content;
+        }
+
+        String marker = "\n鈥︹�︼紙姝ゅ鐪佺暐绾� " + (content.length() - budget) + " 瀛楋級鈥︹�n";
+        int stay = budget - marker.length();
+        if (stay < MIN_EXCERPT) {
+            // 棰勭畻澶皬锛岃繛鐪佺暐鏍囪閮芥斁涓嶄笅锛氶��鍖栨垚绾埅鏂紝浣嗕粛鐒朵繚鐣欏ご閮�
+            return content.substring(0, Math.max(1, budget));
+        }
+
+        // 缁撳熬鐣� 40%锛氱粨璁烘洿閲嶈锛屼絾涔熻缁欏紑澶寸暀澶熻儗鏅�
+        int tail = Math.max(MIN_EXCERPT / 2, (int) (stay * 0.4));
+        int head = stay - tail;
+        return content.substring(0, head) + marker
+                + content.substring(content.length() - tail);
+    }
+
+    /**
      * 鍔犺浇浠庝細璇濇牴鍒版寚瀹氭秷鎭殑瀹屾暣閾捐矾銆�
      *
      * <p>瀹炵幇涓婄敤涓�娆″叏閲忔煡璇� + 鍐呭瓨鍥炴函锛岃�屼笉鏄�掑綊 SQL锛�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f1c79d5..79628d1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -189,10 +189,23 @@
     # 涓婁笅鏂囨渶澶氭惡甯︾殑鍘嗗彶娑堟伅鏉℃暟锛堟潯鏁颁笂闄愶紝闈� token 涓婇檺锛�
     history-limit: 20
     # 鏁翠釜 prompt 鐨勫瓧绗﹂绠椼�傝秴鍑烘椂蹇呴』鐢卞悗绔寜浼樺厛绾ц鍓� 鈥斺��
-    # 鍚﹀垯 Ollama 浼氫粠寮�澶撮潤榛樻埅鏂紝鎶婃渶鍓嶉潰鐨� system 娑堟伅
+    # 鍚﹀垯妯″瀷鏈嶅姟浼氫粠寮�澶撮潤榛樻埅鏂紝鎶婃渶鍓嶉潰鐨� system 娑堟伅
     #锛圧AG 璧勬枡 / 鍥剧墖 OCR 鏂囧瓧锛変涪鎺夛紝琛ㄧ幇涓恒�屾ā鍨嬫病鐪嬪埌鎴戠粰鐨勫浘鐗囥�嶃��
-    # 涓枃鍦烘櫙 1 瀛楃鈮�1 token锛屼笌 num-ctx=8192 閰嶅鍙� 4000銆�
-    context-char-budget: 4000
+    #
+    # 鈿狅笍 杩欎釜鍊艰**鎸夋ā鍨嬬殑涓婁笅鏂囩獥鍙�**鏉ュ畾锛屼腑鏂囧満鏅� 1 瀛楃 鈮� 1 token锛�
+    #     棰勭畻 鈮� 绐楀彛 - 杈撳嚭涓婇檺(max-tokens) - 浣欓噺
+    #
+    #   鏈」鐩綋鍓嶇敤鐨勬槸鏈湴澶х獥鍙fā鍨嬶紙vLLM锛宮ax_model_len=133120锛夛紝
+    #   杈撳嚭涓婇檺 8192锛屽洜姝� 16000 闈炲父淇濆畧銆佸畬鍏ㄥ畨鍏ㄣ��
+    #   瀹炴祴韪╄繃鐨勫潙锛氳繖涓�间竴搴﹀彧鏈� 4000锛岃�屾ā鍨嬬殑闀垮洖绛斿姩杈� 4000~9000 瀛楋紝
+    #   缁撴灉銆屼笂涓�鏉″洖绛斻�嶆湰韬氨鎶婇绠楁拺鐖嗭紝鍘嗗彶瀵硅瘽鏁存杩涗笉鍘� 鈥斺��
+    #   鐢ㄦ埛鐪嬪埌鐨勭幇璞℃槸銆屾瘡杞璇濋兘涓嶈寰椾笂鏂囥�嶃��
+    #   锛堢幇鍦ㄥ嵆浣块亣鍒拌秴闀挎秷鎭篃浼氭埅鍙栨憳瑕佽�屼笉鏄暣娈典涪寮冿紝
+    #     浣嗛绠楃粰灏忎簡锛屾ā鍨嬭兘鐪嬪埌鐨勪笂涓嬫枃缁堢┒鏈夐檺銆傦級
+    #
+    #   鑻ユ敼鐢� Ollama 涓� num_ctx=8192锛岃鏀瑰洖 4000 宸﹀彸锛�
+    #   鎴栨妸 num_ctx 涓�璧疯皟澶э紙濡� 32768 鈫� 棰勭畻 20000锛夈��
+    context-char-budget: 16000
     # 鍗曚釜閮ㄥ垎锛堝浘鐗囨枃瀛� / 鐭ヨ瘑搴撹祫鏂欙級鍚勮嚜鐨勪笂闄愶紝闃叉鏌愪竴閮ㄥ垎鐙崰棰勭畻
     per-part-char-limit: 2000
 

--
Gitblit v1.9.1