Merge pull request #3606 from SillyTavern/reasoning-continue-fix Fix continue duplicating reasoning block

5d255d758ebb2516e54342edae04d2e18a3ae443

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

Signed

public/script.js+15 -5 Viewed

      * @param {boolean} forceName2 If true, force the use of name2
      * @param {Date} timeStarted Date when generation was started
      * @param {string} continueMessage Previous message if the type is 'continue'
 +     * @param {PromptReasoning} promptReasoning Prompt reasoning instance
      */
     constructor(type, forceName2, timeStarted, continueMessage, promptReasoning) {
         this.result = '';
         this.messageId = -1;
         /** @type {HTMLElement} */

         this.toolCalls = [];
         // Initialize reasoning in its own handler
         this.reasoningHandler = new ReasoningHandler(timeStarted);
 +        /** @type {PromptReasoning} */
 +        this.promptReasoning = promptReasoning;
+    }
     #checkDomElements(messageId) {

+    }
     async onStartStreaming(text) {
 +        if (this.type === 'continue' && this.promptReasoning.prefixReasoning) {
 +            this.reasoningHandler.initContinue(this.promptReasoning);
 +        }
++
         let messageId = -1;
         if (this.type == 'impersonate') {

         };
     }));
     const reasoningpromptReasoning = new PromptReasoning();
     for (let i = coreChat.length - 1; i >= 0; i--) {
         const depth = coreChat.length - i - 1;
         const isPrefix = isContinue && i === coreChat.length - 1;
         coreChat[i] = {
             ...coreChat[i],
             mes: reasoningpromptReasoning.addToMessage(
                 coreChat[i].mes,
                 getRegexedString(
                     String(coreChat[i].extra?.reasoning ?? ''),

                     { isPrompt: true, depth: depth },
                 ),
                 isPrefix,
 +                coreChat[i].extra?.reasoning_duration,
             ),
         };
         if (reasoningpromptReasoning.isLimitReached()) {
             break;
+        }
+    }

         console.debug(`pushed prompt bits to itemizedPrompts array. Length is now: ${itemizedPrompts.length}`);
         if (isStreamingEnabled() && type !== 'quiet') {
 -            streamingProcessor = new StreamingProcessor(type, force_name2, generation_started, continue_mag);
 +            continue_mag = promptReasoning.removePrefix(continue_mag);
 +            streamingProcessor = new StreamingProcessor(type, force_name2, generation_started, continue_mag, promptReasoning);
             if (isContinue) {
                 // Save reply does add cycle text to the prompt, so it's not needed here
                 streamingProcessor.firstMessageText = '';

@@ -4824,6 +4833,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4824	4833	}
4825	4834
4826	4835	if (isContinue) {
	4836	+ continue_mag = promptReasoning.removePrefix(continue_mag);
4827	4837	getMessage = continue_mag + getMessage;
4828	4838	}
4829	4839

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

+    }
     /**
 +     * Sets the reasoning state when continuing a prompt.
 +     * @param {PromptReasoning} promptReasoning Prompt reasoning object
 +     */
 +    initContinue(promptReasoning) {
 +        this.reasoning = promptReasoning.prefixReasoning;
 +        this.state = ReasoningState.Done;
 +        this.startTime = this.initialTime;
 +        this.endTime = promptReasoning.prefixDuration ? new Date(this.initialTime.getTime() + promptReasoning.prefixDuration) : null;
 +    }
++
 +    /**
      * Initializes the reasoning handler for a specific message.
+     *
      * Can be used to update the DOM elements or read other reasoning states.

     constructor() {
         this.counter = 0;
 +        this.prefixLength = -1;
 +        this.prefixReasoning = '';
 +        this.prefixDuration = null;
+    }
     /**

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

         // Combine parts with reasoning only
         if (isPrefix && !content) {
             returnconst formattedReasoning = `${prefix}${reasoning}`;
 +            if (isPrefix) {
 +                this.prefixReasoning = reasoning;
 +                this.prefixLength = formattedReasoning.length;
 +                this.prefixDuration = duration;
 +            }
 +            return formattedReasoning;
+        }
         // Combine parts with reasoning and content
         returnconst formattedReasoning = `${prefix}${reasoning}${suffix}${separator}${content}`;
 +        if (isPrefix) {
 +            this.prefixReasoning = reasoning;
 +            this.prefixLength = formattedReasoning.length;
 +            this.prefixDuration = duration;
 +        }
 +        return `${formattedReasoning}${content}`;
 +    }
++
 +    /**
 +     * Removes the reasoning prefix from the content.
 +     * @param {string} content Content with the reasoning prefix
 +     * @returns {string} Content without the reasoning prefix
 +     */
 +    removePrefix(content) {
 +        if (this.prefixLength > 0) {
 +            return content.slice(this.prefixLength);
 +        }
 +        return content;
+    }
+}