Merge pull request #1292 from SillyTavern/staging

Staging

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,90 @@
+name: Bug Report 🐛
+description: Report something that's not working the intended way. Support requests for external programs (reverse proxies, 3rd party servers, other peoples' forks) will be refused!
+title: '[BUG] <title>'
+labels: ['bug']
+body:
+  - type: dropdown
+    id: environment
+    attributes:
+      label: Environment
+      description: Where are you running SillyTavern?
+      options:
+        - Self-Hosted (Bare Metal)      
+        - Self-Hosted (Docker)
+        - Android (Termux)
+        - Cloud Service (Static)
+        - Other (Specify below)
+    validations:
+      required: true
+
+  - type: input
+    id: system
+    attributes:
+      label: System
+      description: >-
+        For deployment issues, specify your [distro or OS](https://whatsmyos.com/) and/ or Docker version.
+        For client-side issues, include your [browser version](https://www.whatsmybrowser.org/)
+      placeholder: e.g. Firefox 101, Manjaro Linux 21.3.0, Docker 20.10.16
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of SillyTavern are you running?
+      placeholder: (check User Settings to see the version)
+    validations:
+      required: true
+
+  - type: textarea
+    id: desktop
+    attributes:
+      label: Desktop Information
+      description: Please provide details about your desktop environment.
+      placeholder: |
+        - Node.js version (if applicable): [run `node --version` in cmd]
+        - Generation API [e.g. KoboldAI, OpenAI]
+        - Branch [staging, release]
+        - Model [e.g. Pygmalion 6b, LLaMa 13b]
+    validations:
+      required: false
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: Describe the problem
+      description: Please describe exactly what is not working, include the steps to reproduce, actual result and expected result
+      placeholder: When doing ABC then DEF, I expect to see XYZ, but I actually see ZYX
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Additional info
+      description: Logs? Screenshots? Yes, please.
+      placeholder: If the issue happens during build-time, include terminal logs. For run-time errors, include browser logs which you can view in the Dev Tools (F12), under the Console tab. Take care to blank out any personal info.
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: idiot-check
+    attributes:
+      label: Please tick the boxes
+      description: Before submitting, please ensure that
+      options:
+        - label: You have explained the issue clearly, and included all relevant info
+          required: true
+        - label: You've checked that this [issue hasn't already been raised](https://github.com/SillyTavern/SillyTavern/issues?q=is%3Aissue)
+          required: true
+        - label: You've checked the [docs](https://docs.sillytavern.app/) ![important](https://img.shields.io/badge/Important!-F6094E)
+          required: true
+
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Thank you for raising this ticket - in doing so you are helping to make SillyTavern better for everyone.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,45 +0,0 @@
----
-name: Bug report
-about: "Create a report to help us improve. PAY ATTENTION: Support requests for external programs (reverse proxies, 3rd party servers, other peoples' forks) will be refused!"
-title: "[BUG]"
-labels: ''
-assignees: ''
-
----
-
-> **Warning**. Complete **all** the fields below. Otherwise, your bug report will be **ignored**!
-
-**Have you searched for similar [bugs](https://github.com/SillyTavern/SillyTavern/issues?q=)?**
-Yes/No
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Logs**
-
-Providing the logs from the browser DevTools console (opened by pressing the F12 key) or SillyTavern command line window will be highly appreciated.
-
-**Desktop (please complete the following information):**
- - OS/Device: [e.g. Windows 11]
- - Environment: [cloud, local]
- - Node.js version (if applicable): [run `node --version` in cmd]
- - Browser [e.g. chrome, safari]
- - Generation API [e.g. KoboldAI, OpenAI]
- - Branch [staging, release]
- - Model [e.g. Pygmalion 6b, LLaMa 13b]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,91 @@
+name: Feature Request ✨
+description: Suggest an idea for future development of this project
+title: '[FEATURE_REQUEST] <title>'
+labels: ['enhancement']
+
+body:
+
+  # Field 1 - Did the user searched for similar requests
+  - type: dropdown
+    id: similarRequest
+    attributes:
+      label: Have you searched for similar requests?
+      description:
+      options:
+        - 'No'
+        - 'Yes'
+    validations:
+      required: false
+
+  # Field 2 - Is it bug-related
+  - type: textarea
+    id: issue
+    attributes:
+      label: Is your feature request related to a problem? If so, please describe.
+      description:
+      placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: false
+
+  # Field 3 - Describe feature
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      placeholder: An outline of how you would like this to be implemented, include as much details as possible 
+    validations:
+      required: true
+
+  # Field 4 - Describe alternatives
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      placeholder: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+
+  # Field 5 - Additional context
+  - type: textarea
+    id: addcontext
+    attributes:
+      label: Additional context
+      placeholder: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
+
+  # Field 6 - Priority
+  - type: dropdown
+    id: priority
+    attributes:
+      label: Priority
+      description: How urgent is the development of this feature
+      options:
+        - Low (Nice-to-have)
+        - Medium (Would be very useful)
+        - High (The app does not function without it)
+    validations:
+      required: true
+
+  # Field 7 - Can the user implement
+  - type: dropdown
+    id: canImplement
+    attributes:
+      label: Is this something you would be keen to implement?
+      description: Are you raising this ticket in order to get an issue number for your PR?
+      options:
+        - 'No'
+        - 'Maybe'
+        - 'Yes!'
+    validations:
+      required: false
+
+  # Final text
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Thank you for your feature suggestion.
+        Please note that there is no guarantee that your idea will be implemented.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[Feature Request] "
-labels: ''
-assignees: ''
-
----
-
-**Have you searched for similar [requests](https://github.com/SillyTavern/SillyTavern/issues?q=)?**
-Yes/No
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/readme-zh_cn.md

@@ -1,8 +1,8 @@
 [English](readme.md) | 中文
 
-![image](https://github.com/SillyTavern/SillyTavern/assets/18619528/8c41a061-7f72-4d2b-9d54-e6d058209e7b)
+![image](https://github.com/SillyTavern/SillyTavern/assets/18619528/c2be4c3f-aada-4f64-87a3-ae35a68b61a4)
 
-移动设备界面友好，多种人工智能服务或模型支持（KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale），类似 Galgame 的 老 婆 模 式，Horde SD，文本系统语音生成，世界信息（Lorebooks），可定制的界面，自动翻译，和比你所需要的更多的 Prompt。附带扩展服务，支持文本绘画生成与语音生成和基于向量数据库 ChromaDB 的聊天信息总结。
+移动设备界面友好，多种人工智能服务或模型支持（KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale），类似 Galgame 的 老 婆 模 式，Horde SD，文本系统语音生成，世界信息（Lorebooks），可定制的界面，自动翻译，和比你所需要的更多的 Prompt。附带扩展服务，支持文本绘画生成与语音生成和基于向量数据库 的聊天信息总结。
 
 基于 TavernAI 1.2.8 的分叉版本
 
@@ -41,8 +41,6 @@ SillyTavern 本身并无用处，因为它只是一个用户聊天界面。你
 
 <https://rentry.org/STAI-Termux>
 
-Termux 不支持**.Webp 字符卡的导入/导出。请使用 JSON 或 PNG 格式**。
-
 ## 有问题或建议？
 
 ### 我们现在有了 Discord 社区
@@ -83,7 +81,6 @@ SillyTavern 支持扩展服务，一些额外的人工智能模块可通过 [Sil
 * 在聊天窗口发送图片，并由人工智能解释图片内容
 * 文本图像生成（5 预设，以及 "自由模式"）
 * 聊天信息的文字转语音（通过 ElevenLabs、Silero 或操作系统的语音生成）
-* ChromaDB 向量数据库，用于更智能的聊天 Prompt
 
 扩展服务的完整功能介绍和使用教程，请参阅 [Docs](https://docs.sillytavern.app/extras/extensions/)。
 

.github/readme.md

@@ -1,15 +1,19 @@
 English | [中文](readme-zh_cn.md)
 
-![image](https://github.com/SillyTavern/SillyTavern/assets/18619528/8c41a061-7f72-4d2b-9d54-e6d058209e7b)
+![SillyTavern-Banner](https://github.com/SillyTavern/SillyTavern/assets/18619528/c2be4c3f-aada-4f64-87a3-ae35a68b61a4)
 
-Mobile-friendly, Multi-API (KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale), VN-like Waifu Mode, Horde SD, System TTS, WorldInfo (lorebooks), customizable UI, auto-translate, and more prompt options than you'd ever want or need. Optional Extras server for more SD/TTS options + ChromaDB/Summarize.
+Mobile-friendly layout, Multi-API (KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale), VN-like Waifu Mode, Stable Diffusion, TTS, WorldInfo (lorebooks), customizable UI, auto-translate, and more prompt options than you'd ever want or need + ability to install third-party extensions.
 
-Based on a fork of TavernAI 1.2.8
+Based on a fork of [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8
+
+## Important news!
+
+1. We have created a [Documentation website](https://docs.sillytavern.app/) to answer most of your questions and help you get started.
+
+2. Missing extensions after the update? Since the 1.10.6 release version, most of the previously built-in extensions have been converted to downloadable add-ons. You can download them via the built-in "Download Extensions and Assets" menu in the extensions panel (stacked blocks icon in the top bar).
 
 ### Brought to you by Cohee, RossAscends, and the SillyTavern community
 
-NOTE: We have created a [Documentation website](https://docs.sillytavern.app/) to answer most of your questions and help you get started.
-
 ### What is SillyTavern or TavernAI?
 
 SillyTavern is a user interface you can install on your computer (and Android phones) that allows you to interact with text generation AIs and chat/roleplay with characters you or the community create.
@@ -41,8 +45,6 @@ Since Tavern is only a user interface, it has tiny hardware requirements, it wil
 
 <https://rentry.org/STAI-Termux>
 
-**.webp character cards import/export is not supported in Termux. Use either JSON or PNG formats instead.**
-
 ## Questions or suggestions?
 
 ### We now have a community Discord server
@@ -71,7 +73,6 @@ Get in touch with the developers directly:
 * [Oobabooga's TextGen WebUI](https://github.com/oobabooga/text-generation-webui) API connection
 * [AI Horde](https://horde.koboldai.net/) connection
 * Prompt generation formatting tweaking
-* webp character card interoperability (PNG is still an internal format)
 
 ## Extensions
 
@@ -83,7 +84,6 @@ SillyTavern has extensibility support, with some additional AI modules hosted vi
 * Sending images to chat, and the AI interpreting the content
 * Stable Diffusion image generation (5 chat-related presets plus 'free mode')
 * Text-to-speech for AI response messages (via ElevenLabs, Silero, or the OS's System TTS)
-* ChromaDB vector storage for smarter chat prompt formatting
 
 A full list of included extensions and tutorials on how to use them can be found in the [Docs](https://docs.sillytavern.app/extras/extensions/).
 
@@ -295,6 +295,7 @@ GNU Affero General Public License for more details.**
 * RossAscends' additions: AGPL v3
 * Portions of CncAnon's TavernAITurbo mod: Unknown license
 * kingbri's various commits and suggestions (<https://github.com/bdashore3>)
+* city_unit's extensions and various QoL features (<https://github.com/city-unit>)
 * StefanDanielSchwarz's various commits and bug reports (<https://github.com/StefanDanielSchwarz>)
 * Waifu mode inspired by the work of PepperTaco (<https://github.com/peppertaco/Tavern/>)
 * Thanks Pygmalion University for being awesome testers and suggesting cool features!

.github/workflows/docker-publish.yml

@@ -0,0 +1,45 @@
+# This workflow will publish a docker image for every full release to the GitHub package repository
+
+name: Create Docker Image on Release
+
+on:
+  release:
+    # Only runs on full releases not pre releases
+    types: [released]
+
+env:
+  # This should allow creation of docker images even in forked repositories
+  # Image name may not contain uppercase characters, so we can not use the repository name
+  # Creates a string like: ghcr.io/SillyTavern/sillytavern
+  image_name: ghcr.io/sillytavern/sillytavern
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      # Build docker image using dockerfile and tag it with branch name
+      # Assumes branch name is the version number
+      - name: Build the Docker image
+        run: |
+          docker build . --file Dockerfile --tag $image_name:${{ github.ref_name }}
+
+      # Login into package repository as the person who created the release
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Assumes release is the latest and marks image as such
+      - name: Docker Tag and Push
+        run: |
+          docker tag $image_name:${{ github.ref_name }} $image_name:latest
+          docker push $image_name:${{ github.ref_name }}
+          docker push $image_name:latest

.gitignore

@@ -26,6 +26,7 @@ public/settings.json
 /thumbnails
 whitelist.txt
 .vscode
+.idea/
 secrets.json
 /dist
 /backups/
@@ -35,3 +36,5 @@ content.log
 cloudflared.exe
 public/assets/
 access.log
+/vectors/
+/cache/

Dockerfile

@@ -13,7 +13,7 @@ ENTRYPOINT [ "tini", "--" ]
 WORKDIR ${APP_HOME}
 
 # Install app dependencies
-COPY package*.json ./
+COPY package*.json post-install.js ./
 RUN \
   echo "*** Install npm packages ***" && \
   npm install && npm cache clean --force
@@ -23,7 +23,7 @@ COPY . ./
 
 # Copy default chats, characters and user avatars to <folder>.default folder
 RUN \
-  IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds" && \
+  IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds,OpenAI Settings,NovelAI Settings,KoboldAI Settings,TextGen Settings" && \
   \
   echo "*** Store default $RESOURCES in <folder>.default ***" && \
   for R in $RESOURCES; do mv "public/$R" "public/$R.default"; done && \

Launcher.bat

@@ -1,641 +0,0 @@
-@echo off
-REM --------------------------------------------
-REM This script was created by: Deffcolony
-REM --------------------------------------------
-title SillyTavern Launcher
-setlocal
-
-REM ANSI Escape Code for Colors
-set "reset="
-
-REM Strong Foreground Colors
-set "white_fg_strong="
-set "red_fg_strong="
-set "green_fg_strong="
-set "yellow_fg_strong="
-set "blue_fg_strong="
-set "magenta_fg_strong="
-set "cyan_fg_strong="
-
-REM Normal Background Colors
-set "red_bg="
-set "blue_bg="
-
-REM Environment Variables (TOOLBOX 7-Zip)
-set "zip7version=7z2301-x64"
-set "zip7_install_path=%ProgramFiles%\7-Zip"
-set "zip7_download_path=%TEMP%\%zip7version%.exe"
-
-REM Environment Variables (TOOLBOX FFmpeg)
-set "ffmpeg_url=https://www.gyan.dev/ffmpeg/builds/ffmpeg-git-full.7z"
-set "ffdownload_path=%TEMP%\ffmpeg.7z"
-set "ffextract_path=C:\ffmpeg"
-set "bin_path=%ffextract_path%\bin"
-
-REM Environment Variables (TOOLBOX Node.js)
-set "node_installer_path=%temp%\NodejsInstaller.msi"
-
-REM Environment Variables (winget)
-set "winget_path=%userprofile%\AppData\Local\Microsoft\WindowsApps"
-
-REM Environment Variables (TOOLBOX Install Extras)
-set "miniconda_path=%userprofile%\miniconda"
-
-
-REM Check if Winget is installed; if not, then install it
-winget --version > nul 2>&1
-if %errorlevel% neq 0 (
-    echo %yellow_fg_strong%[WARN] Winget is not installed on this system.
-    echo %blue_fg_strong%[INFO]%reset% Installing Winget...
-    bitsadmin /transfer "Microsoft.DesktopAppInstaller_8wekyb3d8bbwe" /download /priority FOREGROUND "https://github.com/microsoft/winget-cli/releases/download/v1.5.2201/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle" "%temp%\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"
-    start "" "%temp%\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"
-    echo %green_fg_strong%Winget is now installed.%reset%
-) else (
-    echo %blue_fg_strong%[INFO] Winget is already installed.%reset%
-)
-
-rem Get the current PATH value from the registry
-for /f "tokens=2*" %%A in ('reg query "HKCU\Environment" /v PATH') do set "current_path=%%B"
-
-rem Check if the paths are already in the current PATH
-echo %current_path% | find /i "%winget_path%" > nul
-set "ff_path_exists=%errorlevel%"
-
-rem Append the new paths to the current PATH only if they don't exist
-if %ff_path_exists% neq 0 (
-    set "new_path=%current_path%;%winget_path%"
-
-    rem Update the PATH value in the registry
-    reg add "HKCU\Environment" /v PATH /t REG_EXPAND_SZ /d "%new_path%" /f
-
-    rem Update the PATH value for the current session
-    setx PATH "%new_path%" > nul
-    echo %green_fg_strong%winget added to PATH.%reset%
-) else (
-    set "new_path=%current_path%"
-    echo %blue_fg_strong%[INFO] winget already exists in PATH.%reset%
-)
-
-
-REM Check if Git is installed if not then install git
-git --version > nul 2>&1
-if %errorlevel% neq 0 (
-    echo %yellow_fg_strong%[WARN] Git is not installed on this system.%reset%
-    echo %blue_fg_strong%[INFO]%reset% Installing Git using Winget...
-    winget install -e --id Git.Git
-    echo %green_fg_strong%Git is installed. Please restart the Launcher.%reset%
-    pause
-    exit
-) else (
-    echo %blue_fg_strong%[INFO] Git is already installed.%reset%
-)
-
-REM Check for updates
-git fetch origin
-
-for /f %%i in ('git rev-list HEAD...origin/%current_branch%') do (
-    set "update_status=%yellow_fg_strong%Update Available%reset%"
-    goto :found_update
-)
-
-set "update_status=%green_fg_strong%Up to Date%reset%"
-:found_update
-
-
-REM Home - frontend
-:home
-cls
-echo %blue_fg_strong%/ Home%reset%
-echo -------------------------------------
-echo What would you like to do?
-echo 1. Start SillyTavern
-echo 2. Start SillyTavern + Extras
-echo 3. Update
-echo 4. Backup
-echo 5. Switch branch
-echo 6. Toolbox
-echo 7. Exit
-
-REM Get the current Git branch
-for /f %%i in ('git branch --show-current') do set current_branch=%%i
-echo ======== VERSION STATUS =========
-echo SillyTavern branch: %cyan_fg_strong%%current_branch%%reset%
-echo Update Status: %update_status%
-echo =================================
-
-set "choice="
-set /p "choice=Choose Your Destiny (default is 1): "
-
-REM Default to choice 1 if no input is provided
-if not defined choice set "choice=1"
-
-REM Home - backend
-if "%choice%"=="1" (
-    call :start
-) else if "%choice%"=="2" (
-    call :start_extras
-) else if "%choice%"=="3" (
-    call :update
-) else if "%choice%"=="4" (
-    call :backup_menu
-) else if "%choice%"=="5" (
-    call :switchbrance_menu
-) else if "%choice%"=="6" (
-    call :toolbox
-) else if "%choice%"=="7" (
-    exit
-) else (
-    color 6
-    echo WARNING: Invalid number. Please insert a valid number.
-    pause
-    goto :home
-)
-
-
-:start
-REM Check if Node.js is installed
-node --version > nul 2>&1
-if %errorlevel% neq 0 (
-    echo %red_fg_strong%[ERROR] node command not found in PATH%reset%
-    echo %red_bg%Please make sure Node.js is installed and added to your PATH.%reset%
-    echo %blue_bg%To install Node.js go to Toolbox%reset%
-    pause
-    goto :home
-)
-echo %blue_fg_strong%[INFO]%reset% A new window has been launched.
-start /wait cmd /c start.bat
-goto :home
-
-
-:start_extras
-REM Run conda activate from the Miniconda installation
-call "%miniconda_path%\Scripts\activate.bat"
-
-REM Activate the sillytavernextras environment
-call conda activate sillytavernextras
-
-REM Start SillyTavern Extras with desired configurations
-python server.py --coqui-gpu --rvc-save-file --cuda-device=0 --max-content-length=1000 --enable-modules=caption,summarize,classify,rvc,coqui-tts --classification-model=joeddav/distilbert-base-uncased-go-emotions-student --share
-goto :home
-
-
-:update
-echo Updating...
-pushd %~dp0
-REM Check if git is installed
-git --version > nul 2>&1
-if %errorlevel% neq 0 (
-    echo %red_fg_strong%[ERROR] git command not found in PATH. Skipping update.%reset%
-    echo %red_bg%Please make sure Git is installed and added to your PATH.%reset%
-    echo %blue_bg%To install Git go to Toolbox%reset%
-) else (
-    call git pull --rebase --autostash
-    if %errorlevel% neq 0 (
-        REM incase there is still something wrong
-        echo There were errors while updating. Please download the latest version manually.
-    )
-)
-pause
-goto :home
-
-
-REM Switch Brance - frontend
-:switchbrance_menu
-cls
-echo %blue_fg_strong%/ Home / Switch Branch%reset%
-echo -------------------------------------
-echo What would you like to do?
-echo 1. Switch to Release - SillyTavern
-echo 2. Switch to Staging - SillyTavern
-echo 3. Switch to Main - Extras
-echo 4. Switch to Neo - Extras
-echo 5. Back to Home
-
-REM Get the current Git branch
-for /f %%i in ('git branch --show-current') do set current_branch=%%i
-echo ======== VERSION STATUS =========
-echo SillyTavern branch: %cyan_fg_strong%%current_branch%%reset%
-echo Extras branch: %cyan_fg_strong%%current_branch%%reset%
-echo =================================
-set /p brance_choice=Choose Your Destiny: 
-
-REM Switch Brance - backend
-if "%brance_choice%"=="1" (
-    call :switch_release_st
-) else if "%brance_choice%"=="2" (
-    call :switch_staging_st
-) else if "%brance_choice%"=="3" (
-    call :switch_main_ste
-) else if "%brance_choice%"=="4" (
-    call :switch_neo_ste
-) else if "%brance_choice%"=="5" (
-    goto :home
-) else (
-    color 6
-    echo WARNING: Invalid number. Please insert a valid number.
-    pause
-    goto :switchbrance_menu
-)
-
-
-:switch_release_st
-echo %blue_fg_strong%[INFO]%reset% Switching to release branch...
-git switch release
-pause
-goto :switchbrance_menu
-
-
-:switch_staging_st
-echo %blue_fg_strong%[INFO]%reset% Switching to staging branch...
-git switch staging
-pause
-goto :switchbrance_menu
-
-
-:switch_main_ste
-echo %blue_fg_strong%[INFO]%reset% Switching to main branch...
-cd SillyTavern-extras
-git switch main
-pause
-goto :switchbrance_menu
-
-
-:switch_neo_ste
-echo %blue_fg_strong%[INFO]%reset% Switching to neo branch...
-cd SillyTavern-extras
-git switch neo
-pause
-goto :switchbrance_menu
-
-
-REM Backup - Frontend
-:backup_menu
-REM Check if 7-Zip is installed
-7z > nul 2>&1
-if %errorlevel% neq 0 (
-    echo %red_fg_strong%[ERROR] 7z command not found in PATH%reset%
-    echo %red_bg%Please make sure 7-Zip is installed and added to your PATH.%reset%
-    echo %blue_bg%To install 7-Zip go to Toolbox%reset%
-    pause
-    goto :home
-)
-cls
-echo %blue_fg_strong%/ Home / Backup%reset%
-echo -------------------------------------
-echo What would you like to do?
-REM color 7
-echo 1. Create Backup
-echo 2. Restore Backup
-echo 3. Back to Home
-
-set /p backup_choice=Choose Your Destiny: 
-
-REM Backup - Backend
-if "%backup_choice%"=="1" (
-    call :create_backup
-) else if "%backup_choice%"=="2" (
-    call :restore_backup
-) else if "%backup_choice%"=="3" (
-    goto :home
-) else (
-    color 6
-    echo WARNING: Invalid number. Please insert a valid number.
-    pause
-    goto :backup_menu
-)
-
-:create_backup
-REM Create a backup using 7zip
-7z a "backups\backup_.7z" ^
-    "public\assets\*" ^
-    "public\Backgrounds\*" ^
-    "public\Characters\*" ^
-    "public\Chats\*" ^
-    "public\context\*" ^
-    "public\Group chats\*" ^
-    "public\Groups\*" ^
-    "public\instruct\*" ^
-    "public\KoboldAI Settings\*" ^
-    "public\movingUI\*" ^
-    "public\NovelAI Settings\*" ^
-    "public\OpenAI Settings\*" ^
-    "public\QuickReplies\*" ^
-    "public\TextGen Settings\*" ^
-    "public\themes\*" ^
-    "public\User Avatars\*" ^
-    "public\user\*" ^
-    "public\worlds\*" ^
-    "public\settings.json" ^
-    "secrets.json"
-
-REM Get current date and time components
-for /f "tokens=1-3 delims=/- " %%d in ("%date%") do (
-    set "day=%%d"
-    set "month=%%e"
-    set "year=%%f"
-)
-
-for /f "tokens=1-2 delims=:." %%h in ("%time%") do (
-    set "hour=%%h"
-    set "minute=%%i"
-)
-
-REM Pad single digits with leading zeros
-setlocal enabledelayedexpansion
-set "day=0!day!"
-set "month=0!month!"
-set "hour=0!hour!"
-set "minute=0!minute!"
-
-set "formatted_date=%month:~-2%-%day:~-2%-%year%_%hour:~-2%%minute:~-2%"
-
-REM Rename the backup file with the formatted date and time
-rename "backups\backup_.7z" "backup_%formatted_date%.7z"
-
-endlocal
-
-
-echo %green_fg_strong%Backup created successfully!%reset%
-pause
-endlocal
-goto :backup_menu
-
-
-:restore_backup
-REM Restore a backup using 7zip
-
-echo List of available backups:
-echo =========================
-
-setlocal enabledelayedexpansion
-set "backup_count=0"
-
-for %%F in ("backups\backup_*.7z") do (
-    set /a "backup_count+=1"
-    set "backup_files[!backup_count!]=%%~nF"
-    echo !backup_count!. %cyan_fg_strong%%%~nF%reset%
-)
-
-echo =========================
-set /p "restore_choice=Enter number of backup to restore: "
-
-if "%restore_choice%" geq "1" (
-    if "%restore_choice%" leq "%backup_count%" (
-        set "selected_backup=!backup_files[%restore_choice%]!"
-        echo Restoring backup !selected_backup!...
-        REM Extract the contents of the "public" folder directly into the existing "public" folder
-        7z x "backups\!selected_backup!.7z" -o"temp" -aoa
-        xcopy /y /e "temp\public\*" "public\"
-        rmdir /s /q "temp"
-        echo %green_fg_strong%!selected_backup! restored successfully.%reset%
-    ) else (
-        color 6
-        echo WARNING: Invalid backup number. Please insert a valid number.
-    )
-) else (
-    color 6
-    echo WARNING: Invalid number. Please insert a valid number.
-)
-pause
-goto :backup_menu
-
-
-REM Toolbox - Frontend
-:toolbox
-cls
-echo %blue_fg_strong%/ Home / Toolbox%reset%
-echo -------------------------------------
-echo What would you like to do?
-REM color 7
-echo 1. Install 7-Zip
-echo 2. Install FFmpeg
-echo 3. Install Node.js
-echo 4. Edit Environment
-echo 5. Reinstall SillyTavern
-echo 6. Reinstall Extras
-echo 7. Back to Home
-
-set /p toolbox_choice=Choose Your Destiny: 
-
-REM Toolbox - Backend
-if "%toolbox_choice%"=="1" (
-    call :install7zip
-) else if "%toolbox_choice%"=="2" (
-    call :installffmpeg
-) else if "%toolbox_choice%"=="3" (
-    call :installnodejs
-) else if "%toolbox_choice%"=="4" (
-    call :editenvironment
-) else if "%toolbox_choice%"=="5" (
-    call :reinstallsillytavern
-) else if "%toolbox_choice%"=="6" (
-    call :reinstallextras
-) else if "%toolbox_choice%"=="7" (
-    goto :home
-) else (
-    color 6
-    echo WARNING: Invalid number. Please insert a valid number.
-    pause
-    goto :toolbox
-)
-
-
-:install7zip
-echo %blue_fg_strong%[INFO]%reset% Installing 7-Zip...
-winget install -e --id 7zip.7zip
-
-rem Get the current PATH value from the registry
-for /f "tokens=2*" %%A in ('reg query "HKCU\Environment" /v PATH') do set "current_path=%%B"
-
-rem Check if the paths are already in the current PATH
-echo %current_path% | find /i "%zip7_install_path%" > nul
-set "zip7_path_exists=%errorlevel%"
-
-rem Append the new paths to the current PATH only if they don't exist
-if %zip7_path_exists% neq 0 (
-    set "new_path=%current_path%;%zip7_install_path%"
-    echo %green_fg_strong%7-Zip added to PATH.%reset%
-) else (
-    set "new_path=%current_path%"
-    echo %blue_fg_strong%[INFO] 7-Zip already exists in PATH.%reset%
-)
-
-rem Update the PATH value in the registry
-reg add "HKCU\Environment" /v PATH /t REG_EXPAND_SZ /d "%new_path%" /f
-
-rem Update the PATH value for the current session
-setx PATH "%new_path%"
-
-echo %green_fg_strong%7-Zip is installed. Please restart the Launcher.%reset%
-pause
-exit
-
-
-:installffmpeg
-REM Check if 7-Zip is installed
-7z > nul 2>&1
-if %errorlevel% neq 0 (
-    echo %red_fg_strong%[ERROR] 7z command not found in PATH%reset%
-    echo %red_bg%Please make sure 7-Zip is installed and added to your PATH.%reset%
-    echo %blue_bg%To install 7-Zip go to Toolbox%reset%
-    pause
-    goto :toolbox
-)
-
-echo %blue_fg_strong%[INFO]%reset% Downloading FFmpeg archive...
-rem bitsadmin /transfer "ffmpeg" /download /priority FOREGROUND "%ffmpeg_url%" "%ffdownload_path%"
-curl -o "%ffdownload_path%" "%ffmpeg_url%"
-
-echo %blue_fg_strong%[INFO]%reset% Creating ffmpeg directory if it doesn't exist...
-if not exist "%ffextract_path%" (
-    mkdir "%ffextract_path%"
-)
-
-echo %blue_fg_strong%[INFO]%reset% Extracting FFmpeg archive...
-7z x "%ffdownload_path%" -o"%ffextract_path%"
-
-
-echo %blue_fg_strong%[INFO]%reset% Moving FFmpeg contents to C:\ffmpeg...
-for /d %%i in ("%ffextract_path%\ffmpeg-*-full_build") do (
-    xcopy "%%i\bin" "%ffextract_path%\bin" /E /I /Y
-    xcopy "%%i\doc" "%ffextract_path%\doc" /E /I /Y
-    xcopy "%%i\presets" "%ffextract_path%\presets" /E /I /Y
-    rd "%%i" /S /Q
-)
-
-rem Get the current PATH value from the registry
-for /f "tokens=2*" %%A in ('reg query "HKCU\Environment" /v PATH') do set "current_path=%%B"
-
-rem Check if the paths are already in the current PATH
-echo %current_path% | find /i "%bin_path%" > nul
-set "ff_path_exists=%errorlevel%"
-
-rem Append the new paths to the current PATH only if they don't exist
-if %ff_path_exists% neq 0 (
-    set "new_path=%current_path%;%bin_path%"
-    echo %green_fg_strong%ffmpeg added to PATH.%reset%
-) else (
-    set "new_path=%current_path%"
-    echo %blue_fg_strong%[INFO] ffmpeg already exists in PATH.%reset%
-)
-
-rem Update the PATH value in the registry
-reg add "HKCU\Environment" /v PATH /t REG_EXPAND_SZ /d "%new_path%" /f
-
-rem Update the PATH value for the current session
-setx PATH "%new_path%" > nul
-
-del "%ffdownload_path%"
-echo %green_fg_strong%FFmpeg is installed. Please restart the Launcher.%reset%
-pause
-exit
-
-
-:installnodejs
-echo %blue_fg_strong%[INFO]%reset% Installing Node.js...
-winget install -e --id OpenJS.NodeJS
-echo %green_fg_strong%Node.js is installed. Please restart the Launcher.%reset%
-pause
-exit
-
-:editenvironment
-rundll32.exe sysdm.cpl,EditEnvironmentVariables
-goto :toolbox
-
-:reinstallsillytavern
-setlocal enabledelayedexpansion
-chcp 65001 > nul
-REM Define the names of items to be excluded
-set "script_name=%~nx0"
-set "excluded_folders=backups"
-set "excluded_files=!script_name!"
-
-REM Confirm with the user before proceeding
-echo.
-echo %red_bg%╔════ DANGER ZONE ══════════════════════════════════════════════════════════════════════════════╗%reset%
-echo %red_bg%║ WARNING: This will delete all data in the current branch except the Backups.                  ║%reset%
-echo %red_bg%║ If you want to keep any data, make sure to create a backup before proceeding.                 ║%reset%
-echo %red_bg%╚═══════════════════════════════════════════════════════════════════════════════════════════════╝%reset%
-echo.
-echo Are you sure you want to proceed? [Y/N] 
-set /p "confirmation="
-if /i "!confirmation!"=="Y" (
-    REM Remove non-excluded folders
-    for /d %%D in (*) do (
-        set "exclude_folder="
-        for %%E in (!excluded_folders!) do (
-            if "%%D"=="%%E" set "exclude_folder=true"
-        )
-        if not defined exclude_folder (
-            rmdir /s /q "%%D" 2>nul
-        )
-    )
-
-    REM Remove non-excluded files
-    for %%F in (*) do (
-        set "exclude_file="
-        for %%E in (!excluded_files!) do (
-            if "%%F"=="%%E" set "exclude_file=true"
-        )
-        if not defined exclude_file (
-            del /f /q "%%F" 2>nul
-        )
-    )
-
-    REM Clone repo into %temp% folder
-    git clone https://github.com/SillyTavern/SillyTavern.git "%temp%\SillyTavernTemp"
-
-    REM Move the contents of the temporary folder to the current directory
-    xcopy /e /y "%temp%\SillyTavernTemp\*" .
-
-    REM Clean up the temporary folder
-    rmdir /s /q "%temp%\SillyTavernTemp"
-
-    echo %green_fg_strong%SillyTavern reinstalled successfully!%reset%
-) else (
-    echo Reinstall canceled.
-)
-endlocal
-pause
-goto :toolbox
-
-
-:reinstallextras
-cls
-echo %blue_fg_strong%SillyTavern Extras%reset%
-echo ---------------------------------------------------------------
-echo %blue_fg_strong%[INFO]%reset% Installing SillyTavern Extras...
-echo --------------------------------
-echo %cyan_fg_strong%This may take a while. Please be patient.%reset%
-
-winget install -e --id Anaconda.Miniconda3
-
-REM Run conda activate from the Miniconda installation
-call "%miniconda_path%\Scripts\activate.bat"
-
-REM Create a Conda environment named sillytavernextras
-call conda create -n sillytavernextras -y
-
-REM Activate the sillytavernextras environment
-call conda activate sillytavernextras
-
-REM Install Python 3.11 and Git in the sillytavernextras environment
-call conda install python=3.11 git -y
-
-REM Clone the SillyTavern Extras repository
-git clone https://github.com/SillyTavern/SillyTavern-extras
-
-REM Navigate to the SillyTavern-extras directory
-cd SillyTavern-extras
-
-REM Install Python dependencies from requirements files
-pip install -r requirements-complete.txt
-pip install -r requirements-rvc.txt
-
-REM Start SillyTavern Extras with desired configurations
-python server.py --coqui-gpu --rvc-save-file --cuda-device=0 --max-content-length=1000 --enable-modules=caption,summarize,classify,rvc,coqui-tts --classification-model=joeddav/distilbert-base-uncased-go-emotions-student --share
-
-echo.
-echo %green_fg_strong%SillyTavern Extras have been successfully installed.%reset%
-pause
-goto :toolbox

colab/GPU.ipynb

@@ -70,9 +70,10 @@
         "#@markdown * ckpt/sd15 - base SD 1.5\n",
         "#@markdown * stabilityai/stable-diffusion-2-1-base - base SD 2.1\n",
         "extras_enable_chromadb = True #@param {type:\"boolean\"}\n",
-        "#@markdown Enables ChromaDB for Infinity Context plugin\n",
+        "#@markdown Enables ChromaDB module\n",
         "\n",
         "import subprocess\n",
+        "import secrets\n",
         "\n",
         "# ---\n",
         "# SillyTavern extras\n",
@@ -115,7 +116,8 @@
         "!git clone https://github.com/Cohee1207/tts_samples\n",
         "!npm install -g localtunnel\n",
         "!pip install -r requirements-complete.txt\n",
-        "!pip install tensorflow==2.12\n",
+        "!pip install tensorflow==2.14\n",
+        "!pip install colorama\n",
         "!pip install Flask-Cors\n",
         "!pip install Flask-Compress\n",
         "!pip install transformers\n",
@@ -130,6 +132,13 @@
         "!wget https://github.com/cloudflare/cloudflared/releases/download/2023.5.0/cloudflared-linux-amd64 -O /tmp/cloudflared-linux-amd64\n",
         "!chmod +x /tmp/cloudflared-linux-amd64\n",
         "\n",
+        "# Generate a random API key\n",
+        "api_key = secrets.token_hex(5)\n",
+        "\n",
+        "# Write the API key to api_key.txt\n",
+        "with open('./api_key.txt', 'w') as f:\n",
+        "    f.write(api_key)\n",
+        "print(f\"API Key generated: {api_key}\")\n",
         "\n",
         "cmd = f\"python server.py {' '.join(params)}\"\n",
         "print(cmd)\n",

default/config.conf

@@ -9,13 +9,31 @@ const enableExtensions = true; //Enables support for TavernAI-extras project
 const listen = true; // If true, Can be access from other device or PC. otherwise can be access only from hosting machine.
 const allowKeysExposure = false; // If true, private API keys could be fetched to the frontend.
 const skipContentCheck = false; // If true, no new default content will be delivered to you.
-
+const thumbnailsQuality = 95; // Quality of thumbnails. 0-100
+const disableChatBackup = false; // Disables the backup of chat logs to the /backups folder
 
 // If true, Allows insecure settings for listen, whitelist, and authentication.
 // Change this setting only on "trusted networks". Do not change this value unless you are aware of the issues that can arise from changing this setting and configuring a insecure setting.
 const securityOverride = false;
 
+// Additional settings for extra modules / extensions
+const extras = {
+    // Disables auto-download of models from the HuggingFace Hub.
+    // You will need to manually download the models and put them into the /cache folder.
+    disableAutoDownload: false,
+    // Text classification model for sentiment analysis. HuggingFace ID of a model in ONNX format.
+    classificationModel: 'Cohee/distilbert-base-uncased-go-emotions-onnx',
+    // Image captioning model. HuggingFace ID of a model in ONNX format.
+    captioningModel: 'Xenova/vit-gpt2-image-captioning',
+    // Feature extraction model. HuggingFace ID of a model in ONNX format.
+    embeddingModel: 'Xenova/all-mpnet-base-v2',
+    // GPT-2 text generation model. HuggingFace ID of a model in ONNX format.
+    promptExpansionModel: 'Cohee/fooocus_expansion-onnx',
+};
+
 // Request overrides for additional headers
+// Format is an array of objects:
+// { hosts: [ "<url>" ], headers: { <header>: "<value>" } }
 const requestOverrides = [];
 
 module.exports = {
@@ -32,4 +50,7 @@ module.exports = {
     securityOverride,
     skipContentCheck,
     requestOverrides,
+    thumbnailsQuality,
+    extras,
+    disableChatBackup,
 };

default/settings.json

@@ -75,9 +75,6 @@
         "always_force_name2": true,
         "user_prompt_bias": "",
         "show_user_prompt_bias": true,
-        "multigen": false,
-        "multigen_first_chunk": 50,
-        "multigen_next_chunks": 30,
         "markdown_escape_strings": "",
         "fast_ui_mode": false,
         "avatar_style": 0,
@@ -167,7 +164,6 @@
         "custom_stopping_strings_macro": true,
         "fuzzy_search": true,
         "encode_tags": false,
-        "lazy_load": 100,
         "ui_mode": 1
     },
     "extension_settings": {
@@ -410,7 +406,6 @@
         "tfs": 1,
         "rep_pen_slope": 0,
         "single_line": false,
-        "use_stop_sequence": false,
         "streaming_kobold": false,
         "sampler_order": [
             6,
@@ -420,7 +415,12 @@
             3,
             4,
             5
-        ]
+        ],
+        "mirostat": 0,
+        "mirostat_tau": 5,
+        "mirostat_eta": 0.1,
+        "use_default_badwordsids": false,
+        "grammar": ""
     },
     "oai_settings": {
         "preset_settings_openai": "Default",

docker/docker-compose.yml

@@ -9,4 +9,5 @@ services:
       - "8000:8000"
     volumes:
       - "./config:/home/node/app/config"
+      - "./user:/home/node/app/public/user"
     restart: unless-stopped

docker/docker-entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Initialize missing user files
-IFS="," RESOURCES="characters,groups,group chats,chats,User Avatars,worlds"
+IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds,OpenAI Settings,NovelAI Settings,KoboldAI Settings,TextGen Settings"
 for R in $RESOURCES; do
   if [ ! -e "config/$R" ]; then
     echo "Resource not found, copying from defaults: $R"

package.json

@@ -9,29 +9,27 @@
         "cors": "^2.8.5",
         "csrf-csrf": "^2.2.3",
         "device-detector-js": "^3.0.3",
-        "exifreader": "^4.12.0",
         "express": "^4.18.2",
         "google-translate-api-browser": "^3.0.1",
+        "bing-translate-api": "^2.9.1",
         "gpt3-tokenizer": "^1.1.5",
         "ip-matching": "^2.1.2",
         "ipaddr.js": "^2.0.1",
-        "jimp": "^0.22.7",
-        "jquery": "^3.6.4",
+        "jimp": "^0.22.10",
         "json5": "^2.2.3",
         "lodash": "^4.17.21",
         "mime-types": "^2.1.35",
         "multer": "^1.4.5-lts.1",
         "node-fetch": "^2.6.11",
         "open": "^8.4.2",
-        "piexifjs": "^1.0.6",
         "png-chunk-text": "^1.0.0",
         "png-chunks-encode": "^1.0.0",
         "png-chunks-extract": "^1.0.0",
         "response-time": "^2.3.2",
         "sanitize-filename": "^1.6.3",
+        "sillytavern-transformers": "^2.7.3",
         "simple-git": "^3.19.1",
-        "uniqolor": "^1.1.0",
-        "webp-converter": "2.3.2",
+        "vectra": "^0.2.2",
         "write-file-atomic": "^5.0.1",
         "ws": "^8.13.0",
         "yargs": "^17.7.1",
@@ -49,11 +47,12 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.10.1",
+    "version": "1.10.7",
     "scripts": {
         "start": "node server.js",
         "start-multi": "node server.js --disableCsrf",
-        "pkg": "pkg --compress Gzip --no-bytecode --public ."
+        "pkg": "pkg --compress Gzip --no-bytecode --public .",
+        "postinstall": "node post-install.js"
     },
     "bin": {
         "sillytavern": "./server.js"
@@ -78,6 +77,7 @@
         ]
     },
     "devDependencies": {
+        "jquery": "^3.6.4",
         "pkg": "^5.8.1",
         "pkg-fetch": "^3.5.2"
     }

post-install.js

@@ -0,0 +1,81 @@
+/**
+ * Scripts to be done before starting the server for the first time.
+ */
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+
+/**
+ * Creates the default config files if they don't exist yet.
+ */
+function createDefaultFiles() {
+    const files = {
+        settings: './public/settings.json',
+        bg_load: './public/css/bg_load.css',
+        config: './config.conf',
+    };
+
+    for (const file of Object.values(files)) {
+        try {
+            if (!fs.existsSync(file)) {
+                const defaultFilePath = path.join('./default', path.parse(file).base);
+                fs.copyFileSync(defaultFilePath, file);
+                console.log(`Created default file: ${file}`);
+            }
+        } catch (error) {
+            console.error(`FATAL: Could not write default file: ${file}`, error);
+        }
+    }
+}
+
+/**
+ * Returns the MD5 hash of the given data.
+ * @param {Buffer} data Input data
+ * @returns {string} MD5 hash of the input data
+ */
+function getMd5Hash(data) {
+    return crypto
+        .createHash('md5')
+        .update(data)
+        .digest('hex');
+}
+
+/**
+ * Copies the WASM binaries from the sillytavern-transformers package to the dist folder.
+ */
+function copyWasmFiles() {
+    if (!fs.existsSync('./dist')) {
+        fs.mkdirSync('./dist');
+    }
+
+    const listDir = fs.readdirSync('./node_modules/sillytavern-transformers/dist');
+
+    for (const file of listDir) {
+        if (file.endsWith('.wasm')) {
+            const sourcePath = `./node_modules/sillytavern-transformers/dist/${file}`;
+            const targetPath = `./dist/${file}`;
+
+            // Don't copy if the file already exists and is the same checksum
+            if (fs.existsSync(targetPath)) {
+                const sourceChecksum = getMd5Hash(fs.readFileSync(sourcePath));
+                const targetChecksum = getMd5Hash(fs.readFileSync(targetPath));
+
+                if (sourceChecksum === targetChecksum) {
+                    continue;
+                }
+            }
+
+            fs.copyFileSync(sourcePath, targetPath);
+            console.log(`${file} successfully copied to ./dist/${file}`);
+        }
+    }
+}
+
+try {
+    // 1. Create default config files
+    createDefaultFiles();
+    // 2. Copy transformers WASM binaries from node_modules
+    copyWasmFiles();
+} catch (error) {
+    console.error(error);
+}

public/KoboldAI Settings/Ace of Spades.settings

@@ -1,12 +1,12 @@
 {
     "temp": 1.15,
-    "top_k": 0,
-    "top_p": 0.95,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 0.8,
     "rep_pen": 1.05,
     "rep_pen_range": 2048,
+    "top_p": 0.95,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 0.8,
     "rep_pen_slope": 7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         5,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Basic Coherence.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.59,
-    "top_k": 0,
-    "top_p": 1,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 0.87,
     "rep_pen": 1.1,
     "rep_pen_range": 2048,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 0.87,
     "rep_pen_slope": 0.3,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Best Guess.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.8,
-    "top_k": 100,
-    "top_p": 0.9,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 1,
     "rep_pen": 1.15,
     "rep_pen_range": 2048,
+    "top_p": 0.9,
+    "top_a": 0,
+    "top_k": 100,
+    "typical": 1,
+    "tfs": 1,
     "rep_pen_slope": 3.4,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Coherent Creativity.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.51,
-    "top_p": 1,
-    "top_k": 0,
-    "tfs": 0.99,
-    "top_a": 0,
-    "typical": 1,
     "rep_pen": 1.2,
     "rep_pen_range": 2048,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 0.99,
     "rep_pen_slope": 0,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Deterministic.settings

@@ -8,7 +8,6 @@
     "typical": 1,
     "tfs": 1,
     "rep_pen_slope": 0,
-    "single_line": false,
     "sampler_order": [
         6,
         0,
@@ -17,5 +16,9 @@
         4,
         2,
         5
-    ]
-}
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
+}

public/KoboldAI Settings/Genesis.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.63,
-    "top_k": 0,
-    "top_p": 0.98,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 0.98,
     "rep_pen": 1.05,
     "rep_pen_range": 2048,
+    "top_p": 0.98,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 0.98,
     "rep_pen_slope": 0.1,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         5,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Godlike.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.7,
-    "top_k": 0,
-    "top_p": 0.5,
-    "top_a": 0.75,
-    "typical": 0.19,
-    "tfs": 0.97,
     "rep_pen": 1.1,
     "rep_pen_range": 1024,
+    "top_p": 0.5,
+    "top_a": 0.75,
+    "top_k": 0,
+    "typical": 0.19,
+    "tfs": 0.97,
     "rep_pen_slope": 0.7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         2,
         1,
         0
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Good Winds.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.7,
-    "top_k": 0,
-    "top_p": 1,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 0.9,
     "rep_pen": 1.1,
     "rep_pen_range": 1024,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 0.9,
     "rep_pen_slope": 0.7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         4,
         5
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Liminal Drift.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.66,
-    "top_k": 0,
-    "top_p": 1,
-    "top_a": 0.96,
-    "typical": 0.6,
-    "tfs": 1,
     "rep_pen": 1.1,
     "rep_pen_range": 1024,
+    "top_p": 1,
+    "top_a": 0.96,
+    "top_k": 0,
+    "typical": 0.6,
+    "tfs": 1,
     "rep_pen_slope": 0.7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         0,
         2,
         3
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Low Rider.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.94,
-    "top_k": 12,
-    "top_p": 1,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 0.94,
     "rep_pen": 1.05,
     "rep_pen_range": 2048,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 12,
+    "typical": 1,
+    "tfs": 0.94,
     "rep_pen_slope": 0.2,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Luna Moth.settings

@@ -1,12 +1,12 @@
 {
     "temp": 1.5,
-    "top_k": 85,
-    "top_p": 0.24,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 1,
     "rep_pen": 1.1,
     "rep_pen_range": 2048,
+    "top_p": 0.24,
+    "top_a": 0,
+    "top_k": 85,
+    "typical": 1,
+    "tfs": 1,
     "rep_pen_slope": 0,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Mayday.settings

@@ -1,12 +1,12 @@
 {
     "temp": 1.05,
-    "top_k": 0,
-    "top_p": 0.95,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 1,
     "rep_pen": 1.1,
     "rep_pen_range": 1024,
+    "top_p": 0.95,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 1,
     "rep_pen_slope": 0.7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         4,
         5
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Miro Bronze.settings

@@ -0,0 +1,24 @@
+{
+    "temp": 1.06,
+    "rep_pen": 1,
+    "rep_pen_range": 0,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 1,
+    "rep_pen_slope": 0.9,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "mirostat": 2,
+    "mirostat_tau": 9.61,
+    "mirostat_eta": 1,
+    "grammar": ""
+}

public/KoboldAI Settings/Miro Gold.settings

@@ -0,0 +1,24 @@
+{
+    "temp": 1.17,
+    "rep_pen": 1,
+    "rep_pen_range": 0,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 1,
+    "rep_pen_slope": 0.9,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "mirostat": 2,
+    "mirostat_tau": 9.91,
+    "mirostat_eta": 1,
+    "grammar": ""
+}

public/KoboldAI Settings/Miro Silver.settings

@@ -0,0 +1,24 @@
+{
+    "temp": 1.17,
+    "rep_pen": 1,
+    "rep_pen_range": 0,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 1,
+    "rep_pen_slope": 0.9,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "mirostat": 2,
+    "mirostat_tau": 9.62,
+    "mirostat_eta": 1,
+    "grammar": ""
+}

public/KoboldAI Settings/Ouroboros.settings

@@ -1,12 +1,12 @@
 {
     "temp": 1.07,
-    "top_k": 100,
-    "top_p": 1,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 0.93,
     "rep_pen": 1.05,
     "rep_pen_range": 404,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 100,
+    "typical": 1,
+    "tfs": 0.93,
     "rep_pen_slope": 0.8,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         2,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Pleasing Results.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.44,
-    "top_k": 0,
-    "top_p": 1,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 0.9,
     "rep_pen": 1.15,
     "rep_pen_range": 2048,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 0.9,
     "rep_pen_slope": 6.8,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/Pro Writer.settings

@@ -1,12 +1,12 @@
 {
     "temp": 1.35,
-    "top_k": 0,
-    "top_p": 1,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 0.69,
     "rep_pen": 1.15,
     "rep_pen_range": 2048,
+    "top_p": 1,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 0.69,
     "rep_pen_slope": 0.1,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         0,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/RecoveredRuins.settings

@@ -1,12 +1,12 @@
 {
     "temp": 1,
-    "top_k": 0,
-    "top_p": 0.95,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 1,
     "rep_pen": 1.1,
     "rep_pen_range": 600,
+    "top_p": 0.95,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 1,
     "rep_pen_slope": 0,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         4,
         5
-    ]
-}
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
+}

public/KoboldAI Settings/Space Alien.settings

@@ -8,7 +8,6 @@
     "typical": 1,
     "tfs": 1,
     "rep_pen_slope": 0,
-    "single_line": false,
     "sampler_order": [
         6,
         0,
@@ -17,5 +16,9 @@
         4,
         2,
         5
-    ]
-}
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
+}

public/KoboldAI Settings/Storywriter.settings

@@ -1,12 +1,12 @@
 {
     "temp": 0.72,
-    "tfs": 1,
-    "top_a": 0,
-    "top_k": 0,
-    "top_p": 0.73,
-    "typical": 1,
     "rep_pen": 1.1,
     "rep_pen_range": 2048,
+    "top_p": 0.73,
+    "top_a": 0,
+    "top_k": 0,
+    "typical": 1,
+    "tfs": 1,
     "rep_pen_slope": 0.2,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }

public/KoboldAI Settings/TFS-with-Top-A.settings

@@ -8,7 +8,6 @@
     "typical": 1,
     "tfs": 0.95,
     "rep_pen_slope": 0,
-    "single_line": false,
     "sampler_order": [
         6,
         0,
@@ -17,5 +16,9 @@
         4,
         2,
         5
-    ]
-}
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
+}

public/KoboldAI Settings/Titanic.settings

@@ -8,7 +8,6 @@
     "typical": 1,
     "tfs": 1,
     "rep_pen_slope": 0,
-    "single_line": false,
     "sampler_order": [
         6,
         0,
@@ -17,5 +16,9 @@
         4,
         2,
         5
-    ]
-}
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
+}

public/KoboldAI Settings/simple-proxy-for-tavern.settings

@@ -8,7 +8,6 @@
     "typical": 1,
     "tfs": 1,
     "rep_pen_slope": 0,
-    "single_line": false,
     "sampler_order": [
         6,
         0,
@@ -17,5 +16,9 @@
         4,
         2,
         5
-    ]
-}
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
+}

public/TextGen Settings/Miro Bronze.settings

@@ -0,0 +1,24 @@
+{
+    "temp": 1.06,
+    "top_p": 1,
+    "top_k": 0,
+    "typical_p": 1,
+    "top_a": 0,
+    "tfs": 1,
+    "epsilon_cutoff": 0,
+    "eta_cutoff": 0,
+    "rep_pen": 1,
+    "rep_pen_range": 0,
+    "no_repeat_ngram_size": 0,
+    "penalty_alpha": 0,
+    "num_beams": 1,
+    "length_penalty": 1,
+    "min_length": 0,
+    "encoder_rep_pen": 1,
+    "do_sample": true,
+    "early_stopping": false,
+    "mirostat_mode": 2,
+    "mirostat_tau": 9.61,
+    "mirostat_eta": 1,
+    "rep_pen_size": 0
+}

public/TextGen Settings/Miro Gold.settings

@@ -0,0 +1,24 @@
+{
+    "temp": 1.17,
+    "top_p": 1,
+    "top_k": 0,
+    "typical_p": 1,
+    "top_a": 0,
+    "tfs": 1,
+    "epsilon_cutoff": 0,
+    "eta_cutoff": 0,
+    "rep_pen": 1,
+    "rep_pen_range": 0,
+    "no_repeat_ngram_size": 0,
+    "penalty_alpha": 0,
+    "num_beams": 1,
+    "length_penalty": 1,
+    "min_length": 0,
+    "encoder_rep_pen": 1,
+    "do_sample": true,
+    "early_stopping": false,
+    "mirostat_mode": 2,
+    "mirostat_tau": 9.91,
+    "mirostat_eta": 1,
+    "rep_pen_size": 0
+}

public/TextGen Settings/Miro Silver.settings

@@ -0,0 +1,24 @@
+{
+    "temp": 1.17,
+    "top_p": 1,
+    "top_k": 0,
+    "typical_p": 1,
+    "top_a": 0,
+    "tfs": 1,
+    "epsilon_cutoff": 0,
+    "eta_cutoff": 0,
+    "rep_pen": 1,
+    "rep_pen_range": 0,
+    "no_repeat_ngram_size": 0,
+    "penalty_alpha": 0,
+    "num_beams": 1,
+    "length_penalty": 1,
+    "min_length": 0,
+    "encoder_rep_pen": 1,
+    "do_sample": true,
+    "early_stopping": false,
+    "mirostat_mode": 2,
+    "mirostat_tau": 9.62,
+    "mirostat_eta": 1,
+    "rep_pen_size": 0
+}

public/assets/blip/.placeholder

@@ -0,0 +1 @@
+Put blip audio files here

public/assets/live2d/.placeholder

@@ -0,0 +1 @@
+Put live2d model folders here

public/context/Adventure.json

@@ -0,0 +1,11 @@
+{
+    "story_string": "{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{personality}}\n{{/if}}{{#if scenario}}{{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}",
+    "example_separator": "",
+    "chat_start": "",
+    "always_force_name2": false,
+    "trim_sentences": false,
+    "include_newline": false,
+    "custom_stopping_strings": "[\"\\n\"]",
+    "custom_stopping_strings_macro": true,
+    "name": "Adventure"
+}

public/context/ChatML.json

@@ -0,0 +1,6 @@
+{
+    "story_string": "<|im_start|>system\n{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}<|im_end|>",
+    "chat_start": "",
+    "example_separator": "",
+    "name": "ChatML"
+}

public/context/Libra-32B.json

@@ -0,0 +1,6 @@
+{
+    "story_string": "### Instruction:\nWrite {{char}}'s next reply in this roleplay with {{user}}. Use the provided character sheet and example dialogue for formatting direction and character speech patterns.\n\n{{#if system}}{{system}}\n\n{{/if}}### Character Sheet:\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}",
+    "chat_start": "### START ROLEPLAY:",
+    "example_separator": "### Example:",
+    "name": "Libra-32B"
+}

public/context/Lightning 1.1.json

@@ -0,0 +1,6 @@
+{
+    "story_string": "{{system}}\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{char}}'s description:{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality:{{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{user}}'s persona: {{persona}}\n{{/if}}",
+    "chat_start": "This is the history of the roleplay:",
+    "example_separator": "Example of an interaction:",
+    "name": "Lightning 1.1"
+}

public/context/Mistral.json

@@ -0,0 +1,6 @@
+{
+    "story_string": "[INST] {{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}[/INST]",
+    "chat_start": "",
+    "example_separator": "Examples:",
+    "name": "Mistral"
+}

public/context/OldDefault.json

@@ -0,0 +1,6 @@
+{
+    "story_string": "{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Circumstances and context of the dialogue: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}",
+    "chat_start": "\nThen the roleplay chat between {{user}} and {{char}} begins.\n",
+    "example_separator": "This is how {{char}} should talk",
+    "name": "OldDefault"
+}

public/context/Pygmalion.json

@@ -1,6 +1,6 @@
 {
     "name": "Pygmalion",
-    "story_string": "{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{{char}}}'s Persona: {{description}}\n{{/if}}{{#if personality}}Personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}",
-    "chat_start": "<START>",
-    "example_separator": "<START>"
+    "story_string": "{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}",
+    "chat_start": "",
+    "example_separator": ""
 }

public/context/Story.json

@@ -0,0 +1,6 @@
+{
+    "story_string": "{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{personality}}\n{{/if}}{{#if scenario}}{{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}",
+    "chat_start": "",
+    "example_separator": "",
+    "name": "Story"
+}

public/css/extensions-panel.css

@@ -93,4 +93,118 @@ input.extension_missing[type="checkbox"] {
 .update-button {
     margin-right: 10px;
     display: inline-flex;
-}
+}
+
+/* Fixes order of settings for extensions */
+#extensions_settings,
+#extensions_settings2 {
+    display: flex;
+    flex-direction: column;
+}
+
+/** LEFT COLUMN **/
+#extensions_settings>#assets_ui {
+    order: 1;
+}
+
+#extensions_settings>.expression_settings {
+    order: 2;
+}
+
+#extensions_settings>.background_settings {
+    order: 3;
+}
+
+#extensions_settings>.sd_settings {
+    order: 4;
+}
+
+#extensions_settings>#tts_settings {
+    order: 5;
+}
+
+#extensions_settings>#rvc_settings {
+    order: 6;
+}
+
+#extensions_settings>.objective-settings {
+    order: 7;
+}
+
+#extensions_settings>#speech_recognition_settings {
+    order: 8;
+}
+
+#extensions_settings>#audio_settings {
+    order: 9;
+}
+
+/** RIGHT COLUMN **/
+#extensions_settings2>.translation_settings {
+    order: 1;
+}
+
+#extensions_settings2>.caption_settings {
+    order: 2;
+}
+
+#extensions_settings2>.quickReplySettings {
+    order: 3;
+}
+
+#extensions_settings2>.idle-settings {
+    order: 4;
+}
+
+#extensions_settings2>#memory_settings {
+    order: 5;
+}
+
+#extensions_settings2>.hypebot_settings {
+    order: 6;
+}
+
+#extensions_settings2>.regex_settings {
+    order: 7;
+}
+
+#extensions_settings2>.vectors_settings {
+    order: 8;
+}
+
+#extensions_settings2>.chromadb_settings {
+    order: 9;
+}
+
+#extensions_settings2>.randomizer_settings {
+    order: 10;
+}
+
+/** WAND MENU **/
+#extensionsMenu>#ttsExtensionMenuItem {
+    order: 1;
+}
+
+#extensionsMenu>#sd_gen {
+    order: 2;
+}
+
+#extensionsMenu>#send_picture {
+    order: 3;
+}
+
+#extensionsMenu>#token_counter {
+    order: 4;
+}
+
+#extensionsMenu>#objective-task-manual-check-menu-item {
+    order: 5;
+}
+
+#extensionsMenu>#roll_dice {
+    order: 6;
+}
+
+#extensionsMenu>#translate_chat {
+    order: 7;
+}

public/css/mobile-styles.css

@@ -35,7 +35,7 @@
         max-width: 90svw;
     }
 
-    .world_entry_thin_controls,
+    /* .world_entry_thin_controls, */
     #persona-management-block,
     #character_popup .flex-container {
         flex-direction: column;
@@ -63,6 +63,15 @@
         display: none;
     }
 
+    .world_entry .inline-drawer-toggle {
+        padding-bottom: 5px;
+    }
+
+    #worldInfoScanningCheckboxes {
+        flex-flow: row;
+        flex-wrap: wrap;
+    }
+
     body {
         touch-action: none;
         overflow: hidden;
@@ -70,6 +79,10 @@
 
     }
 
+    .world_entry_form_control {
+        /* width: 100%; */
+    }
+
     .drawer-content {
         min-width: unset;
         width: 100%;
@@ -78,7 +91,7 @@
         position: fixed;
         left: 0;
         top: 5px;
-        border: 1px solid var(--grey30);
+        border: 1px solid var(--SmartThemeBorderColor);
     }
 
     #select_chat_popup {
@@ -91,7 +104,6 @@
     #top-settings-holder,
     #top-bar {
         position: fixed;
-        padding-top: 3px;
         width: 100vw;
         width: 100svw;
     }
@@ -114,18 +126,32 @@
     /* ,
     #world_popup  */
         {
-        max-height: calc(100vh - 36px);
-        max-height: calc(100svh - 36px);
+        /*max-height: calc(100vh - 36px);
+        max-height: calc(100svh - 36px);*/
         width: 100% !important;
         margin: 0 auto;
         max-width: 100%;
         left: 0 !important;
         resize: none !important;
-        top: 36px;
+        top: var(--topBarBlockSize);
     }
 
     .wi-settings {
         flex-direction: column;
+        gap: 5px !important;
+    }
+
+    .WIEntryTitleAndStatus,
+    .WIEntryHeaderControls {
+        width: 100%;
+    }
+
+    #WIEntryHeaderTitlesPC {
+        display: none;
+    }
+
+    .WIEntryHeaderTitleMobile {
+        display: block !important;
     }
 
     #character_popup,
@@ -135,15 +161,15 @@
 
     #character_popup,
     #send_form {
-        border: 1px solid var(--grey30);
+        border: 1px solid var(--SmartThemeBorderColor);
         backdrop-filter: blur(calc(var(--SmartThemeBlurStrength) * 2));
         max-width: 100dvw;
     }
 
     #chat {
-        border-left: 1px solid var(--grey30);
-        border-right: 1px solid var(--grey30);
-        border-bottom: 1px solid var(--grey30);
+        border-left: 1px solid var(--SmartThemeBorderColor);
+        border-right: 1px solid var(--SmartThemeBorderColor);
+        border-bottom: 1px solid var(--SmartThemeBorderColor);
         align-items: start;
         align-content: start;
         overflow-y: auto;
@@ -161,7 +187,9 @@
     }
 
     #showRawPrompt,
-    #groupCurrentMemberPopoutButton {
+    #copyPromptToClipboard,
+    #groupCurrentMemberPopoutButton,
+    #summaryExtensionPopoutButton {
         display: none;
     }
 
@@ -175,11 +203,11 @@
         width: 100% !important;
         max-width: 100% !important;
         overflow-y: hidden;
-        border-left: 1px solid var(--grey30);
-        border-right: 1px solid var(--grey30);
-        border-bottom: 1px solid var(--grey30);
+        border-left: 1px solid var(--SmartThemeBorderColor);
+        border-right: 1px solid var(--SmartThemeBorderColor);
+        border-bottom: 1px solid var(--SmartThemeBorderColor);
         border-radius: 0 0 20px 20px;
-        top: 36px !important;
+        top: var(--topBarBlockSize) !important;
         left: 0 !important;
         backdrop-filter: blur(calc(var(--SmartThemeBlurStrength) * 2));
     }
@@ -265,12 +293,13 @@
         display: none;
     }
 
-    #bg_menu_content {
+    .bg_list {
         width: unset;
     }
 }
 
 @media screen and (min-width: 1001px) {
+
     #PygOverrides,
     #ContextFormatting,
     #UI-Theme-Block,
@@ -310,8 +339,7 @@
         min-width: 100px;
         min-height: 100px;
         max-height: 50vh;
-        max-width: 50vh;
-        width: 50vw;
+        max-width: 90vw;
         position: absolute;
         padding: 0;
         filter: drop-shadow(2px 2px 2px #51515199);

public/css/promptmanager.css

@@ -13,7 +13,7 @@
     grid-column-end: 4;
     width: 100%;
     margin: 0.5em 0;
-    background-image: linear-gradient(90deg, var(--transparent), var(--white30a), var(--transparent));
+    background-image: linear-gradient(90deg, var(--transparent), var(--SmartThemeBorderColor), var(--transparent));
     min-height: 1px;
 }
 
@@ -54,7 +54,7 @@
 #completion_prompt_manager #completion_prompt_manager_list li.completion_prompt_manager_prompt {
     align-items: center;
     padding: 0.5em;
-    border: 1px solid var(--white30a);
+    border: 1px solid var(--SmartThemeBorderColor);
 }
 
 #completion_prompt_manager #completion_prompt_manager_list li.completion_prompt_manager_prompt .prompt_manager_prompt_controls {
@@ -109,7 +109,7 @@
 #completion_prompt_manager_popup .completion_prompt_manager_prompt {
     margin: 1em 0;
     padding: 0.5em;
-    border: 1px solid var(--white30a);
+    border: 1px solid var(--SmartThemeBorderColor);
 }
 
 #completion_prompt_manager_popup .completion_prompt_manager_popup_header {
@@ -265,7 +265,7 @@
     top: var(--topBarBlockSize);
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
     padding: 1em;
-    border: 1px solid #333333;
+    border: 1px solid var(--SmartThemeBorderColor);
     flex-direction: column;
     z-index: 3010 !important;
     border-radius: 0 0 20px 20px;

public/css/rm-groups.css

@@ -14,7 +14,8 @@
     margin-top: auto;
     margin-bottom: auto;
     color: rgb(188, 193, 200, 1);
-    border: 1px solid #333;
+    border: 1px solid var(--SmartThemeBorderColor);
+    ;
     background-color: rgba(0, 0, 0, 0.3);
     padding: 6px;
     border-radius: 10px;
@@ -61,7 +62,8 @@
 #rm_group_add_members {
     margin-top: 0.25rem;
     margin-bottom: 0.5rem;
-    border: 1px solid grey;
+    border: 1px solid var(--SmartThemeBorderColor);
+    ;
     border-radius: 10px;
     background-color: var(--black30a);
 }
@@ -76,6 +78,7 @@
 
 #rm_group_members:empty {
     width: 100%;
+    padding: 0.5em 0;
 }
 
 #rm_group_members:empty::before {
@@ -224,4 +227,5 @@
 
 .group_member .avatar {
     flex-shrink: 0;
-}
+    flex-basis: auto;
+}

public/css/select2-overrides.css

@@ -6,7 +6,7 @@
 /* Customize the dropdown */
 .select2-dropdown {
     background-color: var(--SmartThemeBlurTintColor);
-    border: 1px solid var(--white30a) !important;
+    border: 1px solid var(--SmartThemeBorderColor) !important;
     border-radius: 10px;
     box-shadow: 0 0 5px black;
     text-shadow: 0px 0px calc(var(--shadowWidth) * 1px) var(--SmartThemeShadowColor);
@@ -19,11 +19,24 @@
     color: var(--SmartThemeBodyColor);
 }
 
+.select2-container .select2-search__field {
+    opacity: 0.8;
+}
+
+.select2-container .select2-selection--single .select2-selection__rendered {
+    color: var(--SmartThemeBodyColor);
+    line-height: revert;
+    padding-left: unset;
+}
+
+.select2-container .select2-results>.select2-results__options {
+    max-height: 300px;
+}
+
 .select2-container .select2-selection--multiple .select2-selection__choice__remove {
     padding: revert;
-    border-right: 1px solid var(--white30a);
+    border-right: 1px solid var(--SmartThemeBorderColor);
     font-size: 1.1em;
-
 }
 
 .select2-container .select2-selection--multiple .select2-selection__choice__display {
@@ -34,7 +47,7 @@
 .select2-search__field {
     background-color: var(--black30a);
     color: var(--SmartThemeBodyColor);
-    border: 1px solid var(--white30a);
+    border: 1px solid var(--SmartThemeBorderColor);
     border-radius: 7px;
     font-family: "Noto Sans", "Noto Color Emoji", sans-serif;
     padding: 3px 5px;
@@ -58,27 +71,30 @@
     background-color: var(--SmartThemeBodyColor);
 }
 
-.select2-container .select2-selection--multiple {
+.select2-container .select2-selection--multiple,
+.select2-container .select2-selection--single {
     background-color: var(--black30a);
     color: var(--SmartThemeBodyColor);
-    border: 1px solid var(--white30a);
+    border: 1px solid var(--SmartThemeBorderColor);
     border-radius: 7px;
     font-family: "Noto Sans", "Noto Color Emoji", sans-serif;
     padding: 3px 5px;
 }
 
-.select2-container.select2-container--focus .select2-selection--multiple {
-    border: 1px solid var(--white30a);
+.select2-container.select2-container--focus .select2-selection--multiple,
+.select2-container.select2-container--focus .select2-selection--single {
+    border: 1px solid var(--SmartThemeBorderColor);
 }
 
-.select2-container .select2-selection--multiple .select2-selection__choice {
+.select2-container .select2-selection--multiple .select2-selection__choice,
+.select2-container .select2-selection--single .select2-selection__choice {
     border-radius: 5px;
     border-style: solid;
     border-width: 1px;
     box-sizing: border-box;
     color: var(--SmartThemeBodyColor);
     background-color: var(--black30a);
-    border-color: var(--white30a);
+    border-color: var(--SmartThemeBorderColor);
     font-size: calc(var(--mainFontSize) - 5%);
     text-shadow: none !important;
 }
@@ -114,12 +130,13 @@
     margin-top: -7px;
     width: 14px;
     height: 14px;
-    border: 1px solid var(--white30a);
+    border: 1px solid var(--SmartThemeBorderColor);
     background-color: var(--SmartThemeBlurTintColor);
     border-radius: 2px;
 }
 
-.select2-container .select2-selection--multiple .select2-selection__choice__remove {
+.select2-container .select2-selection--multiple .select2-selection__choice__remove,
+.select2-container .select2-selection--single .select2-selection__choice__remove {
     color: var(--SmartThemeBodyColor);
 }
 

public/css/st-tailwind.css

@@ -6,6 +6,16 @@
     color: var(--fullred);
 }
 
+.highlighted {
+    color: black;
+    background-color: yellow;
+    text-shadow: none !important;
+}
+
+.m-t-0 {
+    margin-top: 0;
+}
+
 .m-t-1 {
     margin-top: 1em;
 }
@@ -99,6 +109,10 @@
     align-self: start;
 }
 
+.gap3px {
+    gap: 3px !important;
+}
+
 .gap5px {
     gap: 5px !important;
 }
@@ -120,6 +134,10 @@
     max-width: 100px;
 }
 
+.width100px {
+    width: 100px;
+}
+
 .widthUnset {
     width: unset;
 }
@@ -147,6 +165,10 @@
     font-weight: 600;
 }
 
+.textAlignCenter {
+    text-align: center;
+}
+
 .margin-right-10px {
     margin-right: 10px;
 }
@@ -230,6 +252,10 @@
     overflow: hidden;
 }
 
+.padding0 {
+    padding: 0;
+}
+
 .padding5 {
     padding: 5px;
 }
@@ -262,6 +288,10 @@
     flex-flow: column;
 }
 
+.flexFlowRow {
+    flex-flow: row;
+}
+
 .wideMinContent {
     width: min-content;
 }
@@ -362,6 +392,11 @@
     cursor: pointer;
 }
 
+input:disabled,
+textarea:disabled {
+    cursor: not-allowed;
+}
+
 .debug-red {
     border: 1px solid red !important;
 }
@@ -390,6 +425,11 @@
     font-size: calc(var(--mainFontSize) * 0.6) !important;
 }
 
+.paddingBottom5px {
+    padding: unset;
+    padding-bottom: 5px;
+}
+
 .paddingTopBot5 {
     padding: 5px 0;
 }
@@ -417,4 +457,4 @@
 
 .opacity1 {
     opacity: 1 !important;
-}
+}

public/css/tags.css

@@ -109,6 +109,7 @@
     overflow: hidden;
     text-align: left;
     white-space: nowrap;
+    text-shadow: none !important;
 }
 
 .tags_inline .tag {
@@ -128,10 +129,16 @@
     cursor: pointer;
     opacity: 0.6;
     filter: brightness(0.8);
+    transition: opacity 200ms;
 }
 
-.tags_view,
-.open_alternate_greetings {
+.rm_tag_filter .tag:hover {
+
+    opacity: 1;
+    filter: brightness(1);
+}
+
+.tags_view {
     margin: 0;
     aspect-ratio: 1 / 1;
 }

public/css/toggle-dependent.css

@@ -117,7 +117,7 @@ body.big-avatars .avatar img {
     height: 90px;
     object-fit: cover;
     object-position: center;
-    border: 1px solid var(--black30a);
+    border: 1px solid var(--SmartThemeBorderColor);
     border-radius: 10px;
 }
 
@@ -191,7 +191,7 @@ body.bubblechat .mes {
     border-radius: 10px;
     background-color: var(--SmartThemeBotMesBlurTintColor);
     margin-bottom: 5px;
-    border: 1px solid var(--white30a);
+    border: 1px solid var(--SmartThemeBorderColor);
 }
 
 body.bubblechat .mes[is_user="true"] {
@@ -257,31 +257,16 @@ body.no-blur #bg_custom {
 
 }
 
-body:not(.bubblechat).no-blur #chat,
 body.no-blur #top-bar,
 body.no-blur #send_form {
     background-color: var(--SmartThemeBlurTintColor) !important;
 }
 
-body.no-blur #options,
-body.no-blur .ui-widget-content,
-body.no-blur #floatingPrompt,
-body.no-blur #extensionsMenu,
-body.no-blur .list-group,
-body.no-blur #character_popup,
-body.no-blur #world_popup,
-body.no-blur #dialogue_popup,
-body.no-blur #select_chat_popup,
-body.no-blur .drawer-content,
-body.no-blur .select2-results__options {
-    background-color: black !important;
-}
-
 /* wAIfu mode*/
 
 body.waifuMode #top-bar {
     border-radius: 0 0 20px 20px;
-    border: 1px solid var(--grey30a);
+    border: 1px solid var(--SmartThemeBorderColor);
 }
 
 body.waifuMode #sheld {
@@ -292,7 +277,7 @@ body.waifuMode #sheld {
 }
 
 body.waifuMode #chat {
-    border-top: 1px solid var(--grey30a);
+    border-top: 1px solid var(--SmartThemeBorderColor);
     border-radius: 20px 20px 0 0;
 }
 
@@ -343,8 +328,7 @@ body.movingUI .drawer-content,
 body.movingUI #expression-holder,
 body.movingUI .zoomed_avatar,
 body.movingUI .draggable,
-body.movingUI #floatingPrompt,
-body.movingUI #groupMemberListPopout {
+body.movingUI #floatingPrompt {
     resize: both;
 }
 
@@ -353,6 +337,7 @@ body.movingUI #groupMemberListPopout {
     height: 120px;
     margin-top: 0;
     top: 50px;
+    justify-content: center;
 }
 
 /*No Text Shadows Mode*/
@@ -360,3 +345,11 @@ body.movingUI #groupMemberListPopout {
 body.noShadows * {
     text-shadow: none !important;
 }
+
+body.expandMessageActions .mes .mes_buttons .extraMesButtons {
+    display: inherit !important;
+}
+
+body.expandMessageActions .mes .mes_buttons .extraMesButtonsHint {
+    display: none !important;
+}

public/css/world-info.css

@@ -101,7 +101,7 @@
     height: auto;
     margin-top: 0;
     margin-bottom: 0;
-    min-height: 32px;
+    min-height: calc(var(--mainFontSize) + 13px);
 }
 
 .delete_entry_button {
@@ -157,6 +157,37 @@
     width: 10em;
 }
 
-#world_info_search {
-    width: 10em;
+#world_info_search,
+#world_info_sort_order {
+    width: 7em;
 }
+
+.wi-card-entry {
+    border: 1px solid;
+    border-color: var(--SmartThemeBorderColor);
+    border-radius: 10px;
+    padding: 0 5px;
+    margin-bottom: 1px;
+}
+
+.world_entry {
+    transition: opacity 500ms;
+}
+
+.disabledWIEntry {
+    opacity: 0.4;
+    filter: grayscale(1);
+}
+
+.disabledWIEntry:not(input):hover {
+    opacity: 1;
+    filter: grayscale(0.5);
+}
+
+.height32px {
+    height: 32px;
+}
+
+.WIEntryHeaderTitleMobile {
+    display: none;
+}

public/img/palm.svg

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Standard_product_icon__x28_1:1_x29_"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="192px" height="192px" viewBox="0 0 192 192" enable-background="new 0 0 192 192" xml:space="preserve">
+    <symbol id="material_x5F_product_x5F_standard_x5F_icon_x5F_keylines_00000077318920148093339210000006245950728745084294_" viewBox="-96 -96 192 192">
+        <g opacity="0.4">
+            <defs>
+                <path id="SVGID_1_" opacity="0.4" d="M-96,96V-96H96V96H-96z"/>
+            </defs>
+            <clipPath id="SVGID_00000071517564283228984050000017848131202901217410_">
+                <use xlink:href="#SVGID_1_" overflow="visible"/>
+            </clipPath>
+            <g clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)">
+                <g>
+                    <path d="M95.75,95.75v-191.5h-191.5v191.5H95.75 M96,96H-96V-96H96V96L96,96z"/>
+                </g>
+                <circle fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" cx="0" cy="0" r="64"/>
+            </g>
+
+            <circle clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)" fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" cx="0" cy="0" r="88"/>
+
+            <path clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)" fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" d="
+			M64,76H-64c-6.6,0-12-5.4-12-12V-64c0-6.6,5.4-12,12-12H64c6.6,0,12,5.4,12,12V64C76,70.6,70.6,76,64,76z"/>
+
+            <path clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)" fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" d="
+			M52,88H-52c-6.6,0-12-5.4-12-12V-76c0-6.6,5.4-12,12-12H52c6.6,0,12,5.4,12,12V76C64,82.6,58.6,88,52,88z"/>
+
+            <path clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)" fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" d="
+			M76,64H-76c-6.6,0-12-5.4-12-12V-52c0-6.6,5.4-12,12-12H76c6.6,0,12,5.4,12,12V52C88,58.6,82.6,64,76,64z"/>
+        </g>
+    </symbol>
+    <rect id="bounding_box_1_" display="none" fill="none" width="192" height="192"/>
+    <g id="art_layer">
+        <g>
+            <path d="M96,181.92L96,181.92c6.63,0,12-5.37,12-12v-104H84v104C84,176.55,89.37,181.92,96,181.92z"/>
+            <g>
+                <path d="M143.81,103.87C130.87,90.94,111.54,88.32,96,96l51.37,51.37c2.12,2.12,5.77,1.28,6.67-1.57
+				C158.56,131.49,155.15,115.22,143.81,103.87z"/>
+            </g>
+            <g>
+                <path d="M48.19,103.87C61.13,90.94,80.46,88.32,96,96l-51.37,51.37c-2.12,2.12-5.77,1.28-6.67-1.57
+				C33.44,131.49,36.85,115.22,48.19,103.87z"/>
+            </g>
+            <g>
+                <path d="M140,64c-20.44,0-37.79,13.4-44,32h81.24c3.33,0,5.55-3.52,4.04-6.49C173.56,74.36,157.98,64,140,64z"/>
+            </g>
+            <g>
+                <path d="M104.49,42.26C90.03,56.72,87.24,78.45,96,96l57.45-57.45c2.36-2.36,1.44-6.42-1.73-7.45
+				C135.54,25.85,117.2,29.55,104.49,42.26z"/>
+            </g>
+            <g>
+                <path d="M87.51,42.26C101.97,56.72,104.76,78.45,96,96L38.55,38.55c-2.36-2.36-1.44-6.42,1.73-7.45
+				C56.46,25.85,74.8,29.55,87.51,42.26z"/>
+            </g>
+            <g>
+                <g>
+                    <path d="M52,64c20.44,0,37.79,13.4,44,32H14.76c-3.33,0-5.55-3.52-4.04-6.49C18.44,74.36,34.02,64,52,64z"/>
+                </g>
+            </g>
+        </g>
+    </g>
+    <g id="keylines" display="none">
+
+        <use xlink:href="#material_x5F_product_x5F_standard_x5F_icon_x5F_keylines_00000077318920148093339210000006245950728745084294_" width="192" height="192" id="material_x5F_product_x5F_standard_x5F_icon_x5F_keylines" x="-96" y="-96" transform="matrix(1 0 0 -1 96 96)" display="inline" overflow="visible"/>
+    </g>
+</svg>

public/instruct/Adventure.json

@@ -0,0 +1,18 @@
+{
+    "system_prompt": "[Enter Adventure Mode. Narrate the story based on {{user}}'s dialogue and actions after \">\". Describe the surroundings in vivid detail. Be detailed, creative, verbose, and proactive. Move the story forward by introducing fantasy elements and interesting characters.]",
+    "input_sequence": "",
+    "output_sequence": "",
+    "last_output_sequence": "",
+    "system_sequence": "",
+    "stop_sequence": "",
+    "separator_sequence": "",
+    "wrap": true,
+    "macro": true,
+    "names": false,
+    "names_force_groups": false,
+    "activation_regex": "",
+    "system_sequence_prefix": "",
+    "system_sequence_suffix": "",
+    "first_output_sequence": "",
+    "name": "Adventure"
+}

public/instruct/ChatML.json

@@ -0,0 +1,17 @@
+{
+    "wrap": false,
+    "names": true,
+    "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.",
+    "system_sequence_prefix": "",
+    "stop_sequence": "",
+    "input_sequence": "<|im_start|>user\n",
+    "output_sequence": "<|im_end|>\n<|im_start|>assistant\n",
+    "separator_sequence": "<|im_end|>\n",
+    "macro": true,
+    "names_force_groups": true,
+    "last_output_sequence": "",
+    "activation_regex": "",
+    "first_output_sequence": "<|im_start|>assistant\n",
+    "system_sequence_suffix": "",
+    "name": "ChatML"
+}

public/instruct/Libra-32B.json

@@ -0,0 +1,17 @@
+{
+    "wrap": true,
+    "names": true,
+    "system_prompt": "Avoid repetition, don't loop. Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions.",
+    "system_sequence_prefix": "",
+    "stop_sequence": "",
+    "input_sequence": "",
+    "output_sequence": "",
+    "separator_sequence": "",
+    "macro": true,
+    "names_force_groups": true,
+    "last_output_sequence": "\n### Response:",
+    "activation_regex": "",
+    "first_output_sequence": "",
+    "system_sequence_suffix": "",
+    "name": "Libra-32B"
+}

public/instruct/Lightning 1.1.json

@@ -0,0 +1,18 @@
+{
+    "wrap": true,
+    "names": false,
+    "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\n### Instruction:\nTake the role of {{char}} in a play that leaves a lasting impression on {{user}}. Write {{char}}'s next reply.\nNever skip or gloss over {{char}}’s actions. Progress the scene at a naturally slow pace.\n\n",
+    "system_sequence": "",
+    "stop_sequence": "",
+    "input_sequence": "### Instruction:",
+    "output_sequence": "### Response: (length = unlimited)",
+    "separator_sequence": "",
+    "macro": true,
+    "names_force_groups": true,
+    "last_output_sequence": "",
+    "system_sequence_prefix": "",
+    "system_sequence_suffix": "",
+    "first_output_sequence": "",
+    "activation_regex": "",
+    "name": "Lightning 1.1"
+}

public/instruct/Mistral.json

@@ -0,0 +1,17 @@
+{
+    "wrap": false,
+    "names": true,
+    "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.",
+    "system_sequence_prefix": "",
+    "stop_sequence": "",
+    "input_sequence": "[INST] ",
+    "output_sequence": " [/INST]\n",
+    "separator_sequence": "\n",
+    "macro": true,
+    "names_force_groups": true,
+    "last_output_sequence": "",
+    "activation_regex": "",
+    "first_output_sequence": "\n",
+    "system_sequence_suffix": "",
+    "name": "Mistral"
+}

public/instruct/Pygmalion.json

@@ -0,0 +1,17 @@
+{
+    "name": "Pygmalion",
+    "system_prompt": "Enter RP mode. You shall reply to {{user}} while staying in character. Your responses must be detailed, creative, immersive, and drive the scenario forward. You will follow {{char}}'s persona.",
+    "input_sequence": "<|user|>",
+    "output_sequence": "<|model|>",
+    "first_output_sequence": "",
+    "last_output_sequence": "",
+    "system_sequence_prefix": "<|system|>",
+    "system_sequence_suffix": "",
+    "stop_sequence": "<|user|>",
+    "separator_sequence": "",
+    "wrap": false,
+    "macro": true,
+    "names": true,
+    "names_force_groups": true,
+    "activation_regex": ""
+}

public/instruct/Story.json

@@ -0,0 +1,18 @@
+{
+    "system_prompt": "",
+    "input_sequence": "",
+    "output_sequence": "",
+    "last_output_sequence": "",
+    "system_sequence": "",
+    "stop_sequence": "",
+    "separator_sequence": "",
+    "wrap": true,
+    "macro": true,
+    "names": false,
+    "names_force_groups": false,
+    "activation_regex": "",
+    "system_sequence_prefix": "",
+    "system_sequence_suffix": "",
+    "first_output_sequence": "",
+    "name": "Story"
+}

public/instruct/Synthia.json

@@ -0,0 +1,17 @@
+{
+    "wrap": false,
+    "names": false,
+    "system_prompt": "Elaborate on the topic using a Tree of Thoughts and backtrack when necessary to construct a clear, cohesive Chain of Thought reasoning. Always answer without hesitation.",
+    "system_sequence_prefix": "SYSTEM: ",
+    "stop_sequence": "",
+    "input_sequence": "USER: ",
+    "output_sequence": "\nASSISTANT: ",
+    "separator_sequence": "\n",
+    "macro": true,
+    "names_force_groups": true,
+    "last_output_sequence": "",
+    "activation_regex": "",
+    "first_output_sequence": "ASSISTANT: ",
+    "system_sequence_suffix": "",
+    "name": "Synthia"
+}

public/lib/select2-search-placeholder.js

@@ -0,0 +1,25 @@
+(function($) {
+
+    var Defaults = $.fn.select2.amd.require('select2/defaults');
+
+    $.extend(Defaults.defaults, {
+        searchInputPlaceholder: '',
+        searchInputCssClass: '',
+    });
+
+    var SearchDropdown = $.fn.select2.amd.require('select2/dropdown/search');
+
+    var _renderSearchDropdown = SearchDropdown.prototype.render;
+
+    SearchDropdown.prototype.render = function(decorated) {
+
+        // invoke parent method
+        var $rendered = _renderSearchDropdown.apply(this, Array.prototype.slice.apply(arguments));
+
+        this.$search.attr('placeholder', this.options.get('searchInputPlaceholder'));
+        this.$search.addClass(this.options.get('searchInputCssClass'));
+
+        return $rendered;
+    };
+
+})(window.jQuery);

public/scripts/PromptManager.js

@@ -21,6 +21,16 @@ function debouncePromise(func, delay) {
     };
 }
 
+const DEFAULT_DEPTH = 4;
+
+/**
+ * @enum {number}
+ */
+export const INJECTION_POSITION ={
+    RELATIVE: 0,
+    ABSOLUTE: 1,
+}
+
 /**
  * Register migrations for the prompt manager when settings are loaded or an Open AI preset is loaded.
  */
@@ -60,7 +70,7 @@ const registerPromptManagerMigration = () => {
  * Represents a prompt.
  */
 class Prompt {
-    identifier; role; content; name; system_prompt;
+    identifier; role; content; name; system_prompt; position; injection_position; injection_depth;
 
     /**
      * Create a new Prompt instance.
@@ -71,13 +81,19 @@ class Prompt {
      * @param {string} param0.content - The content of the prompt.
      * @param {string} param0.name - The name of the prompt.
      * @param {boolean} param0.system_prompt - Indicates if the prompt is a system prompt.
+     * @param {string} param0.position - The position of the prompt in the prompt list.
+     * @param {number} param0.injection_position - The insert position of the prompt.
+     * @param {number} param0.injection_depth - The depth of the prompt in the chat.
      */
-    constructor({ identifier, role, content, name, system_prompt } = {}) {
+    constructor({ identifier, role, content, name, system_prompt, position, injection_depth, injection_position } = {}) {
         this.identifier = identifier;
         this.role = role;
         this.content = content;
         this.name = name;
         this.system_prompt = system_prompt;
+        this.position = position;
+        this.injection_depth = injection_depth;
+        this.injection_position = injection_position;
     }
 }
 
@@ -379,6 +395,8 @@ PromptManagerModule.prototype.init = function (moduleConfiguration, serviceSetti
         document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name').value = prompt.name;
         document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role').value = 'system';
         document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt').value = prompt.content;
+        document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position').value = prompt.injection_position ?? 0;
+        document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth').value = prompt.injection_depth ?? DEFAULT_DEPTH;
     }
 
     // Append prompt to selected character
@@ -671,6 +689,8 @@ PromptManagerModule.prototype.updatePromptWithPromptEditForm = function (prompt)
     prompt.name = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name').value;
     prompt.role = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role').value;
     prompt.content = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt').value;
+    prompt.injection_position = Number(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position').value);
+    prompt.injection_depth = Number(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth').value);
 }
 
 /**
@@ -1083,10 +1103,14 @@ PromptManagerModule.prototype.loadPromptIntoEditForm = function (prompt) {
     const nameField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name');
     const roleField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role');
     const promptField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt');
+    const injectionPositionField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position');
+    const injectionDepthField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth');
 
     nameField.value = prompt.name ?? '';
     roleField.value = prompt.role ?? '';
     promptField.value = prompt.content ?? '';
+    injectionPositionField.value = prompt.injection_position ?? INJECTION_POSITION.RELATIVE;
+    injectionDepthField.value = prompt.injection_depth ?? DEFAULT_DEPTH;
 
     const resetPromptButton = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_reset');
     if (true === prompt.system_prompt) {
@@ -1150,10 +1174,14 @@ PromptManagerModule.prototype.clearEditForm = function () {
     const nameField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name');
     const roleField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role');
     const promptField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt');
+    const injectionPositionField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position');
+    const injectionDepthField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth');
 
     nameField.value = '';
     roleField.selectedIndex = 0;
     promptField.value = '';
+    injectionPositionField.selectedIndex = 0;
+    injectionDepthField.value = DEFAULT_DEPTH;
 
     roleField.disabled = false;
 }
@@ -1433,13 +1461,18 @@ PromptManagerModule.prototype.renderPromptManagerListItems = function () {
         }
 
         const encodedName = escapeHtml(prompt.name);
+        const isSystemPrompt = !prompt.marker && prompt.system_prompt && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE;
+        const isUserPrompt = !prompt.marker && !prompt.system_prompt && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE;
+        const isInjectionPrompt = !prompt.marker && prompt.injection_position === INJECTION_POSITION.ABSOLUTE;
         listItemHtml += `
             <li class="${prefix}prompt_manager_prompt ${draggableClass} ${enabledClass} ${markerClass}" data-pm-identifier="${prompt.identifier}">
                 <span class="${prefix}prompt_manager_prompt_name" data-pm-name="${encodedName}">
                     ${prompt.marker ? '<span class="fa-solid fa-thumb-tack" title="Marker"></span>' : ''}
-                    ${!prompt.marker && prompt.system_prompt ? '<span class="fa-solid fa-square-poll-horizontal" title="Global Prompt"></span>' : ''}
-                    ${!prompt.marker && !prompt.system_prompt ? '<span class="fa-solid fa-user" title="User Prompt"></span>' : ''}
+                    ${isSystemPrompt ? '<span class="fa-solid fa-square-poll-horizontal" title="Global Prompt"></span>' : ''}
+                    ${isUserPrompt ? '<span class="fa-solid fa-user" title="User Prompt"></span>' : ''}
+                    ${isInjectionPrompt ? `<span class="fa-solid fa-syringe" title="In-Chat Injection"></span>` : ''}
                     ${this.isPromptInspectionAllowed(prompt) ? `<a class="prompt-manager-inspect-action">${encodedName}</a>` : encodedName}
+                    ${isInjectionPrompt ? `<small class="prompt-manager-injection-depth">@ ${prompt.injection_depth}</small>` : ''}
                 </span>
                 <span>
                         <span class="prompt_manager_prompt_controls">

public/scripts/RossAscends-mods.js

@@ -18,6 +18,8 @@ import {
     getThumbnailUrl,
     selectCharacterById,
     eventSource,
+    menu_type,
+    substituteParams,
 } from "../script.js";
 
 import {
@@ -31,7 +33,7 @@ import {
     SECRET_KEYS,
     secret_state,
 } from "./secrets.js";
-import { debounce, delay, getStringHash, waitUntilCondition } from "./utils.js";
+import { debounce, delay, getStringHash, isValidUrl, waitUntilCondition } from "./utils.js";
 import { chat_completion_sources, oai_settings } from "./openai.js";
 import { getTokenCount } from "./tokenizers.js";
 
@@ -210,10 +212,12 @@ $("#character_popup").on("input", function () { countTokensDebounced(); });
 //function:
 export function RA_CountCharTokens() {
     let total_tokens = 0;
+    let permanent_tokens = 0;
 
     $('[data-token-counter]').each(function () {
         const counter = $(this);
         const input = $(document.getElementById(counter.data('token-counter')));
+        const isPermanent = counter.data('token-permanent') === true;
         const value = String(input.val());
 
         if (input.length === 0) {
@@ -230,10 +234,14 @@ export function RA_CountCharTokens() {
 
         if (input.data('last-value-hash') === valueHash) {
             total_tokens += Number(counter.text());
+            permanent_tokens += isPermanent ? Number(counter.text()) : 0;
         } else {
-            const tokens = getTokenCount(value);
+            // We substitute macro for existing characters, but not for the character being created
+            const valueToCount = menu_type === 'create' ? value : substituteParams(value);
+            const tokens = getTokenCount(valueToCount);
             counter.text(tokens);
             total_tokens += tokens;
+            permanent_tokens += isPermanent ? tokens : 0;
             input.data('last-value-hash', valueHash);
         }
     });
@@ -242,6 +250,7 @@ export function RA_CountCharTokens() {
     const tokenLimit = Math.max(((main_api !== 'openai' ? max_context : oai_settings.openai_max_context) / 2), 1024);
     const showWarning = (total_tokens > tokenLimit);
     $('#result_info_total_tokens').text(total_tokens);
+    $('#result_info_permanent_tokens').text(permanent_tokens);
     $('#result_info_text').toggleClass('neutral_warning', showWarning);
     $('#chartokenwarning').toggle(showWarning);
 }
@@ -274,10 +283,16 @@ export async function favsToHotswap() {
     const entities = getEntitiesList({ doFilter: false });
     const container = $('#right-nav-panel .hotswap');
     const template = $('#hotswap_template .hotswapAvatar');
-    container.empty();
-    const maxCount = 6;
+    const DEFAULT_COUNT = 6;
+    const WIDTH_PER_ITEM = 60; // 50px + 5px gap + 5px padding
+    const containerWidth = container.outerWidth();
+    const maxCount = containerWidth > 0 ? Math.floor(containerWidth / WIDTH_PER_ITEM) : DEFAULT_COUNT;
     let count = 0;
 
+    const promises = [];
+    const newContainer = container.clone();
+    newContainer.empty();
+
     for (const entity of entities) {
         if (count >= maxCount) {
             break;
@@ -310,23 +325,39 @@ export async function favsToHotswap() {
         }
 
         if (isCharacter) {
-            const avatarUrl = getThumbnailUrl('avatar', entity.item.avatar);
-            $(slot).find('img').attr('src', avatarUrl);
-            $(slot).attr('title', entity.item.avatar);
+            const imgLoadPromise = new Promise((resolve) => {
+                const avatarUrl = getThumbnailUrl('avatar', entity.item.avatar);
+                $(slot).find('img').attr('src', avatarUrl).on('load', resolve);
+                $(slot).attr('title', entity.item.avatar);
+            });
+
+            // if the image doesn't load in 500ms, resolve the promise anyway
+            promises.push(Promise.race([imgLoadPromise, delay(500)]));
         }
 
         $(slot).css('cursor', 'pointer');
-        container.append(slot);
+        newContainer.append(slot);
         count++;
     }
 
-    // there are 6 slots in total,
-    if (count < maxCount) { //if any are left over
+    // don't fill leftover spaces with avatar placeholders
+    // just evenly space the selected avatars instead
+    /*
+   if (count < maxCount) { //if any space is left over
         let leftOverSlots = maxCount - count;
         for (let i = 1; i <= leftOverSlots; i++) {
-            container.append(template.clone());
+            newContainer.append(template.clone());
         }
     }
+    */
+
+    await Promise.allSettled(promises);
+    //helpful instruction message if no characters are favorited
+    if (count === 0) { container.html(`<small><span><i class="fa-solid fa-star"></i> Favorite characters to add them to HotSwaps</span></small>`) }
+    //otherwise replace with fav'd characters
+    if (count > 0) {
+        container.replaceWith(newContainer);
+    }
 }
 
 //changes input bar and send button display depending on connection status
@@ -367,7 +398,7 @@ function RA_autoconnect(PrevApi) {
     if (online_status === "no_connection" && LoadLocalBool('AutoConnectEnabled')) {
         switch (main_api) {
             case 'kobold':
-                if (api_server && isUrlOrAPIKey(api_server)) {
+                if (api_server && isValidUrl(api_server)) {
                     $("#api_button").click();
                 }
                 break;
@@ -377,7 +408,7 @@ function RA_autoconnect(PrevApi) {
                 }
                 break;
             case 'textgenerationwebui':
-                if (api_server_textgenerationwebui && isUrlOrAPIKey(api_server_textgenerationwebui)) {
+                if (api_server_textgenerationwebui && isValidUrl(api_server_textgenerationwebui)) {
                     $("#api_button_textgenerationwebui").click();
                 }
                 break;
@@ -388,6 +419,7 @@ function RA_autoconnect(PrevApi) {
                     || (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI)
                     || (secret_state[SECRET_KEYS.OPENROUTER] && oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER)
                     || (secret_state[SECRET_KEYS.AI21] && oai_settings.chat_completion_source == chat_completion_sources.AI21)
+                    || (secret_state[SECRET_KEYS.PALM] && oai_settings.chat_completion_source == chat_completion_sources.PALM)
                 ) {
                     $("#api_button_openai").click();
                 }
@@ -403,15 +435,6 @@ function RA_autoconnect(PrevApi) {
     }
 }
 
-function isUrlOrAPIKey(string) {
-    try {
-        new URL(string);
-        return true;
-    } catch (_) {
-        //          return pattern.test(string);
-    }
-}
-
 function OpenNavPanels() {
     const deviceInfo = getDeviceInfo();
     if (deviceInfo && deviceInfo.device.type === 'desktop') {
@@ -867,13 +890,20 @@ export function initRossMods() {
 
     //this makes the chat input text area resize vertically to match the text size (limited by CSS at 50% window height)
     $('#send_textarea').on('input', function () {
+        const chatBlock = $('#chat');
+        const originalScrollBottom = chatBlock[0].scrollHeight - (chatBlock.scrollTop() + chatBlock.outerHeight());
         this.style.height = window.getComputedStyle(this).getPropertyValue('min-height');
         this.style.height = (this.scrollHeight) + 'px';
+        const newScrollTop = chatBlock[0].scrollHeight - (chatBlock.outerHeight() + originalScrollBottom);
+        chatBlock.scrollTop(newScrollTop);
     });
 
     //Regenerate if user swipes on the last mesage in chat
 
     document.addEventListener('swiped-left', function (e) {
+        if (power_user.gestures === false) {
+            return
+        }
         var SwipeButR = $('.swipe_right:last');
         var SwipeTargetMesClassParent = $(e.target).closest('.last_mes');
         if (SwipeTargetMesClassParent !== null) {
@@ -883,6 +913,9 @@ export function initRossMods() {
         }
     });
     document.addEventListener('swiped-right', function (e) {
+        if (power_user.gestures === false) {
+            return
+        }
         var SwipeButL = $('.swipe_left:last');
         var SwipeTargetMesClassParent = $(e.target).closest('.last_mes');
         if (SwipeTargetMesClassParent !== null) {
@@ -906,10 +939,13 @@ export function initRossMods() {
     }
 
     $(document).on('keydown', function (event) {
-        processHotkeys(event);
+        processHotkeys(event.originalEvent);
     });
 
     //Additional hotkeys CTRL+ENTER and CTRL+UPARROW
+    /**
+     * @param {KeyboardEvent} event
+     */
     function processHotkeys(event) {
         //Enter to send when send_textarea in focus
         if ($(':focus').attr('id') === 'send_textarea') {
@@ -943,6 +979,14 @@ export function initRossMods() {
             }, 300);
         }
 
+        // Alt+Enter or AltGr+Enter to Continue
+        if ((event.altKey || (event.altKey && event.ctrlKey)) && event.key == "Enter") {
+            if (is_send_press == false) {
+                console.debug("Continuing with Alt+Enter");
+                $('#option_continue').trigger('click');
+            }
+        }
+
         // Ctrl+Enter for Regeneration Last Response. If editing, accept the edits instead
         if (event.ctrlKey && event.key == "Enter") {
             const editMesDone = $(".mes_edit_done:visible");
@@ -958,14 +1002,6 @@ export function initRossMods() {
             }
         }
 
-        // Alt+Enter to Continue
-        if (event.altKey && event.key == "Enter") {
-            if (is_send_press == false) {
-                console.debug("Continuing with Alt+Enter");
-                $('#option_continue').trigger('click');
-            }
-        }
-
         // Helper function to check if nanogallery2's lightbox is active
         function isNanogallery2LightboxActive() {
             // Check if the body has the 'nGY2On' class, adjust this based on actual behavior
@@ -1097,13 +1133,14 @@ export function initRossMods() {
                 $("#rightNavDrawerIcon").trigger('click');
                 return
             }
+            if ($(".draggable").is(":visible")) {
+                // Remove the first matched element
+                $('.draggable:first').remove();
+                return;
+            }
         }
 
-        if ($(".draggable").is(":visible")) {
-            // Remove the first matched element
-            $('.draggable:first').remove();
-            return;
-        }
+
 
 
         if (event.ctrlKey && /^[1-9]$/.test(event.key)) {

public/scripts/authors-note.js

@@ -235,6 +235,7 @@ function loadSettings() {
     chat_metadata[metadata_keys.depth] = chat_metadata[metadata_keys.depth] ?? extension_settings.note.defaultDepth ?? DEFAULT_DEPTH;
     $('#extension_floating_prompt').val(chat_metadata[metadata_keys.prompt]);
     $('#extension_floating_interval').val(chat_metadata[metadata_keys.interval]);
+    $('#extension_floating_allow_wi_scan').prop('checked', extension_settings.note.allowWIScan ?? false);
     $('#extension_floating_depth').val(chat_metadata[metadata_keys.depth]);
     $(`input[name="extension_floating_position"][value="${chat_metadata[metadata_keys.position]}"]`).prop('checked', true);
 
@@ -389,6 +390,11 @@ function onChatChanged() {
     $('#extension_floating_default_token_counter').text(tokenCounter3);
 }
 
+function onAllowWIScanCheckboxChanged() {
+    extension_settings.note.allowWIScan = !!$(this).prop('checked');
+    updateSettings();
+}
+
 /**
  * Inject author's note options and setup event listeners.
  */
@@ -402,6 +408,7 @@ export function initAuthorsNote() {
     $('#extension_floating_default').on('input', onExtensionFloatingDefaultInput);
     $('#extension_default_depth').on('input', onDefaultDepthInput);
     $('#extension_default_interval').on('input', onDefaultIntervalInput);
+    $('#extension_floating_allow_wi_scan').on('input', onAllowWIScanCheckboxChanged);
     $('input[name="extension_floating_position"]').on('change', onExtensionFloatingPositionInput);
     $('input[name="extension_default_position"]').on('change', onDefaultPositionInput);
     $('input[name="extension_floating_char_position"]').on('change', onExtensionFloatingCharPositionInput);

public/scripts/backgrounds.js

@@ -0,0 +1,488 @@
+import { callPopup, chat_metadata, eventSource, event_types, generateQuietPrompt, getCurrentChatId, getRequestHeaders, getThumbnailUrl } from "../script.js";
+import { saveMetadataDebounced } from "./extensions.js";
+import { registerSlashCommand } from "./slash-commands.js";
+import { stringFormat } from "./utils.js";
+
+const BG_METADATA_KEY = 'custom_background';
+const LIST_METADATA_KEY = 'chat_backgrounds';
+
+/**
+ * Sets the background for the current chat and adds it to the list of custom backgrounds.
+ * @param {{url: string, path:string}} backgroundInfo
+ */
+function forceSetBackground(backgroundInfo) {
+    saveBackgroundMetadata(backgroundInfo.url);
+    setCustomBackground();
+
+    const list = chat_metadata[LIST_METADATA_KEY] || [];
+    const bg = backgroundInfo.path;
+    list.push(bg);
+    chat_metadata[LIST_METADATA_KEY] = list;
+    saveMetadataDebounced();
+    getChatBackgroundsList();
+    highlightNewBackground(bg);
+    highlightLockedBackground();
+}
+
+async function onChatChanged() {
+    if (hasCustomBackground()) {
+        setCustomBackground();
+    }
+    else {
+        unsetCustomBackground();
+    }
+
+    getChatBackgroundsList();
+    highlightLockedBackground();
+}
+
+function getChatBackgroundsList() {
+    const list = chat_metadata[LIST_METADATA_KEY];
+    const listEmpty = !Array.isArray(list) || list.length === 0;
+
+    $('#bg_custom_content').empty();
+    $('#bg_chat_hint').toggle(listEmpty);
+
+    if (listEmpty) {
+        return;
+    }
+
+    for (const bg of list) {
+        const template = getBackgroundFromTemplate(bg, true);
+        $('#bg_custom_content').append(template);
+    }
+}
+
+function getBackgroundPath(fileUrl) {
+    return `backgrounds/${fileUrl}`;
+}
+
+function highlightLockedBackground() {
+    $('.bg_example').removeClass('locked');
+
+    const lockedBackground = chat_metadata[BG_METADATA_KEY];
+
+    if (!lockedBackground) {
+        return;
+    }
+
+    $(`.bg_example`).each(function () {
+        const url = $(this).data('url');
+        if (url === lockedBackground) {
+            $(this).addClass('locked');
+        }
+    });
+}
+
+function onLockBackgroundClick(e) {
+    e.stopPropagation();
+
+    const chatName = getCurrentChatId();
+
+    if (!chatName) {
+        toastr.warning('Select a chat to lock the background for it');
+        return;
+    }
+
+    const relativeBgImage = getUrlParameter(this);
+
+    saveBackgroundMetadata(relativeBgImage);
+    setCustomBackground();
+    highlightLockedBackground();
+}
+
+function onUnlockBackgroundClick(e) {
+    e.stopPropagation();
+    removeBackgroundMetadata();
+    unsetCustomBackground();
+    highlightLockedBackground();
+}
+
+function hasCustomBackground() {
+    return chat_metadata[BG_METADATA_KEY];
+}
+
+function saveBackgroundMetadata(file) {
+    chat_metadata[BG_METADATA_KEY] = file;
+    saveMetadataDebounced();
+}
+
+function removeBackgroundMetadata() {
+    delete chat_metadata[BG_METADATA_KEY];
+    saveMetadataDebounced();
+}
+
+function setCustomBackground() {
+    const file = chat_metadata[BG_METADATA_KEY];
+
+    // bg already set
+    if (document.getElementById("bg_custom").style.backgroundImage == file) {
+        return;
+    }
+
+    $("#bg_custom").css("background-image", file);
+}
+
+function unsetCustomBackground() {
+    $("#bg_custom").css("background-image", 'none');
+}
+
+function onSelectBackgroundClick() {
+    const isCustom = $(this).attr('custom') === 'true';
+    const relativeBgImage = getUrlParameter(this);
+
+    // if clicked on upload button
+    if (!relativeBgImage) {
+        return;
+    }
+
+    // Automatically lock the background if it's custom or other background is locked
+    if (hasCustomBackground() || isCustom) {
+        saveBackgroundMetadata(relativeBgImage);
+        setCustomBackground();
+        highlightLockedBackground();
+    } else {
+        highlightLockedBackground();
+    }
+
+    const customBg = window.getComputedStyle(document.getElementById('bg_custom')).backgroundImage;
+
+    // Custom background is set. Do not override the layer below
+    if (customBg !== 'none') {
+        return;
+    }
+
+    const bgFile = $(this).attr("bgfile");
+    const backgroundUrl = getBackgroundPath(bgFile);
+
+    // Fetching to browser memory to reduce flicker
+    fetch(backgroundUrl).then(() => {
+        $("#bg1").css("background-image", relativeBgImage);
+        setBackground(bgFile);
+    }).catch(() => {
+        console.log('Background could not be set: ' + backgroundUrl);
+    });
+}
+
+async function onCopyToSystemBackgroundClick(e) {
+    e.stopPropagation();
+    const bgNames = await getNewBackgroundName(this);
+
+    if (!bgNames) {
+        return;
+    }
+
+    const bgFile = await fetch(bgNames.oldBg);
+
+    if (!bgFile.ok) {
+        toastr.warning('Failed to copy background');
+        return;
+    }
+
+    const blob = await bgFile.blob();
+    const file = new File([blob], bgNames.newBg);
+    const formData = new FormData();
+    formData.set('avatar', file);
+
+    uploadBackground(formData);
+
+    const list = chat_metadata[LIST_METADATA_KEY] || [];
+    const index = list.indexOf(bgNames.oldBg);
+    list.splice(index, 1);
+    saveMetadataDebounced();
+    getChatBackgroundsList();
+}
+
+/**
+ * Gets the new background name from the user.
+ * @param {Element} referenceElement
+ * @returns {Promise<{oldBg: string, newBg: string}>}
+ * */
+async function getNewBackgroundName(referenceElement) {
+    const exampleBlock = $(referenceElement).closest('.bg_example');
+    const isCustom = exampleBlock.attr('custom') === 'true';
+    const oldBg = exampleBlock.attr('bgfile');
+
+    if (!oldBg) {
+        console.debug('no bgfile');
+        return;
+    }
+
+    const fileExtension = oldBg.split('.').pop();
+    const fileNameBase = isCustom ? oldBg.split('/').pop() : oldBg;
+    const oldBgExtensionless = fileNameBase.replace(`.${fileExtension}`, '');
+    const newBgExtensionless = await callPopup('<h3>Enter new background name:</h3>', 'input', oldBgExtensionless);
+
+    if (!newBgExtensionless) {
+        console.debug('no new_bg_extensionless');
+        return;
+    }
+
+    const newBg = `${newBgExtensionless}.${fileExtension}`;
+
+    if (oldBgExtensionless === newBgExtensionless) {
+        console.debug('new_bg === old_bg');
+        return;
+    }
+
+    return { oldBg, newBg };
+}
+
+async function onRenameBackgroundClick(e) {
+    e.stopPropagation();
+
+    const bgNames = await getNewBackgroundName(this);
+
+    if (!bgNames) {
+        return;
+    }
+
+    const data = { old_bg: bgNames.oldBg, new_bg: bgNames.newBg };
+    const response = await fetch('/renamebackground', {
+        method: 'POST',
+        headers: getRequestHeaders(),
+        body: JSON.stringify(data),
+        cache: 'no-cache',
+    });
+
+    if (response.ok) {
+        await getBackgrounds();
+        highlightNewBackground(bgNames.newBg);
+    } else {
+        toastr.warning('Failed to rename background');
+    }
+}
+
+async function onDeleteBackgroundClick(e) {
+    e.stopPropagation();
+    const bgToDelete = $(this).closest('.bg_example');
+    const url = bgToDelete.data('url');
+    const isCustom = bgToDelete.attr('custom') === 'true';
+    const confirm = await callPopup("<h3>Delete the background?</h3>", 'confirm');
+    const bg = bgToDelete.attr('bgfile');
+
+    if (confirm) {
+        // If it's not custom, it's a built-in background. Delete it from the server
+        if (!isCustom) {
+            delBackground(bg);
+        } else {
+            const list = chat_metadata[LIST_METADATA_KEY] || [];
+            const index = list.indexOf(bg);
+            list.splice(index, 1);
+        }
+
+        const siblingSelector = '.bg_example:not(#form_bg_download)';
+        const nextBg = bgToDelete.next(siblingSelector);
+        const prevBg = bgToDelete.prev(siblingSelector);
+        const anyBg = $(siblingSelector);
+
+        if (nextBg.length > 0) {
+            nextBg.trigger('click');
+        } else if (prevBg.length > 0) {
+            prevBg.trigger('click');
+        } else {
+            $(anyBg[Math.floor(Math.random() * anyBg.length)]).trigger('click');
+        }
+
+        bgToDelete.remove();
+
+        if (url === chat_metadata[BG_METADATA_KEY]) {
+            removeBackgroundMetadata();
+            unsetCustomBackground();
+            highlightLockedBackground();
+        }
+
+        if (isCustom) {
+            getChatBackgroundsList();
+            saveMetadataDebounced();
+        }
+    }
+}
+
+const autoBgPrompt = `Pause your roleplay and choose a location ONLY from the provided list that is the most suitable for the current scene. Do not output any other text:\n{0}`;
+
+async function autoBackgroundCommand() {
+    /** @type {HTMLElement[]} */
+    const bgTitles = Array.from(document.querySelectorAll('#bg_menu_content .BGSampleTitle'));
+    const options = bgTitles.map(x => ({ element: x, text: x.innerText.trim() })).filter(x => x.text.length > 0);
+    if (options.length == 0) {
+        toastr.warning('No backgrounds to choose from. Please upload some images to the "backgrounds" folder.');
+        return;
+    }
+
+    const list = options.map(option => `- ${option.text}`).join('\n');
+    const prompt = stringFormat(autoBgPrompt, list);
+    const reply = await generateQuietPrompt(prompt, false, false);
+    const fuse = new Fuse(options, { keys: ['text'] });
+    const bestMatch = fuse.search(reply, { limit: 1 });
+
+    if (bestMatch.length == 0) {
+        toastr.warning('No match found. Please try again.');
+        return;
+    }
+
+    console.debug('Automatically choosing background:', bestMatch);
+    bestMatch[0].item.element.click();
+}
+
+export async function getBackgrounds() {
+    const response = await fetch("/getbackgrounds", {
+        method: "POST",
+        headers: getRequestHeaders(),
+        body: JSON.stringify({
+            "": "",
+        }),
+    });
+    if (response.ok === true) {
+        const getData = await response.json();
+        //background = getData;
+        //console.log(getData.length);
+        $("#bg_menu_content").children('div').remove();
+        for (const bg of getData) {
+            const template = getBackgroundFromTemplate(bg, false);
+            $("#bg_menu_content").append(template);
+        }
+    }
+}
+
+/**
+ * Gets the URL of the background
+ * @param {Element} block
+ * @returns {string} URL of the background
+ */
+function getUrlParameter(block) {
+    return $(block).closest(".bg_example").data("url");
+}
+
+/**
+ * Instantiates a background template
+ * @param {string} bg Path to background
+ * @param {boolean} isCustom Whether the background is custom
+ * @returns {JQuery<HTMLElement>} Background template
+ */
+function getBackgroundFromTemplate(bg, isCustom) {
+    const template = $('#background_template .bg_example').clone();
+    const thumbPath = isCustom ? bg : getThumbnailUrl('bg', bg);
+    const url = isCustom ? `url("${encodeURI(bg)}")` : `url("${getBackgroundPath(bg)}")`;
+    const title = isCustom ? bg.split('/').pop() : bg;
+    const friendlyTitle = title.slice(0, title.lastIndexOf('.'));
+    template.attr('title', title);
+    template.attr('bgfile', bg);
+    template.attr('custom', String(isCustom));
+    template.data('url', url);
+    template.css('background-image', `url('${thumbPath}')`);
+    template.find('.BGSampleTitle').text(friendlyTitle);
+    return template;
+}
+
+async function setBackground(bg) {
+    jQuery.ajax({
+        type: "POST", //
+        url: "/setbackground", //
+        data: JSON.stringify({
+            bg: bg,
+        }),
+        beforeSend: function () {
+
+        },
+        cache: false,
+        dataType: "json",
+        contentType: "application/json",
+        //processData: false,
+        success: function (html) { },
+        error: function (jqXHR, exception) {
+            console.log(exception);
+            console.log(jqXHR);
+        },
+    });
+}
+
+async function delBackground(bg) {
+    const response = await fetch("/delbackground", {
+        method: "POST",
+        headers: getRequestHeaders(),
+        body: JSON.stringify({
+            bg: bg,
+        }),
+    });
+}
+
+function onBackgroundUploadSelected() {
+    const form = $("#form_bg_download").get(0);
+
+    if (!(form instanceof HTMLFormElement)) {
+        console.error('form_bg_download is not a form');
+        return;
+    }
+
+    const formData = new FormData(form);
+    uploadBackground(formData);
+    form.reset();
+}
+
+/**
+ * Uploads a background to the server
+ * @param {FormData} formData
+ */
+function uploadBackground(formData) {
+    jQuery.ajax({
+        type: "POST",
+        url: "/downloadbackground",
+        data: formData,
+        beforeSend: function () {
+        },
+        cache: false,
+        contentType: false,
+        processData: false,
+        success: async function (bg) {
+            setBackground(bg);
+            $("#bg1").css("background-image", `url("${getBackgroundPath(bg)}"`);
+            await getBackgrounds();
+            highlightNewBackground(bg);
+        },
+        error: function (jqXHR, exception) {
+            console.log(exception);
+            console.log(jqXHR);
+        },
+    });
+}
+
+/**
+ * @param {string} bg
+ */
+function highlightNewBackground(bg) {
+    const newBg = $(`.bg_example[bgfile="${bg}"]`);
+    const scrollOffset = newBg.offset().top - newBg.parent().offset().top;
+    $('#Backgrounds').scrollTop(scrollOffset);
+    newBg.addClass('flash animated');
+    setTimeout(() => newBg.removeClass('flash animated'), 2000);
+}
+
+function onBackgroundFilterInput() {
+    const filterValue = String($(this).val()).toLowerCase();
+    $("#bg_menu_content > div").each(function () {
+        const $bgContent = $(this);
+        if ($bgContent.attr("title").toLowerCase().includes(filterValue)) {
+            $bgContent.show();
+        } else {
+            $bgContent.hide();
+        }
+    });
+}
+
+export function initBackgrounds() {
+    eventSource.on(event_types.CHAT_CHANGED, onChatChanged);
+    eventSource.on(event_types.FORCE_SET_BACKGROUND, forceSetBackground);
+    $(document).on("click", '.bg_example', onSelectBackgroundClick);
+    $(document).on('click', '.bg_example_lock', onLockBackgroundClick);
+    $(document).on('click', '.bg_example_unlock', onUnlockBackgroundClick);
+    $(document).on('click', '.bg_example_edit', onRenameBackgroundClick);
+    $(document).on("click", '.bg_example_cross', onDeleteBackgroundClick);
+    $(document).on("click", '.bg_example_copy', onCopyToSystemBackgroundClick);
+    $('#auto_background').on("click", autoBackgroundCommand);
+    $("#add_bg_button").on('change', onBackgroundUploadSelected);
+    $("#bg-filter").on("input", onBackgroundFilterInput);
+    registerSlashCommand('lockbg', onLockBackgroundClick, ['bglock'], "– locks a background for the currently selected chat", true, true);
+    registerSlashCommand('unlockbg', onUnlockBackgroundClick, ['bgunlock'], '– unlocks a background for the currently selected chat', true, true);
+    registerSlashCommand('autobg', autoBackgroundCommand, ['bgauto'], '– automatically changes the background based on the chat context using the AI request prompt', true, true);
+}

public/scripts/bookmarks.js

@@ -133,6 +133,39 @@ async function saveBookmarkMenu() {
     return createNewBookmark(chat.length - 1);
 }
 
+export async function createBranch(mesId) {
+    if (!chat.length) {
+        toastr.warning('The chat is empty.', 'Branch creation failed');
+        return;
+    }
+
+    if (mesId < 0 || mesId >= chat.length) {
+        toastr.warning('Invalid message ID.', 'Branch creation failed');
+        return;
+    }
+
+    const lastMes = chat[mesId];
+    const mainChat = selected_group ? groups?.find(x => x.id == selected_group)?.chat_id : characters[this_chid].chat;
+    const newMetadata = { main_chat: mainChat };
+    let name = `Branch #${mesId} - ${humanizedDateTime()}`
+
+    if (selected_group) {
+        await saveGroupBookmarkChat(selected_group, name, newMetadata, mesId);
+    } else {
+        await saveChat(name, newMetadata, mesId);
+    }
+    // append to branches list if it exists
+    // otherwise create it
+    if (typeof lastMes.extra !== 'object') {
+        lastMes.extra = {};
+    }
+    if (typeof lastMes.extra['branches'] !== 'object') {
+        lastMes.extra['branches'] = [];
+    }
+    lastMes.extra['branches'].push(name);
+    return name;
+}
+
 async function createNewBookmark(mesId) {
     if (!chat.length) {
         toastr.warning('The chat is empty.', 'Bookmark creation failed');
@@ -280,7 +313,6 @@ async function convertSoloToGroupChat() {
         message.name = character.name;
         message.original_avatar = character.avatar;
         message.force_avatar = getThumbnailUrl('avatar', character.avatar);
-        message.is_name = true;
 
         // Allow regens of a single message in group
         if (typeof message.extra !== 'object') {

public/scripts/bulk-edit.js

@@ -1,4 +1,4 @@
-import { characters, getCharacters, handleDeleteCharacter, callPopup } from "../../../script.js";
+import { characters, getCharacters, handleDeleteCharacter, callPopup } from "../script.js";
 
 let is_bulk_edit = false;
 
@@ -64,23 +64,6 @@ async function onDeleteButtonClick() {
     }
 }
 
-/**
- * Adds the bulk edit and delete buttons to the UI.
- */
-function addButtons() {
-    const editButton = $(
-        "<i id='bulkEditButton' class='fa-solid fa-edit menu_button bulkEditButton' title='Bulk edit characters'></i>"
-    );
-    const deleteButton = $(
-        "<i id='bulkDeleteButton' class='fa-solid fa-trash menu_button bulkDeleteButton' title='Bulk delete characters' style='display: none;'></i>"
-    );
-
-    $("#charListGridToggle").after(editButton, deleteButton);
-
-    $("#bulkEditButton").on("click", onEditButtonClick);
-    $("#bulkDeleteButton").on("click", onDeleteButtonClick);
-}
-
 /**
  * Enables bulk selection by adding a checkbox next to each character.
  */
@@ -111,7 +94,7 @@ function disableBulkSelect() {
 /**
  * Entry point that runs on page load.
  */
-jQuery(async () => {
-    addButtons();
-    // loadSettings();
+jQuery(() => {
+    $("#bulkEditButton").on("click", onEditButtonClick);
+    $("#bulkDeleteButton").on("click", onDeleteButtonClick);
 });

public/scripts/cfg-scale.js

@@ -1,19 +1,17 @@
 import {
     chat_metadata,
+    substituteParams,
+    this_chid,
     eventSource,
     event_types,
     saveSettingsDebounced,
-    this_chid,
-} from "../../../script.js";
-import { selected_group } from "../../group-chats.js";
-import { extension_settings, saveMetadataDebounced } from "../../extensions.js";
-import { getCharaFilename, delay } from "../../utils.js";
-import { power_user } from "../../power-user.js";
-import { metadataKeys } from "./util.js";
+} from "../script.js";
+import { extension_settings, saveMetadataDebounced } from "./extensions.js"
+import { selected_group } from "./group-chats.js";
+import { getCharaFilename, delay } from "./utils.js";
+import { power_user } from "./power-user.js";
 
-// Keep track of where your extension is located, name should match repo name
-const extensionName = "cfg";
-const extensionFolderPath = `scripts/extensions/${extensionName}`;
+const extensionName = 'cfg';
 const defaultSettings = {
     global: {
         "guidance_scale": 1,
@@ -199,7 +197,7 @@ function loadSettings() {
         if (!promptSeparator.startsWith(`"`)) {
             promptSeparatorDisplay.unshift(`"`);
         }
-    
+
         if (!promptSeparator.endsWith(`"`)) {
             promptSeparatorDisplay.push(`"`);
         }
@@ -279,14 +277,8 @@ function migrateSettings() {
 }
 
 // This function is called when the extension is loaded
-jQuery(async () => {
-    // This is an example of loading HTML from a file
-    const windowHtml = $(await $.get(`${extensionFolderPath}/window.html`));
-
-    // Append settingsHtml to extensions_settings
-    // extension_settings and extensions_settings2 are the left and right columns of the settings menu
-    // Left should be extensions that deal with system functions and right should be visual/UI related 
-    windowHtml.find('#CFGClose').on('click', function () {
+export function initCfg() {
+    $('#CFGClose').on('click', function () {
         $("#cfgConfig").transition({
             opacity: 0,
             duration: 200,
@@ -295,7 +287,7 @@ jQuery(async () => {
         setTimeout(function () { $('#cfgConfig').hide() }, 200);
     });
 
-    windowHtml.find('#chat_cfg_guidance_scale').on('input', function() {
+    $('#chat_cfg_guidance_scale').on('input', function() {
         const numberValue = Number($(this).val());
         const success = setChatCfg(numberValue, settingType.guidance_scale);
         if (success) {
@@ -303,15 +295,15 @@ jQuery(async () => {
         }
     });
 
-    windowHtml.find('#chat_cfg_negative_prompt').on('input', function() {
+    $('#chat_cfg_negative_prompt').on('input', function() {
         setChatCfg($(this).val(), settingType.negative_prompt);
     });
 
-    windowHtml.find('#chat_cfg_positive_prompt').on('input', function() {
+    $('#chat_cfg_positive_prompt').on('input', function() {
         setChatCfg($(this).val(), settingType.positive_prompt);
     });
 
-    windowHtml.find('#chara_cfg_guidance_scale').on('input', function() {
+    $('#chara_cfg_guidance_scale').on('input', function() {
         const value = $(this).val();
         const success = setCharCfg(value, settingType.guidance_scale);
         if (success) {
@@ -319,34 +311,34 @@ jQuery(async () => {
         }
     });
 
-    windowHtml.find('#chara_cfg_negative_prompt').on('input', function() {
+    $('#chara_cfg_negative_prompt').on('input', function() {
         setCharCfg($(this).val(), settingType.negative_prompt);
     });
 
-    windowHtml.find('#chara_cfg_positive_prompt').on('input', function() {
+    $('#chara_cfg_positive_prompt').on('input', function() {
         setCharCfg($(this).val(), settingType.positive_prompt);
     });
 
-    windowHtml.find('#global_cfg_guidance_scale').on('input', function() {
+    $('#global_cfg_guidance_scale').on('input', function() {
         extension_settings.cfg.global.guidance_scale = Number($(this).val());
         $('#global_cfg_guidance_scale_counter').text(extension_settings.cfg.global.guidance_scale.toFixed(2));
         saveSettingsDebounced();
     });
 
-    windowHtml.find('#global_cfg_negative_prompt').on('input', function() {
+    $('#global_cfg_negative_prompt').on('input', function() {
         extension_settings.cfg.global.negative_prompt = $(this).val();
         saveSettingsDebounced();
     });
 
-    windowHtml.find('#global_cfg_positive_prompt').on('input', function() {
+    $('#global_cfg_positive_prompt').on('input', function() {
         extension_settings.cfg.global.positive_prompt = $(this).val();
         saveSettingsDebounced();
     });
 
-    windowHtml.find(`input[name="cfg_prompt_combine"]`).on('input', function() {
-        const values = windowHtml.find(`input[name="cfg_prompt_combine"]`)
+    $(`input[name="cfg_prompt_combine"]`).on('input', function() {
+        const values = $('#cfgConfig').find(`input[name="cfg_prompt_combine"]`)
             .filter(":checked")
-            .map(function() { return parseInt($(this).val()) })
+            .map(function() { return Number($(this).val()) })
             .get()
             .filter((e) => !Number.isNaN(e)) || [];
 
@@ -354,17 +346,17 @@ jQuery(async () => {
         saveMetadataDebounced();
     });
 
-    windowHtml.find(`#cfg_prompt_insertion_depth`).on('input', function() {
+    $(`#cfg_prompt_insertion_depth`).on('input', function() {
         chat_metadata[metadataKeys.prompt_insertion_depth] = Number($(this).val());
         saveMetadataDebounced();
     });
 
-    windowHtml.find(`#cfg_prompt_separator`).on('input', function() {
+    $(`#cfg_prompt_separator`).on('input', function() {
         chat_metadata[metadataKeys.prompt_separator] = $(this).val();
         saveMetadataDebounced();
     });
 
-    windowHtml.find('#groupchat_cfg_use_chara').on('input', function() {
+    $('#groupchat_cfg_use_chara').on('input', function() {
         const checked = !!$(this).prop('checked');
         chat_metadata[metadataKeys.groupchat_individual_chars] = checked
 
@@ -375,20 +367,126 @@ jQuery(async () => {
         saveMetadataDebounced();
     });
 
-    $("#movingDivs").append(windowHtml);
-
     initialLoadSettings();
 
     if (extension_settings.cfg) {
         migrateSettings();
     }
 
-    const buttonHtml = $(await $.get(`${extensionFolderPath}/menuButton.html`));
-    buttonHtml.on('click', onCfgMenuItemClick)
-    buttonHtml.appendTo("#options_advanced");
+    $('#option_toggle_CFG').on('click', onCfgMenuItemClick);
 
     // Hook events
     eventSource.on(event_types.CHAT_CHANGED, async () => {
         await onChatChanged();
     });
-});
+}
+
+export const cfgType = {
+    chat: 0,
+    chara: 1,
+    global: 2
+}
+
+export const metadataKeys = {
+    guidance_scale: "cfg_guidance_scale",
+    negative_prompt: "cfg_negative_prompt",
+    positive_prompt: "cfg_positive_prompt",
+    prompt_combine: "cfg_prompt_combine",
+    groupchat_individual_chars: "cfg_groupchat_individual_chars",
+    prompt_insertion_depth: "cfg_prompt_insertion_depth",
+    prompt_separator: "cfg_prompt_separator"
+}
+
+// Gets the CFG guidance scale
+// If the guidance scale is 1, ignore the CFG prompt(s) since it won't be used anyways
+export function getGuidanceScale() {
+    if (!extension_settings.cfg) {
+        console.warn("CFG extension is not enabled. Skipping CFG guidance.");
+        return;
+    }
+
+    const charaCfg = extension_settings.cfg.chara?.find((e) => e.name === getCharaFilename(this_chid));
+    const chatGuidanceScale = chat_metadata[metadataKeys.guidance_scale];
+    const groupchatCharOverride = chat_metadata[metadataKeys.groupchat_individual_chars] ?? false;
+
+    if (chatGuidanceScale && chatGuidanceScale !== 1 && !groupchatCharOverride) {
+        return {
+            type: cfgType.chat,
+            value: chatGuidanceScale
+        };
+    }
+
+    if ((!selected_group && charaCfg || groupchatCharOverride) && charaCfg?.guidance_scale !== 1) {
+        return {
+            type: cfgType.chara,
+            value: charaCfg.guidance_scale
+        };
+    }
+
+    if (extension_settings.cfg.global && extension_settings.cfg.global?.guidance_scale !== 1) {
+        return {
+            type: cfgType.global,
+            value: extension_settings.cfg.global.guidance_scale
+        };
+    }
+}
+
+/**
+ * Gets the CFG prompt separator.
+ * @returns {string} The CFG prompt separator
+ */
+function getCustomSeparator() {
+    const defaultSeparator = "\n";
+
+    try {
+        if (chat_metadata[metadataKeys.prompt_separator]) {
+            return JSON.parse(chat_metadata[metadataKeys.prompt_separator]);
+        }
+
+        return defaultSeparator;
+    } catch {
+        console.warn("Invalid JSON detected for prompt separator. Using default separator.");
+        return defaultSeparator;
+    }
+}
+
+// Gets the CFG prompt
+export function getCfgPrompt(guidanceScale, isNegative) {
+    let splitCfgPrompt = [];
+
+    const cfgPromptCombine = chat_metadata[metadataKeys.prompt_combine] ?? [];
+    if (guidanceScale.type === cfgType.chat || cfgPromptCombine.includes(cfgType.chat)) {
+        splitCfgPrompt.unshift(
+            substituteParams(
+                chat_metadata[isNegative ? metadataKeys.negative_prompt : metadataKeys.positive_prompt]
+            )
+        );
+    }
+
+    const charaCfg = extension_settings.cfg.chara?.find((e) => e.name === getCharaFilename(this_chid));
+    if (guidanceScale.type === cfgType.chara || cfgPromptCombine.includes(cfgType.chara)) {
+        splitCfgPrompt.unshift(
+            substituteParams(
+                isNegative ? charaCfg.negative_prompt : charaCfg.positive_prompt
+            )
+        );
+    }
+
+    if (guidanceScale.type === cfgType.global || cfgPromptCombine.includes(cfgType.global)) {
+        splitCfgPrompt.unshift(
+            substituteParams(
+                isNegative ? extension_settings.cfg.global.negative_prompt : extension_settings.cfg.global.positive_prompt
+            )
+        );
+    }
+
+    const customSeparator = getCustomSeparator();
+    const combinedCfgPrompt = splitCfgPrompt.filter((e) => e.length > 0).join(customSeparator);
+    const insertionDepth = chat_metadata[metadataKeys.prompt_insertion_depth] ?? 1;
+    console.log(`Setting CFG with guidance scale: ${guidanceScale.value}, negatives: ${combinedCfgPrompt}`);
+
+    return {
+        value: combinedCfgPrompt,
+        depth: insertionDepth
+    };
+}

public/scripts/extensions.js

@@ -11,7 +11,7 @@ export {
     ModuleWorkerWrapper,
 };
 
-let extensionNames = [];
+export let extensionNames = [];
 let manifests = {};
 const defaultUrl = "http://localhost:5100";
 
@@ -123,6 +123,7 @@ const extension_settings = {
     apiUrl: defaultUrl,
     apiKey: '',
     autoConnect: false,
+    notifyUpdates: false,
     disabledExtensions: [],
     expressionOverrides: [],
     memory: {},
@@ -134,7 +135,10 @@ const extension_settings = {
     caption: {
         refine_mode: false,
     },
-    expressions: {},
+    expressions: {
+        /** @type {string[]} */
+        custom: [],
+    },
     dice: {},
     regex: [],
     tts: {},
@@ -153,6 +157,8 @@ const extension_settings = {
     },
     speech_recognition: {},
     rvc: {},
+    hypebot: {},
+    vectors: {},
 };
 
 let modules = [];
@@ -192,7 +198,6 @@ async function doExtrasFetch(endpoint, args) {
     }
     Object.assign(args.headers, {
         'Authorization': `Bearer ${extension_settings.apiKey}`,
-        'Bypass-Tunnel-Reminder': 'bypass'
     });
 
     const response = await fetch(endpoint, args);
@@ -201,7 +206,7 @@ async function doExtrasFetch(endpoint, args) {
 
 async function discoverExtensions() {
     try {
-        const response = await fetch('/discover_extensions');
+        const response = await fetch('/api/extensions/discover');
 
         if (response.ok) {
             const extensions = await response.json();
@@ -363,6 +368,15 @@ function addExtensionsButtonAndMenu() {
     });
 }
 
+function notifyUpdatesInputHandler() {
+    extension_settings.notifyUpdates = !!$('#extensions_notify_updates').prop('checked');
+    saveSettingsDebounced();
+
+    if (extension_settings.notifyUpdates) {
+        checkForExtensionUpdates(true);
+    }
+}
+
 /*     $(document).on('click', function (e) {
         const target = $(e.target);
         if (target.is(dropdown)) return;
@@ -578,16 +592,25 @@ async function showExtensionsDetails() {
     let htmlExternal = '<h3>External Extensions:</h3>';
 
     const extensions = Object.entries(manifests).sort((a, b) => a[1].loading_order - b[1].loading_order);
+    const promises = [];
 
     for (const extension of extensions) {
-        const { isExternal, extensionHtml } = await getExtensionData(extension);
-        if (isExternal) {
-            htmlExternal += extensionHtml;
-        } else {
-            htmlDefault += extensionHtml;
-        }
+        promises.push(getExtensionData(extension));
     }
 
+    const settledPromises = await Promise.allSettled(promises);
+
+    settledPromises.forEach(promise => {
+        if (promise.status === 'fulfilled') {
+            const { isExternal, extensionHtml } = promise.value;
+            if (isExternal) {
+                htmlExternal += extensionHtml;
+            } else {
+                htmlDefault += extensionHtml;
+            }
+        }
+    });
+
     const html = `
         ${getModuleInformation()}
         ${htmlDefault}
@@ -605,8 +628,17 @@ async function showExtensionsDetails() {
  */
 async function onUpdateClick() {
     const extensionName = $(this).data('name');
+    await updateExtension(extensionName, false);
+}
+
+/**
+ * Updates a third-party extension via the API.
+ * @param {string} extensionName Extension folder name
+ * @param {boolean} quiet If true, don't show a success message
+ */
+async function updateExtension(extensionName, quiet) {
     try {
-        const response = await fetch('/update_extension', {
+        const response = await fetch('/api/extensions/update', {
             method: 'POST',
             headers: getRequestHeaders(),
             body: JSON.stringify({ extensionName })
@@ -614,19 +646,24 @@ async function onUpdateClick() {
 
         const data = await response.json();
         if (data.isUpToDate) {
-            toastr.success('Extension is already up to date');
+            if (!quiet) {
+                toastr.success('Extension is already up to date');
+            }
         } else {
-            toastr.success(`Extension updated to ${data.shortCommitHash}`);
+            toastr.success(`Extension ${extensionName} updated to ${data.shortCommitHash}`);
+        }
+
+        if (!quiet) {
+            showExtensionsDetails();
         }
-        showExtensionsDetails();
     } catch (error) {
         console.error('Error:', error);
     }
-};
+}
 
 /**
  * Handles the click event for the delete button of an extension.
- * This function makes a POST request to '/delete_extension' with the extension's name.
+ * This function makes a POST request to '/api/extensions/delete' with the extension's name.
  * If the extension is deleted, it displays a success message.
  * Creates a popup for the user to confirm before delete.
  */
@@ -635,23 +672,26 @@ async function onDeleteClick() {
     // use callPopup to create a popup for the user to confirm before delete
     const confirmation = await callPopup(`Are you sure you want to delete ${extensionName}?`, 'delete_extension');
     if (confirmation) {
-        try {
-            const response = await fetch('/delete_extension', {
-                method: 'POST',
-                headers: getRequestHeaders(),
-                body: JSON.stringify({ extensionName })
-            });
-        } catch (error) {
-            console.error('Error:', error);
-        }
-        toastr.success(`Extension ${extensionName} deleted`);
-        showExtensionsDetails();
-        // reload the page to remove the extension from the list
-        location.reload();
+        await deleteExtension(extensionName);
     }
 };
 
+export async function deleteExtension(extensionName) {
+    try {
+        const response = await fetch('/api/extensions/delete', {
+            method: 'POST',
+            headers: getRequestHeaders(),
+            body: JSON.stringify({ extensionName })
+        });
+    } catch (error) {
+        console.error('Error:', error);
+    }
 
+    toastr.success(`Extension ${extensionName} deleted`);
+    showExtensionsDetails();
+    // reload the page to remove the extension from the list
+    location.reload();
+}
 
 /**
  * Fetches the version details of a specific extension.
@@ -663,7 +703,7 @@ async function onDeleteClick() {
  */
 async function getExtensionVersion(extensionName) {
     try {
-        const response = await fetch('/get_extension_version', {
+        const response = await fetch('/api/extensions/version', {
             method: 'POST',
             headers: getRequestHeaders(),
             body: JSON.stringify({ extensionName })
@@ -676,9 +716,42 @@ async function getExtensionVersion(extensionName) {
     }
 }
 
+/**
+ * Installs a third-party extension via the API.
+ * @param {string} url Extension repository URL
+ * @returns {Promise<void>}
+ */
+export async function installExtension(url) {
+    console.debug('Extension installation started', url);
 
+    toastr.info('Please wait...', 'Installing extension');
 
-async function loadExtensionSettings(settings) {
+    const request = await fetch('/api/extensions/install', {
+        method: 'POST',
+        headers: getRequestHeaders(),
+        body: JSON.stringify({ url }),
+    });
+
+    if (!request.ok) {
+        const text = await request.text();
+        toastr.warning(text || request.statusText, 'Extension installation failed', { timeOut: 5000 });
+        console.error('Extension installation failed', request.status, request.statusText, text);
+        return;
+    }
+
+    const response = await request.json();
+    toastr.success(`Extension "${response.display_name}" by ${response.author} (version ${response.version}) has been installed successfully!`, 'Extension installation successful');
+    console.debug(`Extension "${response.display_name}" has been installed successfully at ${response.extensionPath}`);
+    await loadExtensionSettings({}, false);
+    eventSource.emit(event_types.EXTENSION_SETTINGS_LOADED);
+}
+
+/**
+ * Loads extension settings from the app settings.
+ * @param {object} settings App Settings
+ * @param {boolean} versionChanged Is this a version change?
+ */
+async function loadExtensionSettings(settings, versionChanged) {
     if (settings.extension_settings) {
         Object.assign(extension_settings, settings.extension_settings);
     }
@@ -686,15 +759,80 @@ async function loadExtensionSettings(settings) {
     $("#extensions_url").val(extension_settings.apiUrl);
     $("#extensions_api_key").val(extension_settings.apiKey);
     $("#extensions_autoconnect").prop('checked', extension_settings.autoConnect);
+    $("#extensions_notify_updates").prop('checked', extension_settings.notifyUpdates);
 
     // Activate offline extensions
     eventSource.emit(event_types.EXTENSIONS_FIRST_LOAD);
     extensionNames = await discoverExtensions();
     manifests = await getManifests(extensionNames)
+
+    if (versionChanged) {
+        await autoUpdateExtensions();
+    }
+
     await activateExtensions();
     if (extension_settings.autoConnect && extension_settings.apiUrl) {
         connectToApi(extension_settings.apiUrl);
     }
+
+    if (extension_settings.notifyUpdates) {
+        checkForExtensionUpdates(false);
+    }
+}
+
+/**
+ * Checks if there are updates available for 3rd-party extensions.
+ * @param {boolean} force Skip nag check
+ * @returns {Promise<any>}
+ */
+async function checkForExtensionUpdates(force) {
+    if (!force) {
+        const STORAGE_NAG_KEY = 'extension_update_nag';
+        const currentDate = new Date().toDateString();
+
+        // Don't nag more than once a day
+        if (localStorage.getItem(STORAGE_NAG_KEY) === currentDate) {
+            return;
+        }
+
+        localStorage.setItem(STORAGE_NAG_KEY, currentDate);
+    }
+
+    const updatesAvailable = [];
+    const promises = [];
+
+    for (const [id, manifest] of Object.entries(manifests)) {
+        if (manifest.auto_update && id.startsWith('third-party')) {
+            const promise = new Promise(async (resolve, reject) => {
+                try {
+                    const data = await getExtensionVersion(id.replace('third-party', ''));
+                    if (data.isUpToDate === false) {
+                        updatesAvailable.push(manifest.display_name);
+                    }
+                    resolve();
+                } catch (error) {
+                    console.error('Error checking for extension updates', error);
+                    reject();
+                }
+            });
+            promises.push(promise);
+        }
+    }
+
+    await Promise.allSettled(promises);
+
+    if (updatesAvailable.length > 0) {
+        toastr.info(`${updatesAvailable.map(x => `• ${x}`).join('\n')}`, 'Extension updates available');
+    }
+}
+
+async function autoUpdateExtensions() {
+    for (const [id, manifest] of Object.entries(manifests)) {
+        if (manifest.auto_update && id.startsWith('third-party')) {
+            console.debug(`Auto-updating 3rd-party extension: ${manifest.display_name} (${id})`);
+            await updateExtension(id.replace('third-party', ''), true);
+        }
+    }
 }
 
 async function runGenerationInterceptors(chat, contextSize) {
@@ -717,8 +855,36 @@ jQuery(function () {
     $("#extensions_connect").on('click', connectClickHandler);
     $("#extensions_autoconnect").on('input', autoConnectInputHandler);
     $("#extensions_details").on('click', showExtensionsDetails);
+    $("#extensions_notify_updates").on('input', notifyUpdatesInputHandler);
     $(document).on('click', '.toggle_disable', onDisableExtensionClick);
     $(document).on('click', '.toggle_enable', onEnableExtensionClick);
     $(document).on('click', '.btn_update', onUpdateClick);
     $(document).on('click', '.btn_delete', onDeleteClick);
+
+    /**
+     * Handles the click event for the third-party extension import button.
+     * Prompts the user to enter the Git URL of the extension to import.
+     * After obtaining the Git URL, makes a POST request to '/api/extensions/install' to import the extension.
+     * If the extension is imported successfully, a success message is displayed.
+     * If the extension import fails, an error message is displayed and the error is logged to the console.
+     * After successfully importing the extension, the extension settings are reloaded and a 'EXTENSION_SETTINGS_LOADED' event is emitted.
+     *
+     * @listens #third_party_extension_button#click - The click event of the '#third_party_extension_button' element.
+     */
+    $('#third_party_extension_button').on('click', async () => {
+        const html = `<h3>Enter the Git URL of the extension to install</h3>
+    <br>
+    <p><b>Disclaimer:</b> Please be aware that using external extensions can have unintended side effects and may pose security risks. Always make sure you trust the source before importing an extension. We are not responsible for any damage caused by third-party extensions.</p>
+    <br>
+    <p>Example: <tt> https://github.com/author/extension-name </tt></p>`
+        const input = await callPopup(html, 'input');
+
+        if (!input) {
+            console.debug('Extension install cancelled');
+            return;
+        }
+
+        const url = input.trim();
+        await installExtension(url);
+    });
 });

public/scripts/extensions/assets/confirm.html

@@ -0,0 +1,9 @@
+<div class="m-b-1">
+    Are you sure you want to connect to '{{url}}'?
+</div>
+<div class="flex-container justifyCenter">
+    <label class="checkbox_label" for="assets-remember">
+        <input type="checkbox" id="assets-remember">
+        Don't ask again for this URL
+    </label>
+</div>

public/scripts/extensions/assets/index.js

@@ -1,14 +1,16 @@
 /*
 TODO:
- - Check failed install file (0kb size ?)
 */
-//const DEBUG_TONY_SAMA_FORK_MODE = false
+//const DEBUG_TONY_SAMA_FORK_MODE = true
 
 import { getRequestHeaders, callPopup } from "../../../script.js";
+import { deleteExtension, extensionNames, installExtension, renderExtensionTemplate } from "../../extensions.js";
+import { getStringHash, isValidUrl } from "../../utils.js";
 export { MODULE_NAME };
 
-const MODULE_NAME = 'Assets';
+const MODULE_NAME = 'assets';
 const DEBUG_PREFIX = "<Assets module> ";
+let previewAudio = null;
 let ASSETS_JSON_URL = "https://raw.githubusercontent.com/SillyTavern/SillyTavern-Content/main/index.json"
 
 const extensionName = "assets";
@@ -29,7 +31,7 @@ const defaultSettings = {
 
 function downloadAssetsList(url) {
     updateCurrentAssets().then(function () {
-        fetch(url)
+        fetch(url, { cache: "no-cache" })
             .then(response => response.json())
             .then(json => {
 
@@ -47,10 +49,20 @@ function downloadAssetsList(url) {
                 }
 
                 console.debug(DEBUG_PREFIX, "Updated available assets to", availableAssets);
+                // First extensions, then everything else
+                const assetTypes = Object.keys(availableAssets).sort((a, b) => (a === 'extension') ? -1 : (b === 'extension') ? 1 : 0);
 
-                for (const assetType in availableAssets) {
+                for (const assetType of assetTypes) {
                     let assetTypeMenu = $('<div />', { id: "assets_audio_ambient_div", class: "assets-list-div" });
                     assetTypeMenu.append(`<h3>${assetType}</h3>`)
+
+                    if (assetType == 'extension') {
+                        assetTypeMenu.append(`
+                        <div class="assets-list-git">
+                            To download extensions from this page, you need to have <a href="https://git-scm.com/downloads" target="_blank">Git</a> installed.
+                        </div>`);
+                    }
+
                     for (const i in availableAssets[assetType]) {
                         const asset = availableAssets[assetType][i];
                         const elemId = `assets_install_${assetType}_${i}`;
@@ -59,7 +71,7 @@ function downloadAssetsList(url) {
                         element.append(label);
 
                         //if (DEBUG_TONY_SAMA_FORK_MODE)
-                        //    assetUrl = assetUrl.replace("https://github.com/SillyTavern/","https://github.com/Tony-sama/"); // DBG
+                        //    asset["url"] = asset["url"].replace("https://github.com/SillyTavern/","https://github.com/Tony-sama/"); // DBG
 
                         console.debug(DEBUG_PREFIX, "Checking asset", asset["id"], asset["url"]);
 
@@ -71,18 +83,18 @@ function downloadAssetsList(url) {
                             label.addClass("fa-check");
                             this.classList.remove('asset-download-button-loading');
                             element.on("click", assetDelete);
-                            element.on("mouseenter", function(){
+                            element.on("mouseenter", function () {
                                 label.removeClass("fa-check");
                                 label.addClass("fa-trash");
                                 label.addClass("redOverlayGlow");
-                            }).on("mouseleave", function(){
+                            }).on("mouseleave", function () {
                                 label.addClass("fa-check");
                                 label.removeClass("fa-trash");
                                 label.removeClass("redOverlayGlow");
                             });
                         };
 
-                        const assetDelete = async function() {
+                        const assetDelete = async function () {
                             element.off("click");
                             await deleteAsset(assetType, asset["id"]);
                             label.removeClass("fa-check");
@@ -98,11 +110,11 @@ function downloadAssetsList(url) {
                             label.toggleClass("fa-download");
                             label.toggleClass("fa-check");
                             element.on("click", assetDelete);
-                            element.on("mouseenter", function(){
+                            element.on("mouseenter", function () {
                                 label.removeClass("fa-check");
                                 label.addClass("fa-trash");
                                 label.addClass("redOverlayGlow");
-                            }).on("mouseleave", function(){
+                            }).on("mouseleave", function () {
                                 label.addClass("fa-check");
                                 label.removeClass("fa-trash");
                                 label.removeClass("redOverlayGlow");
@@ -114,14 +126,28 @@ function downloadAssetsList(url) {
                             element.on("click", assetInstall);
                         }
 
-                        console.debug(DEBUG_PREFIX, "Created element for BGM", asset["id"])
+                        console.debug(DEBUG_PREFIX, "Created element for ", asset["id"])
+
+                        const displayName = DOMPurify.sanitize(asset["name"] || asset["id"]);
+                        const description = DOMPurify.sanitize(asset["description"] || "");
+                        const url = isValidUrl(asset["url"]) ? asset["url"] : "";
+                        const previewIcon = assetType == 'extension' ? 'fa-arrow-up-right-from-square' : 'fa-headphones-simple';
 
                         $(`<i></i>`)
                             .append(element)
-                            .append(`<span>${asset["id"]}</span>`)
+                            .append(`<div class="flex-container flexFlowColumn">
+                                        <span class="flex-container alignitemscenter">
+                                            <b>${displayName}</b>
+                                            <a class="asset_preview" href="${url}" target="_blank" title="Preview in browser">
+                                                <i class="fa-solid fa-sm ${previewIcon}"></i>
+                                            </a>
+                                        </span>
+                                        <span>${description}</span>
+                                     </div>`)
                             .appendTo(assetTypeMenu);
                     }
                     assetTypeMenu.appendTo("#assets_menu");
+                    assetTypeMenu.on('click', 'a.asset_preview', previewAsset);
                 }
 
                 $("#assets_menu").show();
@@ -135,8 +161,37 @@ function downloadAssetsList(url) {
     });
 }
 
+function previewAsset(e) {
+    const href = $(this).attr('href');
+    const audioExtensions = ['.mp3', '.ogg', '.wav'];
+
+    if (audioExtensions.some(ext => href.endsWith(ext))) {
+        e.preventDefault();
+
+        if (previewAudio) {
+            previewAudio.pause();
+
+            if (previewAudio.src === href) {
+                previewAudio = null;
+                return;
+            }
+        }
+
+        previewAudio = new Audio(href);
+        previewAudio.play();
+        return;
+    }
+}
+
 function isAssetInstalled(assetType, filename) {
-    for (const i of currentAssets[assetType]) {
+    let assetList = currentAssets[assetType];
+
+    if (assetType == 'extension') {
+        const thirdPartyMarker = "third-party/";
+        assetList = extensionNames.filter(x => x.startsWith(thirdPartyMarker)).map(x => x.replace(thirdPartyMarker, ''));
+    }
+
+    for (const i of assetList) {
         //console.debug(DEBUG_PREFIX,i,filename)
         if (i.includes(filename))
             return true;
@@ -149,8 +204,15 @@ async function installAsset(url, assetType, filename) {
     console.debug(DEBUG_PREFIX, "Downloading ", url);
     const category = assetType;
     try {
+        if (category === 'extension') {
+            console.debug(DEBUG_PREFIX, "Installing extension ", url)
+            await installExtension(url);
+            console.debug(DEBUG_PREFIX, "Extension installed.")
+            return;
+        }
+
         const body = { url, category, filename };
-        const result = await fetch('/asset_download', {
+        const result = await fetch('/api/assets/download', {
             method: 'POST',
             headers: getRequestHeaders(),
             body: JSON.stringify(body),
@@ -170,8 +232,14 @@ async function deleteAsset(assetType, filename) {
     console.debug(DEBUG_PREFIX, "Deleting ", assetType, filename);
     const category = assetType;
     try {
+        if (category === 'extension') {
+            console.debug(DEBUG_PREFIX, "Deleting extension ", filename)
+            await deleteExtension(filename);
+            console.debug(DEBUG_PREFIX, "Extension deleted.")
+        }
+
         const body = { category, filename };
-        const result = await fetch('/asset_delete', {
+        const result = await fetch('/api/assets/delete', {
             method: 'POST',
             headers: getRequestHeaders(),
             body: JSON.stringify(body),
@@ -194,7 +262,7 @@ async function deleteAsset(assetType, filename) {
 async function updateCurrentAssets() {
     console.debug(DEBUG_PREFIX, "Checking installed assets...")
     try {
-        const result = await fetch(`/get_assets`, {
+        const result = await fetch(`/api/assets/get`, {
             method: 'POST',
             headers: getRequestHeaders(),
         });
@@ -214,24 +282,35 @@ async function updateCurrentAssets() {
 // This function is called when the extension is loaded
 jQuery(async () => {
     // This is an example of loading HTML from a file
-    const windowHtml = $(await $.get(`${extensionFolderPath}/window.html`));
+    const windowHtml = $(renderExtensionTemplate(MODULE_NAME, 'window', {}));
 
     const assetsJsonUrl = windowHtml.find('#assets-json-url-field');
     assetsJsonUrl.val(ASSETS_JSON_URL);
 
     const connectButton = windowHtml.find('#assets-connect-button');
     connectButton.on("click", async function () {
-        const confirmation = await callPopup(`Are you sure you want to connect to '${assetsJsonUrl.val()}'?`, 'confirm')
+        const url = String(assetsJsonUrl.val());
+        const rememberKey = `Assets_SkipConfirm_${getStringHash(url)}`;
+        const skipConfirm = localStorage.getItem(rememberKey) === 'true';
+
+        const template = renderExtensionTemplate(MODULE_NAME, 'confirm', { url });
+        const confirmation = skipConfirm || await callPopup(template, 'confirm');
+
         if (confirmation) {
             try {
+                if (!skipConfirm) {
+                    const rememberValue = Boolean($('#assets-remember').prop('checked'));
+                    localStorage.setItem(rememberKey, String(rememberValue));
+                }
+
                 console.debug(DEBUG_PREFIX, "Confimation, loading assets...");
-                downloadAssetsList(assetsJsonUrl.val());
+                downloadAssetsList(url);
                 connectButton.removeClass("fa-plug-circle-exclamation");
                 connectButton.removeClass("redOverlayGlow");
                 connectButton.addClass("fa-plug-circle-check");
             } catch (error) {
                 console.error('Error:', error);
-                toastr.error(`Cannot get assets list from ${assetsJsonUrl.val()}`);
+                toastr.error(`Cannot get assets list from ${url}`);
                 connectButton.removeClass("fa-plug-circle-check");
                 connectButton.addClass("fa-plug-circle-exclamation");
                 connectButton.removeClass("redOverlayGlow");

public/scripts/extensions/assets/style.css

@@ -13,18 +13,37 @@
     padding: 5px;
 }
 
+.assets-list-git {
+    font-size: calc(var(--mainFontSize) * 0.8);
+    opacity: 0.8;
+    margin-bottom: 1em;
+}
+
+.assets-list-div h3 {
+    text-transform: capitalize;
+}
+
+.assets-list-div i a {
+    color: inherit;
+}
+
 .assets-list-div i {
     display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: left;
     padding: 5px;
+    font-style: normal;
 }
 
-.assets-list-div i span{
+.assets-list-div i span {
     margin-left: 10px;
 }
 
+.assets-list-div i span:first-of-type {
+    font-weight: bold;
+}
+
 .asset-download-button {
     position: relative;
     width: 50px;
@@ -33,8 +52,8 @@
     outline: none;
     border-radius: 2px;
     cursor: pointer;
-  }
-  
+}
+
 .asset-download-button:active {
     background: #007a63;
 }
@@ -67,13 +86,11 @@
 }
 
 @keyframes asset-download-button-loading-spinner {
-from {
-    transform: rotate(0turn);
-}
+    from {
+        transform: rotate(0turn);
+    }
 
-to {
-    transform: rotate(1turn);
+    to {
+        transform: rotate(1turn);
+    }
 }
-}
-  
-  

public/scripts/extensions/assets/window.html

@@ -1,7 +1,7 @@
 <div id="assets_ui">
     <div class="inline-drawer">
         <div class="inline-drawer-toggle inline-drawer-header">
-            <b>Assets</b>
+            <b>Download Extensions & Assets</b>
             <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
         </div>
         <div class="inline-drawer-content">

public/scripts/extensions/audio/index.js

@@ -1,593 +0,0 @@
-/*
-Ideas:
- - cross fading between bgm / start a different time
- - Background based ambient sounds
-    - import option on background UI ?
- - Allow background music edition using background menu
-    - https://fontawesome.com/icons/music?f=classic&s=solid
-    - https://codepen.io/noirsociety/pen/rNQxQwm
-    - https://codepen.io/xrocker/pen/abdKVGy
-*/
-
-import { saveSettingsDebounced, getRequestHeaders } from "../../../script.js";
-import { getContext, extension_settings, ModuleWorkerWrapper } from "../../extensions.js";
-import { isDataURL } from "../../utils.js";
-export { MODULE_NAME };
-
-const extensionName = "audio";
-const extensionFolderPath = `scripts/extensions/${extensionName}`;
-
-const MODULE_NAME = 'Audio';
-const DEBUG_PREFIX = "<Audio module> ";
-const UPDATE_INTERVAL = 1000;
-
-const ASSETS_BGM_FOLDER = "bgm";
-const ASSETS_AMBIENT_FOLDER = "ambient";
-const CHARACTER_BGM_FOLDER = "bgm"
-
-const FALLBACK_EXPRESSION = "neutral";
-const DEFAULT_EXPRESSIONS = [
-    //"talkinghead",
-    "admiration",
-    "amusement",
-    "anger",
-    "annoyance",
-    "approval",
-    "caring",
-    "confusion",
-    "curiosity",
-    "desire",
-    "disappointment",
-    "disapproval",
-    "disgust",
-    "embarrassment",
-    "excitement",
-    "fear",
-    "gratitude",
-    "grief",
-    "joy",
-    "love",
-    "nervousness",
-    "optimism",
-    "pride",
-    "realization",
-    "relief",
-    "remorse",
-    "sadness",
-    "surprise",
-    "neutral"
-];
-const SPRITE_DOM_ID = "#expression-image";
-
-let fallback_BGMS = null; // Initialized only once with module workers
-let ambients = null; // Initialized only once with module workers
-let characterMusics = {}; // Updated with module workers
-
-let currentCharacterBGM = null;
-let currentExpressionBGM = null;
-let currentBackground = null;
-
-let cooldownBGM = 0;
-
-//#############################//
-//  Extension UI and Settings  //
-//#############################//
-
-const defaultSettings = {
-    enabled: false,
-    bgm_muted: true,
-    ambient_muted: true,
-    bgm_volume: 50,
-    ambient_volume: 50,
-    bgm_cooldown: 30
-}
-
-function loadSettings() {
-    if (extension_settings.audio === undefined)
-        extension_settings.audio = {};
-
-    if (Object.keys(extension_settings.audio).length === 0) {
-        Object.assign(extension_settings.audio, defaultSettings)
-    }
-    $("#audio_enabled").prop('checked', extension_settings.audio.enabled);
-
-    $("#audio_bgm_volume").text(extension_settings.audio.bgm_volume);
-    $("#audio_ambient_volume").text(extension_settings.audio.ambient_volume);
-
-    $("#audio_bgm_volume_slider").val(extension_settings.audio.bgm_volume);
-    $("#audio_ambient_volume_slider").val(extension_settings.audio.ambient_volume);
-
-    if (extension_settings.audio.bgm_muted) {
-        $("#audio_bgm_mute_icon").removeClass("fa-volume-high");
-        $("#audio_bgm_mute_icon").addClass("fa-volume-mute");
-        $("#audio_bgm_mute").addClass("redOverlayGlow");
-        $("#audio_bgm").prop("muted", true);
-    }
-    else{
-        $("#audio_bgm_mute_icon").addClass("fa-volume-high");
-        $("#audio_bgm_mute_icon").removeClass("fa-volume-mute");
-        $("#audio_bgm_mute").removeClass("redOverlayGlow");
-        $("#audio_bgm").prop("muted", false);
-    }
-
-    if (extension_settings.audio.ambient_muted) {
-        $("#audio_ambient_mute_icon").removeClass("fa-volume-high");
-        $("#audio_ambient_mute_icon").addClass("fa-volume-mute");
-        $("#audio_ambient_mute").addClass("redOverlayGlow");
-        $("#audio_ambient").prop("muted", true);
-    }
-    else{
-        $("#audio_ambient_mute_icon").addClass("fa-volume-high");
-        $("#audio_ambient_mute_icon").removeClass("fa-volume-mute");
-        $("#audio_ambient_mute").removeClass("redOverlayGlow");
-        $("#audio_ambient").prop("muted", false);
-    }
-
-    $("#audio_bgm_cooldown").val(extension_settings.audio.bgm_cooldown);
-
-    $("#audio_debug_div").hide(); // DBG
-}
-
-async function onEnabledClick() {
-    extension_settings.audio.enabled = $('#audio_enabled').is(':checked');
-    if (extension_settings.audio.enabled) {
-        if ($("#audio_bgm").attr("src") != "")
-            $("#audio_bgm")[0].play();
-        if ($("#audio_ambient").attr("src") != "")
-            $("#audio_ambient")[0].play();
-    } else {
-        $("#audio_bgm")[0].pause();
-        $("#audio_ambient")[0].pause();
-    }
-    saveSettingsDebounced();
-}
-
-async function onBGMMuteClick() {
-    extension_settings.audio.bgm_muted = !extension_settings.audio.bgm_muted;
-    $("#audio_bgm_mute_icon").toggleClass("fa-volume-high");
-    $("#audio_bgm_mute_icon").toggleClass("fa-volume-mute");
-    $("#audio_bgm").prop("muted", !$("#audio_bgm").prop("muted"));
-    $("#audio_bgm_mute").toggleClass("redOverlayGlow");
-    saveSettingsDebounced();
-}
-
-async function onAmbientMuteClick() {
-    extension_settings.audio.ambient_muted = !extension_settings.audio.ambient_muted;
-    $("#audio_ambient_mute_icon").toggleClass("fa-volume-high");
-    $("#audio_ambient_mute_icon").toggleClass("fa-volume-mute");
-    $("#audio_ambient").prop("muted", !$("#audio_ambient").prop("muted"));
-    $("#audio_ambient_mute").toggleClass("redOverlayGlow");
-    saveSettingsDebounced();
-}
-
-async function onBGMVolumeChange() {
-    extension_settings.audio.bgm_volume = ~~($("#audio_bgm_volume_slider").val());
-    $("#audio_bgm").prop("volume", extension_settings.audio.bgm_volume * 0.01);
-    $("#audio_bgm_volume").text(extension_settings.audio.bgm_volume);
-    saveSettingsDebounced();
-    //console.debug(DEBUG_PREFIX,"UPDATED BGM MAX TO",extension_settings.audio.bgm_volume);
-}
-
-async function onAmbientVolumeChange() {
-    extension_settings.audio.ambient_volume = ~~($("#audio_ambient_volume_slider").val());
-    $("#audio_ambient").prop("volume", extension_settings.audio.ambient_volume * 0.01);
-    $("#audio_ambient_volume").text(extension_settings.audio.ambient_volume);
-    saveSettingsDebounced();
-    //console.debug(DEBUG_PREFIX,"UPDATED Ambient MAX TO",extension_settings.audio.ambient_volume);
-}
-
-async function onBGMCooldownInput() {
-    extension_settings.audio.bgm_cooldown = ~~($("#audio_bgm_cooldown").val());
-    cooldownBGM = extension_settings.audio.bgm_cooldown * 1000;
-    saveSettingsDebounced();
-    console.debug(DEBUG_PREFIX, "UPDATED BGM cooldown to", extension_settings.audio.bgm_cooldown);
-}
-
-//#############################//
-//  API Calls                  //
-//#############################//
-
-async function getAssetsList(type) {
-    console.debug(DEBUG_PREFIX, "getting assets of type", type);
-
-    try {
-        const result = await fetch(`/get_assets`, {
-            method: 'POST',
-            headers: getRequestHeaders(),
-        });
-        const assets = result.ok ? (await result.json()) : { type: [] };
-        console.debug(DEBUG_PREFIX, "Found assets:", assets);
-        return assets[type];
-    }
-    catch (err) {
-        console.log(err);
-        return [];
-    }
-}
-
-async function getCharacterBgmList(name) {
-    console.debug(DEBUG_PREFIX, "getting bgm list for", name);
-
-    try {
-        const result = await fetch(`/get_character_assets_list?name=${encodeURIComponent(name)}&category=${CHARACTER_BGM_FOLDER}`, {
-            method: 'POST',
-            headers: getRequestHeaders(),
-        });
-        let musics = result.ok ? (await result.json()) : [];
-        return musics;
-    }
-    catch (err) {
-        console.log(err);
-        return [];
-    }
-}
-
-
-//#############################//
-//  Module Worker              //
-//#############################//
-
-/*
-    - Update ambient sound
-    - Update character BGM
-        - Solo dynamique expression
-        - Group only neutral bgm
-*/
-async function moduleWorker() {
-    const moduleEnabled = extension_settings.audio.enabled;
-
-    if (moduleEnabled) {
-
-        if (cooldownBGM > 0)
-            cooldownBGM -= UPDATE_INTERVAL;
-
-        if (fallback_BGMS == null) {
-            console.debug(DEBUG_PREFIX, "Updating audio bgm assets...");
-            fallback_BGMS = await getAssetsList(ASSETS_BGM_FOLDER);
-            fallback_BGMS = fallback_BGMS.filter((filename) => filename != ".placeholder")
-            console.debug(DEBUG_PREFIX, "Detected assets:", fallback_BGMS);
-        }
-
-        if (ambients == null) {
-            console.debug(DEBUG_PREFIX, "Updating audio ambient assets...");
-            ambients = await getAssetsList(ASSETS_AMBIENT_FOLDER);
-            ambients = ambients.filter((filename) => filename != ".placeholder")
-            console.debug(DEBUG_PREFIX, "Detected assets:", ambients);
-        }
-
-        // 1) Update ambient audio
-        // ---------------------------
-        let newBackground = $("#bg1").css("background-image");
-        const custom_background = getContext()["chatMetadata"]["custom_background"];
-
-        if (custom_background !== undefined)
-            newBackground = custom_background
-
-        if (!isDataURL(newBackground)) {
-            newBackground = newBackground.substring(newBackground.lastIndexOf("/") + 1).replace(/\.[^/.]+$/, "").replaceAll("%20", "-").replaceAll(" ", "-"); // remove path and spaces
-
-            //console.debug(DEBUG_PREFIX,"Current backgroung:",newBackground);
-
-            if (currentBackground !== newBackground) {
-                currentBackground = newBackground;
-
-                console.debug(DEBUG_PREFIX, "Changing ambient audio for", currentBackground);
-                updateAmbient();
-            }
-        }
-
-        const context = getContext();
-        //console.debug(DEBUG_PREFIX,context);
-
-        if (context.chat.length == 0)
-            return;
-
-        let chatIsGroup = context.chat[0].is_group;
-        let newCharacter = null;
-
-        // 1) Update BGM (single chat)
-        // -----------------------------
-        if (!chatIsGroup) {
-            newCharacter = context.name2;
-
-            //console.log(DEBUG_PREFIX,"SOLO CHAT MODE"); // DBG
-
-            // 1.1) First time loading chat
-            if (characterMusics[newCharacter] === undefined) {
-                await loadCharacterBGM(newCharacter);
-                currentExpressionBGM = FALLBACK_EXPRESSION;
-                //currentCharacterBGM = newCharacter;
-
-                //updateBGM();
-                //cooldownBGM = BGM_UPDATE_COOLDOWN;
-                return;
-            }
-
-            // 1.2) Switched chat
-            if (currentCharacterBGM !== newCharacter) {
-                currentCharacterBGM = newCharacter;
-                try {
-                    await updateBGM();
-                    cooldownBGM = extension_settings.audio.bgm_cooldown * 1000;
-                }
-                catch (error) {
-                    console.debug(DEBUG_PREFIX, "Error while trying to update BGM character, will try again");
-                    currentCharacterBGM = null
-                }
-                return;
-            }
-
-            const newExpression = getNewExpression();
-
-            // 1.3) Same character but different expression
-            if (currentExpressionBGM !== newExpression) {
-
-                // Check cooldown
-                if (cooldownBGM > 0) {
-                    //console.debug(DEBUG_PREFIX,"(SOLO) BGM switch on cooldown:",cooldownBGM);
-                    return;
-                }
-
-                try {
-                    await updateBGM();
-                    cooldownBGM = extension_settings.audio.bgm_cooldown * 1000;
-                    currentExpressionBGM = newExpression;
-                    console.debug(DEBUG_PREFIX, "(SOLO) Updated current character expression to", currentExpressionBGM, "cooldown", cooldownBGM);
-                }
-                catch (error) {
-                    console.debug(DEBUG_PREFIX, "Error while trying to update BGM expression, will try again");
-                    currentCharacterBGM = null
-                }
-                return;
-            }
-
-            return;
-        }
-
-        // 2) Update BGM (group chat)
-        // -----------------------------
-        newCharacter = context.chat[context.chat.length - 1].name;
-        const userName = context.name1;
-
-        if (newCharacter !== undefined && newCharacter != userName) {
-
-            //console.log(DEBUG_PREFIX,"GROUP CHAT MODE"); // DBG
-
-            // 2.1) First time character appear
-            if (characterMusics[newCharacter] === undefined) {
-                await loadCharacterBGM(newCharacter);
-                return;
-            }
-
-            // 2.2) Switched chat
-            if (currentCharacterBGM !== newCharacter) {
-                // Check cooldown
-                if (cooldownBGM > 0) {
-                    //console.debug(DEBUG_PREFIX,"(GROUP) BGM switch on cooldown:",cooldownBGM);
-                    return;
-                }
-
-                try {
-                    currentCharacterBGM = newCharacter;
-                    await updateBGM();
-                    cooldownBGM = extension_settings.audio.bgm_cooldown * 1000;
-                    currentCharacterBGM = newCharacter;
-                    currentExpressionBGM = FALLBACK_EXPRESSION;
-                    console.debug(DEBUG_PREFIX, "(GROUP) Updated current character BGM to", currentExpressionBGM, "cooldown", cooldownBGM);
-                }
-                catch (error) {
-                    console.debug(DEBUG_PREFIX, "Error while trying to update BGM group, will try again");
-                    currentCharacterBGM = null
-                }
-                return;
-            }
-
-            /*
-            const newExpression = getNewExpression();
-
-            // 1.3) Same character but different expression
-            if (currentExpressionBGM !== newExpression) {
-
-                // Check cooldown
-                if (cooldownBGM > 0) {
-                    console.debug(DEBUG_PREFIX,"BGM switch on cooldown:",cooldownBGM);
-                    return;
-                }
-
-                cooldownBGM = BGM_UPDATE_COOLDOWN;
-                currentExpressionBGM = newExpression;
-                console.debug(DEBUG_PREFIX,"Updated current character expression to",currentExpressionBGM);
-                updateBGM();
-                return;
-            }
-
-            return;*/
-
-        }
-
-        // Case 3: Same character/expression or BGM switch on cooldown keep playing same BGM
-        //console.debug(DEBUG_PREFIX,"Nothing to do for",currentCharacterBGM, newCharacter, currentExpressionBGM, cooldownBGM);
-    }
-}
-
-async function loadCharacterBGM(newCharacter) {
-    console.debug(DEBUG_PREFIX, "New character detected, loading BGM folder of", newCharacter);
-
-    // 1.1) First time character appear, load its music folder
-    const audio_file_paths = await getCharacterBgmList(newCharacter);
-    //console.debug(DEBUG_PREFIX, "Recieved", audio_file_paths);
-
-    // Initialise expression/files mapping
-    characterMusics[newCharacter] = {};
-    for (const e of DEFAULT_EXPRESSIONS)
-        characterMusics[newCharacter][e] = [];
-
-    for (const i of audio_file_paths) {
-        //console.debug(DEBUG_PREFIX,"File found:",i);
-        for (const e of DEFAULT_EXPRESSIONS)
-            if (i.includes(e))
-                characterMusics[newCharacter][e].push(i);
-    }
-    console.debug(DEBUG_PREFIX, "Updated BGM map of", newCharacter, "to", characterMusics[newCharacter]);
-}
-
-function getNewExpression() {
-    let newExpression;
-
-    // HACK: use sprite file name as expression detection
-    if (!$(SPRITE_DOM_ID).length) {
-        console.error(DEBUG_PREFIX, "ERROR: expression sprite does not exist, cannot extract expression from ", SPRITE_DOM_ID)
-        return FALLBACK_EXPRESSION;
-    }
-
-    const spriteFile = $("#expression-image").attr("src");
-    newExpression = spriteFile.substring(spriteFile.lastIndexOf("/") + 1).replace(/\.[^/.]+$/, "");
-    //
-
-    // No sprite to detect expression
-    if (newExpression == "") {
-        //console.info(DEBUG_PREFIX,"Warning: no expression extracted from sprite, switch to",FALLBACK_EXPRESSION);
-        newExpression = FALLBACK_EXPRESSION;
-    }
-
-    if (!DEFAULT_EXPRESSIONS.includes(newExpression)) {
-        console.info(DEBUG_PREFIX, "Warning:", newExpression, " is not a handled expression, expected one of", FALLBACK_EXPRESSION);
-        return FALLBACK_EXPRESSION;
-    }
-
-    return newExpression;
-}
-
-async function updateBGM() {
-    let audio_files = characterMusics[currentCharacterBGM][currentExpressionBGM];// Try char expression BGM
-
-    if (audio_files === undefined || audio_files.length == 0) {
-        console.debug(DEBUG_PREFIX, "No BGM for", currentCharacterBGM, currentExpressionBGM);
-        audio_files = characterMusics[currentCharacterBGM][FALLBACK_EXPRESSION]; // Try char FALLBACK BGM
-        if (audio_files === undefined || audio_files.length == 0) {
-            console.debug(DEBUG_PREFIX, "No default BGM for", currentCharacterBGM, FALLBACK_EXPRESSION, "switch to ST BGM");
-            audio_files = fallback_BGMS; // ST FALLBACK BGM
-
-            if (audio_files.length == 0) {
-                console.debug(DEBUG_PREFIX, "No default BGM file found, bgm folder may be empty.");
-                return;
-            }
-        }
-    }
-
-    const audio_file_path = audio_files[Math.floor(Math.random() * audio_files.length)];
-    console.log(DEBUG_PREFIX, "Updating BGM");
-    console.log(DEBUG_PREFIX, "Checking file", audio_file_path);
-    try {
-        const response = await fetch(audio_file_path);
-
-        if (!response.ok) {
-            console.log(DEBUG_PREFIX, "File not found!")
-        }
-        else {
-            console.log(DEBUG_PREFIX, "Switching BGM to", currentExpressionBGM)
-            const audio = $("#audio_bgm");
-
-            if (audio.attr("src") == audio_file_path) {
-                console.log(DEBUG_PREFIX, "Already playing, ignored");
-                return;
-            }
-
-            audio.animate({ volume: 0.0 }, 2000, function () {
-                audio.attr("src", audio_file_path);
-                audio[0].play();
-                audio.volume = extension_settings.audio.bgm_volume * 0.01;
-                audio.animate({ volume: extension_settings.audio.bgm_volume * 0.01 }, 2000);
-            })
-        }
-
-    } catch (error) {
-        console.log(DEBUG_PREFIX, "Error while trying to fetch", audio_file_path, ":", error);
-    }
-}
-
-async function updateAmbient() {
-    let audio_file_path = null;
-    for (const i of ambients) {
-        console.debug(i)
-        if (i.includes(currentBackground)) {
-            audio_file_path = i;
-            break;
-        }
-    }
-
-    if (audio_file_path === null) {
-        console.debug(DEBUG_PREFIX, "No ambient file found for background", currentBackground);
-        const audio = $("#audio_ambient");
-        audio.attr("src", "");
-        audio[0].pause();
-        return;
-    }
-
-    //const audio_file_path = AMBIENT_FOLDER+currentBackground+".mp3";
-    console.log(DEBUG_PREFIX, "Updating ambient");
-    console.log(DEBUG_PREFIX, "Checking file", audio_file_path);
-
-    const audio = $("#audio_ambient");
-    audio.animate({ volume: 0.0 }, 2000, function () {
-        audio.attr("src", audio_file_path);
-        audio[0].play();
-        audio.volume = extension_settings.audio.ambient_volume * 0.01;
-        audio.animate({ volume: extension_settings.audio.ambient_volume * 0.01 }, 2000);
-    });
-}
-
-//#############################//
-//  Extension load             //
-//#############################//
-
-// This function is called when the extension is loaded
-jQuery(async () => {
-    // This is an example of loading HTML from a file
-    const windowHtml = $(await $.get(`${extensionFolderPath}/window.html`));
-
-    $('#extensions_settings').append(windowHtml);
-    loadSettings();
-
-    $("#audio_bgm").attr("loop", true);
-    $("#audio_ambient").attr("loop", true);
-
-    $("#audio_bgm").hide();
-    $("#audio_ambient").hide();
-    $("#audio_bgm_mute").on("click", onBGMMuteClick);
-    $("#audio_ambient_mute").on("click", onAmbientMuteClick);
-
-    $("#audio_enabled").on("click", onEnabledClick);
-    $("#audio_bgm_volume_slider").on("input", onBGMVolumeChange);
-    $("#audio_ambient_volume_slider").on("input", onAmbientVolumeChange);
-
-    $("#audio_bgm_cooldown").on("input", onBGMCooldownInput);
-
-    // Reset assets container, will be redected like if ST restarted
-    $("#audio_refresh_assets").on("click", function(){
-        console.debug(DEBUG_PREFIX,"Refreshing audio assets");
-        fallback_BGMS = null;
-        ambients = null;
-        characterMusics = {};
-        currentCharacterBGM = null;
-        currentExpressionBGM = null;
-        currentBackground = null;
-    })
-
-    // DBG
-    $("#audio_debug").on("click", function () {
-        if ($("#audio_debug").is(':checked')) {
-            $("#audio_bgm").show();
-            $("#audio_ambient").show();
-        }
-        else {
-            $("#audio_bgm").hide();
-            $("#audio_ambient").hide();
-        }
-    });
-    //
-
-    const wrapper = new ModuleWorkerWrapper(moduleWorker);
-    setInterval(wrapper.update.bind(wrapper), UPDATE_INTERVAL);
-    moduleWorker();
-});

public/scripts/extensions/audio/manifest.json

@@ -1,11 +0,0 @@
-{
-    "display_name": "Dynamic Audio",
-    "loading_order": 14,
-    "requires": [],
-    "optional": ["classify"],
-    "js": "index.js",
-    "css": "style.css",
-    "author": "Keij#6799 and Deffcolony",
-    "version": "0.1.0",
-    "homePage": "https://github.com/SillyTavern/SillyTavern"
-}

public/scripts/extensions/audio/style.css

@@ -1,22 +0,0 @@
-.mixer-div {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    padding: 5px;
-}
-
-.audio-mute-button {
-    padding: 5px;
-    width: 50px;
-    height: 30px;
-}
-
-.audio-mute-button-muted {
-    color: red;
-}
-
-#audio_refresh_assets {
-    width: 50px;
-    height: 30px;
-}

public/scripts/extensions/audio/window.html

@@ -1,66 +0,0 @@
-<div id="audio_settings">
-    <div class="inline-drawer">
-        <div class="inline-drawer-toggle inline-drawer-header">
-            <b>Dynamic Audio</b>
-            <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
-        </div>
-        <div class="inline-drawer-content">
-            <div>
-                <label class="checkbox_label" for="audio_enabled">
-                    <input type="checkbox" id="audio_enabled" name="audio_enabled">
-                    <small>Enabled</small>
-                </label>
-                <div id="audio_debug_div">
-                    <label class="checkbox_label" for="audio_debug">
-                        <input type="checkbox" id="audio_debug" name="audio_debug">
-                        <small>Debug</small>
-                    </label>
-                </div>
-                <div>
-                    <label for="audio_refresh_assets">Refresh assets</label>
-                    <div id="audio_refresh_assets" class="menu_button">
-                        <i class="fa-solid fa-refresh fa-lg"></i>
-                    </div>
-                </div>
-            </div>
-            <div>
-                <div>
-                    <label for="audio_bgm_volume_slider">Music <span id="audio_bgm_volume"></span></label>
-                    <div class="mixer-div">
-                        <div id="audio_bgm_mute" class="menu_button audio-mute-button">
-                            <i class="fa-solid fa-volume-high fa-lg" id="audio_bgm_mute_icon"></i>
-                        </div>
-                        <input type="range" class ="slider" id ="audio_bgm_volume_slider" value = "0" maxlength ="100">
-                    </div>
-                    <audio id="audio_bgm" controls src="">
-                </div>
-                <div>
-                    <label for="audio_ambient_volume_slider">Ambient <span id="audio_ambient_volume"></span></label>
-                    <div class="mixer-div">
-                        <div id="audio_ambient_mute" class="menu_button audio-mute-button">
-                            <i class="fa-solid fa-volume-high fa-lg" id="audio_ambient_mute_icon"></i>
-                        </div>
-                        <input type="range" class ="slider" id ="audio_ambient_volume_slider" value = "0" maxlength ="100">
-                    </div>
-                    <audio id="audio_ambient" controls src="">
-                </div>
-                <div>
-                    <label for="audio_bgm_cooldown">Music update cooldown (in seconds)</label>
-                    <input id="audio_bgm_cooldown" class="text_pole wide30p">
-                </div>
-            </div>
-            <div>
-                <b>Hint:</b>
-                <i>
-                    Create new folder in the
-                    <b>public/characters/</b>
-                    folder and name it as the name of the character.
-                    Create a folder name <b>bgm</b> inside of it.
-                    Put bgm music with expressions there. File names should follow the pattern:
-                    <it>[expression_label]_[number].mp3</it>
-                    By default one of the <it>neutral_[number].mp3</it> will play if classify module is not active. 
-                </i>
-            </div>
-        </div>
-    </div>
-</div>

public/scripts/extensions/backgrounds/index.js

@@ -1,178 +0,0 @@
-import { eventSource, event_types, generateQuietPrompt } from "../../../script.js";
-import { getContext, saveMetadataDebounced } from "../../extensions.js";
-import { registerSlashCommand } from "../../slash-commands.js";
-import { stringFormat } from "../../utils.js";
-export { MODULE_NAME };
-
-const MODULE_NAME = 'backgrounds';
-const METADATA_KEY = 'custom_background';
-
-/**
- * @param {string} background
- */
-function forceSetBackground(background) {
-    saveBackgroundMetadata(background);
-    setCustomBackground();
-}
-
-async function moduleWorker() {
-    if (hasCustomBackground()) {
-        $('#unlock_background').show();
-        $('#lock_background').hide();
-        setCustomBackground();
-    }
-    else {
-        $('#unlock_background').hide();
-        $('#lock_background').show();
-        unsetCustomBackground();
-    }
-}
-
-function onLockBackgroundClick() {
-    const bgImage = window.getComputedStyle(document.getElementById('bg1')).backgroundImage;
-
-    // Extract the URL from the CSS string
-    const urlRegex = /url\((['"])?(.*?)\1\)/;
-    const matches = bgImage.match(urlRegex);
-    const url = matches[2];
-
-    // Remove the protocol and host, leaving the relative URL
-    const relativeUrl = new URL(url).pathname;
-    const relativeBgImage = `url("${relativeUrl}")`
-
-    saveBackgroundMetadata(relativeBgImage);
-    setCustomBackground();
-    $('#unlock_background').show();
-    $('#lock_background').hide();
-}
-
-function onUnlockBackgroundClick() {
-    removeBackgroundMetadata();
-    unsetCustomBackground();
-    $('#unlock_background').hide();
-    $('#lock_background').show();
-}
-
-function hasCustomBackground() {
-    const context = getContext();
-    return !!context.chatMetadata[METADATA_KEY];
-}
-
-function saveBackgroundMetadata(file) {
-    const context = getContext();
-    context.chatMetadata[METADATA_KEY] = file;
-    saveMetadataDebounced();
-}
-
-function removeBackgroundMetadata() {
-    const context = getContext();
-    delete context.chatMetadata[METADATA_KEY];
-    saveMetadataDebounced();
-}
-
-function setCustomBackground() {
-    const context = getContext();
-    const file = context.chatMetadata[METADATA_KEY];
-
-    // bg already set
-    if (document.getElementById("bg_custom").style.backgroundImage == file) {
-        return;
-    }
-
-    $("#bg_custom").css("background-image", file);
-    $("#custom_bg_preview").css("background-image", file);
-}
-
-function unsetCustomBackground() {
-    $("#bg_custom").css("background-image", 'none');
-    $("#custom_bg_preview").css("background-image", 'none');
-}
-
-function onSelectBackgroundClick() {
-    const bgfile = $(this).attr("bgfile");
-
-    if (hasCustomBackground()) {
-        saveBackgroundMetadata(`url("backgrounds/${bgfile}")`);
-        setCustomBackground();
-    }
-}
-
-const autoBgPrompt = `Pause your roleplay and choose a location ONLY from the provided list that is the most suitable for the current scene. Do not output any other text:\n{0}`;
-
-async function autoBackgroundCommand() {
-    const options = Array.from(document.querySelectorAll('.BGSampleTitle')).map(x => ({ element: x, text: x.innerText.trim() })).filter(x => x.text.length > 0);
-    if (options.length == 0) {
-        toastr.warning('No backgrounds to choose from. Please upload some images to the "backgrounds" folder.');
-        return;
-    }
-
-    const list = options.map(option => `- ${option.text}`).join('\n');
-    const prompt = stringFormat(autoBgPrompt, list);
-    const reply = await generateQuietPrompt(prompt);
-    const fuse = new Fuse(options, { keys: ['text'] });
-    const bestMatch = fuse.search(reply, { limit: 1 });
-
-    if (bestMatch.length == 0) {
-        toastr.warning('No match found. Please try again.');
-        return;
-    }
-
-    console.debug('Automatically choosing background:', bestMatch);
-    bestMatch[0].item.element.click();
-}
-
-$(document).ready(function () {
-    function addSettings() {
-        const html = `
-        <div class="background_settings">
-            <div class="inline-drawer">
-                <div class="inline-drawer-toggle inline-drawer-header">
-                    <b>Chat Backgrounds</b>
-                    <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
-                </div>
-                <div class="inline-drawer-content">
-                    <div class="background_controls">
-                        <div id="lock_background" class="menu_button">
-                            <i class="fa-solid fa-lock"></i>
-                            Lock
-                        </div>
-                        <div id="unlock_background" class="menu_button">
-                            <i class="fa-solid fa-unlock"></i>
-                            Unlock
-                        </div>
-                        <small>
-                            Press "Lock" to assign a currently selected background to a character or group chat.<br>
-                            Any background image selected while lock is engaged will be saved automatically.
-                        </small>
-                    </div>
-                    <div class="background_controls">
-                        <div id="auto_background" class="menu_button">
-                            <i class="fa-solid fa-wand-magic"></i>
-                            Auto
-                        </div>
-                        <small>
-                            Automatically select a background based on the chat context.<br>
-                            Respects the "Lock" setting state.
-                        </small>
-                    </div>
-                    <div>Preview</div>
-                    <div id="custom_bg_preview">
-                    </div>
-                </div>
-            </div>
-        </div>
-        `;
-        $('#extensions_settings').append(html);
-        $('#lock_background').on('click', onLockBackgroundClick);
-        $('#unlock_background').on('click', onUnlockBackgroundClick);
-        $(document).on("click", ".bg_example", onSelectBackgroundClick);
-        $('#auto_background').on("click", autoBackgroundCommand);
-    }
-
-    addSettings();
-    registerSlashCommand('lockbg', onLockBackgroundClick, ['bglock'], " – locks a background for the currently selected chat", true, true);
-    registerSlashCommand('unlockbg', onUnlockBackgroundClick, ['bgunlock'], ' – unlocks a background for the currently selected chat', true, true);
-    registerSlashCommand('autobg', autoBackgroundCommand, ['bgauto'], ' – automatically changes the background based on the chat context using the AI request prompt', true, true);
-    eventSource.on(event_types.FORCE_SET_BACKGROUND, forceSetBackground);
-    eventSource.on(event_types.CHAT_CHANGED, moduleWorker);
-});

public/scripts/extensions/backgrounds/manifest.json

@@ -1,11 +0,0 @@
-{
-    "display_name": "Chat Backgrounds",
-    "loading_order": 7,
-    "requires": [],
-    "optional": [],
-    "js": "index.js",
-    "css": "style.css",
-    "author": "Cohee#1207",
-    "version": "1.0.0",
-    "homePage": "https://github.com/SillyTavern/SillyTavern"
-}

public/scripts/extensions/backgrounds/style.css

@@ -1,45 +0,0 @@
-#custom_bg_preview {
-    width: 160px;
-    height: 90px;
-    background-color: var(--grey30a);
-    background-repeat: no-repeat;
-    background-attachment: fixed;
-    background-size: cover;
-    border-radius: 20px;
-    border: 1px solid var(--black50a);
-    box-shadow: 0 0 7px var(--black50a);
-    margin: 5px;
-}
-
-#custom_bg_preview::before {
-    content: 'No Background';
-    color: white;
-    position: relative;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-#custom_bg_preview:not([style*="background-image: none"])::before {
-    display: none;
-}
-
-.background_controls .menu_button {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    column-gap: 10px;
-}
-
-.background_controls {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    column-gap: 10px;
-}
-
-.background_controls small {
-    flex-grow: 1;
-}

public/scripts/extensions/bulk-edit/manifest.json

@@ -1,11 +0,0 @@
-{
-    "display_name": "Bulk Card Editor",
-    "loading_order": 9,
-    "requires": [],
-    "optional": [],
-    "js": "index.js",
-    "css": "style.css",
-    "author": "city-unit",
-    "version": "1.0.0",
-    "homePage": "https://github.com/city-unit"
-}

public/scripts/extensions/bulk-edit/style.css

@@ -1,7 +0,0 @@
-.bulk_select_checkbox {
-    align-self: center;
-}
-
-#rm_print_characters_block.bulk_select .wide100pLess70px {
-    width: calc(100% - 85px);
-}

public/scripts/extensions/caption/index.js

@@ -1,6 +1,6 @@
-import { getBase64Async } from "../../utils.js";
-import { getContext, getApiUrl, doExtrasFetch, extension_settings } from "../../extensions.js";
-import { callPopup, saveSettingsDebounced } from "../../../script.js";
+import { getBase64Async, saveBase64AsFile } from "../../utils.js";
+import { getContext, getApiUrl, doExtrasFetch, extension_settings, modules } from "../../extensions.js";
+import { callPopup, getRequestHeaders, saveSettingsDebounced } from "../../../script.js";
 import { getMessageTimeStamp } from "../../RossAscends-mods.js";
 export { MODULE_NAME };
 
@@ -8,7 +8,8 @@ const MODULE_NAME = 'caption';
 const UPDATE_INTERVAL = 1000;
 
 async function moduleWorker() {
-    $('#send_picture').toggle(getContext().onlineStatus !== 'no_connection');
+    const hasConnection = getContext().onlineStatus !== 'no_connection';
+    $('#send_picture').toggle(hasConnection);
 }
 
 async function setImageIcon() {
@@ -52,7 +53,6 @@ async function sendCaptionedMessage(caption, image) {
     const message = {
         name: context.name1,
         is_user: true,
-        is_name: true,
         send_date: getMessageTimeStamp(),
         mes: messageText,
         extra: {
@@ -65,16 +65,21 @@ async function sendCaptionedMessage(caption, image) {
     await context.generate('caption');
 }
 
-async function onSelectImage(e) {
-    setSpinnerIcon();
-    const file = e.target.files[0];
+async function doCaptionRequest(base64Img) {
+    if (extension_settings.caption.local) {
+        const apiResult = await fetch('/api/extra/caption', {
+            method: 'POST',
+            headers: getRequestHeaders(),
+            body: JSON.stringify({ image: base64Img })
+        });
 
-    if (!file) {
-        return;
-    }
+        if (!apiResult.ok) {
+            throw new Error('Failed to caption image via local pipeline.');
+        }
 
-    try {
-        const base64Img = await getBase64Async(file);
+        const data = await apiResult.json();
+        return data;
+    } else if (modules.includes('caption')) {
         const url = new URL(getApiUrl());
         url.pathname = '/api/caption';
 
@@ -84,17 +89,42 @@ async function onSelectImage(e) {
                 'Content-Type': 'application/json',
                 'Bypass-Tunnel-Reminder': 'bypass',
             },
-            body: JSON.stringify({ image: base64Img.split(',')[1] })
+            body: JSON.stringify({ image: base64Img })
         });
 
-        if (apiResult.ok) {
-            const data = await apiResult.json();
-            const caption = data.caption;
-            const imageToSave = data.thumbnail ? `data:image/jpeg;base64,${data.thumbnail}` : base64Img;
-            await sendCaptionedMessage(caption, imageToSave);
+        if (!apiResult.ok) {
+            throw new Error('Failed to caption image via Extras.');
         }
+
+        const data = await apiResult.json();
+        return data;
+    } else {
+        throw new Error('No captioning module is available.');
+    }
+}
+
+async function onSelectImage(e) {
+    setSpinnerIcon();
+    const file = e.target.files[0];
+
+    if (!file || !(file instanceof File)) {
+        return;
+    }
+
+    try {
+        const context = getContext();
+        const fileData = await getBase64Async(file);
+        const base64Format = fileData.split(',')[0].split(';')[0].split('/')[1];
+        const base64Data = fileData.split(',')[1];
+        const data = await doCaptionRequest(base64Data);
+        const caption = data.caption;
+        const imageToSave = data.thumbnail ? data.thumbnail : base64Data;
+        const format = data.thumbnail ? 'jpeg' : base64Format;
+        const imagePath = await saveBase64AsFile(imageToSave, context.name2, '', format);
+        await sendCaptionedMessage(caption, imagePath);
     }
     catch (error) {
+        toastr.error('Failed to caption image.');
         console.log(error);
     }
     finally {
@@ -113,12 +143,21 @@ jQuery(function () {
         const sendButton = $(`
         <div id="send_picture" class="list-group-item flex-container flexGap5">
             <div class="fa-solid fa-image extensionsMenuExtensionButton"></div>
-            Send a picture
+            Send a Picture
         </div>`);
 
         $('#extensionsMenu').prepend(sendButton);
         $(sendButton).hide();
-        $(sendButton).on('click', () => $('#img_file').trigger('click'));
+        $(sendButton).on('click', () => {
+            const hasCaptionModule = modules.includes('caption') || extension_settings.caption.local;
+
+            if (!hasCaptionModule) {
+                toastr.error('No captioning module is available. Either enable the local captioning pipeline or connect to Extras.');
+                return;
+            }
+
+            $('#img_file').trigger('click');
+        });
     }
     function addPictureSendForm() {
         const inputHtml = `<input id="img_file" type="file" accept="image/*">`;
@@ -131,13 +170,17 @@ jQuery(function () {
     }
     function addSettings() {
         const html = `
-        <div class="background_settings">
+        <div class="caption_settings">
             <div class="inline-drawer">
                 <div class="inline-drawer-toggle inline-drawer-header">
                     <b>Image Captioning</b>
                     <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
                 </div>
                 <div class="inline-drawer-content">
+                    <label class="checkbox_label" for="caption_local">
+                        <input id="caption_local" type="checkbox" class="checkbox">
+                        Use local captioning pipeline
+                    </label>
                     <label class="checkbox_label" for="caption_refine_mode">
                         <input id="caption_refine_mode" type="checkbox" class="checkbox">
                         Edit captions before generation
@@ -155,6 +198,11 @@ jQuery(function () {
     setImageIcon();
     moduleWorker();
     $('#caption_refine_mode').prop('checked', !!(extension_settings.caption.refine_mode));
+    $('#caption_local').prop('checked', !!(extension_settings.caption.local));
     $('#caption_refine_mode').on('input', onRefineModeInput);
+    $('#caption_local').on('input', () => {
+        extension_settings.caption.local = !!$('#caption_local').prop('checked');
+        saveSettingsDebounced();
+    });
     setInterval(moduleWorker, UPDATE_INTERVAL);
 });

public/scripts/extensions/caption/manifest.json

@@ -1,10 +1,10 @@
 {
     "display_name": "Image Captioning",
     "loading_order": 4,
-    "requires": [
+    "requires": [],
+    "optional": [
         "caption"
     ],
-    "optional": [],
     "js": "index.js",
     "css": "style.css",
     "author": "Cohee#1207",