Merge pull request #3395 from pcpthm/reasoning-continue Always add reasoning for continue

9243a68b183c0c796fa09f3adf6948f9dd16f618

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/script.js+5 -3 Viewed

     const reasoning = new PromptReasoning();
     for (let i = coreChat.length - 1; i >= 0; i--) {
 -        if (reasoning.isLimitReached()) {
 -            break;
 -        }
         const depth = coreChat.length - i - 1;
 +        const isPrefix = isContinue && i === coreChat.length - 1;
         coreChat[i] = {
             ...coreChat[i],
             mes: reasoning.addToMessage(

                     regex_placement.REASONING,
                     { isPrompt: true, depth: depth },
                 ),
 +                isPrefix,
             ),
         };
 +        if (reasoning.isLimitReached()) {
 +            break;
 +        }
+    }
     // Determine token limit

public/scripts/reasoning.js+9 -3 Viewed

      * Add reasoning to a message according to the power user settings.
      * @param {string} content Message content
      * @param {string} reasoning Message reasoning
 +     * @param {boolean} isPrefix Whether this is the last message prefix
      * @returns {string} Message content with reasoning
      */
     addToMessage(content, reasoning, isPrefix) {
         // Disabled or reached limit of additions
         if (!isPrefix && (!power_user.reasoning.add_to_prompts || this.counter >= power_user.reasoning.max_additions)) {
             return content;
+        }

         const separator = substituteParams(power_user.reasoning.separator || '');
         const suffix = substituteParams(power_user.reasoning.suffix || '');
 +        // Combine parts with reasoning only
 +        if (isPrefix && !content) {
 +            return `${prefix}${reasoning}`;
 +        }
++
         // Combine parts with reasoning and content
         return `${prefix}${reasoning}${suffix}${separator}${content}`;
+    }

     MacrosParser.registerMacro('reasoningSeparator', () => power_user.reasoning.separator, t`Reasoning Separator`);
+}
 function setReasoningEventHandlers() {
     $(document).on('click', '.mes_reasoning_copy', (e) => {
         e.stopPropagation();
         e.preventDefault();