Merge branch 'staging' into bogus-localstorage

d4061cc13974e70a2c635f8114dbcbbfafa34fb4

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

public/script.js+3 -2 Viewed

 import { initBulkEdit } from './scripts/bulk-edit.js';
 import { deriveTemplatesFromChatTemplate } from './scripts/chat-templates.js';
 import { getContext } from './scripts/st-context.js';
-import { extractReasoningFromData, initReasoning, PromptReasoning, updateReasoningTimeUI } from './scripts/reasoning.js';
+import { extractReasoningFromData, initReasoning, PromptReasoning, removeReasoningFromString, updateReasoningTimeUI } from './scripts/reasoning.js';
 import { accountStorage } from './scripts/util/AccountStorage.js';
 // API OBJECT FOR EXTERNAL WIRING

             TempResponseLength.save(main_api, responseLength);
             eventHook = TempResponseLength.setupEventHook(main_api);
+        }
-        return await Generate('quiet', options);
+        const result = await Generate('quiet', options);
+        return removeReasoningFromString(result);
     } finally {
         if (responseLengthCustomized && TempResponseLength.isCustomized()) {
             TempResponseLength.restore(main_api);

public/scripts/reasoning.js+14 -0 Viewed

+}
 /**
+ * Removes reasoning from a string if auto-parsing is enabled.
+ * @param {string} str Input string
+ * @returns {string} Output string
+ */
+export function removeReasoningFromString(str) {
+    if (!power_user.reasoning.auto_parse) {
+        return str;
+    }
+    const parsedReasoning = parseReasoningFromString(str);
+    return parsedReasoning?.content ?? str;
+}
+/**
  * Parses reasoning from a string using the power user reasoning settings.
  * @typedef {Object} ParsedReasoning
  * @property {string} reasoning Reasoning block