c5d4bdcd · permissionBRICK/SillyTavern

.eslintrc.cjs+4 -0 Viewed

     extends: [
         'eslint:recommended',
     ],
+    plugins: [
+        'jsdoc',
+    ],
     env: {
         es6: true,
     },

         'public/scripts/extensions/tts/lib/**',
     ],
     rules: {
+        'jsdoc/no-undefined-types': ['warn', { disableReporting: true, markVariablesAsUsed: true }],
         'no-unused-vars': ['error', { args: 'none' }],
         'no-control-regex': 'off',
         'no-constant-condition': ['error', { checkLoops: false }],

.github/workflows/pr-auto-manager.yml+41 -0 Viewed

   pull-requests: write
 jobs:
+  run-eslint:
+    name: ✅ Check ESLint on PR
+    runs-on: ubuntu-latest
+    # Only needs to run when code is changed
+    if: github.event.action == 'opened' || github.event.action == 'synchronize'
+    steps:
+      - name: Checkout Repository
+        # Checkout
+        # https://github.com/marketplace/actions/checkout
+        uses: actions/checkout@v4.2.2
+      - name: Setup Node.js
+        # Setup Node.js environment
+        # https://github.com/marketplace/actions/setup-node-js-environment
+        uses: actions/setup-node@v4.3.0
+        with:
+          node-version: 20
+      - name: Run npm install
+        run: npm ci
+      - name: Run ESLint
+        # Action ESLint
+        # https://github.com/marketplace/actions/action-eslint
+        uses: sibiraj-s/action-eslint@v3.0.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          eslint-args: '--ignore-path=.gitignore --quiet'
+          extensions: 'js,ts'
+          annotations: true
+          ignore-patterns: |
+            dist/
+            lib/
   label-by-size:
     name: 🏷️ Label PR by Size
     # This job should run after all others, to prevent possible concurrency issues

     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'staging'
+    # Override permissions, We need to be able to write to issues
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
     steps:
       - name: Extract Linked Issues From PR Description
         id: extract_issues

package-lock.json+202 -4 Viewed

                 "@types/write-file-atomic": "^4.0.3",
                 "@types/yargs": "^17.0.33",
                 "@types/yauzl": "^2.10.3",
-                "eslint": "^8.57.1"
+                "eslint": "^8.57.1",
+                "eslint-plugin-jsdoc": "^48.10.0"
             },
             "engines": {
                 "node": ">= 18"

             "integrity": "sha512-KlmTftToTtmb6aLVdne4NluS+POWputPF5J8v25UN/EQS+K9vahWEIe1NPRSFqBQclObkqHaj7JOnFrmnSm5MA==",
             "license": "Apache-2.0"
         },
+        "node_modules/@es-joy/jsdoccomment": {
+            "version": "0.46.0",
+            "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.46.0.tgz",
+            "integrity": "sha512-C3Axuq1xd/9VqFZpW4YAzOx5O9q/LP46uIQy/iNDpHG3fmPa6TBtvfglMCs3RBiBxAIi0Go97r8+jvTt55XMyQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "comment-parser": "1.4.1",
+                "esquery": "^1.6.0",
+                "jsdoc-type-pratt-parser": "~4.0.0"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
         "node_modules/@eslint-community/eslint-utils": {
             "version": "4.4.0",
             "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",

                 "node": ">=14"
+            }
         },
+        "node_modules/@pkgr/core": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+            "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/unts"
+            }
+        },
         "node_modules/@popperjs/core": {
             "version": "2.11.8",
             "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",

                 "safe-buffer": "~5.2.0"
+            }
         },
+        "node_modules/are-docs-informative": {
+            "version": "0.0.2",
+            "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+            "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=14"
+            }
+        },
         "node_modules/argparse": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",

             "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
             "license": "MIT"
         },
+        "node_modules/comment-parser": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+            "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 12.0.0"
+            }
+        },
         "node_modules/compress-commons": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",

                 "url": "https://opencollective.com/eslint"
+            }
         },
+        "node_modules/eslint-plugin-jsdoc": {
+            "version": "48.10.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.10.0.tgz",
+            "integrity": "sha512-BEli0k8E0dzhJairAllwlkGnyYDZVKNn4WDmyKy+v6J5qGNuofjzxwNUi+55BOGmyO9mKBhqaidwGy+dxndn/Q==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@es-joy/jsdoccomment": "~0.46.0",
+                "are-docs-informative": "^0.0.2",
+                "comment-parser": "1.4.1",
+                "debug": "^4.3.5",
+                "escape-string-regexp": "^4.0.0",
+                "esquery": "^1.6.0",
+                "parse-imports": "^2.1.1",
+                "semver": "^7.6.3",
+                "spdx-expression-parse": "^4.0.0",
+                "synckit": "^0.9.1"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
+            }
+        },
+        "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.3"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/eslint-scope": {
             "version": "7.2.2",
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",

+            }
         },
         "node_modules/esquery": {
-            "version": "1.5.0",
+            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-            "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+            "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
             "dev": true,
             "license": "BSD-3-Clause",
             "dependencies": {

             "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
             "license": "MIT"
         },
+        "node_modules/jsdoc-type-pratt-parser": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+            "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
         "node_modules/json-buffer": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",

             "integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==",
             "license": "MIT"
         },
+        "node_modules/parse-imports": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.2.1.tgz",
+            "integrity": "sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==",
+            "dev": true,
+            "license": "Apache-2.0 AND MIT",
+            "dependencies": {
+                "es-module-lexer": "^1.5.3",
+                "slashes": "^3.0.12"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
         "node_modules/parse5": {
             "version": "7.1.2",
             "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",

             "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
             "license": "MIT"
         },
+        "node_modules/semver": {
+            "version": "7.7.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/send": {
             "version": "0.19.0",
             "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",

             "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
             "license": "MIT"
         },
+        "node_modules/slashes": {
+            "version": "3.0.12",
+            "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz",
+            "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==",
+            "dev": true,
+            "license": "ISC"
+        },
         "node_modules/sliced": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",

                 "source-map": "^0.6.0"
+            }
         },
+        "node_modules/spdx-exceptions": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+            "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+            "dev": true,
+            "license": "CC-BY-3.0"
+        },
+        "node_modules/spdx-expression-parse": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+            "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "spdx-exceptions": "^2.1.0",
+                "spdx-license-ids": "^3.0.0"
+            }
+        },
+        "node_modules/spdx-license-ids": {
+            "version": "3.0.21",
+            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
+            "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+            "dev": true,
+            "license": "CC0-1.0"
+        },
         "node_modules/sprintf-js": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",

                 "node": ">=8"
+            }
         },
+        "node_modules/synckit": {
+            "version": "0.9.2",
+            "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz",
+            "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@pkgr/core": "^0.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/unts"
+            }
+        },
         "node_modules/tapable": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",

package.json+2 -1 Viewed

@@ -140,6 +140,7 @@
140	"@types/write-file-atomic": "^4.0.3",	140	"@types/write-file-atomic": "^4.0.3",
141	"@types/yargs": "^17.0.33",	141	"@types/yargs": "^17.0.33",
142	"@types/yauzl": "^2.10.3",	142	"@types/yauzl": "^2.10.3",
143	"eslint": "^8.57.1"	143	"eslint": "^8.57.1",
		144	"eslint-plugin-jsdoc": "^48.10.0"
144	}	145	}
145	}	146	}

public/index.html+9 -7 Viewed

                             <div class="flex-container">
                                 <select id="model_custom_select" class="text_pole model_custom_select"></select>
                             </div>
-                            <h4 data-i18n="Prompt Post-Processing">Prompt Post-Processing</h4>
-                            <select id="custom_prompt_post_processing" class="text_pole" title="Applies additional processing to the prompt before sending it to the API." data-i18n="[title]Applies additional processing to the prompt before sending it to the API.">
-                                <option data-i18n="prompt_post_processing_none" value="">None</option>
-                                <option data-i18n="prompt_post_processing_merge" value="merge">Merge consecutive roles</option>
-                                <option data-i18n="prompt_post_processing_semi" value="semi">Semi-strict (alternating roles)</option>
-                                <option data-i18n="prompt_post_processing_strict" value="strict">Strict (user first, alternating roles)</option>
-                            </select>
                         </form>
                         <div id="01ai_form" data-source="01ai">
                             <h4>

                             <select id="model_01ai_select">
                             </select>
                         </div>
+                        <div id="prompt_post_porcessing_form" data-source="custom,openrouter">
+                            <h4 data-i18n="Prompt Post-Processing">Prompt Post-Processing</h4>
+                            <select id="custom_prompt_post_processing" class="text_pole" title="Applies additional processing to the prompt before sending it to the API." data-i18n="[title]Applies additional processing to the prompt before sending it to the API.">
+                                <option data-i18n="prompt_post_processing_none" value="">None</option>
+                                <option data-i18n="prompt_post_processing_merge" value="merge">Merge consecutive roles</option>
+                                <option data-i18n="prompt_post_processing_semi" value="semi">Semi-strict (alternating roles)</option>
+                                <option data-i18n="prompt_post_processing_strict" value="strict">Strict (user first, alternating roles)</option>
+                            </select>
+                        </div>
                         <div class="flex-container flex">
                             <div id="api_button_openai" class="api_button menu_button menu_button_icon" type="submit" data-i18n="Connect">Connect</div>
                             <div class="api_loading menu_button menu_button_icon" data-i18n="Cancel">Cancel</div>

public/script.js+1 -1 Viewed

 let fav_ch_checked = false;
 let scrollLock = false;
 export let abortStatusCheck = new AbortController();
-let charDragDropHandler = null;
+export let charDragDropHandler = null;
 /** @type {debounce_timeout} The debounce timeout used for chat/settings save. debounce_timeout.long: 1.000 ms */
 export const DEFAULT_SAVE_EDIT_TIMEOUT = debounce_timeout.relaxed;

public/scripts/PromptManager.js+1 -1 Viewed

 import { event_types, eventSource, is_send_press, main_api, substituteParams } from '../script.js';
 import { is_group_generating } from './group-chats.js';
-import { Message, TokenHandler } from './openai.js';
+import { Message, MessageCollection, TokenHandler } from './openai.js';
 import { power_user } from './power-user.js';
 import { debounce, waitUntilCondition, escapeHtml } from './utils.js';
 import { debounce_timeout } from './constants.js';

public/scripts/autocomplete/AutoComplete.js+0 -2 Viewed

 import { AutoCompleteOption } from './AutoCompleteOption.js';
 import { AutoCompleteFuzzyScore } from './AutoCompleteFuzzyScore.js';
 import { BlankAutoCompleteOption } from './BlankAutoCompleteOption.js';
-// eslint-disable-next-line no-unused-vars
 import { AutoCompleteNameResult } from './AutoCompleteNameResult.js';
 import { AutoCompleteSecondaryNameResult } from './AutoCompleteSecondaryNameResult.js';
-import { Popup, getTopmostModalLayer } from '../popup.js';
 /**@readonly*/
 /**@enum {Number}*/

public/scripts/autocomplete/AutoCompleteNameResultBase.js+0 -1 Viewed

@@ -1,4 +1,3 @@
1	import { SlashCommandNamedArgumentAutoCompleteOption } from '../slash-commands/SlashCommandNamedArgumentAutoCompleteOption.js';
2	import { AutoCompleteOption } from './AutoCompleteOption.js';	1	import { AutoCompleteOption } from './AutoCompleteOption.js';
3		2
4		3

public/scripts/autocomplete/AutoCompleteOption.js+0 -1 Viewed

@@ -1,4 +1,3 @@
1	import { SlashCommand } from '../slash-commands/SlashCommand.js';
2	import { AutoCompleteFuzzyScore } from './AutoCompleteFuzzyScore.js';	1	import { AutoCompleteFuzzyScore } from './AutoCompleteFuzzyScore.js';
3		2
4		3

public/scripts/bookmarks.js+1 -2 Viewed

 import {
     characters,
     saveChat,
-    system_messages,
     system_message_types,
     this_chid,
     openCharacterChat,

     saveChatConditional,
     saveItemizedPrompts,
 } from '../script.js';
-import { humanizedDateTime, getMessageTimeStamp } from './RossAscends-mods.js';
+import { humanizedDateTime } from './RossAscends-mods.js';
 import {
     getGroupPastChats,
     group_activation_strategy,

public/scripts/extensions/expressions/index.js+53 -15 Viewed

 import { dragElement, isMobile } from '../../RossAscends-mods.js';
 import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js';
 import { loadMovingUIState, performFuzzySearch, power_user } from '../../power-user.js';
-import { onlyUnique, debounce, getCharaFilename, trimToEndSentence, trimToStartSentence, waitUntilCondition, findChar } from '../../utils.js';
+import { onlyUnique, debounce, getCharaFilename, trimToEndSentence, trimToStartSentence, waitUntilCondition, findChar, isFalseBoolean } from '../../utils.js';
 import { hideMutedSprites, selected_group } from '../../group-chats.js';
 import { isJsonSchemaSupported } from '../../textgen-settings.js';
 import { debounce_timeout } from '../../constants.js';

     return '';
+}
-async function classifyCallback(/** @type {{api: string?, prompt: string?}} */ { api = null, prompt = null }, text) {
+async function classifyCallback(/** @type {{api: string?, filter: string?, prompt: string?}} */ { api = null, filter = null, prompt = null }, text) {
     if (!text) {
         toastr.error('No text provided');
         return '';

@@ -690,13 +690,14 @@ async function classifyCallback(/** @type {{api: string?, prompt: string?}} */ {
690	}	690	}
691		691
692	const expressionApi = EXPRESSION_API[api] \|\| extension_settings.expressions.api;	692	const expressionApi = EXPRESSION_API[api] \|\| extension_settings.expressions.api;
		693	const filterAvailable = !isFalseBoolean(filter);
693		694
694	if (!modules.includes('classify') && expressionApi == EXPRESSION_API.extras) {	695	if (!modules.includes('classify') && expressionApi == EXPRESSION_API.extras) {
695	toastr.warning('Text classification is disabled or not available');	696	toastr.warning('Text classification is disabled or not available');
696	return '';	697	return '';
697	}	698	}
698		699
699	const label = await getExpressionLabel(text, expressionApi, { customPrompt: prompt });	700	const label = await getExpressionLabel(text, expressionApi, { filterAvailable: filterAvailable, customPrompt: prompt });
700	console.debug(`Classification result for "${text}": ${label}`);	701	console.debug(`Classification result for "${text}": ${label}`);
701	return label;	702	return label;
702	}	703	}

  * @param {string} text - The text to classify and retrieve the expression label for.
  * @param {EXPRESSION_API} [expressionsApi=extension_settings.expressions.api] - The expressions API to use for classification.
  * @param {object} [options={}] - Optional arguments.
+ * @param {boolean?} [options.filterAvailable=null] - Whether to filter available expressions. If not specified, uses the extension setting.
  * @param {string?} [options.customPrompt=null] - The custom prompt to use for classification.
  * @returns {Promise<string?>} - The label of the expression.
  */
-export async function getExpressionLabel(text, expressionsApi = extension_settings.expressions.api, { customPrompt = null } = {}) {
+export async function getExpressionLabel(text, expressionsApi = extension_settings.expressions.api, { filterAvailable = null, customPrompt = null } = {}) {
     // Return if text is undefined, saving a costly fetch request
     if ((!modules.includes('classify') && expressionsApi == EXPRESSION_API.extras) || !text) {
         return extension_settings.expressions.fallback_expression;

     text = sampleClassifyText(text);
+    filterAvailable ??= extension_settings.expressions.filterAvailable;
+    if (filterAvailable && ![EXPRESSION_API.llm, EXPRESSION_API.webllm].includes(expressionsApi)) {
+        console.debug('Filter available is only supported for LLM and WebLLM expressions');
+    }
     try {
         switch (expressionsApi) {
             // Local BERT pipeline

                     return extension_settings.expressions.fallback_expression;
+                }
-                const expressionsList = await getExpressionsList();
+                const expressionsList = await getExpressionsList({ filterAvailable: filterAvailable });
                 const prompt = substituteParamsExtended(customPrompt, { labels: expressionsList }) || await getLlmPrompt(expressionsList);
                 eventSource.once(event_types.TEXT_COMPLETION_SETTINGS_READY, onTextGenSettingsReady);
                 const emotionResponse = await generateRaw(text, main_api, false, false, prompt);

                     return extension_settings.expressions.fallback_expression;
+                }
-                const expressionsList = await getExpressionsList();
+                const expressionsList = await getExpressionsList({ filterAvailable: filterAvailable });
                 const prompt = substituteParamsExtended(customPrompt, { labels: expressionsList }) || await getLlmPrompt(expressionsList);
                 const messages = [
                     { role: 'user', content: text + '\n\n' + prompt },

     return [...expressionsList, ...extension_settings.expressions.custom].filter(onlyUnique);
+}
-export async function getExpressionsList() {
+export async function getExpressionsList({ filterAvailable = false } = {}) {
-    // Return cached list if available
+    // If there is no cached list, load and cache it
-    if (Array.isArray(expressionsList)) {
+    if (!Array.isArray(expressionsList)) {
-        return getCachedExpressions();
+        expressionsList = await resolveExpressionsList();
+    }
+    const expressions = getCachedExpressions();
+    // Filtering is only available for llm and webllm APIs
+    if (!filterAvailable || ![EXPRESSION_API.llm, EXPRESSION_API.webllm].includes(extension_settings.expressions.api)) {
+        return expressions;
+    }
+    // Get expressions with available sprites
+    const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
+    const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
+    return expressions.filter(label => {
+        const expression = spriteCache[spriteFolderName]?.find(x => x.label === label);
+        return (expression?.files.length ?? 0) > 0;
+    });
     /**
      * Returns the list of expressions from the API or fallback in offline mode.
      * @returns {Promise<string[]>}

@@ -1376,9 +1399,6 @@ export async function getExpressionsList() {
1376	expressionsList = DEFAULT_EXPRESSIONS.slice();	1399	expressionsList = DEFAULT_EXPRESSIONS.slice();
1377	return expressionsList;	1400	return expressionsList;
1378	}	1401	}
1379
1380	const result = await resolveExpressionsList();
1381	return [...result, ...extension_settings.expressions.custom].filter(onlyUnique);
1382	}	1402	}
1383		1403
1384	/**	1404	/**

             extension_settings.expressions.rerollIfSame = !!$(this).prop('checked');
             saveSettingsDebounced();
         });
+        $('#expressions_filter_available').prop('checked', extension_settings.expressions.filterAvailable).on('input', function () {
+            extension_settings.expressions.filterAvailable = !!$(this).prop('checked');
+            saveSettingsDebounced();
+        });
         $('#expression_override_cleanup_button').on('click', onClickExpressionOverrideRemoveAllButton);
         $(document).on('dragstart', '.expression', (e) => {
             e.preventDefault();

     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'expression-list',
         aliases: ['expressions'],
-        /** @type {(args: {return: string}) => Promise<string>} */
+        /** @type {(args: {return: string, filter: string}) => Promise<string>} */
         callback: async (args) => {
             let returnType =
                 /** @type {import('../../slash-commands/SlashCommandReturnHelper.js').SlashCommandReturnType} */
                 (args.return);
-            const list = await getExpressionsList();
+            const list = await getExpressionsList({ filterAvailable: !isFalseBoolean(args.filter) });
             return await slashCommandReturnHelper.doReturn(returnType ?? 'pipe', list, { objectToStringFunc: list => list.join(', ') });
         },

                 enumList: slashCommandReturnHelper.enumList({ allowObject: true }),
                 forceEnum: true,
             }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'filter',
+                description: 'Filter the list to only include expressions that have available sprites for the current character.',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+                defaultValue: 'true',
+            }),
         ],
         returns: 'The comma-separated list of available expressions, including custom expressions.',
         helpString: 'Returns a list of available expressions, including custom expressions.',

                 enumList: Object.keys(EXPRESSION_API).map(api => new SlashCommandEnumValue(api, null, enumTypes.enum)),
             }),
             SlashCommandNamedArgument.fromProps({
+                name: 'filter',
+                description: 'Filter the list to only include expressions that have available sprites for the current character.',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+                defaultValue: 'true',
+            }),
+            SlashCommandNamedArgument.fromProps({
                 name: 'prompt',
                 description: 'Custom prompt for classification. Only relevant if Classifier API is set to LLM.',
                 typeList: [ARGUMENT_TYPE.STRING],

public/scripts/extensions/expressions/settings.html+5 -1 Viewed

                 </select>
             </div>
             <div class="expression_llm_prompt_block m-b-1 m-t-1">
-                <label for="expression_llm_prompt" class="title_restorable">
+                <label class="checkbox_label" for="expressions_filter_available" title="When using LLM or WebLLM classifier, only show and use expressions that have sprites assigned to them." data-i18n="[title]When using LLM or WebLLM classifier, only show and use expressions that have sprites assigned to them.">
+                    <input id="expressions_filter_available" type="checkbox">
+                    <span data-i18n="Filter expressions for available sprites">Filter expressions for available sprites</span>
+                </label>
+                <label for="expression_llm_prompt" class="title_restorable m-t-1">
                     <span data-i18n="LLM Prompt">LLM Prompt</span>
                     <div id="expression_llm_prompt_restore" title="Restore default value" class="right_menu_button">
                         <i class="fa-solid fa-clock-rotate-left fa-sm"></i>

public/scripts/extensions/quick-reply/api/QuickReplyApi.js+0 -3 Viewed

-// eslint-disable-next-line no-unused-vars
 import { QuickReply } from '../src/QuickReply.js';
 import { QuickReplyContextLink } from '../src/QuickReplyContextLink.js';
 import { QuickReplySet } from '../src/QuickReplySet.js';
-// eslint-disable-next-line no-unused-vars
 import { QuickReplySettings } from '../src/QuickReplySettings.js';
-// eslint-disable-next-line no-unused-vars
 import { SettingsUi } from '../src/ui/SettingsUi.js';
 import { onlyUnique } from '../../../utils.js';

public/scripts/extensions/quick-reply/src/AutoExecuteHandler.js+0 -2 Viewed

 import { warn } from '../index.js';
-// eslint-disable-next-line no-unused-vars
 import { QuickReply } from './QuickReply.js';
-// eslint-disable-next-line no-unused-vars
 import { QuickReplySettings } from './QuickReplySettings.js';
 export class AutoExecuteHandler {

public/scripts/extensions/quick-reply/src/QuickReply.js+0 -2 Viewed

             }, { passive:true });
             const getLineStart = ()=>{
                 const start = message.selectionStart;
-                const end = message.selectionEnd;
                 let lineStart;
                 if (start == 0 || message.value[start - 1] == '\n') {
                     // cursor is already at beginning of line

                 } else if (evt.key == 'Enter' && !evt.ctrlKey && !evt.shiftKey && !evt.altKey && !(ac.isReplaceable && ac.isActive)) {
                     // new line, keep indent
                     const start = message.selectionStart;
-                    const end = message.selectionEnd;
                     let lineStart = getLineStart();
                     const indent = /^([^\S\n]*)/.exec(message.value.slice(lineStart))[1] ?? '';
                     if (indent.length) {

public/scripts/extensions/quick-reply/src/SlashCommandHandler.js+0 -1 Viewed

 import { SlashCommandParser } from '../../../slash-commands/SlashCommandParser.js';
 import { SlashCommandScope } from '../../../slash-commands/SlashCommandScope.js';
 import { isTrueBoolean } from '../../../utils.js';
-// eslint-disable-next-line no-unused-vars
 import { QuickReplyApi } from '../api/QuickReplyApi.js';
 import { QuickReply } from './QuickReply.js';
 import { QuickReplySet } from './QuickReplySet.js';

public/scripts/extensions/quick-reply/src/ui/ButtonUi.js+0 -1 Viewed

 import { animation_duration } from '../../../../../script.js';
 import { dragElement } from '../../../../RossAscends-mods.js';
 import { loadMovingUIState } from '../../../../power-user.js';
-// eslint-disable-next-line no-unused-vars
 import { QuickReplySettings } from '../QuickReplySettings.js';
 export class ButtonUi {

public/scripts/extensions/quick-reply/src/ui/SettingsUi.js+0 -1 Viewed

 import { log, warn } from '../../index.js';
 import { QuickReply } from '../QuickReply.js';
 import { QuickReplySet } from '../QuickReplySet.js';
-// eslint-disable-next-line no-unused-vars
 import { QuickReplySettings } from '../QuickReplySettings.js';
 export class SettingsUi {

public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js+0 -1 Viewed

 import { QuickReply } from '../../QuickReply.js';
-// eslint-disable-next-line no-unused-vars
 import { QuickReplySet } from '../../QuickReplySet.js';
 import { MenuHeader } from './MenuHeader.js';
 import { MenuItem } from './MenuItem.js';

public/scripts/extensions/stable-diffusion/index.js+0 -1 Viewed

     $('#sd_wand_container').append(buttonHtml);
     $(document.body).append(dropdownHtml);
-    const messageButton = $('.sd_message_gen');
     const button = $('#sd_gen');
     const dropdown = $('#sd_dropdown');
     dropdown.hide();

public/scripts/extensions/token-counter/index.js+0 -0 Viewed

public/scripts/extensions/tts/gpt-sovits-v2.js+0 -2 Viewed

         let prompt_text = replaceSpeaker(voiceId);
-        const streaming = this.settings.streaming;
         const params = {
             text: inputText,
             prompt_text: prompt_text,

public/scripts/extensions/tts/index.js+1 -1 Viewed

 import { cancelTtsPlay, eventSource, event_types, getCurrentChatId, isStreamingEnabled, name2, saveSettingsDebounced, substituteParams } from '../../../script.js';
-import { ModuleWorkerWrapper, doExtrasFetch, extension_settings, getApiUrl, getContext, modules, renderExtensionTemplateAsync } from '../../extensions.js';
+import { ModuleWorkerWrapper, extension_settings, getContext, renderExtensionTemplateAsync } from '../../extensions.js';
 import { delay, escapeRegex, getBase64Async, getStringHash, onlyUnique } from '../../utils.js';
 import { EdgeTtsProvider } from './edge.js';
 import { ElevenLabsTtsProvider } from './elevenlabs.js';

public/scripts/group-chats.js+0 -1 Viewed

     hideSwipeButtons,
     chat_metadata,
     updateChatMetadata,
-    isStreamingEnabled,
     getThumbnailUrl,
     getRequestHeaders,
     setMenuType,

public/scripts/nai-settings.js+1 -0 Viewed

     // Add the chosen token to `merged` if it's not already there. This can
     // happen if the chosen token was not among the top 10 most likely ones.
+    // eslint-disable-next-line no-unused-vars
     const [[chosenId], [_, chosenAfter]] = data.chosen[0];
     if (!merged.some(([id]) => id === chosenId)) {
         merged.push([chosenId, chosenAfter]);

public/scripts/openai.js+1 -1 Viewed

         'reasoning_effort': String(oai_settings.reasoning_effort),
         'enable_web_search': Boolean(oai_settings.enable_web_search),
         'request_images': Boolean(oai_settings.request_images),
+        'custom_prompt_post_processing': oai_settings.custom_prompt_post_processing,
     };
     if (!canMultiSwipe && ToolManager.canPerformToolCalls(type)) {

         generate_data['custom_include_body'] = oai_settings.custom_include_body;
         generate_data['custom_exclude_body'] = oai_settings.custom_exclude_body;
         generate_data['custom_include_headers'] = oai_settings.custom_include_headers;
-        generate_data['custom_prompt_post_processing'] = oai_settings.custom_prompt_post_processing;
+    }
     if (isCohere) {

public/scripts/slash-commands.js+5 -3 Viewed

 import { SlashCommandAbortController } from './slash-commands/SlashCommandAbortController.js';
 import { SlashCommandNamedArgumentAssignment } from './slash-commands/SlashCommandNamedArgumentAssignment.js';
 import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
-import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
+import { POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
 import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { SlashCommandBreakController } from './slash-commands/SlashCommandBreakController.js';
 import { SlashCommandExecutionError } from './slash-commands/SlashCommandExecutionError.js';
 import { slashCommandReturnHelper } from './slash-commands/SlashCommandReturnHelper.js';
 import { accountStorage } from './util/AccountStorage.js';
+import { SlashCommandDebugController } from './slash-commands/SlashCommandDebugController.js';
+import { SlashCommandScope } from './slash-commands/SlashCommandScope.js';
 export {
     executeSlashCommands, executeSlashCommandsWithOptions, getSlashCommandsHelp, registerSlashCommand,
 };

  * @prop {boolean} [handleParserErrors] (true) Whether to handle parser errors (show toast on error) or throw.
  * @prop {SlashCommandScope} [scope] (null) The scope to be used when executing the commands.
  * @prop {boolean} [handleExecutionErrors] (false) Whether to handle execution errors (show toast on error) or throw
- * @prop {{[id:PARSER_FLAG]:boolean}} [parserFlags] (null) Parser flags to apply
+ * @prop {import('./slash-commands/SlashCommandParser.js').ParserFlags} [parserFlags] (null) Parser flags to apply
  * @prop {SlashCommandAbortController} [abortController] (null) Controller used to abort or pause command execution
  * @prop {SlashCommandDebugController} [debugController] (null) Controller used to control debug execution
  * @prop {(done:number, total:number)=>void} [onProgress] (null) Callback to handle progress events

 /**
  * @typedef ExecuteSlashCommandsOnChatInputOptions
  * @prop {SlashCommandScope} [scope] (null) The scope to be used when executing the commands.
- * @prop {{[id:PARSER_FLAG]:boolean}} [parserFlags] (null) Parser flags to apply
+ * @prop {import('./slash-commands/SlashCommandParser.js').ParserFlags} [parserFlags] (null) Parser flags to apply
  * @prop {boolean} [clearChatInput] (false) Whether to clear the chat input textarea
  * @prop {string} [source] (null) String indicating where the code come from (e.g., QR name)
  */

public/scripts/slash-commands/SlashCommand.js+1 -5 Viewed

 import { SlashCommandArgument, SlashCommandNamedArgument } from './SlashCommandArgument.js';
 import { SlashCommandClosure } from './SlashCommandClosure.js';
 import { SlashCommandDebugController } from './SlashCommandDebugController.js';
-import { PARSER_FLAG } from './SlashCommandParser.js';
 import { SlashCommandScope } from './SlashCommandScope.js';
 /**
  * @typedef {{
  * _scope:SlashCommandScope,
- * _parserFlags:{[id:PARSER_FLAG]:boolean},
+ * _parserFlags:import('./SlashCommandParser.js').ParserFlags,
  * _abortController:SlashCommandAbortController,
  * _debugController:SlashCommandDebugController,
  * _hasUnnamedArgument:boolean,

public/scripts/slash-commands/SlashCommandAutoCompleteNameResult.js+0 -3 Viewed

 import { AutoCompleteNameResult } from '../autocomplete/AutoCompleteNameResult.js';
-import { AutoCompleteOption } from '../autocomplete/AutoCompleteOption.js';
 import { AutoCompleteSecondaryNameResult } from '../autocomplete/AutoCompleteSecondaryNameResult.js';
 import { SlashCommand } from './SlashCommand.js';
-import { SlashCommandNamedArgument } from './SlashCommandArgument.js';
-import { SlashCommandClosure } from './SlashCommandClosure.js';
 import { SlashCommandCommandAutoCompleteOption } from './SlashCommandCommandAutoCompleteOption.js';
 import { SlashCommandEnumAutoCompleteOption } from './SlashCommandEnumAutoCompleteOption.js';
 import { SlashCommandExecutor } from './SlashCommandExecutor.js';

public/scripts/slash-commands/SlashCommandClosure.js+0 -3 Viewed

 import { delay, escapeRegex, uuidv4 } from '../utils.js';
 import { SlashCommand } from './SlashCommand.js';
 import { SlashCommandAbortController } from './SlashCommandAbortController.js';
-import { SlashCommandNamedArgument } from './SlashCommandArgument.js';
 import { SlashCommandBreak } from './SlashCommandBreak.js';
 import { SlashCommandBreakController } from './SlashCommandBreakController.js';
 import { SlashCommandBreakPoint } from './SlashCommandBreakPoint.js';

 export class SlashCommandClosure {
     /** @type {SlashCommandScope} */ scope;
     /** @type {boolean} */ executeNow = false;
-    // @ts-ignore
     /** @type {SlashCommandNamedArgumentAssignment[]} */ argumentList = [];
-    // @ts-ignore
     /** @type {SlashCommandNamedArgumentAssignment[]} */ providedArgumentList = [];
     /** @type {SlashCommandExecutor[]} */ executorList = [];
     /** @type {SlashCommandAbortController} */ abortController;

public/scripts/slash-commands/SlashCommandDebugController.js+0 -0 Viewed

public/scripts/slash-commands/SlashCommandEnumValue.js+0 -4 Viewed

-import { SlashCommandExecutor } from './SlashCommandExecutor.js';
-import { SlashCommandScope } from './SlashCommandScope.js';
 /**
  * @typedef {'enum' | 'command' | 'namedArgument' | 'variable' | 'qr' | 'macro' | 'number' | 'name'} EnumType
  */

public/scripts/slash-commands/SlashCommandExecutor.js+1 -6 Viewed

-// eslint-disable-next-line no-unused-vars
 import { uuidv4 } from '../utils.js';
 import { SlashCommand } from './SlashCommand.js';
-// eslint-disable-next-line no-unused-vars
 import { SlashCommandClosure } from './SlashCommandClosure.js';
 import { SlashCommandNamedArgumentAssignment } from './SlashCommandNamedArgumentAssignment.js';
-// eslint-disable-next-line no-unused-vars
-import { PARSER_FLAG } from './SlashCommandParser.js';
 import { SlashCommandUnnamedArgumentAssignment } from './SlashCommandUnnamedArgumentAssignment.js';
 export class SlashCommandExecutor {

@@ -29,10 +25,9 @@ export class SlashCommandExecutor {
29	}	25	}
30	}	26	}
31	/** @type {SlashCommand} */ command;	27	/** @type {SlashCommand} */ command;
32	// @ts-ignore
33	/** @type {SlashCommandNamedArgumentAssignment[]} */ namedArgumentList = [];	28	/** @type {SlashCommandNamedArgumentAssignment[]} */ namedArgumentList = [];
34	/** @type {SlashCommandUnnamedArgumentAssignment[]} */ unnamedArgumentList = [];	29	/** @type {SlashCommandUnnamedArgumentAssignment[]} */ unnamedArgumentList = [];
35	/*@type {{[id:PARSER_FLAG]:boolean}} / parserFlags;	30	/** @type {import('./SlashCommandParser.js').ParserFlags} */ parserFlags;
36		31
37	get commandCount() {	32	get commandCount() {
38	return 1	33	return 1

public/scripts/slash-commands/SlashCommandNamedArgumentAssignment.js+0 -0 Viewed

public/scripts/slash-commands/SlashCommandNamedArgumentAutoCompleteOption.js+0 -1 Viewed

 import { AutoCompleteOption } from '../autocomplete/AutoCompleteOption.js';
 import { SlashCommand } from './SlashCommand.js';
 import { SlashCommandNamedArgument } from './SlashCommandArgument.js';
-import { SlashCommandNamedArgumentAssignment } from './SlashCommandNamedArgumentAssignment.js';
 export class SlashCommandNamedArgumentAutoCompleteOption extends AutoCompleteOption {
     /** @type {SlashCommandNamedArgument} */ arg;

public/scripts/slash-commands/SlashCommandParser.js+5 -6 Viewed

 import { SlashCommandParserError } from './SlashCommandParserError.js';
 import { AutoCompleteNameResult } from '../autocomplete/AutoCompleteNameResult.js';
 import { SlashCommandQuickReplyAutoCompleteOption } from './SlashCommandQuickReplyAutoCompleteOption.js';
-// eslint-disable-next-line no-unused-vars
 import { SlashCommandScope } from './SlashCommandScope.js';
 import { SlashCommandVariableAutoCompleteOption } from './SlashCommandVariableAutoCompleteOption.js';
 import { SlashCommandNamedArgumentAssignment } from './SlashCommandNamedArgumentAssignment.js';
-// eslint-disable-next-line no-unused-vars
 import { SlashCommandAbortController } from './SlashCommandAbortController.js';
 import { SlashCommandAutoCompleteNameResult } from './SlashCommandAutoCompleteNameResult.js';
 import { SlashCommandUnnamedArgumentAssignment } from './SlashCommandUnnamedArgumentAssignment.js';

 /** @typedef {import('./SlashCommand.js').NamedArgumentsCapture} NamedArgumentsCapture */
 /** @typedef {import('./SlashCommand.js').NamedArguments} NamedArguments */
-/**@readonly*/
+/**
-/**@enum {Number}*/
+ * @enum {Number}
+ * @readonly
+ * @typedef {{[id:PARSER_FLAG]:boolean}} ParserFlags
+ */
 export const PARSER_FLAG = {
     'STRICT_ESCAPING': 1,
     'REPLACE_GETVAR': 2,
 };
 export class SlashCommandParser {
-    // @ts-ignore
     /** @type {Object.<string, SlashCommand>} */ static commands = {};
     /**

     get commands() {
         return SlashCommandParser.commands;
+    }
-    // @ts-ignore
     /** @type {Object.<string, string>} */ helpStrings = {};
     /** @type {boolean} */ verifyCommandNames = true;
     /** @type {string} */ text;

public/scripts/slash-commands/SlashCommandScope.js+0 -0 Viewed

public/scripts/slash-commands/SlashCommandUnnamedArgumentAssignment.js+0 -0 Viewed

public/scripts/tags.js+0 -1 Viewed

     DEFAULT_PRINT_TIMEOUT,
     printCharacters,
 } from '../script.js';
-// eslint-disable-next-line no-unused-vars
 import { FILTER_TYPES, FILTER_STATES, DEFAULT_FILTER_STATE, isFilterState, FilterHelper } from './filters.js';
 import { groupCandidatesFilter, groups, selected_group } from './group-chats.js';

public/scripts/variables.js+2 -2 Viewed

 import { SlashCommandClosureResult } from './slash-commands/SlashCommandClosureResult.js';
 import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
-import { PARSER_FLAG, SlashCommandParser } from './slash-commands/SlashCommandParser.js';
+import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
 import { slashCommandReturnHelper } from './slash-commands/SlashCommandReturnHelper.js';
 import { SlashCommandScope } from './slash-commands/SlashCommandScope.js';
 import { isFalseBoolean, convertValueType, isTrueBoolean } from './utils.js';

  * Executes a slash command from a string (may be enclosed in quotes) and returns the result.
  * @param {string} command Command to execute. May contain escaped macro and batch separators.
  * @param {SlashCommandScope} [scope] The scope to use.
- * @param {{[id:PARSER_FLAG]:boolean}} [parserFlags] The parser flags to use.
+ * @param {import('./slash-commands/SlashCommandParser.js').ParserFlags} [parserFlags] The parser flags to use.
  * @param {SlashCommandAbortController} [abortController] The abort controller to use.
  * @returns {Promise<SlashCommandClosureResult>} Closure execution result
  */

public/scripts/world-info.js+1 -1 Viewed

 import { Fuse } from '../lib.js';
-import { saveSettings, callPopup, substituteParams, getRequestHeaders, chat_metadata, this_chid, characters, saveCharacterDebounced, menu_type, eventSource, event_types, getExtensionPromptByName, saveMetadata, getCurrentChatId, extension_prompt_roles } from '../script.js';
+import { saveSettings, substituteParams, getRequestHeaders, chat_metadata, this_chid, characters, saveCharacterDebounced, menu_type, eventSource, event_types, getExtensionPromptByName, saveMetadata, getCurrentChatId, extension_prompt_roles } from '../script.js';
 import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile, extractDataFromPng, getFileBuffer, getCharaFilename, getSortableDelay, escapeRegex, PAGINATION_TEMPLATE, navigation_option, waitUntilCondition, isTrueBoolean, setValueByPath, flashHighlight, select2ModifyOptions, getSelect2OptionId, dynamicSelect2DataViaAjax, highlightRegex, select2ChoiceClickSubscribe, isFalseBoolean, getSanitizedFilename, checkOverwriteExistingData, getStringHash, parseStringArray, cancelDebounce, findChar, onlyUnique } from './utils.js';
 import { extension_settings, getContext } from './extensions.js';
 import { NOTE_MODULE_NAME, metadata_keys, shouldWIAddPrompt } from './authors-note.js';

src/endpoints/backends/chat-completions.js+9 -8 Viewed

     let bodyParams;
     const isTextCompletion = Boolean(request.body.model && TEXT_COMPLETION_MODELS.includes(request.body.model)) || typeof request.body.messages === 'string';
+    const postProcessTypes = [CHAT_COMPLETION_SOURCES.CUSTOM, CHAT_COMPLETION_SOURCES.OPENROUTER];
+    if (Array.isArray(request.body.messages) && postProcessTypes.includes(request.body.chat_completion_source) && request.body.custom_prompt_post_processing) {
+        console.info('Applying custom prompt post-processing of type', request.body.custom_prompt_post_processing);
+        request.body.messages = postProcessPrompt(
+            request.body.messages,
+            request.body.custom_prompt_post_processing,
+            getPromptNames(request));
+    }
     if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.OPENAI) {
         apiUrl = new URL(request.body.reverse_proxy || API_OPENAI).toString();
         apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.OPENAI);

         mergeObjectWithYaml(bodyParams, request.body.custom_include_body);
         mergeObjectWithYaml(headers, request.body.custom_include_headers);
-        if (request.body.custom_prompt_post_processing) {
-            console.info('Applying custom prompt post-processing of type', request.body.custom_prompt_post_processing);
-            request.body.messages = postProcessPrompt(
-                request.body.messages,
-                request.body.custom_prompt_post_processing,
-                getPromptNames(request));
-        }
     } else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.PERPLEXITY) {
         apiUrl = API_PERPLEXITY;
         apiKey = readSecret(request.user.directories, SECRET_KEYS.PERPLEXITY);

src/endpoints/chats.js+4 -5 Viewed

                 continue;
+            }
-            // Search through messages
+            // Search through title and messages of the chat
             const fragments = query.trim().toLowerCase().split(/\s+/).filter(x => x);
-            const hasMatch = messages.some(message => {
+            const text = [path.parse(chatFile.path).name,
-                const text = message?.mes?.toLowerCase();
+                ...messages.map(message => message?.mes)].join('\n').toLowerCase();
-                return text && fragments.every(fragment => text.includes(fragment));
+            const hasMatch = fragments.every(fragment => text.includes(fragment));
-            });
             if (hasMatch) {
                 results.push({

Merge branch 'staging' into fix-srw-trim