Merge pull request #1290 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 && \

SECURITY.md

@@ -0,0 +1,25 @@
+# Security Policy
+
+We take the security of this project seriously. If you discover any security vulnerabilities or have concerns regarding the security of this repository, please reach out to us immediately. We appreciate your efforts in responsibly disclosing the issue and will make every effort to address it promptly.
+
+## Reporting a Vulnerability
+
+To report a security vulnerability, please follow these steps:
+
+1. Go to the **Security** tab of this repository on GitHub.
+2. Click on **"Report a vulnerability"**.
+3. Provide a clear description of the vulnerability and its potential impact. Be as detailed as possible.
+4. If applicable, include steps or a PoC (Proof of Concept) to reproduce the vulnerability.
+5. Submit the report.
+
+Once we receive the private report notification, we will promptly investigate and assess the reported vulnerability.
+
+Please do not disclose any potential vulnerabilities in public repositories, issue trackers, or forums until we have had a chance to review and address the issue.
+
+## Scope
+
+This security policy applies to all the code and files within this repository and its dependencies actively maintained by us. If you encounter a security issue in a dependency that is not directly maintained by us, please follow responsible disclosure practices and report it to the respective project.
+
+While we strive to ensure the security of this project, please note that there may be limitations on resources, response times, and mitigations.
+
+Thank you for your help in making this project more secure.

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,10 +116,29 @@
         "!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",
+        "!pip install Flask_Cloudflared\n",
+        "!pip install webuiapi\n",
+        "!pip install diffusers\n",
+        "!pip install accelerate\n",
+        "!pip install silero_api_server\n",
+        "!pip install edge_tts\n",
+        "!pip install chromadb\n",
+        "!pip install sentence_transformers\n",
         "!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,23 +9,48 @@ 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;
 
-module.exports = {
-  port,
-  whitelist,
-  whitelistMode,
-  basicAuthMode,
-  basicAuthUser,
-  autorun,
-  enableExtensions,
-  listen,
-  disableThumbnails,
-  allowKeysExposure,
-  securityOverride,
-  skipContentCheck,
+// 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 = {
+    port,
+    whitelist,
+    whitelistMode,
+    basicAuthMode,
+    basicAuthUser,
+    autorun,
+    enableExtensions,
+    listen,
+    disableThumbnails,
+    allowKeysExposure,
+    securityOverride,
+    skipContentCheck,
+    requestOverrides,
+    thumbnailsQuality,
+    extras,
+    disableChatBackup,
 };

default/settings.json

@@ -68,7 +68,6 @@
         "tokenizer": 99,
         "token_padding": 64,
         "collapse_newlines": false,
-        "pygmalion_formatting": 0,
         "pin_examples": false,
         "strip_examples": false,
         "trim_sentences": false,
@@ -76,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,
@@ -168,7 +164,6 @@
         "custom_stopping_strings_macro": true,
         "fuzzy_search": true,
         "encode_tags": false,
-        "lazy_load": 100,
         "ui_mode": 1
     },
     "extension_settings": {
@@ -411,7 +406,6 @@
         "tfs": 1,
         "rep_pen_slope": 0,
         "single_line": false,
-        "use_stop_sequence": false,
         "streaming_kobold": false,
         "sampler_order": [
             6,
@@ -421,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",
@@ -604,7 +603,6 @@
         "proxy_password": "",
         "assistant_prefill": "",
         "use_ai21_tokenizer": false,
-        "exclude_assistant": false,
-        "nsfw_avoidance_prompt": "Avoid writing a NSFW/Smut reply. Creatively write around it NSFW/Smut scenarios in character."
+        "exclude_assistant": false
     }
 }

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"

jsconfig.json

@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "ESNext",
+        "target": "ESNext",
+        "moduleResolution": "node",
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "checkJs": true,
+        "allowUmdGlobalAccess": true,
+        "allowSyntheticDefaultImports": true,
+        "resolveJsonModule": true
+    },
+    "exclude": [
+        "node_modules",
+        "**/node_modules/*"
+    ]
+}

package.json

@@ -3,37 +3,33 @@
         "@agnai/sentencepiece-js": "^1.1.1",
         "@agnai/web-tokenizers": "^0.1.3",
         "@dqbd/tiktoken": "^1.0.2",
-        "axios": "^1.4.0",
         "command-exists": "^1.2.9",
         "compression": "^1",
         "cookie-parser": "^1.4.6",
         "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",
-        "node-rest-client": "^3.1.1",
-        "open": "^8.4.0",
-        "piexifjs": "^1.0.6",
+        "open": "^8.4.2",
         "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",
@@ -51,11 +47,12 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.10.0",
+    "version": "1.10.6",
     "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"
@@ -80,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/Adventurer-NeoX-20B-Erebus.settings

@@ -1,21 +0,0 @@
-{
-   "temp": 0.8,
-   "top_k": 28,
-   "top_p": 0.94,
-   "top_a": 0.00,
-   "tfs": 0.96,
-   "typical": 0.98,
-   "rep_pen": 1.03,
-   "rep_pen_slope": 0.8,
-   "rep_pen_range": 120.0,
-   "ikgen": 200,
-   "sampler_order": [
-      6,
-      4,
-      3,
-      2,
-      0,
-      1,
-      5
-   ]
-}

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/Calibrated-Pygmalion-6b.settings

@@ -1,20 +0,0 @@
-{
-	"temp": 1.0,
-	"top_p": 0.9,
-	"top_k": 40,
-	"top_a": 0.0,
-	"tfs": 0.9,
-	"typical": 1.0,
-	"rep_pen": 1.01,
-	"rep_pen_slope": 0.9,
-	"rep_pen_range": 1024,
-	"sampler_order": [
-		6,
-		0,
-		1,
-		2,
-		3,
-		4,
-		5
-	]
-}

public/KoboldAI Settings/Classic-Pygmalion-2.7b.settings

@@ -1,20 +0,0 @@
-{
-	"temp": 0.43,
-	"top_p": 0.96,
-	"top_k": 0,
-	"top_a": 0.0,
-	"tfs": 0.68,
-	"typical": 1.0,
-	"rep_pen": 1.17,
-	"rep_pen_slope": 0.2,
-	"rep_pen_range": 1024,
-	"sampler_order": [
-		6,
-		0,
-		1,
-		2,
-		3,
-		4,
-		5
-	]
-}

public/KoboldAI Settings/Classic-Pygmalion-6b.settings

@@ -1,20 +0,0 @@
-{
-	"temp": 0.65,
-	"top_p": 0.9,
-	"top_k": 0,
-	"top_a": 0.0,
-	"tfs": 0.9,
-	"typical": 1.0,
-	"rep_pen": 1.1,
-	"rep_pen_slope": 0.9,
-	"rep_pen_range": 1024,
-	"sampler_order": [
-		6,
-		0,
-		1,
-		2,
-		3,
-		4,
-		5		
-	]
-}

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/Default-TavernAI.settings

@@ -1,20 +0,0 @@
-{
-    "temp": 0.79,
-    "top_k": 0,
-    "top_p": 0.9,
-    "top_a": 0,
-    "typical": 1,
-    "tfs": 0.95,
-    "rep_pen": 1.19,
-    "rep_pen_range": 1024,
-    "rep_pen_slope": 0.9,
-    "sampler_order": [
-        6,
-        0,
-        1,
-        2,
-        3,
-        4,
-        5
-    ]
-}

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/DragonSlayer-Pygmalion-6b.settings

@@ -1,20 +0,0 @@
-{
-	"temp": 0.79,
-	"top_p": 0.9,
-	"top_k": 0,
-	"top_a": 0.0,
-	"tfs": 0.95,
-	"typical": 1.0,
-	"rep_pen": 1.19,
-	"rep_pen_slope": 0.9,
-	"rep_pen_range": 1024,
-	"sampler_order": [
-		6,
-		0,
-		1,
-		2,
-		3,
-		4,
-		5
-	]
-}

public/KoboldAI Settings/GPU-Pygmalion-6b.settings

@@ -1,20 +0,0 @@
-{
-	"temp": 0.65,
-	"top_p": 0.9,
-	"top_k": 0,
-	"top_a": 0.0,
-	"tfs": 0.9,
-	"typical": 1.0,
-	"rep_pen": 1.08,
-	"rep_pen_slope": 0.9,
-	"rep_pen_range": 1024,
-	"sampler_order": [
-		6,
-		0,
-		1,
-		2,
-		3,
-		4,
-		5
-	]
-}

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/Lancer-OPT-2.7B-Erebus.settings

@@ -1,20 +0,0 @@
-{
-   "temp": 0.8,
-   "top_p": 0.94,
-   "top_k": 15,
-   "tfs": 0.96,
-   "typical": 0.98,
-   "top_a": 0.01,
-   "rep_pen": 1.02,
-   "rep_pen_slope": 0.8,
-   "rep_pen_range": 256.0,
-   "sampler_order": [
-      6,
-      4,
-      3,
-      2,
-      0,
-      1,
-      5
-   ]
-}

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/RA - Pygmalion-1.3b.settings

@@ -1,20 +0,0 @@
-{
-	"temp": 1,
-	"top_p": 1,
-	"top_k": 0,
-	"top_a": 0.0,
-	"tfs": 0.97,
-	"typical": 1.0,
-	"rep_pen": 1.04,
-	"rep_pen_slope": 0.0,
-	"rep_pen_range": 1400,
-	"sampler_order": [
-		6,
-		0,
-		1,
-		2,
-		3,
-		4,
-		5
-	]
-}

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/NovelAI Settings/Ace_of_Spades-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-    "order": [3, 2, 1, 0],
-    "temperature": 1.15,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 0,
-    "top_p": 0.95,
-    "top_a": 1,
-    "typical_p": 1,
-    "tail_free_sampling": 0.8,
-    "repetition_penalty": 2.75,
-    "repetition_penalty_range": 2048,
-    "repetition_penalty_slope": 7.02,
-    "repetition_penalty_frequency": 0,
-    "repetition_penalty_presence": 0,
-    "max_context": 2048
-}

public/NovelAI Settings/All_Nighter-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-    "order": [1, 0, 3],
-    "temperature": 1.33,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 13,
-    "top_p": 1,
-    "top_a": 1,
-    "typical_p": 1,
-    "tail_free_sampling": 0.836,
-    "repetition_penalty": 2.366,
-    "repetition_penalty_range": 400,
-    "repetition_penalty_slope": 0.33,
-    "repetition_penalty_frequency": 0.01,
-    "repetition_penalty_presence": 0,
-    "max_context": 2048
-}

public/NovelAI Settings/Basic_Coherence-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-    "order": [0, 1, 2, 3],
-    "temperature": 0.585,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 0,
-    "top_p": 1,
-    "top_a": 1,
-    "typical_p": 1,
-    "tail_free_sampling": 0.87,
-    "repetition_penalty": 3.05,
-    "repetition_penalty_range": 2048,
-    "repetition_penalty_slope": 0.33,
-    "repetition_penalty_frequency": 0,
-    "repetition_penalty_presence": 0,
-    "max_context": 2048
-}

public/NovelAI Settings/Classic-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-   "order": [2, 1, 3, 0],
-   "temperature": 0.63,
-   "max_length": 90,
-   "min_length": 1,
-   "tail_free_sampling": 0.975,
-   "repetition_penalty": 1.148125,
-   "repetition_penalty_range": 2048,
-   "repetition_penalty_frequency": 0,
-   "repetition_penalty_presence": 0,
-   "repetition_penalty_slope": 0.09,
-   "max_context":2048,
-   "top_p": 0.975,
-   "top_k": 0,
-   "top_a": 1,
-   "typical_p": 1
-}

public/NovelAI Settings/Classic-Krake.settings

@@ -1,17 +0,0 @@
-{
-   "order": [3, 4, 5, 2, 0],
-   "temperature": 1.33,
-   "max_length": 90,
-   "min_length": 1,
-   "tail_free_sampling": 0.937,
-   "repetition_penalty": 1.05,
-   "repetition_penalty_range": 560,
-   "repetition_penalty_frequency": 0,
-   "repetition_penalty_presence": 0,
-   "repetition_penalty_slope": 0.18,
-   "max_context": 2048,
-   "top_p": 0.88,
-   "top_k": 0,
-   "top_a": 0.085,
-   "typical_p": 0.985
-}

public/NovelAI Settings/Fandango-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-    "order": [2, 1, 3, 0],
-    "temperature": 0.86,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 20,
-    "top_p": 0.95,
-    "top_a": 1,
-    "typical_p": 1,
-    "tail_free_sampling": 1,
-    "repetition_penalty": 2.25,
-    "repetition_penalty_range": 2048,
-    "repetition_penalty_slope": 0.09,
-    "repetition_penalty_frequency": 0,
-    "repetition_penalty_presence": 0,
-    "max_context": 2048
-}

public/NovelAI Settings/Genesis-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-    "order": [2, 1, 3, 0],
-    "temperature": 0.63,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 0,
-    "top_p": 0.975,
-    "top_a": 1,
-    "typical_p": 1,
-    "tail_free_sampling": 0.975,
-    "repetition_penalty": 2.975,
-    "repetition_penalty_range": 2048,
-    "repetition_penalty_slope": 0.09,
-    "repetition_penalty_frequency": 0,
-    "repetition_penalty_presence": 0,
-    "max_context":2048
-}

public/NovelAI Settings/Low_Rider-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-   "order": [2, 1, 3, 0],
-    "temperature": 0.94,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 12,
-    "top_p": 1,
-    "top_a": 1,
-    "typical_p": 1,
-    "tail_free_sampling": 0.94,
-    "repetition_penalty": 2.66,
-    "repetition_penalty_range": 2048,
-    "repetition_penalty_slope": 0.18,
-    "repetition_penalty_frequency": 0.013,
-    "repetition_penalty_presence": 0,
-    "max_context": 2048
-}

public/NovelAI Settings/Moonlit_Chronicler-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-    "order": [1, 5, 4, 3, 0],
-    "temperature": 1.25,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 300,
-    "top_p": 1,
-    "top_a": 0.782,
-    "typical_p": 0.95,
-    "tail_free_sampling": 0.802,
-    "repetition_penalty": 2.075,
-    "repetition_penalty_range": 512,
-    "repetition_penalty_slope": 0.36,
-    "repetition_penalty_frequency": 0,
-    "repetition_penalty_presence": 0,
-    "max_context": 2048
-}

public/NovelAI Settings/Morpho-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-   "order": [0],
-    "temperature": 0.6889,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 0,
-    "top_p": 1,
-    "top_a": 1,
-    "typical_p": 1,
-    "tail_free_sampling": 1,
-    "repetition_penalty": 1,
-    "repetition_penalty_range": 2048,
-    "repetition_penalty_slope": 0,
-    "repetition_penalty_frequency": 0.1,
-    "repetition_penalty_presence": 0,
-    "max_context": 2048
-}

public/NovelAI Settings/Ouroborous-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-    "order": [1, 0, 3],
-    "temperature": 1.07,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 264,
-    "top_p": 1,
-    "top_a": 1,
-    "typical_p": 1,
-    "tail_free_sampling": 0.925,
-    "repetition_penalty": 2.165,
-    "repetition_penalty_range": 404,
-    "repetition_penalty_slope": 0.84,
-    "repetition_penalty_frequency": 0,
-    "repetition_penalty_presence": 0,
-    "max_context":2048
-}

public/NovelAI Settings/Pro_Writer-Euterpe.settings

@@ -1,17 +0,0 @@
-{
-    "order": [3, 0],
-    "temperature": 1.348,
-    "max_length": 60,
-    "min_length": 60,
-    "top_k": 64,
-    "top_p": 0.909,
-    "top_a": 1,
-    "typical_p": 1,
-    "tail_free_sampling": 0.688,
-    "repetition_penalty": 4.967,
-    "repetition_penalty_range": 2048,
-    "repetition_penalty_slope": 0.09,
-    "repetition_penalty_frequency": 0,
-    "repetition_penalty_presence": 0,
-    "max_context": 2048
-}

public/TextGen Settings/Miro Bronze.settings

@@ -1,11 +1,13 @@
 {
-    "temp": 0.5,
-    "top_p": 0.9,
+    "temp": 1.06,
+    "top_p": 1,
     "top_k": 0,
     "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
-    "rep_pen": 1.1,
+    "epsilon_cutoff": 0,
+    "eta_cutoff": 0,
+    "rep_pen": 1,
     "rep_pen_range": 0,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
@@ -15,7 +17,8 @@
     "encoder_rep_pen": 1,
     "do_sample": true,
     "early_stopping": false,
-    "mirostat_mode": 0,
-    "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "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,11 +293,22 @@
         display: none;
     }
 
-    #bg_menu_content {
+    .bg_list {
         width: unset;
     }
 }
 
+@media screen and (min-width: 1001px) {
+
+    #PygOverrides,
+    #ContextFormatting,
+    #UI-Theme-Block,
+    #UI-Customization,
+    #power-user-options-block {
+        flex: 1;
+    }
+}
+
 /*landscape mode phones and ipads*/
 @media screen and (max-width: 1000px) and (orientation: landscape) {
     body.waifuMode img.expression {
@@ -300,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);
@@ -407,4 +445,4 @@
     #horde_model {
         height: unset;
     }
-}
+}

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,12 +54,13 @@
 #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 {
     display: flex;
     justify-content: space-between;
+    font-size: calc(var(--mainFontSize)*1.2);
 }
 
 #completion_prompt_manager #completion_prompt_manager_list li.completion_prompt_manager_prompt .prompt_manager_prompt_controls span {
@@ -77,7 +78,7 @@
     height: 20px;
     width: 20px;
     filter: drop-shadow(0px 0px 2px black);
-    opacity: 0.2;
+    opacity: 0.4;
 }
 
 #completion_prompt_manager #completion_prompt_manager_list li.completion_prompt_manager_prompt span span:hover {
@@ -108,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 {
@@ -171,6 +172,10 @@
     color: var(--white30a);
 }
 
+#completion_prompt_manager #completion_prompt_manager_list .completion_prompt_manager_prompt:not(.completion_prompt_manager_prompt_disabled) .prompt-manager-toggle-action {
+    color: var(--SmartThemeQuoteColor);
+}
+
 #completion_prompt_manager #completion_prompt_manager_list .completion_prompt_manager_prompt.completion_prompt_manager_prompt_disabled {
     border: 1px solid var(--white20a);
 }
@@ -260,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;
 }
@@ -404,6 +444,7 @@
 
 .widthFitContent {
     width: fit-content;
+    min-width: fit-content;
 }
 
 .flexGap5 {

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

@@ -8,15 +8,10 @@ body.tts .mes_narrate {
     display: inline-block;
 }
 
-body.no-hotswap .hotswap {
-    display: none !important;
-}
-
-body.no-timer .mes_timer {
-    display: none !important;
-}
-
+body.no-hotswap .hotswap,
+body.no-timer .mes_timer,
 body.no-timestamps .timestamp,
+body.no-tokenCount .tokenCounterDisplay,
 body.no-mesIDDisplay .mesIDDisplay,
 body.no-modelIcons .icon-svg {
     display: none !important;
@@ -122,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;
 }
 
@@ -196,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"] {
@@ -262,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 {
@@ -297,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;
 }
 
@@ -347,8 +327,8 @@ body.movingUI #sheld,
 body.movingUI .drawer-content,
 body.movingUI #expression-holder,
 body.movingUI .zoomed_avatar,
-body.movingUI #floatingPrompt,
-body.movingUI #groupMemberListPopout {
+body.movingUI .draggable,
+body.movingUI #floatingPrompt {
     resize: both;
 }
 
@@ -357,6 +337,7 @@ body.movingUI #groupMemberListPopout {
     height: 120px;
     margin-top: 0;
     top: 50px;
+    justify-content: center;
 }
 
 /*No Text Shadows Mode*/
@@ -364,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

@@ -4,7 +4,7 @@ import { callPopup, event_types, eventSource, is_send_press, main_api, substitut
 import { is_group_generating } from "./group-chats.js";
 import { TokenHandler } from "./openai.js";
 import { power_user } from "./power-user.js";
-import { debounce, waitUntilCondition } from "./utils.js";
+import { debounce, waitUntilCondition, escapeHtml } from "./utils.js";
 
 function debouncePromise(func, delay) {
     let timeoutId;
@@ -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.
  */
@@ -53,14 +63,14 @@ const registerPromptManagerMigration = () => {
     };
 
     eventSource.on(event_types.SETTINGS_LOADED_BEFORE, settings => migrate(settings));
-    eventSource.on(event_types.OAI_PRESET_CHANGED, event => migrate(event.preset, event.savePreset, event.presetName));
+    eventSource.on(event_types.OAI_PRESET_CHANGED_BEFORE, event => migrate(event.preset, event.savePreset, event.presetName));
 }
 
 /**
  * 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
@@ -604,22 +622,20 @@ PromptManagerModule.prototype.init = function (moduleConfiguration, serviceSetti
     document.getElementById(this.configuration.prefix + 'prompt_manager_popup_close_button').addEventListener('click', closeAndClearPopup);
 
     // Re-render prompt manager on openai preset change
-    eventSource.on(event_types.OAI_PRESET_CHANGED, settings => {
-        // Save configuration and wrap everything up.
-        this.saveServiceSettings().then(() => {
-            this.hidePopup();
-            this.clearEditForm();
-            this.renderDebounced();
+    eventSource.on(event_types.OAI_PRESET_CHANGED_AFTER, () => {
+        this.sanitizeServiceSettings();
+        const mainPrompt = this.getPromptById('main');
+        this.updateQuickEdit('main', mainPrompt);
 
-            const mainPrompt = this.getPromptById('main');
-            this.updateQuickEdit('main', mainPrompt);
+        const nsfwPrompt = this.getPromptById('nsfw');
+        this.updateQuickEdit('nsfw', nsfwPrompt);
 
-            const nsfwPrompt = this.getPromptById('nsfw');
-            this.updateQuickEdit('nsfw', nsfwPrompt);
+        const jailbreakPrompt = this.getPromptById('jailbreak');
+        this.updateQuickEdit('jailbreak', jailbreakPrompt);
 
-            const jailbreakPrompt = this.getPromptById('jailbreak');
-            this.updateQuickEdit('jailbreak', jailbreakPrompt);
-        });
+        this.hidePopup();
+        this.clearEditForm();
+        this.renderDebounced();
     });
 
     // Re-render prompt manager on world settings update
@@ -643,19 +659,13 @@ PromptManagerModule.prototype.render = function (afterTryGenerate = true) {
         if (true === afterTryGenerate) {
             // Executed during dry-run for determining context composition
             this.profileStart('filling context');
-            this.tryGenerate().then(() => {
+            this.tryGenerate().finally(() => {
                 this.profileEnd('filling context');
                 this.profileStart('render');
                 this.renderPromptManager();
                 this.renderPromptManagerListItems()
                 this.makeDraggable();
                 this.profileEnd('render');
-            }).catch(error => {
-                this.profileEnd('filling context');
-                this.log('Error caught during render: ' + error);
-                this.renderPromptManager();
-                this.renderPromptManagerListItems()
-                this.makeDraggable();
             });
         } else {
             // Executed during live communication
@@ -679,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);
 }
 
 /**
@@ -1091,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) {
@@ -1158,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;
 }
@@ -1291,7 +1311,7 @@ PromptManagerModule.prototype.renderPromptManager = function () {
         const prompts = [...this.serviceSettings.prompts]
             .filter(prompt => prompt && !prompt?.system_prompt)
             .sort((promptA, promptB) => promptA.name.localeCompare(promptB.name))
-            .reduce((acc, prompt) => acc + `<option value="${prompt.identifier}">${prompt.name}</option>`, '');
+            .reduce((acc, prompt) => acc + `<option value="${prompt.identifier}">${escapeHtml(prompt.name)}</option>`, '');
 
         const footerHtml = `
             <div class="${this.configuration.prefix}prompt_manager_footer">
@@ -1440,13 +1460,19 @@ PromptManagerModule.prototype.renderPromptManagerListItems = function () {
             toggleSpanHtml = `<span class="fa-solid"></span>`;
         }
 
+        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="${prompt.name}">
+                <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>' : ''}
-                    ${this.isPromptInspectionAllowed(prompt) ? `<a class="prompt-manager-inspect-action">${prompt.name}</a>` : prompt.name}
+                    ${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">